Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor iconsets folder #3381

Closed
wants to merge 30 commits into from
Closed

Refactor iconsets folder #3381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
de36635
Change Seismic Prospector top face to north face
BlueHero233 Oct 16, 2024
2cbb425
Remove "_POTIONBREWER" from file name since its already inside potion…
BlueHero233 Oct 16, 2024
9a9bdc1
Make Steel and Bronze Machinery use already existing textures from ba…
BlueHero233 Oct 16, 2024
d6afaa5
Move Steam Furnace, Mass Fabricator, Scanner, Gene Extractor, Replica…
BlueHero233 Oct 16, 2024
02625ae
Added new texture for RTG instead of reusing naquadah reactor textures
BlueHero233 Oct 16, 2024
07d2dca
Remove unused textures from api (and organize them a bit)
BlueHero233 Oct 16, 2024
de69013
Miniscule detail
BlueHero233 Oct 16, 2024
a1be025
Merge branch 'master' into small-fixes
Dream-Master Oct 16, 2024
e5d2cca
Merge branch 'master' into small-fixes
Dream-Master Oct 17, 2024
cbcefc5
Merge branch 'master' into small-fixes
Dream-Master Oct 21, 2024
62b87e8
Merge branch 'master' into small-fixes
BlueHero233 Oct 21, 2024
5b61818
Remove boolean
BlueHero233 Oct 21, 2024
567be79
Texture Rename and Redo
BlueHero233 Oct 30, 2024
1fc457c
Merge branch 'master' into small-fixes
BlueHero233 Oct 30, 2024
6c692f7
Add New Textures for Charcoal Pit instead of reusing Rockbreaker
BlueHero233 Nov 1, 2024
ccba0c9
Add New Textures for Advanced Seismic Prospector instead of reusing R…
BlueHero233 Nov 1, 2024
5f044b1
Merge branch 'master' into small-fixes
Dream-Master Nov 2, 2024
48bdaea
Merge branch 'master' into small-fixes
BlueHero233 Nov 9, 2024
d4342ce
Merge branch 'master' into small-fixes
BlueHero233 Nov 9, 2024
641d916
Merge branch 'master' into small-fixes
BlueHero233 Nov 16, 2024
f8a3b4a
Merge branch 'master' into small-fixes
Dream-Master Nov 16, 2024
d38e8f1
Merge branch 'master' into small-fixes
BlueHero233 Nov 16, 2024
9c79c13
Merge branch 'master' into small-fixes
Dream-Master Nov 17, 2024
a875e17
Merge branch 'master' into small-fixes
Dream-Master Nov 17, 2024
f1696e6
Merge branch 'master' into small-fixes
Dream-Master Dec 14, 2024
3ee027c
Merge branch 'master' into small-fixes
Dream-Master Dec 18, 2024
c0a6d79
Merge branch 'master' into small-fixes
Dream-Master Dec 21, 2024
bac3715
Merge branch 'master' into small-fixes
Dream-Master Dec 21, 2024
197a52f
Merge branch 'master' into small-fixes
Dream-Master Jan 8, 2025
113198f
Merge branch 'master' into small-fixes
Dream-Master Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 31 additions & 166 deletions src/main/java/gregtech/api/enums/Textures.java
View file
Open in desktop

Large diffs are not rendered by default.

49 changes: 17 additions & 32 deletions src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
package gregtech.common.tileentities.machines.basic;

import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_GLOW;
import static gregtech.common.UndergroundOil.undergroundOilReadInformation;

