diff options
author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2024-05-10 21:34:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-10 21:34:39 +0200 |
commit | 5dd59e4322f9a88e94a40046fb3a88d6525b8638 (patch) | |
tree | 7e2dfab31332abb6808473f3dae2a703bbc2a481 /src/main | |
parent | 3d3dc4928236f8c5ba137d34e22aca255216d4c8 (diff) | |
download | GT5-Unofficial-5dd59e4322f9a88e94a40046fb3a88d6525b8638.tar.gz GT5-Unofficial-5dd59e4322f9a88e94a40046fb3a88d6525b8638.tar.bz2 GT5-Unofficial-5dd59e4322f9a88e94a40046fb3a88d6525b8638.zip |
Add textures for numbered bio and breakthrough circuits (#880)
add numbers to bio and breakthrough circuits
Diffstat (limited to 'src/main')
53 files changed, 7 insertions, 19 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java b/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java index 9db4d7b97c..e70561efac 100644 --- a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java +++ b/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java @@ -37,6 +37,7 @@ import gregtech.api.objects.XSTR; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Utility; import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory; +import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatableItem { @@ -44,7 +45,7 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab private final List<ItemStack> ALL_VARIANTS = new ArrayList<>(); private final String iconLocation; - protected IIcon base; + protected final IIcon[] iconDamage = new IIcon[25]; public GTPP_IntegratedCircuit_Item(String unlocalizedName, String iconLocation) { this.setHasSubtypes(true); @@ -111,27 +112,14 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab @Override public void registerIcons(final IIconRegister u) { - this.base = u.registerIcon(GTPlusPlus.ID + ":" + iconLocation); - } - - @Override - public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { - return this.base; - } - - @Override - public IIcon getIconFromDamage(int damage) { - return this.base; - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - return this.base; + for (int i = 0; i < iconDamage.length; i++) { + this.iconDamage[i] = u.registerIcon(GTPlusPlus.ID + ":" + iconLocation + "/" + i); + } } @Override - public IIcon getIcon(ItemStack stack, int pass) { - return this.base; + public IIcon getIconFromDamage(int meta) { + return this.iconDamage[MathUtils.balance(meta, 0, 24)]; } @Override diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png Binary files differdeleted file mode 100644 index c2736be76c..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/0.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/0.png Binary files differnew file mode 100644 index 0000000000..4143a1eb39 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/0.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/1.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/1.png Binary files differnew file mode 100644 index 0000000000..f39df3b01d --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/1.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/10.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/10.png Binary files differnew file mode 100644 index 0000000000..10af629bb7 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/10.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/11.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/11.png Binary files differnew file mode 100644 index 0000000000..b674e687f5 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/11.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/12.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/12.png Binary files differnew file mode 100644 index 0000000000..a9040b5f80 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/12.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/13.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/13.png Binary files differnew file mode 100644 index 0000000000..4be42c2631 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/13.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/14.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/14.png Binary files differnew file mode 100644 index 0000000000..5ce86b105c --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/14.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/15.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/15.png Binary files differnew file mode 100644 index 0000000000..ac7e30177f --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/15.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/16.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/16.png Binary files differnew file mode 100644 index 0000000000..37867c28e4 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/16.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/17.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/17.png Binary files differnew file mode 100644 index 0000000000..f1b2d9578c --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/17.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/18.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/18.png Binary files differnew file mode 100644 index 0000000000..89b5cf0d67 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/18.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/19.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/19.png Binary files differnew file mode 100644 index 0000000000..e0d4ecdd46 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/19.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/2.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/2.png Binary files differnew file mode 100644 index 0000000000..b49d729143 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/2.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/20.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/20.png Binary files differnew file mode 100644 index 0000000000..9147fb942b --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/20.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/21.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/21.png Binary files differnew file mode 100644 index 0000000000..43a02b8eaf --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/21.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/22.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/22.png Binary files differnew file mode 100644 index 0000000000..b58efee183 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/22.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/23.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/23.png Binary files differnew file mode 100644 index 0000000000..7f6067e83e --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/23.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/24.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/24.png Binary files differnew file mode 100644 index 0000000000..a0590c188c --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/24.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/3.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/3.png Binary files differnew file mode 100644 index 0000000000..9439d51b25 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/3.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/4.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/4.png Binary files differnew file mode 100644 index 0000000000..fe06094f2d --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/4.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/5.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/5.png Binary files differnew file mode 100644 index 0000000000..f4bd2f6df2 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/5.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/6.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/6.png Binary files differnew file mode 100644 index 0000000000..abf0b77778 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/6.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/7.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/7.png Binary files differnew file mode 100644 index 0000000000..338a39d5f6 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/7.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/8.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/8.png Binary files differnew file mode 100644 index 0000000000..73c2408ce8 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/8.png diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/9.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/9.png Binary files differnew file mode 100644 index 0000000000..b5ab13cb1f --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/9.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png Binary files differdeleted file mode 100644 index 8bcfa62ae4..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/0.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/0.png Binary files differnew file mode 100644 index 0000000000..0ae88d993d --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/0.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/1.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/1.png Binary files differnew file mode 100644 index 0000000000..fdc81d8566 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/1.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/10.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/10.png Binary files differnew file mode 100644 index 0000000000..2a8e28155c --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/10.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/11.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/11.png Binary files differnew file mode 100644 index 0000000000..fc33c3a20e --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/11.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/12.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/12.png Binary files differnew file mode 100644 index 0000000000..d79ccb6457 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/12.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/13.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/13.png Binary files differnew file mode 100644 index 0000000000..0b1a12cf05 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/13.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/14.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/14.png Binary files differnew file mode 100644 index 0000000000..3182d9cb04 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/14.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/15.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/15.png Binary files differnew file mode 100644 index 0000000000..eeecdbd59a --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/15.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/16.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/16.png Binary files differnew file mode 100644 index 0000000000..3d5f296660 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/16.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/17.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/17.png Binary files differnew file mode 100644 index 0000000000..440fd477d9 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/17.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/18.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/18.png Binary files differnew file mode 100644 index 0000000000..463c0ccce0 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/18.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/19.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/19.png Binary files differnew file mode 100644 index 0000000000..982eca6df8 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/19.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/2.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/2.png Binary files differnew file mode 100644 index 0000000000..36afb07e7b --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/2.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/20.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/20.png Binary files differnew file mode 100644 index 0000000000..bba4b04331 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/20.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/21.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/21.png Binary files differnew file mode 100644 index 0000000000..d391055ad7 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/21.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/22.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/22.png Binary files differnew file mode 100644 index 0000000000..acbf53c53c --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/22.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/23.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/23.png Binary files differnew file mode 100644 index 0000000000..4e01f007da --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/23.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/24.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/24.png Binary files differnew file mode 100644 index 0000000000..b80dca122e --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/24.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/3.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/3.png Binary files differnew file mode 100644 index 0000000000..370e0f84d2 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/3.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/4.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/4.png Binary files differnew file mode 100644 index 0000000000..3f1cfe4081 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/4.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/5.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/5.png Binary files differnew file mode 100644 index 0000000000..d789444710 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/5.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/6.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/6.png Binary files differnew file mode 100644 index 0000000000..40ab646c04 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/6.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/7.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/7.png Binary files differnew file mode 100644 index 0000000000..091f63b0c1 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/7.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/8.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/8.png Binary files differnew file mode 100644 index 0000000000..3262bf8f9f --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/8.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/9.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/9.png Binary files differnew file mode 100644 index 0000000000..ce8104263e --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/9.png |