Ic2 1.11.2 support
This commit is contained in:
parent
ee9e46eaa3
commit
3d55b435d4
7 changed files with 63 additions and 54 deletions
|
@ -86,7 +86,7 @@ if (ENV.BUILD_NUMBER) {
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "1.11.2-13.20.0.2255"
|
version = "1.11.2-13.20.0.2282"
|
||||||
mappings = "snapshot_20161220"
|
mappings = "snapshot_20161220"
|
||||||
replace "@MODVERSION@", project.version
|
replace "@MODVERSION@", project.version
|
||||||
// makeObfSourceJar = false
|
// makeObfSourceJar = false
|
||||||
|
@ -125,7 +125,7 @@ dependencies {
|
||||||
compile("codechicken:ForgeMultipart:1.11.2-+:deobf") {
|
compile("codechicken:ForgeMultipart:1.11.2-+:deobf") {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
compileOnly 'net.industrial-craft:industrialcraft-2:2.6.129-ex110'
|
deobfCompile 'net.industrial-craft:industrialcraft-2:2.7.5-ex111'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,7 @@ public class Core {
|
||||||
// Entitys
|
// Entitys
|
||||||
EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true);
|
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) {
|
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
|
||||||
compatModule.preInit(event);
|
compatModule.preInit(event);
|
||||||
|
|
|
@ -48,7 +48,7 @@ public class CompatManager {
|
||||||
public ArrayList<ICompatModule> compatModules = new ArrayList<>();
|
public ArrayList<ICompatModule> compatModules = new ArrayList<>();
|
||||||
|
|
||||||
public CompatManager() {
|
public CompatManager() {
|
||||||
isIC2Loaded = Loader.isModLoaded("IC2");
|
isIC2Loaded = Loader.isModLoaded("ic2");
|
||||||
isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage");
|
isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage");
|
||||||
register(CraftTweakerCompat.class, "crafttweaker");
|
register(CraftTweakerCompat.class, "crafttweaker");
|
||||||
registerCompact(TechRebornParts.class, false, "reborncore-mcmultipart");
|
registerCompact(TechRebornParts.class, false, "reborncore-mcmultipart");
|
||||||
|
@ -59,7 +59,7 @@ public class CompatManager {
|
||||||
register(CompatModuleTinkers.class, "tconstruct");
|
register(CompatModuleTinkers.class, "tconstruct");
|
||||||
register(CompactTheOneProbe.class, "theoneprobe");
|
register(CompactTheOneProbe.class, "theoneprobe");
|
||||||
//register(CompatModulePsi.class, "Psi");
|
//register(CompatModulePsi.class, "Psi");
|
||||||
register(RecipesIC2.class, "IC2");
|
register(RecipesIC2.class, "ic2");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void register(Class<? extends ICompatModule> moduleClass, Object... objs) {
|
public void register(Class<? extends ICompatModule> moduleClass, Object... objs) {
|
||||||
|
|
|
@ -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
|
@Override
|
||||||
public Class<? extends GuiScreen> mainConfigGuiClass() {
|
public Class<? extends GuiScreen> mainConfigGuiClass() {
|
||||||
return TechRebornConfigGui.class;
|
return TechRebornConfigGui.class;
|
||||||
|
|
|
@ -37,6 +37,7 @@ import ic2.core.ref.ItemName;
|
||||||
import ic2.core.ref.TeBlock;
|
import ic2.core.ref.TeBlock;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
|
import reborncore.api.recipe.RecipeHandler;
|
||||||
import techreborn.Core;
|
import techreborn.Core;
|
||||||
import techreborn.api.recipe.machines.ExtractorRecipe;
|
import techreborn.api.recipe.machines.ExtractorRecipe;
|
||||||
import techreborn.items.ItemParts;
|
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
|
//Rubber tree blocks, hidden when deduplication is on, and rubber tress are not set to gen, includes tree taps
|
||||||
//Circuits are hidden in JEI
|
//Circuits are hidden in JEI
|
||||||
|
|
||||||
|
RecipeHandler.addRecipe(
|
||||||
|
new ExtractorRecipe(ItemName.misc_resource.getItemStack("resin"),
|
||||||
|
ItemParts.getPartByName("rubber", 3), 400, 2));
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// CraftingItemType.circuit.getName();
|
CraftingItemType.circuit.getName();
|
||||||
//
|
|
||||||
// OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack());
|
OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack());
|
||||||
//
|
|
||||||
// OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit));
|
OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit));
|
||||||
// OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit));
|
OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit));
|
||||||
//
|
|
||||||
// OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine));
|
OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine));
|
||||||
// OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine));
|
OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine));
|
||||||
//
|
|
||||||
// OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack());
|
OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack());
|
||||||
// OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack());
|
OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack());
|
||||||
//
|
|
||||||
// OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack());
|
OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack());
|
||||||
// OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack());
|
OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack());
|
||||||
// OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack());
|
OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack());
|
||||||
//
|
|
||||||
// ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt);
|
ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt);
|
||||||
// industrialTnt.setItemDamage(1);
|
industrialTnt.setItemDamage(1);
|
||||||
// OreDictionary.registerOre("industrialTnt", industrialTnt);
|
OreDictionary.registerOre("industrialTnt", industrialTnt);
|
||||||
//
|
|
||||||
// OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond));
|
OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond));
|
||||||
// OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff));
|
OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff));
|
||||||
// OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer));
|
OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer));
|
||||||
//
|
|
||||||
// //TODO:
|
OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235));
|
||||||
//
|
OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238));
|
||||||
// //OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold));
|
OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238));
|
||||||
//
|
OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235));
|
||||||
// //OreDictionary.registerOre("ic2Generator", ModBlocks.Generator);
|
|
||||||
// //OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel);
|
OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron));
|
||||||
// //OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder);
|
OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack());
|
||||||
// //OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor);
|
OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced));
|
||||||
// //OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill);
|
|
||||||
// //OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill);
|
OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore));
|
||||||
//
|
|
||||||
// OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235));
|
OreDictionary.registerOre("plateIridium", ItemName.crafting.getItemStack(CraftingItemType.iridium));
|
||||||
// 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));
|
|
||||||
} catch (NoClassDefFoundError notFound) {
|
} catch (NoClassDefFoundError notFound) {
|
||||||
Core.logHelper.warn(
|
Core.logHelper.warn(
|
||||||
"Can't enable integration: IC2 installed but cannot be hooked\n" +
|
"Can't enable integration: IC2 installed but cannot be hooked\n" +
|
||||||
|
|
|
@ -46,7 +46,7 @@ public class OreDict {
|
||||||
);
|
);
|
||||||
|
|
||||||
public static void init() {
|
public static void init() {
|
||||||
if (Loader.isModLoaded("IC2")) {
|
if (Loader.isModLoaded("ic2")) {
|
||||||
Core.logHelper.info("IC2 installed, enabling integration");
|
Core.logHelper.info("IC2 installed, enabling integration");
|
||||||
IC2Dict.init();
|
IC2Dict.init();
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,8 @@ public class OreDict {
|
||||||
//OreDictionary.registerOre("smallUran235", nothing);
|
//OreDictionary.registerOre("smallUran235", nothing);
|
||||||
|
|
||||||
OreDictionary.registerOre("fenceIron", ModBlocks.REFINED_IRON_FENCE);
|
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("glassReinforced", ModBlocks.REINFORCED_GLASS);
|
||||||
|
|
||||||
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead"));
|
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead"));
|
||||||
|
|
|
@ -117,7 +117,7 @@ public class TileCreativePanel extends TilePowerAcceptor implements IWrenchable
|
||||||
|
|
||||||
//Done to prevent ic2 from exploding the adjacent blocks
|
//Done to prevent ic2 from exploding the adjacent blocks
|
||||||
@Override
|
@Override
|
||||||
@Optional.Method(modid = "IC2")
|
@Optional.Method(modid = "ic2")
|
||||||
public int getSourceTier() {
|
public int getSourceTier() {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue