diff --git a/build.properties b/build.properties index b15a096b..16b95a90 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.10.2 forge.version=12.18.1.2079 -gt.version=5.10.18 +gt.version=5.10.19 forestry.version=5.2.7.220 ic2.version=2.6.99-ex110 diff --git a/build/libs/gregtech-5.10.17-dev.jar b/build/libs/gregtech-5.10.17-dev.jar index cd411a97..b89d0de8 100644 Binary files a/build/libs/gregtech-5.10.17-dev.jar and b/build/libs/gregtech-5.10.17-dev.jar differ diff --git a/build/libs/gregtech-5.10.17-sources.jar b/build/libs/gregtech-5.10.17-sources.jar index 03c098b8..6bcccfdf 100644 Binary files a/build/libs/gregtech-5.10.17-sources.jar and b/build/libs/gregtech-5.10.17-sources.jar differ diff --git a/build/libs/gregtech-5.10.17.jar b/build/libs/gregtech-5.10.17.jar index 722e9288..3c608323 100644 Binary files a/build/libs/gregtech-5.10.17.jar and b/build/libs/gregtech-5.10.17.jar differ diff --git a/build/libs/gregtech-5.10.18.jar b/build/libs/gregtech-5.10.18.jar deleted file mode 100644 index 3c608323..00000000 Binary files a/build/libs/gregtech-5.10.18.jar and /dev/null differ diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 724e9823..49d966f1 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -19,7 +19,6 @@ import gregtech.common.items.armor.*; import ic2.core.block.type.ResourceBlock; import ic2.core.block.wiring.CableType; import ic2.core.item.ItemFluidCell; -import ic2.core.item.ItemUpgradeModule; import ic2.core.item.type.*; import ic2.core.ref.BlockName; import ic2.core.ref.FluidName; @@ -334,8 +333,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { ItemList.Circuit_Basic.set(GT_ModHandler.getIC2Item(ItemName.crafting, CraftingItemType.circuit, 1)); ItemList.Circuit_Advanced.set(GT_ModHandler.getIC2Item(ItemName.crafting, CraftingItemType.advanced_circuit, 1)); - ItemList.Upgrade_Overclocker.set(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.overclocker, 1)); - ItemList.Upgrade_Battery.set(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.energy_storage, 1)); + //ItemList.Upgrade_Overclocker.set(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.overclocker, 1)); + //ItemList.Upgrade_Battery.set(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.energy_storage, 1)); ItemList.Dye_Bonemeal.set(new ItemStack(Items.DYE, 1, 15)); ItemList.Dye_SquidInk.set(new ItemStack(Items.DYE, 1, 0)); diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index cc8cb622..e1c140a6 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1,23 +1,5 @@ package gregtech.loaders.postload; -import ic2.core.block.BlockIC2Fence; -import ic2.core.block.BlockScaffold; -import ic2.core.block.type.ResourceBlock; -import ic2.core.block.wiring.CableType; -import ic2.core.item.ItemIC2Boat; -import ic2.core.item.ItemUpgradeModule; -import ic2.core.item.block.ItemCable; -import ic2.core.item.type.CasingResourceType; -import ic2.core.item.type.CraftingItemType; -import ic2.core.item.type.MiscResourceType; -import ic2.core.item.type.NuclearResourceType; -import ic2.core.ref.BlockName; -import ic2.core.ref.ItemName; -import ic2.core.ref.TeBlock; -import mezz.jei.Internal; -import mezz.jei.api.IItemBlacklist; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.Loader; import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.*; @@ -25,6 +7,17 @@ import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; +import ic2.core.block.BlockIC2Fence; +import ic2.core.block.BlockScaffold; +import ic2.core.block.type.ResourceBlock; +import ic2.core.block.wiring.CableType; +import ic2.core.item.ItemIC2Boat; +import ic2.core.item.block.ItemCable; +import ic2.core.item.type.CasingResourceType; +import ic2.core.item.type.CraftingItemType; +import ic2.core.ref.BlockName; +import ic2.core.ref.ItemName; +import ic2.core.ref.TeBlock; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -554,19 +547,19 @@ public class GT_CraftingRecipeLoader GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.meter, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{" G ", "CIC", "C C", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'G', OrePrefixes.dust.get(Materials.Glowstone), 'I', OrePrefixes.circuit.get(Materials.Basic)}); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.obscurator, 1)); GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.obscurator, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"RER", "CAC", "RRR", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'R', OrePrefixes.dust.get(Materials.Redstone), 'E', OrePrefixes.battery.get(Materials.Advanced), 'A', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.overclocker, 1)); - GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.overclocker, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"CCC", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', GT_ModHandler.getIC2Item(ItemName.heat_vent, 1, 1), 'E', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.transformer, 1)); - GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.transformer, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"GGG", "WTW", "GEG", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'T', GT_ModHandler.getIC2TEItem(TeBlock.mv_transformer, 1), 'E', OrePrefixes.circuit.get(Materials.Basic), 'G', OrePrefixes.block.get(Materials.Glass)}); - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.energy_storage, 1)); - GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.energy_storage, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PPP", "WBW", "PEP", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', OrePrefixes.circuit.get(Materials.Basic), 'P', OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.Basic)}); - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.ejector, 1)); - GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.ejector, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', OrePrefixes.circuit.get(Materials.Basic), 'P', new ItemStack(Blocks.PISTON), 'H', new ItemStack(Blocks.HOPPER)}); + //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.overclocker, 1)); + //GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.overclocker, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"CCC", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', GT_ModHandler.getIC2Item(ItemName.heat_vent, 1, 1), 'E', OrePrefixes.circuit.get(Materials.Basic)}); + //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.transformer, 1)); + //GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.transformer, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"GGG", "WTW", "GEG", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'T', GT_ModHandler.getIC2TEItem(TeBlock.mv_transformer, 1), 'E', OrePrefixes.circuit.get(Materials.Basic), 'G', OrePrefixes.block.get(Materials.Glass)}); + //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.energy_storage, 1)); + //GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.energy_storage, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PPP", "WBW", "PEP", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', OrePrefixes.circuit.get(Materials.Basic), 'P', OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.Basic)}); + //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.ejector, 1)); + //GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.ejector, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', OrePrefixes.circuit.get(Materials.Basic), 'P', new ItemStack(Blocks.PISTON), 'H', new ItemStack(Blocks.HOPPER)}); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.single_use_battery, 1)); GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.single_use_battery, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"W", "C", "R", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', OrePrefixes.dust.get(Materials.HydratedCoal), 'R', OrePrefixes.dust.get(Materials.Redstone)}); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.frequency_transmitter, 1)); - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.pulling, 1)); - GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.pulling, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'P', new ItemStack(Blocks.STICKY_PISTON), 'R', new ItemStack(Blocks.HOPPER), 'E', OrePrefixes.circuit.get(Materials.Basic)}); + //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.pulling, 1)); + //GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item(ItemName.upgrade, ItemUpgradeModule.UpgradeType.pulling, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'P', new ItemStack(Blocks.STICKY_PISTON), 'R', new ItemStack(Blocks.HOPPER), 'E', OrePrefixes.circuit.get(Materials.Basic)}); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item(ItemName.cutter, 1)); } else { GT_ModHandler.addCraftingRecipe(ItemCable.getCable(CableType.glass, 0), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"GGG", "EDE", "GGG", Character.valueOf('G'), new ItemStack(Blocks.GLASS, 1, 32767), Character.valueOf('D'), OrePrefixes.dust.get(Materials.Silver), Character.valueOf('E'), ItemList.IC2_Energium_Dust.get(1, new Object[0])});