diff options
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 576 |
1 files changed, 351 insertions, 225 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 401b1395d5..30de62084a 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -748,18 +748,24 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GameRegistry.registerFuelHandler(this); MinecraftForge.EVENT_BUS.register(this); MinecraftForge.ORE_GEN_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); - GregTech_API.sThaumcraftCompat = (IThaumcraftCompat) GT_Utility - .callConstructor("gregtech.common.GT_ThaumcraftCompat", 0, null, GT_Values.D1, new Object[0]); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + FMLCommonHandler.instance() + .bus() + .register(this); + GregTech_API.sThaumcraftCompat = (IThaumcraftCompat) GT_Utility.callConstructor( + "gregtech.common.GT_ThaumcraftCompat", + 0, + null, + GT_Values.D1, + new Object[0]); + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent(tData)); } try { for (String tOreName : OreDictionary.getOreNames()) { ItemStack tOreStack; - for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$ - .hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { + for (Iterator i$ = OreDictionary.getOres(tOreName) + .iterator(); i$.hasNext(); registerOre( + new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { tOreStack = (ItemStack) i$.next(); } } @@ -776,8 +782,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG this.mIgnoreTcon = GregTech_API.sOPStuff.get(ConfigCategories.general, "ignoreTConstruct", true); this.mWireHeatingTicks = GregTech_API.sOPStuff.get(ConfigCategories.general, "WireHeatingTicks", 4); NetworkRegistry.INSTANCE.registerGuiHandler(GT_Values.GT, this); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -872,8 +877,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ItemList.IC2_Hops.set(GT_ModHandler.getIC2Item("hops", 1L)); ItemList.IC2_Resin.set(GT_ModHandler.getIC2Item("resin", 1L)); ItemList.IC2_Plantball.set(GT_ModHandler.getIC2Item("plantBall", 1L)); - ItemList.IC2_PlantballCompressed - .set(GT_ModHandler.getIC2Item("compressedPlantBall", 1L, ItemList.IC2_Plantball.get(1L))); + ItemList.IC2_PlantballCompressed.set( + GT_ModHandler.getIC2Item("compressedPlantBall", 1L, ItemList.IC2_Plantball.get(1L))); ItemList.IC2_Crop_Seeds.set(GT_ModHandler.getIC2Item("cropSeed", 1L)); ItemList.IC2_Grin_Powder.set(GT_ModHandler.getIC2Item("grinPowder", 1L)); ItemList.IC2_Energium_Dust.set(GT_ModHandler.getIC2Item("energiumDust", 1L)); @@ -883,8 +888,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ItemList.IC2_Food_Can_Empty.set(GT_ModHandler.getIC2Item("tinCan", 1L)); ItemList.IC2_Food_Can_Filled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 0)); ItemList.IC2_Food_Can_Spoiled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 1)); - ItemList.IC2_Industrial_Diamond - .set(GT_ModHandler.getIC2Item("industrialDiamond", 1L, new ItemStack(Items.diamond, 1))); + ItemList.IC2_Industrial_Diamond.set( + GT_ModHandler.getIC2Item("industrialDiamond", 1L, new ItemStack(Items.diamond, 1))); ItemList.IC2_Compressed_Coal_Ball.set(GT_ModHandler.getIC2Item("compressedCoalBall", 1L)); ItemList.IC2_Compressed_Coal_Chunk.set(GT_ModHandler.getIC2Item("coalChunk", 1L)); ItemList.IC2_ShaftIron.set(GT_ModHandler.getIC2Item("ironshaft", 1L)); @@ -960,40 +965,40 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.disk", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.blade", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.rotor", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.diamond", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.disk", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.blade", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.rotor", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "borehead.diamond", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.steel", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.iron", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.plateNaga", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.legsNaga", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.plateNaga", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.legsNaga", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticHelm", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticPlate", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticLegs", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiHelm", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiPlate", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiLegs", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristHelmet", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristChest", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristLegs", 1L, 32767)); @@ -1002,10 +1007,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameImpregnated", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameProven", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "waxCast", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("IC2NuclearControl", "ItemToolThermometer", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("IC2NuclearControl", "ItemToolThermometer", 1L, 32767)); RecipeSorter.register( "gregtech:shaped", @@ -1028,16 +1033,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_OreDictUnificator.registerOre( "cropChilipepper", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 2)); - GT_OreDictUnificator - .registerOre("cropTomato", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); - GT_OreDictUnificator - .registerOre("cropGrape", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4)); + GT_OreDictUnificator.registerOre( + "cropTomato", + GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); + GT_OreDictUnificator.registerOre( + "cropGrape", + GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4)); GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0)); // Clay buckets, which don't get registered until Iguana Tweaks pre-init if (IguanaTweaksTinkerConstruct.isModLoaded()) { - OrePrefixes.bucketClay.mContainerItem = GT_ModHandler - .getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketFired", 1L, 0); + OrePrefixes.bucketClay.mContainerItem = GT_ModHandler.getModItem( + IguanaTweaksTinkerConstruct.modID, + "clayBucketFired", + 1L, + 0); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Empty, @@ -1162,8 +1172,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG addFullHazmatToGeneralItem("EnderIO", "item.stellar_boots", 1L); GregTech_API.sLoadStarted = true; - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -1189,10 +1198,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_MetaGenerated_Item_98.init(); GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + GT_OreDictUnificator.addItemData( + new ItemStack(Items.wooden_door, 1, 32767), + new ItemData(Materials.Wood, 21772800L)); + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -1284,8 +1293,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG this.mUniverse = null; this.isFirstServerWorldTick = true; - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -1310,7 +1318,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Log.out.println( "GT_Mod: Cleaning up all OreDict Crafting Recipes, which have an empty List in them, since they are never meeting any Condition."); - List tList = CraftingManager.getInstance().getRecipeList(); + List tList = CraftingManager.getInstance() + .getRecipeList(); for (int i = 0; i < tList.size(); i++) { if ((tList.get(i) instanceof ShapedOreRecipe)) { for (Object tObject : ((ShapedOreRecipe) tList.get(i)).getInput()) { @@ -1362,8 +1371,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG public void onArrowNockEvent(ArrowNockEvent aEvent) { if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.result)) && (GT_Utility.getProjectile(SubTag.PROJECTILE_ARROW, aEvent.entityPlayer.inventory) != null)) { - aEvent.entityPlayer - .setItemInUse(aEvent.result, aEvent.result.getItem().getMaxItemUseDuration(aEvent.result)); + aEvent.entityPlayer.setItemInUse( + aEvent.result, + aEvent.result.getItem() + .getMaxItemUseDuration(aEvent.result)); aEvent.setCanceled(true); } } @@ -1407,8 +1418,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG aEvent.bow.getItem(); new WorldSpawnedEventBuilder.SoundAtEntityEventBuilder().setPitch(0.64893958288F + tSpeed * 0.5F) - .setVolume(1f).setIdentifier(SoundResource.RANDOM_BOW).setEntity(aEvent.entityPlayer) - .setWorld(aEvent.entityPlayer.worldObj).run(); + .setVolume(1f) + .setIdentifier(SoundResource.RANDOM_BOW) + .setEntity(aEvent.entityPlayer) + .setWorld(aEvent.entityPlayer.worldObj) + .run(); tArrowEntity.canBePickedUp = 1; if (!aEvent.entityPlayer.capabilities.isCreativeMode) { @@ -1446,8 +1460,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG new GT_Entity_Arrow( (EntityArrow) aEvent.entity, OrePrefixes.arrowGtWood.mPrefixedItems.get( - aEvent.entity.worldObj.rand - .nextInt(OrePrefixes.arrowGtWood.mPrefixedItems.size())))); + aEvent.entity.worldObj.rand.nextInt( + OrePrefixes.arrowGtWood.mPrefixedItems.size())))); aEvent.entity.setDead(); } } @@ -1570,7 +1584,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG @SubscribeEvent public void registerOre(OreDictionary.OreRegisterEvent aEvent) { - ModContainer tContainer = Loader.instance().activeModContainer(); + ModContainer tContainer = Loader.instance() + .activeModContainer(); String aMod = tContainer == null ? "UNKNOWN" : tContainer.getModId(); String aOriginalMod = aMod; if (GT_OreDictUnificator.isRegisteringOres()) { @@ -1582,7 +1597,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG || (aEvent.Ore.getItem() == null) || (aEvent.Name == null) || (aEvent.Name.isEmpty()) - || (aEvent.Name.replaceAll("_", "").length() - aEvent.Name.length() == 9)) { + || (aEvent.Name.replaceAll("_", "") + .length() + - aEvent.Name.length() == 9)) { if (aOriginalMod.equals("gregtech")) { aOriginalMod = "UNKNOWN"; } @@ -1595,11 +1612,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } try { aEvent.Ore.stackSize = 1; - if (this.mIgnoreTcon || aEvent.Ore.getUnlocalizedName().startsWith("item.oreberry")) { - if ((aOriginalMod.toLowerCase(Locale.ENGLISH).contains("xycraft")) - || (aOriginalMod.toLowerCase(Locale.ENGLISH).contains("tconstruct")) - || ((aOriginalMod.toLowerCase(Locale.ENGLISH).contains("natura")) - && (!aOriginalMod.toLowerCase(Locale.ENGLISH).contains("natural")))) { + if (this.mIgnoreTcon || aEvent.Ore.getUnlocalizedName() + .startsWith("item.oreberry")) { + if ((aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("xycraft")) + || (aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("tconstruct")) + || ((aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("natura")) + && (!aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("natural")))) { if (GT_Values.D1) { GT_Log.ore.println(aMod + " -> " + aEvent.Name + " is getting ignored, because of racism. :P"); } @@ -1689,8 +1711,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Log.ore.println( tModToName + " is getting re-registered because the OreDict Name containing invalid spaces."); - GT_OreDictUnificator - .registerOre(aEvent.Name.replaceAll(" ", ""), GT_Utility.copyAmount(1L, aEvent.Ore)); + GT_OreDictUnificator.registerOre( + aEvent.Name.replaceAll(" ", ""), + GT_Utility.copyAmount(1L, aEvent.Ore)); aEvent.Ore.setStackDisplayName("Invalid OreDictionary Tag"); return; } else if (this.mInvalidNames.contains(aEvent.Name)) { @@ -1701,19 +1724,25 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG OrePrefixes aPrefix = OrePrefixes.getOrePrefix(aEvent.Name); Materials aMaterial = Materials._NULL; if ((aPrefix == OrePrefixes.nugget) && (aMod.equals("Thaumcraft")) - && (aEvent.Ore.getItem().getUnlocalizedName().contains("ItemResource"))) { + && (aEvent.Ore.getItem() + .getUnlocalizedName() + .contains("ItemResource"))) { return; } if (aPrefix == null) { - if (aEvent.Name.toLowerCase().equals(aEvent.Name)) { + if (aEvent.Name.toLowerCase() + .equals(aEvent.Name)) { GT_Log.ore.println(tModToName + " is invalid due to being solely lowercased."); return; - } else if (aEvent.Name.toUpperCase().equals(aEvent.Name)) { - GT_Log.ore.println(tModToName + " is invalid due to being solely uppercased."); - return; - } else if (Character.isUpperCase(aEvent.Name.charAt(0))) { - GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased."); - } + } else if (aEvent.Name.toUpperCase() + .equals(aEvent.Name)) { + GT_Log.ore.println( + tModToName + " is invalid due to being solely uppercased."); + return; + } else + if (Character.isUpperCase(aEvent.Name.charAt(0))) { + GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased."); + } } else { if (aPrefix.mDontUnificateActively) { GT_OreDictUnificator.addToBlacklist(aEvent.Ore); @@ -1749,9 +1778,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } if (aMaterial != Materials._NULL) { Materials tReRegisteredMaterial; - for (Iterator i$ = aMaterial.mOreReRegistrations.iterator(); i$ - .hasNext(); GT_OreDictUnificator - .registerOre(aPrefix, tReRegisteredMaterial, aEvent.Ore)) { + for (Iterator i$ = aMaterial.mOreReRegistrations.iterator(); i$.hasNext(); GT_OreDictUnificator.registerOre( + aPrefix, + tReRegisteredMaterial, + aEvent.Ore)) { tReRegisteredMaterial = (Materials) i$.next(); } aMaterial.add(GT_Utility.copyAmount(1L, aEvent.Ore)); @@ -1822,8 +1852,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG if (aMaterial == Materials.Tin) { GT_OreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore); } else if (aMaterial == Materials.AnyCopper) { - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWireCopper, aEvent.Ore); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingWireCopper, + aEvent.Ore); } else if (aMaterial == Materials.Gold) { GT_OreDictUnificator.registerOre(OreDictNames.craftingWireGold, aEvent.Ore); } else if (aMaterial == Materials.AnyIron) { @@ -1834,8 +1865,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG if ((aMaterial.contains(SubTag.TRANSPARENT)) && (aMaterial.mColor != Dyes._NULL)) { GT_OreDictUnificator.registerOre( - "craftingLens" - + aMaterial.mColor.toString().replaceFirst("dye", ""), + "craftingLens" + aMaterial.mColor.toString() + .replaceFirst("dye", ""), aEvent.Ore); } break; @@ -1905,40 +1936,66 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (aMaterial == Materials.Knightmetal) { GT_OreDictUnificator.registerOre("knightmetal", aEvent.Ore); } else if ((aMaterial == Materials.Brass) && (aEvent.Ore.getItemDamage() == 2) - && (aEvent.Ore.getUnlocalizedName().equals("item.ingotBrass")) + && (aEvent.Ore.getUnlocalizedName() + .equals("item.ingotBrass")) && (new ItemStack(aEvent.Ore.getItem(), 1, 0).getUnlocalizedName() - .contains("red"))) { - GT_OreDictUnificator.set( - OrePrefixes.ingot, - Materials.RedAlloy, - new ItemStack(aEvent.Ore.getItem(), 1, 0)); - GT_OreDictUnificator.set( - OrePrefixes.ingot, - Materials.BlueAlloy, - new ItemStack(aEvent.Ore.getItem(), 1, 1)); - GT_OreDictUnificator.set( - OrePrefixes.ingot, - Materials.Brass, - new ItemStack(aEvent.Ore.getItem(), 1, 2)); - if (!mDisableIC2Cables) { - GT_Values.RA.addWiremillRecipe( - GT_ModHandler.getIC2Item("copperCableItem", 3L), - new ItemStack(aEvent.Ore.getItem(), 1, 8), - 400, - 1); - GT_Values.RA.addWiremillRecipe( - GT_ModHandler.getIC2Item("ironCableItem", 6L), - new ItemStack(aEvent.Ore.getItem(), 1, 9), - 400, - 2); - } - GT_Values.RA.addCutterRecipe( - new ItemStack(aEvent.Ore.getItem(), 1, 3), - new ItemStack(aEvent.Ore.getItem(), 16, 4), - null, - 400, - 8); - } + .contains("red"))) { + GT_OreDictUnificator.set( + OrePrefixes.ingot, + Materials.RedAlloy, + new ItemStack( + aEvent.Ore.getItem(), + 1, + 0)); + GT_OreDictUnificator.set( + OrePrefixes.ingot, + Materials.BlueAlloy, + new ItemStack( + aEvent.Ore.getItem(), + 1, + 1)); + GT_OreDictUnificator.set( + OrePrefixes.ingot, + Materials.Brass, + new ItemStack( + aEvent.Ore.getItem(), + 1, + 2)); + if (!mDisableIC2Cables) { + GT_Values.RA.addWiremillRecipe( + GT_ModHandler.getIC2Item( + "copperCableItem", + 3L), + new ItemStack( + aEvent.Ore.getItem(), + 1, + 8), + 400, + 1); + GT_Values.RA.addWiremillRecipe( + GT_ModHandler.getIC2Item( + "ironCableItem", + 6L), + new ItemStack( + aEvent.Ore.getItem(), + 1, + 9), + 400, + 2); + } + GT_Values.RA.addCutterRecipe( + new ItemStack( + aEvent.Ore.getItem(), + 1, + 3), + new ItemStack( + aEvent.Ore.getItem(), + 16, + 4), + null, + 400, + 8); + } break; default: break; @@ -1948,7 +2005,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } } else { for (Dyes tDye : Dyes.VALUES) { - if (aEvent.Name.endsWith(tDye.name().replaceFirst("dye", ""))) { + if (aEvent.Name.endsWith( + tDye.name() + .replaceFirst("dye", ""))) { GT_OreDictUnificator.addToBlacklist(aEvent.Ore); GT_Log.ore.println( tModToName @@ -2049,8 +2108,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG int size = 5; int sizeStep = mEvents.size() / 20 - 1; GT_Proxy.OreDictEventContainer tEvent; - for (Iterator<GT_Proxy.OreDictEventContainer> i$ = mEvents.iterator(); i$.hasNext(); GT_Proxy - .registerRecipes(tEvent)) { + for (Iterator<GT_Proxy.OreDictEventContainer> i$ = mEvents.iterator(); i$.hasNext(); GT_Proxy.registerRecipes( + tEvent)) { tEvent = i$.next(); sizeStep--; if (sizeStep == 0) { @@ -2147,8 +2206,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG && (((EntityLivingBase) tEntity).getHealth() > 0.0F)) { List tList = tEntity.worldObj.getEntitiesWithinAABBExcludingEntity( tEntity, - tEntity.boundingBox - .expand(0.20000000298023224D, 0.0D, 0.20000000298023224D)); + tEntity.boundingBox.expand( + 0.20000000298023224D, + 0.0D, + 0.20000000298023224D)); Class tClass = tEntity.getClass(); int tEntityCount = 1; if (tList != null) { @@ -2361,8 +2422,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } private static List<String> getOreDictNames(ItemStack stack) { - return Arrays.stream(OreDictionary.getOreIDs(stack)).mapToObj(OreDictionary::getOreName) - .collect(Collectors.toList()); + return Arrays.stream(OreDictionary.getOreIDs(stack)) + .mapToObj(OreDictionary::getOreName) + .collect(Collectors.toList()); } @Override @@ -2372,8 +2434,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } int rFuelValue = 0; if ((aFuel.getItem() instanceof GT_MetaGenerated_Item)) { - final Short tFuelValue = ((GT_MetaGenerated_Item) aFuel.getItem()).mBurnValues - .get((short) aFuel.getItemDamage()); + final Short tFuelValue = ((GT_MetaGenerated_Item) aFuel.getItem()).mBurnValues.get( + (short) aFuel.getItemDamage()); if (tFuelValue != null) { rFuelValue = Math.max(rFuelValue, tFuelValue); } @@ -2387,7 +2449,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG // If not check the ore dict rFuelValue = Math.max( rFuelValue, - getOreDictNames(aFuel).stream().mapToInt(f -> oreDictBurnTimes.getOrDefault(f, 0)).max().orElse(0)); + getOreDictNames(aFuel).stream() + .mapToInt(f -> oreDictBurnTimes.getOrDefault(f, 0)) + .max() + .orElse(0)); } // If we have something from the GT MetaGenerated_Item, ItemFuelValue, or OreDict return @@ -2414,13 +2479,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG : "autogenerated"; return GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withLocalizedName(aMaterial.mDefaultLocalName).withTextureName(fluidTexture) - .withColorRGBA(aMaterial.mRGBa).withStateAndTemperature(LIQUID, aMaterial.getLiquidTemperature()) - .buildAndRegister().configureMaterials(aMaterial) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), - ItemList.Cell_Empty.get(1L)) - .asFluid(); + .withLocalizedName(aMaterial.mDefaultLocalName) + .withTextureName(fluidTexture) + .withColorRGBA(aMaterial.mRGBa) + .withStateAndTemperature(LIQUID, aMaterial.getLiquidTemperature()) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), + ItemList.Cell_Empty.get(1L)) + .asFluid(); } public Fluid addAutoGeneratedCorrespondingGas(Materials aMaterial) { @@ -2431,13 +2499,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG : "autogenerated"; return GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withLocalizedName(aMaterial.mDefaultLocalName).withTextureName(fluidTexture) - .withColorRGBA(aMaterial.mRGBa).withStateAndTemperature(GAS, aMaterial.getGasTemperature()) - .buildAndRegister().configureMaterials(aMaterial) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), - ItemList.Cell_Empty.get(1L)) - .asFluid(); + .withLocalizedName(aMaterial.mDefaultLocalName) + .withTextureName(fluidTexture) + .withColorRGBA(aMaterial.mRGBa) + .withStateAndTemperature(GAS, aMaterial.getGasTemperature()) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), + ItemList.Cell_Empty.get(1L)) + .asFluid(); } public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) { @@ -2448,14 +2519,17 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG : "plasma.autogenerated"; return GT_FluidFactory.builder("plasma." + aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withLocalizedName(aMaterial.mDefaultLocalName + " Plasma").withTextureName(fluidTexture) - .withColorRGBA(aMaterial.mMoltenRGBa).withStateAndTemperature(PLASMA, 10000).buildAndRegister() - .configureMaterials(aMaterial) - .registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), - ItemList.Cell_Empty.get(1L), - aMaterial.getMolten(1) != null ? 144 : 1000) - .asFluid(); + .withLocalizedName(aMaterial.mDefaultLocalName + " Plasma") + .withTextureName(fluidTexture) + .withColorRGBA(aMaterial.mMoltenRGBa) + .withStateAndTemperature(PLASMA, 10000) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerContainers( + GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), + ItemList.Cell_Empty.get(1L), + aMaterial.getMolten(1) != null ? 144 : 1000) + .asFluid(); } public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) { @@ -2466,15 +2540,19 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG : "molten.autogenerated"; return GT_FluidFactory.builder("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withLocalizedName("Molten " + aMaterial.mDefaultLocalName).withTextureName(fluidTexture) - .withColorRGBA(aMaterial.mMoltenRGBa) - .withStateAndTemperature(MOLTEN, aMaterial.mMeltingPoint < 0 ? 1000 : aMaterial.mMeltingPoint) - .buildAndRegister().configureMaterials(aMaterial) - .registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, aMaterial, 1L), - ItemList.Cell_Empty.get(1L), - 144) - .asFluid(); + .withLocalizedName("Molten " + aMaterial.mDefaultLocalName) + .withTextureName(fluidTexture) + .withColorRGBA(aMaterial.mMoltenRGBa) + .withStateAndTemperature( + MOLTEN, + aMaterial.mMeltingPoint < 0 ? 1000 : aMaterial.mMeltingPoint) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerContainers( + GT_OreDictUnificator.get(OrePrefixes.cellMolten, aMaterial, 1L), + ItemList.Cell_Empty.get(1L), + 144) + .asFluid(); } // ------------------------------------------------------------------------------------------------------------ @@ -2492,13 +2570,17 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else return; for (int i = 0; i < 3; i++) { crackedFluids[i] = GT_FluidFactory.builder(namePrefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withIconsFrom(uncrackedFluid) - .withLocalizedName(orePrefixes[i].mLocalizedMaterialPre + aMaterial.mDefaultLocalName) - .withColorRGBA(aMaterial.mRGBa).withStateAndTemperature(GAS, 775).buildAndRegister() - .registerBContainers( - GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L), - ItemList.Cell_Empty.get(1L)) - .asFluid(); + .withIconsFrom(uncrackedFluid) + .withLocalizedName( + orePrefixes[i].mLocalizedMaterialPre + + aMaterial.mDefaultLocalName) + .withColorRGBA(aMaterial.mRGBa) + .withStateAndTemperature(GAS, 775) + .buildAndRegister() + .registerBContainers( + GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L), + ItemList.Cell_Empty.get(1L)) + .asFluid(); int hydrogenAmount = 2 * i + 2; GT_Values.RA.addCrackingRecipe( @@ -2541,13 +2623,17 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else return; for (int i = 0; i < 3; i++) { crackedFluids[i] = GT_FluidFactory.builder(namePrefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withIconsFrom(uncrackedFluid) - .withLocalizedName(orePrefixes[i].mLocalizedMaterialPre + aMaterial.mDefaultLocalName) - .withColorRGBA(aMaterial.mRGBa).withStateAndTemperature(GAS, 775).buildAndRegister() - .registerBContainers( - GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L), - ItemList.Cell_Empty.get(1L)) - .asFluid(); + .withIconsFrom(uncrackedFluid) + .withLocalizedName( + orePrefixes[i].mLocalizedMaterialPre + + aMaterial.mDefaultLocalName) + .withColorRGBA(aMaterial.mRGBa) + .withStateAndTemperature(GAS, 775) + .buildAndRegister() + .registerBContainers( + GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L), + ItemList.Cell_Empty.get(1L)) + .asFluid(); GT_Values.RA.addCrackingRecipe( i + 1, @@ -2593,10 +2679,13 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG @Deprecated public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, int aState, int aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { - return GT_FluidFactory.builder(aName).withLocalizedName(aLocalized) - .withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK).buildAndRegister() - .configureMaterials(aMaterial).registerContainers(aFullContainer, aEmptyContainer, aFluidAmount) - .asFluid(); + return GT_FluidFactory.builder(aName) + .withLocalizedName(aLocalized) + .withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerContainers(aFullContainer, aEmptyContainer, aFluidAmount) + .asFluid(); } /** @@ -2606,15 +2695,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG @SuppressWarnings({ "MethodWithTooManyParameters" }) // Deprecated method public Fluid addFluid(String aName, String aTexture, String aLocalized, Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { - return GT_FluidFactory.builder(aName).withLocalizedName(aLocalized) - .withStillIconResourceLocation(new ResourceLocation(MOD_ID, "fluids/fluid." + aTexture)) - .withColorRGBA(aRGBa).withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK) - .buildAndRegister().configureMaterials(aMaterial) - .registerContainers(aFullContainer, aEmptyContainer, aFluidAmount).asFluid(); + return GT_FluidFactory.builder(aName) + .withLocalizedName(aLocalized) + .withStillIconResourceLocation(new ResourceLocation(MOD_ID, "fluids/fluid." + aTexture)) + .withColorRGBA(aRGBa) + .withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerContainers(aFullContainer, aEmptyContainer, aFluidAmount) + .asFluid(); } public File getSaveDirectory() { - return this.mUniverse == null ? null : this.mUniverse.getSaveHandler().getWorldDirectory(); + return this.mUniverse == null ? null + : this.mUniverse.getSaveHandler() + .getWorldDirectory(); } public long getAnimationTicks() { @@ -2644,22 +2739,29 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mEvent.Ore, (GregTech_API.sUnification.get( new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); continue; } else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Blizz) { - GT_OreDictUnificator - .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); GT_OreDictUnificator.set( tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2667,16 +2769,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Pyrotheum) { - GT_OreDictUnificator - .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); GT_OreDictUnificator.set( tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( - new StringBuilder() - .append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + new StringBuilder().append( + ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2684,16 +2791,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Vinteum) { - GT_OreDictUnificator - .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); GT_OreDictUnificator.set( tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( - new StringBuilder() - .append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + new StringBuilder().append( + ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2711,9 +2823,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( - new StringBuilder() - .append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + new StringBuilder().append( + ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2733,7 +2847,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2754,7 +2870,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2775,8 +2893,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID) - .toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2797,8 +2916,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID) - .toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2819,8 +2939,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID) - .toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2841,9 +2962,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), + .append(".") + .append( + tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2859,8 +2981,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".") - .append(tOre.mModID).toString(), + new StringBuilder().append(ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, false)), true); @@ -2880,8 +3004,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mMaterial, tOre.mEvent.Ore, (tOre.mModID != null) && (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".") - .append(tOre.mModID), + new StringBuilder().append(ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID), tOre.mEvent.Name, false)), true); @@ -2977,7 +3102,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG @SubscribeEvent public void onBlockEvent(BlockEvent event) { - if (event.block.getUnlocalizedName().equals("blockAlloyGlass")) + if (event.block.getUnlocalizedName() + .equals("blockAlloyGlass")) GregTech_API.causeMachineUpdate(event.world, event.x, event.y, event.z); } |