From 3d55b435d48a0e7775e806867485f3403896fada Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 21 Apr 2017 09:09:28 +0100 Subject: [PATCH] Ic2 1.11.2 support --- build.gradle | 4 +- src/main/java/techreborn/Core.java | 2 +- .../java/techreborn/compat/CompatManager.java | 4 +- .../config/TechRebornGUIFactory.java | 10 +++ src/main/java/techreborn/init/IC2Dict.java | 90 +++++++++---------- src/main/java/techreborn/init/OreDict.java | 5 +- .../tiles/generator/TileCreativePanel.java | 2 +- 7 files changed, 63 insertions(+), 54 deletions(-) diff --git a/build.gradle b/build.gradle index 8795dfd2f..f27018071 100644 --- a/build.gradle +++ b/build.gradle @@ -86,7 +86,7 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.11.2-13.20.0.2255" + version = "1.11.2-13.20.0.2282" mappings = "snapshot_20161220" replace "@MODVERSION@", project.version // makeObfSourceJar = false @@ -125,7 +125,7 @@ dependencies { compile("codechicken:ForgeMultipart:1.11.2-+:deobf") { transitive = false } - compileOnly 'net.industrial-craft:industrialcraft-2:2.6.129-ex110' + deobfCompile 'net.industrial-craft:industrialcraft-2:2.7.5-ex111' } diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 916d99d46..b005732c6 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -118,7 +118,7 @@ public class Core { // Entitys EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true); - CompatManager.isIC2Loaded = Loader.isModLoaded("IC2"); + CompatManager.isIC2Loaded = Loader.isModLoaded("ic2"); for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) { compatModule.preInit(event); diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 5e4a415bc..27a97e8aa 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -48,7 +48,7 @@ public class CompatManager { public ArrayList compatModules = new ArrayList<>(); public CompatManager() { - isIC2Loaded = Loader.isModLoaded("IC2"); + isIC2Loaded = Loader.isModLoaded("ic2"); isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage"); register(CraftTweakerCompat.class, "crafttweaker"); registerCompact(TechRebornParts.class, false, "reborncore-mcmultipart"); @@ -59,7 +59,7 @@ public class CompatManager { register(CompatModuleTinkers.class, "tconstruct"); register(CompactTheOneProbe.class, "theoneprobe"); //register(CompatModulePsi.class, "Psi"); - register(RecipesIC2.class, "IC2"); + register(RecipesIC2.class, "ic2"); } public void register(Class moduleClass, Object... objs) { diff --git a/src/main/java/techreborn/config/TechRebornGUIFactory.java b/src/main/java/techreborn/config/TechRebornGUIFactory.java index 315c0e9c7..0c6ef1000 100644 --- a/src/main/java/techreborn/config/TechRebornGUIFactory.java +++ b/src/main/java/techreborn/config/TechRebornGUIFactory.java @@ -36,6 +36,16 @@ public class TechRebornGUIFactory implements IModGuiFactory { } + @Override + public boolean hasConfigGui() { + return true; + } + + @Override + public GuiScreen createConfigGui(GuiScreen parentScreen) { + return new TechRebornConfigGui(parentScreen); + } + @Override public Class mainConfigGuiClass() { return TechRebornConfigGui.class; diff --git a/src/main/java/techreborn/init/IC2Dict.java b/src/main/java/techreborn/init/IC2Dict.java index df5d59d52..8804d8e55 100644 --- a/src/main/java/techreborn/init/IC2Dict.java +++ b/src/main/java/techreborn/init/IC2Dict.java @@ -37,6 +37,7 @@ import ic2.core.ref.ItemName; import ic2.core.ref.TeBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import reborncore.api.recipe.RecipeHandler; import techreborn.Core; import techreborn.api.recipe.machines.ExtractorRecipe; import techreborn.items.ItemParts; @@ -86,53 +87,50 @@ public class IC2Dict { //Rubber tree blocks, hidden when deduplication is on, and rubber tress are not set to gen, includes tree taps //Circuits are hidden in JEI + RecipeHandler.addRecipe( + new ExtractorRecipe(ItemName.misc_resource.getItemStack("resin"), + ItemParts.getPartByName("rubber", 3), 400, 2)); + try { - // CraftingItemType.circuit.getName(); - // - // OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack()); - // - // OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit)); - // OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit)); - // - // OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine)); - // OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine)); - // - // OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack()); - // OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack()); - // - // OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack()); - // OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack()); - // OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack()); - // - // ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt); - // industrialTnt.setItemDamage(1); - // OreDictionary.registerOre("industrialTnt", industrialTnt); - // - // OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond)); - // OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff)); - // OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer)); - // - // //TODO: - // - // //OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold)); - // - // //OreDictionary.registerOre("ic2Generator", ModBlocks.Generator); - // //OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel); - // //OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder); - // //OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor); - // //OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill); - // //OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill); - // - // OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235)); - // OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238)); - // OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238)); - // OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235)); - // - // OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron)); - // OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack()); - // OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced)); - // - // OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore)); + CraftingItemType.circuit.getName(); + + OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack()); + + OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit)); + OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit)); + + OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine)); + OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine)); + + OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack()); + OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack()); + + OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack()); + OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack()); + OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack()); + + ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt); + industrialTnt.setItemDamage(1); + OreDictionary.registerOre("industrialTnt", industrialTnt); + + OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond)); + OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff)); + OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer)); + + OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235)); + OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238)); + OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238)); + OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235)); + + OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron)); + OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack()); + OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced)); + + OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore)); + + OreDictionary.registerOre("plateIridium", ItemName.crafting.getItemStack(CraftingItemType.iridium)); + + } catch (NoClassDefFoundError notFound) { Core.logHelper.warn( "Can't enable integration: IC2 installed but cannot be hooked\n" + diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index 1a7538faf..10e6f293d 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -46,7 +46,7 @@ public class OreDict { ); public static void init() { - if (Loader.isModLoaded("IC2")) { + if (Loader.isModLoaded("ic2")) { Core.logHelper.info("IC2 installed, enabling integration"); IC2Dict.init(); } @@ -86,7 +86,8 @@ public class OreDict { //OreDictionary.registerOre("smallUran235", nothing); OreDictionary.registerOre("fenceIron", ModBlocks.REFINED_IRON_FENCE); - OreDictionary.registerOre("woodRubber", ModBlocks.RUBBER_LOG); + //TODO ic2 bug? Disabled as it crashes with this line + //OreDictionary.registerOre("woodRubber", ModBlocks.RUBBER_LOG); OreDictionary.registerOre("glassReinforced", ModBlocks.REINFORCED_GLASS); OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead")); diff --git a/src/main/java/techreborn/tiles/generator/TileCreativePanel.java b/src/main/java/techreborn/tiles/generator/TileCreativePanel.java index 5c351cd09..91f163f1b 100644 --- a/src/main/java/techreborn/tiles/generator/TileCreativePanel.java +++ b/src/main/java/techreborn/tiles/generator/TileCreativePanel.java @@ -117,7 +117,7 @@ public class TileCreativePanel extends TilePowerAcceptor implements IWrenchable //Done to prevent ic2 from exploding the adjacent blocks @Override - @Optional.Method(modid = "IC2") + @Optional.Method(modid = "ic2") public int getSourceTier() { return 0; }