diff options
56 files changed, 463 insertions, 1376 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java index b53638a77a..4e1728fccd 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java @@ -13,17 +13,12 @@ package com.github.bartimaeusnek.bartworks.API; -import static cpw.mods.fml.common.registry.GameRegistry.findBlock; import static gregtech.api.enums.Mods.IndustrialCraft2; import java.util.HashMap; import java.util.HashSet; import java.util.Objects; -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - -import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems; @@ -207,57 +202,6 @@ public final class BioVatLogicAdder { } } - public static class BioVatGlass { - - private static final HashMap<BlockMetaPair, Byte> glasses = new HashMap<>(); - - /** - * @param sModname The modid owning the block - * @param sUnlocBlockName The name of the block itself - * @param meta The meta of the block - * @param tier the glasses Tier = Voltage tier (MIN 3) - * @return if the block was found in the Block registry - */ - public static boolean addCustomGlass(String sModname, String sUnlocBlockName, int meta, int tier) { - Block block = findBlock(sModname, sUnlocBlockName); - boolean ret = block != null; - if (ret) BioVatGlass.glasses.put(new BlockMetaPair(block, (byte) meta), (byte) tier); - else new IllegalArgumentException( - "Block: " + sUnlocBlockName + " of the Mod: " + sModname + " was NOT found!").printStackTrace(); - block = null; - return ret; - } - - /** - * @param block the block to add - * @param meta the meta of the block (0-15) - * @param tier the glasses Tier = Voltage tier (MIN 3) - */ - public static void addCustomGlass(@Nonnull Block block, @Nonnegative int meta, @Nonnegative int tier) { - BioVatGlass.glasses.put(new BlockMetaPair(block, (byte) meta), (byte) tier); - } - - /** - * @param block the block to add - * @param tier the glasses Tier = Voltage tier (MIN 3) - */ - public static void addCustomGlass(@Nonnull Block block, @Nonnegative int tier) { - BioVatGlass.glasses.put(new BlockMetaPair(block, (byte) 0), (byte) tier); - } - - /** - * @param blockBytePair the block to add and its meta as a javafx.util Pair - * @param tier the glasses Tier = Voltage tier (MIN 3) - */ - public static void addCustomGlass(@Nonnull BlockMetaPair blockBytePair, @Nonnegative byte tier) { - BioVatGlass.glasses.put(blockBytePair, tier); - } - - public static HashMap<BlockMetaPair, Byte> getGlassMap() { - return BioVatGlass.glasses; - } - } - public static class MaterialSvPair { final Materials materials; @@ -291,35 +235,4 @@ public final class BioVatLogicAdder { } } - public static class BlockMetaPair { - - final Block block; - final Byte aByte; - - public BlockMetaPair(Block block, Byte aByte) { - this.block = block; - this.aByte = aByte; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || this.getClass() != o.getClass()) return false; - BioVatLogicAdder.BlockMetaPair that = (BioVatLogicAdder.BlockMetaPair) o; - return Objects.equals(this.getBlock(), that.getBlock()) && Objects.equals(this.getaByte(), that.getaByte()); - } - - @Override - public int hashCode() { - return Objects.hash(this.getBlock(), this.getaByte()); - } - - public Block getBlock() { - return this.block; - } - - public Byte getaByte() { - return this.aByte; - } - } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java index eb4c2a0405..aca6b16330 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java @@ -47,14 +47,14 @@ public class BorosilicateGlass { return tier > 0 && tier <= Byte.MAX_VALUE; } - private static Block getGlassBlock() { + public static Block getGlassBlock() { if (block == null) { block = GameRegistry.findBlock(BartWorks.ID, "BW_GlasBlocks"); } return block; } - private static Block getGlassBlock2() { + public static Block getGlassBlock2() { if (block2 == null) { block2 = GameRegistry.findBlock(BartWorks.ID, "BW_GlasBlocks2"); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/GlassTier.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/GlassTier.java new file mode 100644 index 0000000000..7a9493914a --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/GlassTier.java @@ -0,0 +1,78 @@ +package com.github.bartimaeusnek.bartworks.API; + +import static cpw.mods.fml.common.registry.GameRegistry.findBlock; + +import java.util.HashMap; +import java.util.Objects; + +import net.minecraft.block.Block; + +import org.jetbrains.annotations.NotNull; + +public class GlassTier { + + private static final HashMap<BlockMetaPair, Integer> glasses = new HashMap<>(); + + /** + * @param modname The modid owning the block + * @param unlocalisedBlockName The name of the block itself + * @param meta The meta of the block + * @param tier the glasses Tier = Voltage tier (MIN 3) + */ + public static void addCustomGlass(String modname, String unlocalisedBlockName, int meta, int tier) { + Block block = findBlock(modname, unlocalisedBlockName); + if (block != null) { + addCustomGlass(block, meta, tier); + } else { + new IllegalArgumentException( + "Block: " + unlocalisedBlockName + + " of the Mod: " + + modname + + " was NOT found when attempting to register a glass!").printStackTrace(); + } + } + + public static void addCustomGlass(@NotNull Block block, int meta, int tier) { + GlassTier.glasses.put(new BlockMetaPair(block, (byte) meta), tier); + } + + public static HashMap<BlockMetaPair, Integer> getGlassMap() { + return glasses; + } + + public static int getGlassTier(Block block, int meta) { + return glasses.getOrDefault(new BlockMetaPair(block, (byte) meta), 0); + } + + public static class BlockMetaPair { + + private final Block block; + private final int meta; + + public BlockMetaPair(Block block, int aByte) { + this.block = block; + this.meta = aByte; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || this.getClass() != o.getClass()) return false; + BlockMetaPair that = (BlockMetaPair) o; + return Objects.equals(this.getBlock(), that.getBlock()) && Objects.equals(this.getMeta(), that.getMeta()); + } + + @Override + public int hashCode() { + return Objects.hash(this.getBlock(), this.getMeta()); + } + + public Block getBlock() { + return this.block; + } + + public int getMeta() { + return this.meta; + } + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java index 38a5a70d27..8802105563 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java @@ -109,5 +109,4 @@ public class BWCoreStaticReplacementMethodes { return stack; } - private BWCoreStaticReplacementMethodes() {} } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index 30c1276f97..6526eafe4b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -15,14 +15,11 @@ package com.github.bartimaeusnek.bartworks; import static com.github.bartimaeusnek.bartworks.common.loaders.BioRecipeLoader.runOnServerStarted; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.removeIC2Recipes; -import static gregtech.api.enums.GT_Values.VN; import static gregtech.api.enums.Mods.BartWorks; import java.io.IOException; -import java.util.Map; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.LogManager; @@ -38,15 +35,15 @@ import com.github.bartimaeusnek.bartworks.client.creativetabs.GT2Tab; import com.github.bartimaeusnek.bartworks.client.creativetabs.bartworksTab; import com.github.bartimaeusnek.bartworks.client.textures.PrefixTextureLinker; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; +import com.github.bartimaeusnek.bartworks.common.items.BW_ItemBlocks; import com.github.bartimaeusnek.bartworks.common.loaders.ArtificialMicaLine; -import com.github.bartimaeusnek.bartworks.common.loaders.BeforeGTPreload; import com.github.bartimaeusnek.bartworks.common.loaders.BioCultureLoader; import com.github.bartimaeusnek.bartworks.common.loaders.BioLabLoader; -import com.github.bartimaeusnek.bartworks.common.loaders.GTNHBlocks; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.common.loaders.LocalisationLoader; import com.github.bartimaeusnek.bartworks.common.loaders.RadioHatchMaterialLoader; import com.github.bartimaeusnek.bartworks.common.loaders.RecipeLoader; +import com.github.bartimaeusnek.bartworks.common.loaders.RegisterGlassTiers; import com.github.bartimaeusnek.bartworks.common.loaders.RegisterServerCommands; import com.github.bartimaeusnek.bartworks.common.loaders.StaticRecipeChangeLoaders; import com.github.bartimaeusnek.bartworks.common.net.BW_Network; @@ -72,12 +69,12 @@ import cpw.mods.fml.common.event.FMLServerStartedEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.GT_Version; import gregtech.api.GregTech_API; import gregtech.api.enums.Mods; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_OreDictUnificator; @Mod(modid = MainMod.MOD_ID, name = MainMod.NAME, version = GT_Version.VERSION, dependencies = """ required-after:IC2;\ @@ -107,13 +104,16 @@ public final class MainMod { public static BW_Network BW_Network_instance = new BW_Network(); public MainMod() { - GregTech_API.sBeforeGTPreload.add(new BeforeGTPreload()); + } @Mod.EventHandler public void preInit(FMLPreInitializationEvent preinit) { MainMod.LOGGER.info("Found GT++, continuing"); + GameRegistry.registerBlock(ItemRegistry.bw_glasses[0], BW_ItemBlocks.class, "BW_GlasBlocks"); + GameRegistry.registerBlock(ItemRegistry.bw_glasses[1], BW_ItemBlocks.class, "BW_GlasBlocks2"); + if (API_ConfigValues.debugLog) { try { DebugLog.initDebugLog(preinit); @@ -124,9 +124,7 @@ public final class MainMod { WerkstoffLoader.setUp(); - if (ConfigHandler.BioLab) { - BioCultureLoader.run(); - } + BioCultureLoader.run(); Werkstoff.init(); GregTech_API.sAfterGTPostload.add(new CircuitPartLoader()); @@ -134,6 +132,7 @@ public final class MainMod { GregTech_API.sBeforeGTLoad.add(new PrefixTextureLinker()); } + RegisterGlassTiers.run(); } @Mod.EventHandler @@ -147,9 +146,7 @@ public final class MainMod { FMLCommonHandler.instance() .bus() .register(serverEventHandler); - if (ConfigHandler.BioLab) { - BioLabLoader.run(); - } + BioLabLoader.run(); WerkstoffLoader.runInit(); @@ -162,20 +159,7 @@ public final class MainMod { RecipeLoader.run(); NetworkRegistry.INSTANCE.registerGuiHandler(MainMod.instance, MainMod.GH); - if (ConfigHandler.BioLab) { - GTNHBlocks.run(); - for (Map.Entry<BioVatLogicAdder.BlockMetaPair, Byte> pair : BioVatLogicAdder.BioVatGlass.getGlassMap() - .entrySet()) { - GT_OreDictUnificator.registerOre( - "blockGlass" + VN[pair.getValue()], - new ItemStack( - pair.getKey() - .getBlock(), - 1, - pair.getKey() - .getaByte())); - } - } + ArtificialMicaLine.runArtificialMicaRecipe(); BioObjectAdder.regenerateBioFluids(); @@ -219,8 +203,6 @@ public final class MainMod { if (classicMode) DownTierLoader.run(); - // StaticRecipeChangeLoaders.patchEBFMapForCircuitUnification(); - recipesAdded = true; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipCache.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipCache.java deleted file mode 100644 index 969398df47..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipCache.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.bartworks.client.ClientEventHandler; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import com.github.bartimaeusnek.bartworks.util.Pair; - -class TooltipCache { - - private static final HashMap<Pair<Integer, Short>, char[]> cache = new HashMap<>(); - - static boolean put(ItemStack itemStack, List<String> tooltip) { - Pair<Integer, Short> p = new Pair<>(Item.getIdFromItem(itemStack.getItem()), (short) itemStack.getItemDamage()); - if (TooltipCache.cache.containsKey(p) || tooltip.isEmpty()) { - return false; - } - StringBuilder sb = new StringBuilder(); - for (String s : tooltip) { - sb.append(s); - sb.append(System.lineSeparator()); - } - char[] rettype = sb.toString() - .toCharArray(); - return TooltipCache.cache.put(p, rettype) == rettype; - } - - static List<String> getTooltip(ItemStack itemStack) { - Pair<Integer, Short> p = new Pair<>(Item.getIdFromItem(itemStack.getItem()), (short) itemStack.getItemDamage()); - char[] toTest = TooltipCache.cache.get(p); - if (toTest == null) { - return new ArrayList<>(); - } - return Arrays.asList(new String(toTest).split(System.lineSeparator())); - } -} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java index 0f7cb58bae..edf9b7f07f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java @@ -1,48 +1,17 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - package com.github.bartimaeusnek.bartworks.client.ClientEventHandler; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; +import static gregtech.api.util.GT_Utility.getColoredTierNameFromTier; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import com.github.bartimaeusnek.bartworks.API.BioVatLogicAdder; -import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.common.blocks.BW_Blocks; -import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; -import com.github.bartimaeusnek.bartworks.system.oredict.OreDictHandler; -import com.github.bartimaeusnek.bartworks.util.BW_ColorUtil; -import com.github.bartimaeusnek.bartworks.util.Pair; -import com.github.bartimaeusnek.crossmod.BartWorksCrossmod; +import com.github.bartimaeusnek.bartworks.API.GlassTier; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; @SideOnly(Side.CLIENT) public class TooltipEventHandler { @@ -53,75 +22,16 @@ public class TooltipEventHandler { if (event == null || event.itemStack == null || event.itemStack.getItem() == null) return; - if (TooltipCache.getTooltip(event.itemStack) - .isEmpty()) { - ItemStack tmp = event.itemStack.copy(); - Pair<Integer, Short> abstractedStack = new Pair<>( - Item.getIdFromItem(tmp.getItem()), - (short) tmp.getItemDamage()); - List<String> tooAdd = new ArrayList<>(); - if (ConfigHandler.sharedItemStackTooltip && OreDictHandler.getNonBWCache() - .contains(abstractedStack)) { - for (Pair<Integer, Short> pair : OreDictHandler.getNonBWCache()) { - if (pair.equals(abstractedStack)) { - GameRegistry.UniqueIdentifier UI = GameRegistry.findUniqueIdentifierFor(tmp.getItem()); - if (UI == null) - UI = GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(tmp.getItem())); - if (UI != null) { - for (ModContainer modContainer : Loader.instance() - .getModList()) { - if (MainMod.MOD_ID.equals(UI.modId) || BartWorksCrossmod.MOD_ID.equals(UI.modId) - || "BWCore".equals(UI.modId)) break; - if (UI.modId.equals(modContainer.getModId())) { - tooAdd.add( - "Shared ItemStack between " + EnumChatFormatting.DARK_GREEN - + "BartWorks" - + EnumChatFormatting.GRAY - + " and " - + EnumChatFormatting.RED - + modContainer.getName()); - } - } - } else tooAdd.add( - "Shared ItemStack between " + EnumChatFormatting.DARK_GREEN - + "BartWorks" - + EnumChatFormatting.GRAY - + " and another Mod, that doesn't use the ModContainer propperly!"); - } - } - } + final Block block = Block.getBlockFromItem(event.itemStack.getItem()); + final int meta = event.itemStack.getItemDamage(); + + int tier = GlassTier.getGlassTier(block, meta); + + if (tier == 0) return; - Block BLOCK = Block.getBlockFromItem(event.itemStack.getItem()); - if (BLOCK != null && BLOCK != Blocks.air) { - if (BLOCK instanceof BW_Blocks) { - TooltipCache.put(event.itemStack, tooAdd); - return; - } - BioVatLogicAdder.BlockMetaPair PAIR = new BioVatLogicAdder.BlockMetaPair( - BLOCK, - (byte) event.itemStack.getItemDamage()); - HashMap<BioVatLogicAdder.BlockMetaPair, Byte> GLASSMAP = BioVatLogicAdder.BioVatGlass.getGlassMap(); - if (GLASSMAP.containsKey(PAIR)) { - int tier = GLASSMAP.get(PAIR); - tooAdd.add( - StatCollector.translateToLocal("tooltip.glas.0.name") + " " - + BW_ColorUtil.getColorForTier(tier) - + GT_Values.VN[tier] - + EnumChatFormatting.RESET); - } else if (BLOCK.getMaterial() - .equals(Material.glass)) { - tooAdd.add( - StatCollector.translateToLocal("tooltip.glas.0.name") + " " - + BW_ColorUtil.getColorForTier(3) - + GT_Values.VN[3] - + EnumChatFormatting.RESET); - } - } + event.toolTip.add( + StatCollector.translateToLocal("tooltip.glass_tier.0.name") + " " + + getColoredTierNameFromTier((byte) tier)); - TooltipCache.put(event.itemStack, tooAdd); - event.toolTip.addAll(tooAdd); - } else { - event.toolTip.addAll(TooltipCache.getTooltip(event.itemStack)); - } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java index 27cf0f4fe6..0b6a131341 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java @@ -40,7 +40,6 @@ public class ConfigHandler { public static long energyPerCell = 1000000L; - public static boolean BioLab = true; public static boolean Ross128Enabled = true; public static boolean disableExtraGassesForEBF; @@ -135,12 +134,7 @@ public class ConfigHandler { false, "Enables the Teslastaff, an Item used to destroy Electric Armors") .getBoolean(false); - ConfigHandler.BioLab = !ConfigHandler.c.get( - "System", - "Disable BioLab", - false, - "This switch disables the BioLab, BioVat etc. If you use GT5.08 or equivalent, this needs to be turned off!") - .getBoolean(false); + ConfigHandler.cutoffTier = ConfigHandler.c .get( "System", diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java index f512e778bc..e575dfb269 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java @@ -22,17 +22,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; -import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; import com.github.bartimaeusnek.bartworks.API.ITileAddsInformation; import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.util.BW_ColorUtil; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_LanguageManager; public class BW_ItemBlocks extends ItemBlock { @@ -62,20 +57,12 @@ public class BW_ItemBlocks extends ItemBlock { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { - byte tier = BorosilicateGlass.getTier(this.field_150939_a, aStack.getItemDamage()); - if (tier >= 0) { - aList.add( - StatCollector.translateToLocal("tooltip.glas.0.name") + " " - + BW_ColorUtil.getColorForTier(tier) - + GT_Values.VN[tier]); - } + if (this.field_150939_a instanceof ITileAddsInformation) { aList.addAll(Arrays.asList(((ITileAddsInformation) this.field_150939_a).getInfoData())); } aList.add(this.mNoMobsToolTip); if (!(this.field_150939_a instanceof ITileEntityProvider)) aList.add(this.mNoTileEntityToolTip); - - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java index 0b589bf53a..32c521117b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java @@ -24,7 +24,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -55,7 +54,6 @@ public class BW_SimpleWindMeter extends Item { + (this.getMaxDamage() - this.getDamage(itemStack)) + "/" + this.getMaxDamage()); - list.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java index f58ae8d6e7..eb3b251706 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java @@ -28,7 +28,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -94,7 +93,6 @@ public class BW_Stonage_Rotors extends Item implements IKineticRotor { if (type != null) { info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + this.isAcceptedType(itemStack, type))); } - info.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java index 59332b17a2..fd36b603d2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java @@ -26,7 +26,6 @@ import net.minecraft.world.World; import com.github.bartimaeusnek.bartworks.API.modularUI.BW_UITextures; import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.gtnewhorizons.modularui.api.ModularUITextures; import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable; @@ -80,7 +79,6 @@ public class Circuit_Programmer extends GT_Generic_Item implements IElectricItem + (aStack.getTagCompound() .getBoolean("HasChip") ? StatCollector.translateToLocal("tooltip.bw.yes.name") : StatCollector.translateToLocal("tooltip.bw.no.name"))); - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java deleted file mode 100644 index 37ecfc61d2..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.bartworks.common.items; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.github.bartimaeusnek.bartworks.API.modularUI.BW_UITextures; -import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; -import com.gtnewhorizons.modularui.api.ModularUITextures; -import com.gtnewhorizons.modularui.api.forge.ItemStackHandler; -import com.gtnewhorizons.modularui.api.screen.IItemWithModularUI; -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; -import com.gtnewhorizons.modularui.common.widget.DrawableWidget; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.items.GT_Generic_Item; - -public class GT_Destructopack_Item extends GT_Generic_Item implements IItemWithModularUI { - - public GT_Destructopack_Item() { - super("GT2Destructopack", "Destructopack", "Mobile Trash Bin"); - this.setMaxStackSize(1); - this.setNoRepair(); - this.setHasSubtypes(false); - this.setCreativeTab(MainMod.GT2); - } - - @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { - super.addInformation(aStack, aPlayer, aList, aF3_H); - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); - } - - @Override - public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) { - GT_UIInfos.openPlayerHeldItemUI(aPlayer); - return aStack; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister aIconRegister) { - this.mIcon = aIconRegister.registerIcon("bartworks:gt.GT2Destructopack"); - } - - @Override - public ModularWindow createWindow(UIBuildContext buildContext, ItemStack heldStack) { - ModularWindow.Builder builder = ModularWindow.builder(176, 166); - builder.setBackground(ModularUITextures.VANILLA_BACKGROUND); - builder.bindPlayerInventory(buildContext.getPlayer()); - - builder.widget(new SlotWidget(new BaseSlot(new ItemStackHandler(), 0) { - - @Override - public void putStack(ItemStack stack) { - this.onSlotChanged(); - } - }).setBackground(ModularUITextures.ITEM_SLOT, BW_UITextures.OVERLAY_SLOT_CROSS) - .setPos(79, 16)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT) - .setSize(17, 17) - .setPos(152, 63)); - - return builder.build(); - } -} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java index 3a132dde22..1fb3e42910 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java @@ -34,7 +34,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import com.google.common.collect.Sets; import cpw.mods.fml.relauncher.Side; @@ -74,7 +73,6 @@ public class GT_Rockcutter_Item extends ItemTool implements IElectricItem { @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { aList.add(StatCollector.translateToLocal("tooltip.bw.tier.name") + " " + GT_Values.VN[this.mTier]); - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java index 6728a791e4..9c68f093d7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java @@ -30,7 +30,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import com.google.common.collect.Sets; import cpw.mods.fml.relauncher.Side; @@ -63,7 +62,6 @@ public class GT_Teslastaff_Item extends ItemTool implements IElectricItem { @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { aList.add(StatCollector.translateToLocal("tooltip.teslastaff.0.name")); - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java index 8d5b239a75..b482d14f1a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java @@ -17,13 +17,11 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import com.github.bartimaeusnek.bartworks.MainMod; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -51,12 +49,6 @@ public class SimpleSubItemClass extends Item { } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List<String> aList, boolean p_77624_4_) { - super.addInformation(p_77624_1_, p_77624_2_, aList, p_77624_4_); - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); - } - - @Override public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List<ItemStack> p_150895_3_) { for (int i = 0; i < this.tex.length; i++) { p_150895_3_.add(new ItemStack(p_150895_1_, 1, i)); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java deleted file mode 100644 index 61df90e5d4..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.bartworks.common.loaders; - -import static gregtech.api.enums.Mods.BartWorks; - -import java.lang.reflect.Field; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import org.apache.commons.lang3.reflect.FieldUtils; - -import com.github.bartimaeusnek.bartworks.common.items.BW_ItemBlocks; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.LoadController; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.SubTag; -import ic2.core.Ic2Items; - -/** - * This class gets injected into GT via ASM! DO NOT CALL IT YOURSELF! - */ -public class BeforeGTPreload implements Runnable { - - private static boolean didrun; - - @Override - public void run() { - if (didrun) return; - // fixing BorosilicateGlass... -_-' - Materials.BorosilicateGlass - .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_RECYCLING, SubTag.SMELTING_TO_FLUID); - - Field activeContainer = FieldUtils.getDeclaredField(LoadController.class, "activeContainer", true); - ModContainer bartworks = null; - ModContainer gregtech = Loader.instance() - .activeModContainer(); - boolean switchback = false; - LoadController modController = null; - if (!Loader.instance() - .activeModContainer() - .getModId() - .equals(BartWorks.ID)) { - Field fieldModController = FieldUtils.getDeclaredField(Loader.class, "modController", true); - try { - modController = (LoadController) fieldModController.get(Loader.instance()); - } catch (IllegalAccessException e) { - e.printStackTrace(); - FMLCommonHandler.instance() - .exitJava(-1, true); - } - - assert modController != null; - for (ModContainer mod : modController.getActiveModList()) { - if (mod.getModId() - .equals(BartWorks.ID)) { - bartworks = mod; - } - if (bartworks != null) break; - } - if (bartworks == null || gregtech == null) FMLCommonHandler.instance() - .exitJava(-1, true); - - try { - activeContainer.set(modController, bartworks); - } catch (IllegalAccessException e) { - e.printStackTrace(); - FMLCommonHandler.instance() - .exitJava(-1, true); - } - switchback = true; - } - - Block[] bw_glasses; - try { - bw_glasses = (Block[]) Class.forName("com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry") - .getField("bw_glasses") - .get(null); - GameRegistry.registerBlock(bw_glasses[0], BW_ItemBlocks.class, "BW_GlasBlocks"); - GameRegistry.registerBlock(bw_glasses[1], BW_ItemBlocks.class, "BW_GlasBlocks2"); - OreDictionary.registerOre("blockGlassHV", new ItemStack(Blocks.glass, 1, GT_Values.W)); - OreDictionary.registerOre("blockGlassHV", new ItemStack(bw_glasses[0], 1, 0)); - OreDictionary.registerOre("blockGlassEV", Ic2Items.reinforcedGlass); - OreDictionary.registerOre("blockGlassEV", new ItemStack(bw_glasses[0], 1, 1)); - OreDictionary.registerOre("blockGlassIV", new ItemStack(bw_glasses[0], 1, 12)); - OreDictionary.registerOre("blockGlassIV", new ItemStack(bw_glasses[0], 1, 2)); - OreDictionary.registerOre("blockGlassLuV", new ItemStack(bw_glasses[0], 1, 3)); - OreDictionary.registerOre("blockGlassZPM", new ItemStack(bw_glasses[0], 1, 4)); - OreDictionary.registerOre("blockGlassUV", new ItemStack(bw_glasses[0], 1, 5)); - OreDictionary.registerOre("blockGlassUHV", new ItemStack(bw_glasses[0], 1, 13)); - OreDictionary.registerOre("blockGlassUEV", new ItemStack(bw_glasses[0], 1, 14)); - OreDictionary.registerOre("blockGlassUIV", new ItemStack(bw_glasses[0], 1, 15)); - OreDictionary.registerOre("blockGlassUMV", new ItemStack(bw_glasses[1], 1, 0)); - } catch (IllegalAccessException | NoSuchFieldException | ClassNotFoundException e) { - e.printStackTrace(); - FMLCommonHandler.instance() - .exitJava(-1, true); - } - if (switchback) { - try { - activeContainer.set(modController, gregtech); - } catch (IllegalAccessException e) { - e.printStackTrace(); - FMLCommonHandler.instance() - .exitJava(-1, true); - } - } - BeforeGTPreload.didrun = true; - } -} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java deleted file mode 100644 index 977ebf19e0..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.bartworks.common.loaders; - -import static gregtech.api.enums.Mods.BloodArsenal; -import static gregtech.api.enums.Mods.Botania; -import static gregtech.api.enums.Mods.Botany; -import static gregtech.api.enums.Mods.Chisel; -import static gregtech.api.enums.Mods.EnderIO; -import static gregtech.api.enums.Mods.ExtraUtilities; -import static gregtech.api.enums.Mods.GalaxySpace; -import static gregtech.api.enums.Mods.HardcoreEnderExpansion; -import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.enums.Mods.Minecraft; -import static gregtech.api.enums.Mods.Natura; -import static gregtech.api.enums.Mods.Railcraft; -import static gregtech.api.enums.Mods.RandomThings; -import static gregtech.api.enums.Mods.TecTech; -import static gregtech.api.enums.Mods.TinkerConstruct; -import static gregtech.api.enums.Mods.Witchery; -import static gregtech.api.enums.Mods.ZTones; - -import com.github.bartimaeusnek.bartworks.API.BioVatLogicAdder; - -/** - * Autogenerated run file, script Created on Wed Jan 2 19:11:07 2019 by boubou_19 and bartimaeusnek Executed on - * 2019-01-03 02:08:43 modified by bartimaeusnek to only add blocks that mods are loaded modified by bartimaeusnek on - * 2020-03-22 00:20 to run statically modified by Quarri6343 on 2022-08-24 20:02 to add Botania Support - */ -public class GTNHBlocks { - - public static void run() { - for (int i = 0; i < 16; i++) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(Minecraft.ID, "stained_glass", i, 3); - } - - BioVatLogicAdder.BioVatGlass.addCustomGlass(IndustrialCraft2.ID, "blockAlloyGlass", 0, 4); - - if (BloodArsenal.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(BloodArsenal.ID, "blood_stained_glass", 0, 3); - } - if (Botania.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(Botania.ID, "manaGlass", 0, 4); - BioVatLogicAdder.BioVatGlass.addCustomGlass(Botania.ID, "elfGlass", 0, 5); - } - if (Botany.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(Botany.ID, "stained", 0, 3); - } - - if (Chisel.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "glass2", 0, 3); - - for (int i = 0; i < 16; i++) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "glass", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_white", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_yellow", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_lightgray", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_brown", i, 3); - BioVatLogicAdder.BioVatGlass.addCustomGlass(Chisel.ID, "stained_glass_forestry", i, 3); - } - } - - if (EnderIO.isModLoaded()) { - for (int i = 0; i <= 5; ++i) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(EnderIO.ID, "blockFusedQuartz", i, 3); - } - } - - if (ExtraUtilities.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(ExtraUtilities.ID, "decorativeBlock1", 9, 3); - for (int i = 0; i < 12; ++i) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(ExtraUtilities.ID, "decorativeBlock2", i, 3); - } - - for (int i = 0; i < 6; ++i) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(ExtraUtilities.ID, "etherealglass", i, 3); - - } - } - - if (GalaxySpace.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(GalaxySpace.ID, "futureglass", 0, 3); - for (int i = 0; i < 16; i++) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(GalaxySpace.ID, "futureglasses", i, 3); - } - } - - if (HardcoreEnderExpansion.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(HardcoreEnderExpansion.ID, "laboratory_glass", 0, 3); - } - - if (IndustrialCraft2.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(Minecraft.ID, "glass", 0, 3); - } - - if (Natura.isModLoaded()) { - for (int i = 0; i <= 1; ++i) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(Natura.ID, "NetherGlass", i, 3); - } - } - - if (Railcraft.isModLoaded()) { - for (int i = 0; i < 16; i++) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(Railcraft.ID, "glass", i, 3); - } - } - - if (RandomThings.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(RandomThings.ID, "spectreGlass", 0, 3); - } - - if (TinkerConstruct.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(TinkerConstruct.ID, "GlassBlock", 0, 3); - - for (int i = 0; i < 16; i++) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(TinkerConstruct.ID, "GlassBlock.StainedClear", i, 3); - } - } - - BioVatLogicAdder.BioVatGlass.addCustomGlass(TecTech.ID, "tile.quantumGlass", 0, 8); - - if (Witchery.isModLoaded()) { - for (int i = 0; i < 16; i++) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(Witchery.ID, "shadedglass", i, 3); - } - } - - if (ZTones.isModLoaded()) { - for (int i = 0; i < 16; i++) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(ZTones.ID, "tile.glaxx", i, 3); - } - } - } -} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java index d1167b3a09..a5bd2edc12 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java @@ -194,7 +194,6 @@ import com.github.bartimaeusnek.bartworks.common.items.BW_ItemBlocks; import com.github.bartimaeusnek.bartworks.common.items.BW_SimpleWindMeter; import com.github.bartimaeusnek.bartworks.common.items.BW_Stonage_Rotors; import com.github.bartimaeusnek.bartworks.common.items.Circuit_Programmer; -import com.github.bartimaeusnek.bartworks.common.items.GT_Destructopack_Item; import com.github.bartimaeusnek.bartworks.common.items.GT_Rockcutter_Item; import com.github.bartimaeusnek.bartworks.common.items.GT_Teslastaff_Item; import com.github.bartimaeusnek.bartworks.common.items.SimpleIconItem; @@ -238,7 +237,6 @@ import ic2.api.item.IKineticRotor; public class ItemRegistry { - public static final Item DESTRUCTOPACK = new GT_Destructopack_Item(); public static final Item TESLASTAFF = new GT_Teslastaff_Item(); public static final Item ROCKCUTTER_LV = new GT_Rockcutter_Item(1); public static final Item ROCKCUTTER_MV = new GT_Rockcutter_Item(2); @@ -611,7 +609,7 @@ public class ItemRegistry { TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox( LowPowerLaserConverter[amps / 32 - 1][tier - 4], GT_Values.VN[tier] + "_LPLaser_Converter_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter", + GT_Values.VN[tier] + " " + amps + "A" + " Low Power Laser Converter", tier, amps).getStackForm(1L); } @@ -633,7 +631,7 @@ public class ItemRegistry { TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch( LowPowerLaserTargetHatch[amps / 32 - 1][tier - 4], GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch", + GT_Values.VN[tier] + " " + amps + "A" + " Low Power Laser Target Hatch", tier, amps).getStackForm(1L); } @@ -655,7 +653,7 @@ public class ItemRegistry { TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo( LowPowerLaserSourceHatch[amps / 32 - 1][tier - 4], GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch", + GT_Values.VN[tier] + " " + amps + "A" + " Low Power Laser Source Hatch", tier, amps).getStackForm(1L); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RegisterGlassTiers.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RegisterGlassTiers.java new file mode 100644 index 0000000000..aa2e0bbc2b --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RegisterGlassTiers.java @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following + * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +package com.github.bartimaeusnek.bartworks.common.loaders; + +import static gregtech.api.enums.GT_Values.VN; +import static gregtech.api.enums.Mods.BloodArsenal; +import static gregtech.api.enums.Mods.Botania; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; + +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; +import com.github.bartimaeusnek.bartworks.API.GlassTier; +import com.github.technus.tectech.thing.block.QuantumGlassBlock; + +// Register all your glasses here. +public class RegisterGlassTiers { + + public static void run() { + registerGlassAsTiered(); + registerGlassOreDicts(); + } + + private static void registerGlassAsTiered() { + + // --------------------------------------------------------------------- + // Register glass. + // --------------------------------------------------------------------- + + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 0, 3); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 1, 4); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 2, 5); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 3, 6); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 4, 7); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 5, 8); + + // Stained boro glass + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 6, 3); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 7, 3); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 8, 3); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 9, 3); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 10, 3); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 11, 3); + + // Incrementing tiers + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 12, 5); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 13, 9); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 14, 10); + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock(), 15, 11); + + // Glass block 2 for transcendent (Really?) + GlassTier.addCustomGlass(BorosilicateGlass.getGlassBlock2(), 0, 12); + + // Other mods. + GlassTier.addCustomGlass(IndustrialCraft2.ID, "blockAlloyGlass", 0, 4); + GlassTier.addCustomGlass(QuantumGlassBlock.INSTANCE, 0, 8); + + if (EnderIO.isModLoaded()) { + for (int i = 0; i < 6; ++i) { + GlassTier.addCustomGlass(EnderIO.ID, "blockFusedQuartz", i, 3); + } + } + + if (Railcraft.isModLoaded()) { + for (int i = 0; i < 16; i++) { + GlassTier.addCustomGlass(Railcraft.ID, "glass", i, 3); + } + } + + // Magic alternatives. + if (BloodArsenal.isModLoaded()) { + GlassTier.addCustomGlass(BloodArsenal.ID, "blood_stained_glass", 0, 4); + } + + if (Botania.isModLoaded()) { + GlassTier.addCustomGlass(Botania.ID, "manaGlass", 0, 4); + GlassTier.addCustomGlass(Botania.ID, "elfGlass", 0, 5); + } + + if (Thaumcraft.isModLoaded()) { + // Warded glass + GlassTier.addCustomGlass(Thaumcraft.ID, "blockCosmeticOpaque", 2, 3); + } + } + + private static void registerGlassOreDicts() { + + // Register glass ore dict entries. + for (Map.Entry<GlassTier.BlockMetaPair, Integer> pair : GlassTier.getGlassMap() + .entrySet()) { + String oreName = "blockGlass" + VN[pair.getValue()]; + ItemStack itemStack = new ItemStack( + pair.getKey() + .getBlock(), + 1, + pair.getKey() + .getMeta()); + OreDictionary.registerOre(oreName, itemStack); + } + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java index 6c6896d786..ae0e77c2f8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java @@ -103,20 +103,6 @@ public class CraftingRecipes implements Runnable { new ItemStack(ItemRegistry.BW_BLOCKS[1]), 'F', ItemList.Field_Generator_HV.get(1L) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.DESTRUCTOPACK), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 1L), 'L', - new ItemStack(Items.lava_bucket) }); - - GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.DESTRUCTOPACK), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 1L), 'L', - new ItemStack(Items.lava_bucket) }); - - GT_ModHandler.addCraftingRecipe( new ItemStack(ItemRegistry.ROCKCUTTER_MV), RecipeLoader.BITSD, new Object[] { "DS ", "DP ", "DCB", 'D', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java index 6bdd81bd72..5a8c1e054c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java @@ -29,6 +29,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GT_Utility.getColoredTierNameFromTier; import java.util.ArrayList; import java.util.Arrays; @@ -162,18 +163,18 @@ public class GT_TileEntity_CircuitAssemblyLine extends .addInfo("Change Mode with Screwdriver") .addInfo("Does not lose efficiency when overclocked") .addInfo( - "---------" + EnumChatFormatting.WHITE + "--------- " + EnumChatFormatting.GOLD + StatCollector.translateToLocal("chat.cal.mode.0") + EnumChatFormatting.GRAY - + "--------") + + " --------") .addInfo("Imprint this machine with a Circuit Imprint,") .addInfo("by putting the imprint in the controller") .addInfo("Every Circuit Assembly Line can only be imprinted ONCE") .addInfo( - "---------" + EnumChatFormatting.WHITE + "--------- " + EnumChatFormatting.GOLD + StatCollector.translateToLocal("chat.cal.mode.1") + EnumChatFormatting.GRAY - + "--------") + + " --------") .addInfo( "Does Circuit Assembler recipes, Minimum Length: " + EnumChatFormatting.RED + MINIMUM_CIRCUIT_ASSEMBLER_LENGTH @@ -187,7 +188,11 @@ public class GT_TileEntity_CircuitAssemblyLine extends .addStructureInfo("From Bottom to Top, Left to Right") .addStructureInfo( "Layer 1 - Solid Steel Machine Casing, Input bus (Last Output bus), Solid Steel Machine Casing") - .addStructureInfo("Layer 2 - EV+ Tier Glass, Assembling Line Casing, EV+ Tier Glass") + .addStructureInfo( + "Layer 2 - " + getColoredTierNameFromTier((byte) 4) + + "+ Tier Glass, Assembling Line Casing, " + + getColoredTierNameFromTier((byte) 4) + + "+ Tier Glass") .addStructureInfo("Layer 3 - Grate Machine Casing") .addStructureInfo("Up to 7 repeating slices, last is Output Bus") .addController("Layer 3 first slice front") @@ -198,7 +203,7 @@ public class GT_TileEntity_CircuitAssemblyLine extends .addInputHatch("Any layer 1 casing", 2) .addInputBus("As specified on layer 1", 3, 4) .addOutputBus("As specified in final slice on layer 1", 4) - .addOtherStructurePart("EV+ Tier Glass", "As specified on layer 2", 5) + .addOtherStructurePart(getColoredTierNameFromTier((byte) 4) + "+ Tier Glass", "As specified on layer 2", 5) .addMaintenanceHatch("Any layer 1 casing", 2) .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); return tt; @@ -322,7 +327,7 @@ public class GT_TileEntity_CircuitAssemblyLine extends if (this.type.equals(new NBTTagCompound()) && !this.imprintMachine(this.getControllerSlot())) return SimpleCheckRecipeResult.ofFailure("no_imprint"); if (this.imprintedItemName == null || this.imprintedStack == null) { - this.imprintedStack = new ItemStack(BW_Meta_Items.getNEWCIRCUITS(), 1, 0); + this.imprintedStack = new ItemStack(BW_Meta_Items.getCircuitParts(), 1, 0); this.imprintedStack.setTagCompound(this.type); this.imprintedItemName = GT_LanguageManager.getTranslateableItemStackName(this.imprintedStack); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java index 4bcf4f829c..9d807abfa4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java @@ -26,15 +26,11 @@ import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_ULV; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.ArrayUtils; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; - -import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -123,19 +119,7 @@ public class GT_MetaTileEntity_Diode extends GT_MetaTileEntity_BasicHull { } @Override - @SuppressWarnings("deprecation") public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - StatCollector.translateToLocal("tooltip.tile.tiereddsc.0.name") + " " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(GT_Values.V[this.mTier]), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.1.name") + " " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.maxAmperesIn()), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.2.name") + " " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.maxAmperesOut()), - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); + return ArrayUtils.addAll(this.mDescriptionArray); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java index a3fe064ef7..0622789fa7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java @@ -13,17 +13,13 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.tiered; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; - import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; -import gregtech.api.util.GT_Utility; public class GT_MetaTileEntity_EnergyDistributor extends GT_MetaTileEntity_Transformer { @@ -72,16 +68,6 @@ public class GT_MetaTileEntity_EnergyDistributor extends GT_MetaTileEntity_Trans @Override public String[] getDescription() { - return new String[] { StatCollector.translateToLocal("tooltip.tile.energydistributor.0.name"), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.0.name") + " " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(GT_Values.V[this.mTier]), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.1.name") + " " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.maxAmperesIn()), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.2.name") + " " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.maxAmperesOut()), - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; + return new String[] { StatCollector.translateToLocal("tooltip.tile.energydistributor.0.name") }; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java index 41f28d033a..9bd1206546 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java @@ -24,7 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.github.bartimaeusnek.bartworks.common.items.BW_ItemBlocks; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -75,15 +74,6 @@ public class BW_MetaGeneratedBlock_Item extends BW_ItemBlocks { if (!tooltip.isEmpty()) { aList.add(tooltip); } - - String owner = werkstoff.getOwner(); - if (owner != null) { - aList.add(BW_Tooltip_Reference.ADDED_VIA_BARTWORKS.apply(owner)); - } else { - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); - } - } else { - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java index 4c355284ae..1ec9c7c008 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java @@ -36,7 +36,6 @@ import net.minecraft.world.World; import com.github.bartimaeusnek.bartworks.API.IRadMaterial; import com.github.bartimaeusnek.bartworks.API.SideReference; import com.github.bartimaeusnek.bartworks.client.textures.PrefixTextureLinker; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -141,15 +140,6 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa if (!tooltip.isEmpty()) { aList.add(tooltip); } - - String owner = werkstoff.getOwner(); - if (owner != null) { - aList.add(BW_Tooltip_Reference.ADDED_VIA_BARTWORKS.apply(owner)); - } else { - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); - } - } else { - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_CircuitsLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_CircuitsLoader.java index 6bd186a050..fc06128254 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_CircuitsLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_CircuitsLoader.java @@ -19,21 +19,7 @@ public class BW_CircuitsLoader { private BW_CircuitsLoader() {} - public static BW_Meta_Items getNewCircuits() { - return BW_CircuitsLoader.NEW_CIRCUITS; - } - public static void initNewCircuits() { - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(0, 4, "Primitive Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(1, 5, "Basic Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(2, 6, "Good Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(3, 7, "Advanced Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(4, 8, "Data Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(5, 9, "Elite Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(6, 10, "Master Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(7, 11, "Ultimate Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(8, 12, "Superconductor Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(9, 13, "Infinite Magneto Resonatic Circuit"); - BW_CircuitsLoader.NEW_CIRCUITS.addNewCircuit(10, 14, "Bio Magneto Resonatic Circuit"); + } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java index 7d749d11b7..58d54a321d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java @@ -34,7 +34,6 @@ import net.minecraftforge.fluids.FluidStack; import com.github.bartimaeusnek.bartworks.MainMod; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import com.github.bartimaeusnek.bartworks.util.BW_Util; import cpw.mods.fml.relauncher.Side; @@ -51,7 +50,6 @@ import gregtech.api.interfaces.IItemContainer; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.objects.ItemData; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Config; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; @@ -59,23 +57,24 @@ import gregtech.api.util.GT_Utility; public class BW_Meta_Items { - public static BW_Meta_Items.BW_GT_MetaGenCircuits getNEWCIRCUITS() { - return BW_Meta_Items.NEWCIRCUITS; + public static BW_Meta_Items.BW_GT_MetaGenCircuits getCircuitParts() { + return BW_Meta_Items.NEW_CIRCUIT_PARTS; } - private static final BW_Meta_Items.BW_GT_MetaGenCircuits NEWCIRCUITS = new BW_Meta_Items.BW_GT_MetaGenCircuits(); + private static final BW_Meta_Items.BW_GT_MetaGenCircuits NEW_CIRCUIT_PARTS = new BW_Meta_Items.BW_GT_MetaGenCircuits(); static { - BW_Meta_Items.NEWCIRCUITS.addItem(0, "Circuit Imprint", "", SubTag.NO_UNIFICATION, SubTag.NO_RECYCLING); - BW_Meta_Items.NEWCIRCUITS.addItem(1, "Sliced Circuit", "", SubTag.NO_UNIFICATION, SubTag.NO_RECYCLING); - BW_Meta_Items.NEWCIRCUITS.addItem(2, "Raw Imprint supporting Board", "A Raw Board needed for Circuit Imprints"); - BW_Meta_Items.NEWCIRCUITS.addItem(3, "Imprint supporting Board", "A Board needed for Circuit Imprints"); + BW_Meta_Items.NEW_CIRCUIT_PARTS.addItem(0, "Circuit Imprint", "", SubTag.NO_UNIFICATION, SubTag.NO_RECYCLING); + BW_Meta_Items.NEW_CIRCUIT_PARTS.addItem(1, "Sliced Circuit", "", SubTag.NO_UNIFICATION, SubTag.NO_RECYCLING); + BW_Meta_Items.NEW_CIRCUIT_PARTS + .addItem(2, "Raw Imprint supporting Board", "A Raw Board needed for Circuit Imprints"); + BW_Meta_Items.NEW_CIRCUIT_PARTS.addItem(3, "Imprint supporting Board", "A Board needed for Circuit Imprints"); GT_Values.RA.stdBuilder() .itemInputs( WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.dust, 1), WerkstoffLoader.ArInGaPhoBiBoTe.get(OrePrefixes.dust, 4)) - .itemOutputs(BW_Meta_Items.NEWCIRCUITS.getStack(2)) + .itemOutputs(BW_Meta_Items.NEW_CIRCUIT_PARTS.getStack(2)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(formingPressRecipes); @@ -83,8 +82,8 @@ public class BW_Meta_Items { RecipeMaps.autoclaveRecipes.add( new GT_Recipe( false, - new ItemStack[] { BW_Meta_Items.NEWCIRCUITS.getStack(2) }, - new ItemStack[] { BW_Meta_Items.NEWCIRCUITS.getStack(3) }, + new ItemStack[] { BW_Meta_Items.NEW_CIRCUIT_PARTS.getStack(2) }, + new ItemStack[] { BW_Meta_Items.NEW_CIRCUIT_PARTS.getStack(3) }, null, new int[] { 7500 }, new FluidStack[] { Materials.SolderingAlloy.getMolten(576) }, @@ -94,102 +93,31 @@ public class BW_Meta_Items { BW_Util.CLEANROOM)); } - public void addNewCircuit(int aTier, int aID, String aName) { - - String additionalOreDictData = ""; - String tooltip = ""; - String aOreDictPrefix = OrePrefixes.circuit.toString(); - switch (aTier) { - case 0 -> { - additionalOreDictData = Materials.ULV.toString(); - tooltip = Materials.ULV.getToolTip(); - } - case 1 -> { - additionalOreDictData = Materials.LV.toString(); - tooltip = Materials.LV.getToolTip(); - } - case 2 -> { - additionalOreDictData = Materials.MV.toString(); - tooltip = Materials.MV.getToolTip(); - } - case 3 -> { - additionalOreDictData = Materials.HV.toString(); - tooltip = Materials.HV.getToolTip(); - } - case 4 -> { - additionalOreDictData = Materials.EV.toString(); - tooltip = Materials.EV.getToolTip(); - } - case 5 -> { - additionalOreDictData = Materials.IV.toString(); - tooltip = Materials.IV.getToolTip(); - } - case 6 -> { - additionalOreDictData = Materials.LuV.toString(); - tooltip = Materials.LuV.getToolTip(); - } - case 7 -> { - additionalOreDictData = Materials.ZPM.toString(); - tooltip = Materials.ZPM.getToolTip(); - } - case 8 -> { - additionalOreDictData = Materials.UV.toString(); - tooltip = Materials.UV.getToolTip(); - } - case 9 -> { - additionalOreDictData = Materials.UHV.toString(); - tooltip = Materials.UHV.getToolTip(); - } - case 10 -> { - additionalOreDictData = Materials.UEV.toString(); - tooltip = Materials.UEV.getToolTip(); - } - } - - ItemStack tStack = BW_Meta_Items.NEWCIRCUITS.addCircuit(aID, aName, tooltip, aTier); - - GT_OreDictUnificator.registerOre((aOreDictPrefix + additionalOreDictData).replace(" ", ""), tStack); - } - public static class BW_GT_MetaGenCircuits extends BW_Meta_Items.BW_GT_MetaGen_Item_Hook { public BW_GT_MetaGenCircuits() { super("bwMetaGeneratedItem0"); } - public final ItemStack addCircuit(int aID, String aEnglish, String aToolTip, int tier) { - CircuitImprintLoader.bwCircuitTagMap.put( - new CircuitData( - BW_Util.getMachineVoltageFromTier(Math.min(1, tier - 2)), - tier > 2 ? BW_Util.CLEANROOM : 0, - (byte) tier), - new ItemStack(BW_Meta_Items.NEWCIRCUITS, 1, aID)); - return this.addItem(aID, aEnglish, aToolTip, SubTag.NO_UNIFICATION); + public final ItemStack getStack(int meta) { + return getStack(meta, 1); } - public final ItemStack getStack(int... meta_amount) { - ItemStack ret = new ItemStack(this); - if (meta_amount.length <= 0 || meta_amount.length > 2) return ret; - if (meta_amount.length == 1) { - ret.setItemDamage(meta_amount[0]); - return ret; - } - ret.setItemDamage(meta_amount[0]); - ret.stackSize = meta_amount[1]; - return ret; + public final ItemStack getStack(int meta, int stackSize) { + return new ItemStack(this, stackSize, meta); } - public final ItemStack getStackWithNBT(NBTTagCompound tag, int... meta_amount) { - ItemStack ret = this.getStack(meta_amount); - ret.setTagCompound(tag); - return ret; + public final ItemStack getStackWithNBT(NBTTagCompound tag, int meta, int stackSize) { + ItemStack itemStack = getStack(meta, stackSize); + itemStack.setTagCompound(tag); + return itemStack; } @Override public void getSubItems(Item var1, CreativeTabs aCreativeTab, List<ItemStack> aList) { if (aCreativeTab == this.getCreativeTab()) for (NBTTagCompound tag : CircuitImprintLoader.recipeTagMap.keySet()) { - ItemStack stack = new ItemStack(BW_Meta_Items.NEWCIRCUITS, 1, 0); + ItemStack stack = new ItemStack(BW_Meta_Items.NEW_CIRCUIT_PARTS, 1, 0); stack.setTagCompound(tag); aList.add(stack); } @@ -206,8 +134,7 @@ public class BW_Meta_Items { i, 0, 2, - aIconRegister.registerIcon( - "gregtech:" + (GT_Config.troll ? "troll" : this.getUnlocalizedName() + "/" + i)), + aIconRegister.registerIcon("gregtech:" + this.getUnlocalizedName() + "/" + i), this.mIconList); } } @@ -234,22 +161,28 @@ public class BW_Meta_Items { @Override protected void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) { - if (aStack.getItemDamage() == 0) if (aStack.getTagCompound() != null - && CircuitImprintLoader.getStackFromTag(aStack.getTagCompound()) != null) - aList.add( - "An Imprint for: " + GT_LanguageManager.getTranslation( - GT_LanguageManager.getTranslateableItemStackName( - CircuitImprintLoader.getStackFromTag(aStack.getTagCompound())))); - else aList.add("An Imprint for a Circuit"); - else if (aStack.getItemDamage() == 1) if (aStack.getTagCompound() != null - && CircuitImprintLoader.getStackFromTag(aStack.getTagCompound()) != null) - aList.add( - "A Sliced " + GT_LanguageManager.getTranslation( - GT_LanguageManager.getTranslateableItemStackName( - CircuitImprintLoader.getStackFromTag(aStack.getTagCompound())))); - else aList.add("A Sliced Circuit"); + if (aStack.getTagCompound() != null) { + ItemStack tagStack = CircuitImprintLoader.getStackFromTag(aStack.getTagCompound()); + String itemName = tagStack != null + ? GT_LanguageManager.getTranslation(GT_LanguageManager.getTranslateableItemStackName(tagStack)) + : "a circuit"; + + if (aStack.getItemDamage() == 0) { + aList.add("An imprint for: " + itemName); + } else if (aStack.getItemDamage() == 1) { + aList.add("A sliced " + itemName); + } + } else { + if (aStack.getItemDamage() == 0) { + aList.add("An imprint for a Circuit"); + } else if (aStack.getItemDamage() == 1) { + aList.add("A sliced Circuit"); + } + } + super.addAdditionalToolTips(aList, aStack, aPlayer); } + } public static class BW_GT_MetaGen_Item_Hook extends GT_MetaBase_Item { @@ -368,7 +301,6 @@ public class BW_Meta_Items { @Override protected void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) { super.addAdditionalToolTips(aList, aStack, aPlayer); - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java index 5d3886b9e9..b6ad41e783 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java @@ -177,7 +177,7 @@ public class CircuitImprintLoader { false, in, new ItemStack[] { getOutputMultiplied(original) }, - BW_Meta_Items.getNEWCIRCUITS() + BW_Meta_Items.getCircuitParts() .getStackWithNBT(CircuitImprintLoader.getTagFromStack(original.mOutputs[0]), 0, 0), null, original.mFluidInputs, @@ -198,7 +198,7 @@ public class CircuitImprintLoader { int index) { for (ItemList il : inversed.keySet()) { if (GT_Utility.areStacksEqual(il.get(1), replaceCircuitParts(original.mInputs[index]))) { - in[index] = BW_Meta_Items.getNEWCIRCUITS() + in[index] = BW_Meta_Items.getCircuitParts() .getStack(inversed.get(il), original.mInputs[index].stackSize); } } @@ -314,7 +314,7 @@ public class CircuitImprintLoader { GT_Recipe slicingRecipe = new GT_Recipe( true, new ItemStack[] { stack, ItemList.Shape_Slicer_Flat.get(0) }, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + new ItemStack[] { BW_Meta_Items.getCircuitParts() .getStackWithNBT(tag, 1, 1) }, null, null, @@ -328,11 +328,11 @@ public class CircuitImprintLoader { } private static void makeAndAddCraftingRecipes(NBTTagCompound tag) { - ItemStack circuit = BW_Meta_Items.getNEWCIRCUITS() + ItemStack circuit = BW_Meta_Items.getCircuitParts() .getStackWithNBT(tag, 0, 1); - Object[] imprintRecipe = { " X ", "GPG", " X ", 'P', BW_Meta_Items.getNEWCIRCUITS() + Object[] imprintRecipe = { " X ", "GPG", " X ", 'P', BW_Meta_Items.getCircuitParts() .getStackWithNBT(tag, 1, 1), 'G', WerkstoffLoader.Prasiolite.get(OrePrefixes.gemExquisite, 1), 'X', - BW_Meta_Items.getNEWCIRCUITS() + BW_Meta_Items.getCircuitParts() .getStack(3) }; IRecipe bwrecipe = new BWNBTDependantCraftingRecipe(circuit, imprintRecipe); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java index 6db9c63134..b3bd4a4a4e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java @@ -164,11 +164,11 @@ public class CircuitPartLoader implements Runnable { null, toolTip, true); - String tt = toolTip.size() > 0 ? toolTip.get(0) : ""; + String tt = !toolTip.isEmpty() ? toolTip.get(0) : ""; // tt += "Internal Name = "+single; String localised = GT_LanguageManager .getTranslation(GT_LanguageManager.getTranslateableItemStackName(itemStack)); - BW_Meta_Items.getNEWCIRCUITS() + BW_Meta_Items.getCircuitParts() .addItem(CircuitImprintLoader.reverseIDs, "Wrap of " + localised + "s", tt); GT_Values.RA.stdBuilder() @@ -177,7 +177,7 @@ public class CircuitPartLoader implements Runnable { .copy(), GT_Utility.getIntegratedCircuit(16)) .itemOutputs( - BW_Meta_Items.getNEWCIRCUITS() + BW_Meta_Items.getCircuitParts() .getStack(CircuitImprintLoader.reverseIDs)) .fluidInputs(Materials.Plastic.getMolten(72)) .duration(30 * SECONDS) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java index 91dc709609..e8e7572d33 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java @@ -34,7 +34,6 @@ import com.github.bartimaeusnek.bartworks.API.SideReference; import com.github.bartimaeusnek.bartworks.client.textures.PrefixTextureLinker; import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_Items; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -113,7 +112,6 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items { aList.add(tooltip); } } - aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java index e51431ab0b..e87c5613b7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -23,7 +23,6 @@ import static gregtech.api.enums.OrePrefixes.dust; import static gregtech.api.enums.OrePrefixes.dustSmall; import static gregtech.api.enums.OrePrefixes.gem; import static gregtech.api.enums.OrePrefixes.gemChipped; -import static gregtech.api.enums.OrePrefixes.gemExquisite; import static gregtech.api.enums.OrePrefixes.gemFlawed; import static gregtech.api.enums.OrePrefixes.stick; import static gregtech.api.enums.OrePrefixes.stickLong; @@ -32,7 +31,6 @@ import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.cannerRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; -import static gregtech.api.recipe.RecipeMaps.circuitAssemblerRecipes; import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; import static gregtech.api.recipe.RecipeMaps.extremeNaquadahReactorFuels; import static gregtech.api.recipe.RecipeMaps.fusionRecipes; @@ -58,7 +56,6 @@ import java.util.Objects; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -66,13 +63,11 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps; -import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.common.loaders.BioCultureLoader; import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems; -import com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration.BW_Meta_Items; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.BioCulture; import com.github.bartimaeusnek.bartworks.util.BioDNA; @@ -94,164 +89,162 @@ public class AdditionalRecipes { private static void runBWRecipes() { - if (ConfigHandler.BioLab) { - FluidStack[] dnaFluid = { Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 1000) - : Materials.Biomass.getFluid(1000L) }; - - for (ItemStack stack : BioItemList.getAllPetriDishes()) { - BioData DNA = BioData.getBioDataFromNBTTag( - stack.getTagCompound() - .getCompoundTag("DNA")); - if (DNA != null) { - ItemStack Detergent = BioItemList.getOther(1); - ItemStack DNAFlask = BioItemList.getDNASampleFlask(null); - ItemStack EthanolCell = Materials.Ethanol.getCells(1); - GT_Values.RA.stdBuilder() - .itemInputs(stack, DNAFlask, Detergent, EthanolCell) - .itemOutputs( - BioItemList.getDNASampleFlask(BioDNA.convertDataToDNA(DNA)), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L)) - .outputChances(DNA.getChance(), 100_00) - .fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) - .special(BioItemList.mBioLabParts[0]) - .duration(25 * SECONDS) - .eut(GT_Values.VP[3 + DNA.getTier()]) - .ignoreCollision() - .fake() - .addTo(bioLabRecipes); - } - + FluidStack[] dnaFluid = { Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 1000) + : Materials.Biomass.getFluid(1000L) }; + + for (ItemStack stack : BioItemList.getAllPetriDishes()) { + BioData DNA = BioData.getBioDataFromNBTTag( + stack.getTagCompound() + .getCompoundTag("DNA")); + if (DNA != null) { + ItemStack Detergent = BioItemList.getOther(1); + ItemStack DNAFlask = BioItemList.getDNASampleFlask(null); + ItemStack EthanolCell = Materials.Ethanol.getCells(1); + GT_Values.RA.stdBuilder() + .itemInputs(stack, DNAFlask, Detergent, EthanolCell) + .itemOutputs( + BioItemList.getDNASampleFlask(BioDNA.convertDataToDNA(DNA)), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L)) + .outputChances(DNA.getChance(), 100_00) + .fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) + .special(BioItemList.mBioLabParts[0]) + .duration(25 * SECONDS) + .eut(GT_Values.VP[3 + DNA.getTier()]) + .ignoreCollision() + .fake() + .addTo(bioLabRecipes); } - for (ItemStack stack : BioItemList.getAllDNASampleFlasks()) { - BioData DNA = BioData.getBioDataFromNBTTag(stack.getTagCompound()); - - if (DNA != null) { - ItemStack Outp = ItemList.Tool_DataOrb.get(1L); - Behaviour_DataOrb.setDataTitle(Outp, "DNA Sample"); - Behaviour_DataOrb.setDataName(Outp, DNA.getName()); + } - GT_Values.RA.stdBuilder() - .itemInputs( - stack, - FluidLoader.BioLabFluidCells[0], - FluidLoader.BioLabFluidCells[3], - ItemList.Tool_DataOrb.get(1L)) - .itemOutputs(Outp, ItemList.Cell_Empty.get(2L)) - .outputChances(DNA.getChance(), 100_00) - .fluidInputs(dnaFluid) - .special(BioItemList.mBioLabParts[1]) - .duration(25 * SECONDS) - .eut(GT_Values.VP[4 + DNA.getTier()]) - .ignoreCollision() - .fake() - .addTo(bioLabRecipes); - } + for (ItemStack stack : BioItemList.getAllDNASampleFlasks()) { + BioData DNA = BioData.getBioDataFromNBTTag(stack.getTagCompound()); + + if (DNA != null) { + ItemStack Outp = ItemList.Tool_DataOrb.get(1L); + Behaviour_DataOrb.setDataTitle(Outp, "DNA Sample"); + Behaviour_DataOrb.setDataName(Outp, DNA.getName()); + + GT_Values.RA.stdBuilder() + .itemInputs( + stack, + FluidLoader.BioLabFluidCells[0], + FluidLoader.BioLabFluidCells[3], + ItemList.Tool_DataOrb.get(1L)) + .itemOutputs(Outp, ItemList.Cell_Empty.get(2L)) + .outputChances(DNA.getChance(), 100_00) + .fluidInputs(dnaFluid) + .special(BioItemList.mBioLabParts[1]) + .duration(25 * SECONDS) + .eut(GT_Values.VP[4 + DNA.getTier()]) + .ignoreCollision() + .fake() + .addTo(bioLabRecipes); } + } - for (ItemStack stack : BioItemList.getAllPlasmidCells()) { - BioData DNA = BioData.getBioDataFromNBTTag(stack.getTagCompound()); + for (ItemStack stack : BioItemList.getAllPlasmidCells()) { + BioData DNA = BioData.getBioDataFromNBTTag(stack.getTagCompound()); + + if (DNA != null) { + ItemStack inp = ItemList.Tool_DataOrb.get(0L); + Behaviour_DataOrb.setDataTitle(inp, "DNA Sample"); + Behaviour_DataOrb.setDataName(inp, DNA.getName()); + ItemStack inp2 = ItemList.Tool_DataOrb.get(0L); + Behaviour_DataOrb.setDataTitle(inp2, "DNA Sample"); + Behaviour_DataOrb.setDataName(inp2, BioCultureLoader.BIO_DATA_BETA_LACMATASE.getName()); + + GT_Values.RA.stdBuilder() + .itemInputs(FluidLoader.BioLabFluidCells[1], BioItemList.getPlasmidCell(null), inp, inp2) + .itemOutputs(stack, ItemList.Cell_Empty.get(1L)) + .outputChances(DNA.getChance(), 100_00) + .fluidInputs(dnaFluid) + .special(BioItemList.mBioLabParts[2]) + .duration(25 * SECONDS) + .eut(GT_Values.VP[4 + DNA.getTier()]) + .ignoreCollision() + .fake() + .addTo(bioLabRecipes); + } + } - if (DNA != null) { - ItemStack inp = ItemList.Tool_DataOrb.get(0L); - Behaviour_DataOrb.setDataTitle(inp, "DNA Sample"); - Behaviour_DataOrb.setDataName(inp, DNA.getName()); - ItemStack inp2 = ItemList.Tool_DataOrb.get(0L); - Behaviour_DataOrb.setDataTitle(inp2, "DNA Sample"); - Behaviour_DataOrb.setDataName(inp2, BioCultureLoader.BIO_DATA_BETA_LACMATASE.getName()); + for (ItemStack stack : BioItemList.getAllPetriDishes()) { + BioData DNA = BioData.getBioDataFromNBTTag( + stack.getTagCompound() + .getCompoundTag("DNA")); + BioData Plasmid = BioData.getBioDataFromNBTTag( + stack.getTagCompound() + .getCompoundTag("Plasmid")); + if (!Objects.equals(DNA.getName(), Plasmid.getName())) { + GT_Values.RA.stdBuilder() + .itemInputs( + BioItemList.getPetriDish(BioCulture.getBioCulture(DNA.getName())), + BioItemList.getPlasmidCell(BioPlasmid.convertDataToPlasmid(Plasmid)), + FluidLoader.BioLabFluidCells[2]) + .itemOutputs(stack, ItemList.Cell_Empty.get(1L)) + .outputChances(Plasmid.getChance(), 100_00) + .fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) + .special(BioItemList.mBioLabParts[3]) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .ignoreCollision() + .fake() + .addTo(bioLabRecipes); + } + } + ItemStack Outp = ItemList.Tool_DataOrb.get(1L); + Behaviour_DataOrb.setDataTitle(Outp, "DNA Sample"); + Behaviour_DataOrb.setDataName(Outp, "Any DNA"); + // Clonal Cellular Synthesis- [Liquid DNA] + Medium Petri Dish + Plasma Membrane + Stem Cells + Genome Data + GT_Values.RA.stdBuilder() + .itemInputs( + BioItemList.getPetriDish(null), + BioItemList.getOther(4), + ItemList.Circuit_Chip_Stemcell.get(2L), + Outp) + .itemOutputs( + BioItemList.getPetriDish(null) + .setStackDisplayName("The Culture made from DNA")) + .outputChances(75_00) + .fluidInputs(new FluidStack(dnaFluid[0].getFluid(), 8000)) + .special(BioItemList.mBioLabParts[4]) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .ignoreCollision() + .fake() + .addTo(bioLabRecipes); + + FluidStack[] easyFluids = { Materials.Water.getFluid(1000L), + FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; + for (FluidStack fluidStack : easyFluids) { + for (BioCulture bioCulture : BioCulture.BIO_CULTURE_ARRAY_LIST) { + if (bioCulture.isBreedable() && bioCulture.getTier() == 0) { GT_Values.RA.stdBuilder() - .itemInputs(FluidLoader.BioLabFluidCells[1], BioItemList.getPlasmidCell(null), inp, inp2) - .itemOutputs(stack, ItemList.Cell_Empty.get(1L)) - .outputChances(DNA.getChance(), 100_00) - .fluidInputs(dnaFluid) - .special(BioItemList.mBioLabParts[2]) - .duration(25 * SECONDS) - .eut(GT_Values.VP[4 + DNA.getTier()]) - .ignoreCollision() - .fake() - .addTo(bioLabRecipes); - } - } + .itemInputs(GT_Utility.getIntegratedCircuit(1), new ItemStack(Items.sugar, 64)) + .special(BioItemList.getPetriDish(bioCulture)) + .fluidInputs(fluidStack) + .fluidOutputs(new FluidStack(bioCulture.getFluid(), 10)) + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(bacterialVatRecipes); - for (ItemStack stack : BioItemList.getAllPetriDishes()) { - BioData DNA = BioData.getBioDataFromNBTTag( - stack.getTagCompound() - .getCompoundTag("DNA")); - BioData Plasmid = BioData.getBioDataFromNBTTag( - stack.getTagCompound() - .getCompoundTag("Plasmid")); - if (!Objects.equals(DNA.getName(), Plasmid.getName())) { GT_Values.RA.stdBuilder() .itemInputs( - BioItemList.getPetriDish(BioCulture.getBioCulture(DNA.getName())), - BioItemList.getPlasmidCell(BioPlasmid.convertDataToPlasmid(Plasmid)), - FluidLoader.BioLabFluidCells[2]) - .itemOutputs(stack, ItemList.Cell_Empty.get(1L)) - .outputChances(Plasmid.getChance(), 100_00) - .fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) - .special(BioItemList.mBioLabParts[3]) + BioItemList.getPetriDish(null), + fluidStack.equals(Materials.Water.getFluid(1000L)) ? Materials.Water.getCells(1) + : GT_Utility.getContainersFromFluid(GT_ModHandler.getDistilledWater(1000)) + .get(0)) + .itemOutputs(BioItemList.getPetriDish(bioCulture), Materials.Empty.getCells(1)) + .outputChances(bioCulture.getChance(), 100_00) + .fluidInputs(new FluidStack(bioCulture.getFluid(), 1000)) .duration(25 * SECONDS) - .eut(TierEU.RECIPE_LuV) + .eut(TierEU.RECIPE_HV) .ignoreCollision() .fake() .addTo(bioLabRecipes); } } - - ItemStack Outp = ItemList.Tool_DataOrb.get(1L); - Behaviour_DataOrb.setDataTitle(Outp, "DNA Sample"); - Behaviour_DataOrb.setDataName(Outp, "Any DNA"); - // Clonal Cellular Synthesis- [Liquid DNA] + Medium Petri Dish + Plasma Membrane + Stem Cells + Genome Data - GT_Values.RA.stdBuilder() - .itemInputs( - BioItemList.getPetriDish(null), - BioItemList.getOther(4), - ItemList.Circuit_Chip_Stemcell.get(2L), - Outp) - .itemOutputs( - BioItemList.getPetriDish(null) - .setStackDisplayName("The Culture made from DNA")) - .outputChances(75_00) - .fluidInputs(new FluidStack(dnaFluid[0].getFluid(), 8000)) - .special(BioItemList.mBioLabParts[4]) - .duration(25 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .ignoreCollision() - .fake() - .addTo(bioLabRecipes); - - FluidStack[] easyFluids = { Materials.Water.getFluid(1000L), - FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; - for (FluidStack fluidStack : easyFluids) { - for (BioCulture bioCulture : BioCulture.BIO_CULTURE_ARRAY_LIST) { - if (bioCulture.isBreedable() && bioCulture.getTier() == 0) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1), new ItemStack(Items.sugar, 64)) - .special(BioItemList.getPetriDish(bioCulture)) - .fluidInputs(fluidStack) - .fluidOutputs(new FluidStack(bioCulture.getFluid(), 10)) - .duration(50 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(bacterialVatRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - BioItemList.getPetriDish(null), - fluidStack.equals(Materials.Water.getFluid(1000L)) ? Materials.Water.getCells(1) - : GT_Utility.getContainersFromFluid(GT_ModHandler.getDistilledWater(1000)) - .get(0)) - .itemOutputs(BioItemList.getPetriDish(bioCulture), Materials.Empty.getCells(1)) - .outputChances(bioCulture.getChance(), 100_00) - .fluidInputs(new FluidStack(bioCulture.getFluid(), 1000)) - .duration(25 * SECONDS) - .eut(TierEU.RECIPE_HV) - .ignoreCollision() - .fake() - .addTo(bioLabRecipes); - } - } - } } List<Pair<Materials, Integer>> liquidFuels = Arrays.asList( @@ -459,178 +452,6 @@ public class AdditionalRecipes { .eut(TierEU.RECIPE_MV) .addTo(centrifugeRecipes); - // Magneto Resonatic Circuits - - Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null - ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); - - Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null - ? FluidRegistry.getFluid("molten.mutatedlivingsolder") - : FluidRegistry.getFluid("molten.solderingalloy"); - // ULV - GT_Values.RA.stdBuilder() - .itemInputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gem), - ItemList.NandChip.get(1), - ItemList.Circuit_Parts_DiodeSMD.get(4), - ItemList.Circuit_Parts_CapacitorSMD.get(4), - ItemList.Circuit_Parts_TransistorSMD.get(4)) - .itemOutputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(4)) - .fluidInputs(Materials.SolderingAlloy.getMolten(36)) - .duration(37 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV) - .noOptimize() - .addTo(circuitAssemblerRecipes); - - // LV-EV - long[] voltages = new long[] { 0, TierEU.RECIPE_LV, TierEU.RECIPE_MV, TierEU.RECIPE_HV, TierEU.RECIPE_EV }; - for (int i = 1; i <= 4; i++) { - GT_Values.RA.stdBuilder() - .itemInputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gem), - BW_Meta_Items.getNEWCIRCUITS() - .getStack(i + 3), - ItemList.Circuit_Parts_DiodeSMD.get((i + 1) * 4), - ItemList.Circuit_Parts_CapacitorSMD.get((i + 1) * 4), - ItemList.Circuit_Parts_TransistorSMD.get((i + 1) * 4)) - .itemOutputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(i + 4)) - .fluidInputs(Materials.SolderingAlloy.getMolten((i + 1) * 36)) - .duration((i + 1) * (37 * SECONDS + 10 * TICKS)) - .eut(voltages[i]) - .noOptimize() - .addTo(circuitAssemblerRecipes); - } - // IV-LuV - GT_Values.RA.stdBuilder() - .itemInputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gem), - BW_Meta_Items.getNEWCIRCUITS() - .getStack(8), - ItemList.Circuit_Parts_DiodeASMD.get(24), - ItemList.Circuit_Parts_CapacitorASMD.get(24), - ItemList.Circuit_Parts_TransistorASMD.get(24)) - .itemOutputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(9)) - .fluidInputs(new FluidStack(solderIndalloy, 216)) - .duration(3 * MINUTES + 45 * SECONDS) - .eut(TierEU.RECIPE_LuV) - .noOptimize() - .addTo(circuitAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gem), - BW_Meta_Items.getNEWCIRCUITS() - .getStack(9), - ItemList.Circuit_Parts_DiodeASMD.get(28), - ItemList.Circuit_Parts_CapacitorASMD.get(28), - ItemList.Circuit_Parts_TransistorASMD.get(28)) - .itemOutputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(12)) - .fluidInputs(new FluidStack(solderIndalloy, 252)) - .duration(4 * MINUTES + 22 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_ZPM) - .noOptimize() - .addTo(circuitAssemblerRecipes); - - // ZPM - GT_Values.RA.stdBuilder() - .itemInputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), - BW_Meta_Items.getNEWCIRCUITS() - .getStack(10), - ItemList.Circuit_Parts_DiodeASMD.get(52), - ItemList.Circuit_Parts_CapacitorASMD.get(52), - ItemList.Circuit_Parts_TransistorASMD.get(52)) - .itemOutputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(11)) - .fluidInputs(new FluidStack(solderIndalloy, 288)) - .duration(10 * MINUTES) - .eut(TierEU.RECIPE_UV) - .requiresCleanRoom() - .noOptimize() - .addTo(circuitAssemblerRecipes); - - // UV - GT_Values.RA.stdBuilder() - .itemInputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), - BW_Meta_Items.getNEWCIRCUITS() - .getStack(11), - ItemList.Circuit_Parts_DiodeASMD.get(56), - ItemList.Circuit_Parts_CapacitorASMD.get(56), - ItemList.Circuit_Parts_TransistorASMD.get(56)) - .itemOutputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(12)) - .fluidInputs(new FluidStack(solderUEV, 324)) - .duration(11 * MINUTES + 15 * SECONDS) - .eut(TierEU.RECIPE_UHV) - .requiresCleanRoom() - .noOptimize() - .addTo(circuitAssemblerRecipes); - - // UHV-UEV - GT_Values.RA.stdBuilder() - .itemInputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), - BW_Meta_Items.getNEWCIRCUITS() - .getStack(12), - ItemList.Circuit_Parts_DiodeXSMD.get(60), - ItemList.Circuit_Parts_CapacitorXSMD.get(60), - ItemList.Circuit_Parts_TransistorXSMD.get(60)) - .itemOutputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(13)) - .fluidInputs(new FluidStack(solderUEV, 360)) - .duration(12 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_UEV) - .requiresCleanRoom() - .noOptimize() - .addTo(circuitAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), - BW_Meta_Items.getNEWCIRCUITS() - .getStack(13), - ItemList.Circuit_Parts_DiodeXSMD.get(64), - ItemList.Circuit_Parts_CapacitorXSMD.get(64), - ItemList.Circuit_Parts_TransistorXSMD.get(64)) - .itemOutputs( - BW_Meta_Items.getNEWCIRCUITS() - .getStack(14)) - .fluidInputs(new FluidStack(solderUEV, 396)) - .duration(13 * MINUTES + 45 * SECONDS) - .eut(TierEU.RECIPE_UIV) - .requiresCleanRoom() - .noOptimize() - .addTo(circuitAssemblerRecipes); - GT_Values.RA.stdBuilder() .itemInputs(WerkstoffLoader.Tiberium.get(bolt)) .duration(0) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_ColorUtil.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_ColorUtil.java index 2e384c8e0c..a3a1da4ee4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_ColorUtil.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_ColorUtil.java @@ -16,7 +16,6 @@ package com.github.bartimaeusnek.bartworks.util; import java.util.Arrays; import gregtech.api.enums.Dyes; -import gregtech.api.enums.GT_Values; @SuppressWarnings("unused") public class BW_ColorUtil { @@ -214,7 +213,4 @@ public class BW_ColorUtil { return (color[0] & 0x0ff) << 16 | (color[1] & 0x0ff) << 8 | color[2] & 0x0ff; } - public static String getColorForTier(int tier) { - return GT_Values.TIER_COLORS[tier]; - } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java index 1630113fdb..8174b34b28 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java @@ -33,26 +33,13 @@ public class BW_Tooltip_Reference { public static final Supplier<String> ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS = () -> StatCollector.translateToLocal( "tooltip.bw.1.name") + " " + BW; - public static final Supplier<String> ADDED_BY_BARTWORKS = () -> StatCollector.translateToLocal("tooltip.bw.0.name") - + " " - + BW; - public static final Function<String, String> ADDED_VIA_BARTWORKS = owner -> String - .format(StatCollector.translateToLocal("tooltip.bw.via.name"), owner); + public static final String MULTIBLOCK_ADDED_BY_BARTWORKS = BW; public static final Function<String, String> MULTIBLOCK_ADDED_VIA_BARTWORKS = owner -> String .format(StatCollector.translateToLocal("tooltip.bw.mb_via.name"), owner); public static final String MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS = MULTIBLOCK_ADDED_VIA_BARTWORKS .apply(GREEN + "bartimaeusnek"); - public static final String ADV_STR_CHECK = "Uses an advanced " + TT + " structure check, due to " + BW; public static final String TT_BLUEPRINT = "To see the structure, use a " + TT + " Blueprint on the Controller!"; - public static String[] getTranslatedBrandedTooltip(String key) { - String[] dsc = StatCollector.translateToLocal(key) - .split(";"); - String[] fdsc = new String[dsc.length + 1]; - System.arraycopy(dsc, 0, fdsc, 0, dsc.length); - fdsc[dsc.length] = ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get(); - return fdsc; - } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java index 452eb0f802..27b04dbead 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java @@ -31,13 +31,8 @@ import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Collectors; -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.enchantment.Enchantment; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -53,6 +48,7 @@ import org.apache.commons.lang3.reflect.FieldUtils; import com.github.bartimaeusnek.bartworks.API.BioVatLogicAdder; import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; +import com.github.bartimaeusnek.bartworks.API.GlassTier; import com.github.bartimaeusnek.bartworks.MainMod; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.structure.AutoPlaceEnvironment; @@ -410,30 +406,6 @@ public class BW_Util { return ret; } - public static byte calculateGlassTier(@Nonnull Block block, @Nonnegative byte meta) { - - byte boroTier = BorosilicateGlass.getTier(block, meta); - if (boroTier != -1) return boroTier; - - if ("blockAlloyGlass".equals(block.getUnlocalizedName())) return 4; - - if (block.equals(Blocks.glass)) return 3; - - for (BioVatLogicAdder.BlockMetaPair B : BioVatLogicAdder.BioVatGlass.getGlassMap() - .keySet()) - if (B.getBlock() - .equals(block) - && B.getaByte() - .equals(meta)) - return BioVatLogicAdder.BioVatGlass.getGlassMap() - .get(B); - - if (block.getMaterial() - .equals(Material.glass)) return 3; - - return 0; - } - public static <T> IStructureElement<T> ofGlassTiered(byte mintier, byte maxtier, byte notset, BiConsumer<T, Byte> setter, Function<T, Byte> getter, int aDots) { return new IStructureElement<>() { @@ -444,12 +416,16 @@ public class BW_Util { @Override public boolean check(T te, World world, int x, int y, int z) { if (world.isAirBlock(x, y, z)) return false; - byte glasstier = BW_Util - .calculateGlassTier(world.getBlock(x, y, z), (byte) world.getBlockMetadata(x, y, z)); - // is not a glass ? - if (glasstier == 0 || glasstier == notset || glasstier < mintier || glasstier > maxtier) return false; - if (getter.apply(te) == notset) setter.accept(te, glasstier); - return getter.apply(te) == glasstier; + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + + int glassTier = GlassTier.getGlassTier(block, meta); + + // If it is not a glass, the tier will be 0. + if (glassTier == 0 || glassTier == notset || glassTier < mintier || glassTier > maxtier) return false; + + if (getter.apply(te) == notset) setter.accept(te, (byte) glassTier); + return getter.apply(te) == glassTier; } @Override @@ -480,10 +456,12 @@ public class BW_Util { @Override public boolean check(T te, World world, int x, int y, int z) { if (world.isAirBlock(x, y, z)) return false; - byte glasstier = BW_Util - .calculateGlassTier(world.getBlock(x, y, z), (byte) world.getBlockMetadata(x, y, z)); - if (glasstier == 0) return false; // is not a glass ? - return glasstier >= mintier && glasstier <= maxtier; + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + int glassTier = GlassTier.getGlassTier(block, meta); + + if (glassTier == 0) return false; // Not a glass. + return glassTier >= mintier && glassTier <= maxtier; } @Override diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java index da9bd49397..01c3c82460 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java @@ -29,6 +29,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.gen.ChunkProviderServer; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -143,7 +144,11 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri + " Ores per Second depending on the Dimension it is build in") .addInfo("Put the Ore into the input bus to set the Whitelist/Blacklist") .addInfo("Use a screwdriver to toggle Whitelist/Blacklist") - .addInfo("Blacklist or non Whitelist Ore will be VOIDED") + .addInfo( + "Blacklist or non Whitelist Ore will be " + EnumChatFormatting.DARK_RED + + "VOIDED" + + EnumChatFormatting.RESET + + ".") .addSeparator() .beginStructureBlock(3, 7, 3, false) .addController("Front bottom") diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/blocks/UniversalSpaceBlocks.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/blocks/UniversalSpaceBlocks.java deleted file mode 100644 index af9d9647af..0000000000 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/blocks/UniversalSpaceBlocks.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.crossmod.galacticraft.blocks; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.world.IBlockAccess; - -import com.github.bartimaeusnek.bartworks.common.blocks.BW_Blocks; -import com.github.bartimaeusnek.crossmod.galacticraft.creativetabs.SpaceTab; - -public class UniversalSpaceBlocks extends BW_Blocks { - - public UniversalSpaceBlocks(String name, String[] texture) { - super(name, texture, SpaceTab.getInstance(), Material.rock); - } - - @Override - public boolean canBeReplacedByLeaves(IBlockAccess world, int x, int y, int z) { - return true; - } - - @Override - public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { - return true; - } -} diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/creativetabs/SpaceTab.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/creativetabs/SpaceTab.java deleted file mode 100644 index 5d9b9c3cc1..0000000000 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/creativetabs/SpaceTab.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.crossmod.galacticraft.creativetabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; - -public class SpaceTab extends CreativeTabs { - - private static final SpaceTab instance = new SpaceTab("SpaceTab"); - - private SpaceTab(String label) { - super(label); - } - - public static SpaceTab getInstance() { - return SpaceTab.instance; - } - - @Override - public Item getTabIconItem() { - return ItemRegistry.DESTRUCTOPACK; - } -} diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java index 4b50dab64f..6720fbff78 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java @@ -167,7 +167,7 @@ public class TT_MetaTileEntity_LowPowerLaserBox extends TT_Abstract_LowPowerLase @Override public String[] getDescription() { - return new String[] { "Like a Tranformer... but for LAZORZ", + return new String[] { "Like a transformer... but for LASERS!", "Transfer rate: " + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(this.getTotalPower()) + EnumChatFormatting.WHITE diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java index 5a9cd8048b..ddc7cc2b13 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java @@ -13,18 +13,11 @@ package com.github.bartimaeusnek.crossmod.tectech.tileentites.tiered; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; - -import org.apache.commons.lang3.ArrayUtils; - -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoTunnel; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.util.GT_Utility; public class TT_MetaTileEntity_LowPowerLaserDynamo extends GT_MetaTileEntity_Hatch_DynamoTunnel implements LowPowerLaser { @@ -70,14 +63,7 @@ public class TT_MetaTileEntity_LowPowerLaserDynamo extends GT_MetaTileEntity_Hat @Override public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - StatCollector.translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTotalPower()) - + EnumChatFormatting.RESET - + " EU/t", - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); + return mDescriptionArray; } @Override diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java index 6b6b6c3558..82f15055c7 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java @@ -13,18 +13,11 @@ package com.github.bartimaeusnek.crossmod.tectech.tileentites.tiered; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; - -import org.apache.commons.lang3.ArrayUtils; - -import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.util.GT_Utility; public class TT_MetaTileEntity_LowPowerLaserHatch extends GT_MetaTileEntity_Hatch_EnergyTunnel implements LowPowerLaser { @@ -40,14 +33,7 @@ public class TT_MetaTileEntity_LowPowerLaserHatch extends GT_MetaTileEntity_Hatc @Override public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - StatCollector.translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTotalPower()) - + EnumChatFormatting.RESET - + " EU/t", - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); + return mDescriptionArray; } @Override diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java index cfc57ccf21..e5b9f350a3 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java @@ -1,6 +1,7 @@ package goodgenerator.crossmod.thaumcraft; import static gregtech.api.enums.Mods.Automagy; +import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.ThaumicBases; import static gregtech.api.enums.Mods.ThaumicEnergistics; @@ -307,7 +308,7 @@ public class Research { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Unstable, 1), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Void, 1), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1), Ic2Items.industrialTnt, - new ItemStack(ItemRegistry.DESTRUCTOPACK) }, + GT_ModHandler.getModItem(ExtraUtilities.ID, "trashcan", 1, 0) }, ItemRefer.Essentia_Upgrade_Unstable.get(1), 6, Arrays.asList( diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index e5f9991236..478187cb8f 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -2354,6 +2354,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Concrete.add(SubTag.STONE, SubTag.NO_SMASHING, SubTag.SMELTING_TO_FLUID); ConstructionFoam.add(SubTag.STONE, SubTag.NO_SMASHING, SubTag.EXPLOSIVE, SubTag.NO_SMELTING); ReinforceGlass.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.SMELTING_TO_FLUID); + BorosilicateGlass.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_RECYCLING, SubTag.SMELTING_TO_FLUID); + Redstone.add( SubTag.STONE, SubTag.NO_SMASHING, diff --git a/src/main/resources/assets/bartworks/lang/de_DE.lang b/src/main/resources/assets/bartworks/lang/de_DE.lang index 23edaf6124..e235b69987 100644 --- a/src/main/resources/assets/bartworks/lang/de_DE.lang +++ b/src/main/resources/assets/bartworks/lang/de_DE.lang @@ -110,7 +110,7 @@ tooltip.tile.acidgen.0.name=Ein Säure Generator tooltip.tile.acidgen.1.name=Creates Power from Chemical Energy Potentials. tooltip.tile.biolab.0.name=The BioLab, a Multi-Use Bioengineering Station tooltip.tile.diode.0.name=A Simple diode that will allow Energy Flow in only one direction. -tooltip.tile.energydistributor.0.name=Splits Amperage into several Sides. +tooltip.tile.energydistributor.0.name=Splits Amperage into several sides. tooltip.tile.lesu.0.name=Controller Block for the GT2-Styled L.E.S.U.;Size: ANY tooltip.tile.lesu.1.name=Storage per LESU Casing: tooltip.tile.lesu.2.name=Output EU: LESU Casings amount;Input EU: Next Voltage Tier to Output EU;Input/Output Amps can be configured via 4 Circuits in GUI;Output Side has a dot on it. diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang index d46308df23..30d4a0b7ab 100644 --- a/src/main/resources/assets/bartworks/lang/en_US.lang +++ b/src/main/resources/assets/bartworks/lang/en_US.lang @@ -67,7 +67,7 @@ BW_GlasBlocks.14.name=Cosmic Neutronium Reinforced Borosilicate Glass Block BW_GlasBlocks.15.name=Infinity Reinforced Borosilicate Glass Block BW_GlasBlocks2.0.name=Transcendentally Reinforced Borosilicate Glass Block -tooltip.glas.0.name=Glass-Tier: +tooltip.glass_tier.0.name=Glass-Tier: tooltip.LESU.0.name=Maximum Capacity! tooltip.LESU.1.name=Multiple Controllers! @@ -95,7 +95,6 @@ tooltip.bw.tier.name=Tier: tooltip.bw.kg.0.name=kg tooltip.bw.kg.1.name=kgs tooltip.bw.empty.name=Empty -tooltip.bw.via.name=Added by %s§7 via §2BartWorks tooltip.bw.mb_via.name=%s§7 via §2BartWorks tooltip.teslastaff.0.name=No warranty! @@ -127,7 +126,7 @@ tooltip.tile.tiereddsc.1.name=Amperage IN: tooltip.tile.tiereddsc.2.name=Amperage OUT: tooltip.tile.tiereddsc.3.name=Capacity: tooltip.tile.diode.0.name=A Simple diode that will allow Energy Flow in only one direction. -tooltip.tile.energydistributor.0.name=Splits Amperage into several Sides. +tooltip.tile.energydistributor.0.name=Splits Amperage into several sides. tooltip.tile.biolab.0.name=The BioLab, a Multi-Use Bioengineering Station tooltip.tile.radhatch.0.name=Radioactive Item Chamber for Multiblocks tooltip.tile.radhatch.1.name=Use a screwdriver to set the containment level diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/10.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/10.png Binary files differdeleted file mode 100644 index 38429ed78d..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/10.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/11.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/11.png Binary files differdeleted file mode 100644 index 3901815927..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/11.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/12.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/12.png Binary files differdeleted file mode 100644 index c97ec3384c..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/12.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/13.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/13.png Binary files differdeleted file mode 100644 index 40e5c92817..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/13.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/14.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/14.png Binary files differdeleted file mode 100644 index 10c6f20de0..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/14.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/4.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/4.png Binary files differdeleted file mode 100644 index 86411e18bd..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/4.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/5.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/5.png Binary files differdeleted file mode 100644 index 57a7c7a932..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/5.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/6.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/6.png Binary files differdeleted file mode 100644 index 9f68371247..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/6.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/7.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/7.png Binary files differdeleted file mode 100644 index 7a322b76c0..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/7.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/8.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/8.png Binary files differdeleted file mode 100644 index 9fe039db81..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/8.png +++ /dev/null diff --git a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/9.png b/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/9.png Binary files differdeleted file mode 100644 index 457a51b7a1..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.bwMetaGeneratedItem0/9.png +++ /dev/null |