import java.util.ArrayList;
Expand All @@ -36,6 +20,7 @@
import gregtech.api.GregTechAPI;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
Expand Down Expand Up @@ -67,51 +52,51 @@ public MTEAdvSeismicProspector(int aID, String aName, String aNameRegional, int
1, // input slot count
1, // output slot count
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_SIDE_ACTIVE")),
Comment on lines -70 to +55
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change these all to no longer use the fields in Textures?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When making my resource pack, it was bothering me that the rock breaker texture was being reused on other machines that definetely didnt look or work like a rock breaker, so along with creating a different texture for such machines, i also moved them to basicmachines, as a way to keep single block machine textures consistent instead of adding more fields to the textures enum and making the iconsets folder even bigger

TextureFactory.builder()
.addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_SIDE_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_SIDE")),
TextureFactory.builder()
.addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_SIDE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER_ACTIVE),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_FRONT_ACTIVE")),
TextureFactory.builder()
.addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_FRONT_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_FRONT")),
TextureFactory.builder()
.addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_FRONT_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_TOP_ACTIVE")),
TextureFactory.builder()
.addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_TOP_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_TOP")),
TextureFactory.builder()
.addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_TOP_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_BOTTOM_ACTIVE")),
TextureFactory.builder()
.addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_BOTTOM_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_BOTTOM")),
TextureFactory.builder()
.addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/seismic/OVERLAY_BOTTOM_GLOW"))
.glow()
.build()));
radius = aRadius;
Expand Down
49 changes: 17 additions & 32 deletions src/main/java/gregtech/common/tileentities/machines/basic/MTEMassfabricator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
package gregtech.common.tileentities.machines.basic;

import static gregtech.api.enums.GTValues.V;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MASSFAB;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_MASSFAB;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_MASSFAB;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_MASSFAB_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_MASSFAB_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_MASSFAB_GLOW;

import java.util.Arrays;

Expand All @@ -29,6 +13,7 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.MachineType;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
Expand Down Expand Up @@ -65,51 +50,51 @@ public MTEMassfabricator(int aID, String aName, String aNameRegional, int aTier)
1,
1,
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_MASSFAB_ACTIVE),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_SIDE_ACTIVE")),
TextureFactory.builder()
.addIcon(OVERLAY_SIDE_MASSFAB_ACTIVE_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_SIDE_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_MASSFAB),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_SIDE")),
TextureFactory.builder()
.addIcon(OVERLAY_SIDE_MASSFAB_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_SIDE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_MASSFAB_ACTIVE),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_FRONT_ACTIVE")),
TextureFactory.builder()
.addIcon(OVERLAY_FRONT_MASSFAB_ACTIVE_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_FRONT_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_MASSFAB),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_FRONT")),
TextureFactory.builder()
.addIcon(OVERLAY_FRONT_MASSFAB_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_FRONT_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_MASSFAB_ACTIVE),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_TOP_ACTIVE")),
TextureFactory.builder()
.addIcon(OVERLAY_TOP_MASSFAB_ACTIVE_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_TOP_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_MASSFAB),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_TOP")),
TextureFactory.builder()
.addIcon(OVERLAY_TOP_MASSFAB_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_TOP_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_MASSFAB_ACTIVE),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_BOTTOM_ACTIVE")),
TextureFactory.builder()
.addIcon(OVERLAY_BOTTOM_MASSFAB_ACTIVE_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_BOTTOM_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_MASSFAB),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_BOTTOM")),
TextureFactory.builder()
.addIcon(OVERLAY_BOTTOM_MASSFAB_GLOW)
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/massfab/OVERLAY_BOTTOM_GLOW"))
.glow()
.build()));
}
Expand Down
56 changes: 18 additions & 38 deletions src/main/java/gregtech/common/tileentities/machines/basic/MTEPotionBrewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,74 +33,54 @@ public MTEPotionBrewer(int aID, String aName, String aNameRegional, int aTier) {
1,
0,
TextureFactory.of(
TextureFactory.of(
new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER_ACTIVE")),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_ACTIVE")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon(
"basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW"))
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER")),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER_GLOW"))
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(
new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER_ACTIVE")),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT_ACTIVE")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon(
"basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW"))
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER")),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon(
"basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER_GLOW"))
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(
new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER_ACTIVE")),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_ACTIVE")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon(
"basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW"))
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER")),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER_GLOW"))
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory.of(
new Textures.BlockIcons.CustomIcon(
"basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER_ACTIVE")),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_BOTTOM_ACTIVE")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon(
"basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW"))
new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_BOTTOM_ACTIVE_GLOW"))
.glow()
.build()),
TextureFactory.of(
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER")),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_BOTTOM")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon(
"basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER_GLOW"))
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_BOTTOM_GLOW"))
.glow()
.build()));
}
Expand Down
Loading
Loading