diff --git a/dependencies.gradle b/dependencies.gradle index 015e4b471b..4e51cc80ff 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,5 @@ dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.07-pre:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.19-pre:dev') api("com.github.GTNewHorizons:bartworks:0.10.0:dev") implementation('curse.maven:cofh-core-69162:2388751') 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.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 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 boolean showDurabilityBar(ItemStack stack) { @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 deleted file mode 100644 index c2736be76c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png and /dev/null differ 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 new file mode 100644 index 0000000000..4143a1eb39 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/0.png differ 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 new file mode 100644 index 0000000000..f39df3b01d Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/1.png differ 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 new file mode 100644 index 0000000000..10af629bb7 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/10.png differ 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 new file mode 100644 index 0000000000..b674e687f5 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/11.png differ 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 new file mode 100644 index 0000000000..a9040b5f80 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/12.png differ 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 new file mode 100644 index 0000000000..4be42c2631 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/13.png differ 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 new file mode 100644 index 0000000000..5ce86b105c Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/14.png differ 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 new file mode 100644 index 0000000000..ac7e30177f Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/15.png differ 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 new file mode 100644 index 0000000000..37867c28e4 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/16.png differ 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 new file mode 100644 index 0000000000..f1b2d9578c Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/17.png differ 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 new file mode 100644 index 0000000000..89b5cf0d67 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/18.png differ 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 new file mode 100644 index 0000000000..e0d4ecdd46 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/19.png differ 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 new file mode 100644 index 0000000000..b49d729143 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/2.png differ 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 new file mode 100644 index 0000000000..9147fb942b Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/20.png differ 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 new file mode 100644 index 0000000000..43a02b8eaf Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/21.png differ 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 new file mode 100644 index 0000000000..b58efee183 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/22.png differ 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 new file mode 100644 index 0000000000..7f6067e83e Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/23.png differ 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 new file mode 100644 index 0000000000..a0590c188c Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/24.png differ 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 new file mode 100644 index 0000000000..9439d51b25 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/3.png differ 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 new file mode 100644 index 0000000000..fe06094f2d Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/4.png differ 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 new file mode 100644 index 0000000000..f4bd2f6df2 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/5.png differ 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 new file mode 100644 index 0000000000..abf0b77778 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/6.png differ 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 new file mode 100644 index 0000000000..338a39d5f6 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/7.png differ 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 new file mode 100644 index 0000000000..73c2408ce8 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/8.png differ 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 new file mode 100644 index 0000000000..b5ab13cb1f Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit/9.png differ 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 deleted file mode 100644 index 8bcfa62ae4..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png and /dev/null differ 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 new file mode 100644 index 0000000000..0ae88d993d Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/0.png differ 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 new file mode 100644 index 0000000000..fdc81d8566 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/1.png differ 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 new file mode 100644 index 0000000000..2a8e28155c Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/10.png differ 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 new file mode 100644 index 0000000000..fc33c3a20e Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/11.png differ 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 new file mode 100644 index 0000000000..d79ccb6457 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/12.png differ 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 new file mode 100644 index 0000000000..0b1a12cf05 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/13.png differ 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 new file mode 100644 index 0000000000..3182d9cb04 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/14.png differ 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 new file mode 100644 index 0000000000..eeecdbd59a Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/15.png differ 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 new file mode 100644 index 0000000000..3d5f296660 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/16.png differ 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 new file mode 100644 index 0000000000..440fd477d9 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/17.png differ 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 new file mode 100644 index 0000000000..463c0ccce0 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/18.png differ 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 new file mode 100644 index 0000000000..982eca6df8 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/19.png differ 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 new file mode 100644 index 0000000000..36afb07e7b Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/2.png differ 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 new file mode 100644 index 0000000000..bba4b04331 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/20.png differ 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 new file mode 100644 index 0000000000..d391055ad7 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/21.png differ 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 new file mode 100644 index 0000000000..acbf53c53c Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/22.png differ 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 new file mode 100644 index 0000000000..4e01f007da Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/23.png differ 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 new file mode 100644 index 0000000000..b80dca122e Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/24.png differ 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 new file mode 100644 index 0000000000..370e0f84d2 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/3.png differ 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 new file mode 100644 index 0000000000..3f1cfe4081 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/4.png differ 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 new file mode 100644 index 0000000000..d789444710 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/5.png differ 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 new file mode 100644 index 0000000000..40ab646c04 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/6.png differ 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 new file mode 100644 index 0000000000..091f63b0c1 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/7.png differ 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 new file mode 100644 index 0000000000..3262bf8f9f Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/8.png differ 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 new file mode 100644 index 0000000000..ce8104263e Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit/9.png differ