diff --git a/.gitignore b/.gitignore index 6b78f5170..11a41f1bd 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ TechReborn.ipr Thumbs.db changelog.txt *.log +.idea/* diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 97964a715..60310219e 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -1,9 +1,5 @@ package techreborn; -import java.io.File; - -import org.apache.commons.lang3.time.StopWatch; - import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -13,14 +9,12 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; import erogenousbeef.coreTR.multiblock.MultiblockEventHandler; import erogenousbeef.coreTR.multiblock.MultiblockServerTickHandler; import net.minecraftforge.common.MinecraftForge; +import org.apache.commons.lang3.time.StopWatch; import techreborn.achievement.TRAchievements; import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.recipeConfig.RecipeConfigManager; @@ -30,11 +24,7 @@ import techreborn.compat.CompatManager; import techreborn.compat.ICompatModule; import techreborn.config.ConfigTechReborn; import techreborn.events.TRTickHandler; -import techreborn.init.ModBlocks; -import techreborn.init.ModFluids; -import techreborn.init.ModItems; -import techreborn.init.ModParts; -import techreborn.init.ModRecipes; +import techreborn.init.*; import techreborn.lib.ModInfo; import techreborn.packets.PacketHandler; import techreborn.packets.PacketPipeline; @@ -44,6 +34,8 @@ import techreborn.util.LogHelper; import techreborn.util.VersionChecker; import techreborn.world.TROreGen; +import java.io.File; + @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS) public class Core { public static ConfigTechReborn config; diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index 9f08b54fe..eae9bf664 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -9,6 +9,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import ic2.api.info.IC2Classic; import ic2.api.item.IC2Items; import ic2.api.recipe.RecipeInputOreDict; +import ic2.api.recipe.RecipeOutput; import ic2.api.recipe.Recipes; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -61,9 +62,9 @@ public class RecipesIC2 implements ICompatModule { public void addTRRecipes() { //General - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manuel), IC2Items.getItem("plateiron"), Items.book); - - CraftingHelper.addShapedOreRecipe( + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manuel), IC2Items.getItem("plateiron"), Items.book); + + CraftingHelper.addShapedOreRecipe( ItemParts.getPartByName("machineParts", 16), "CSC", "SCS", "CSC", 'S', "ingotSteel", @@ -372,7 +373,7 @@ public class RecipesIC2 implements ICompatModule { //CentrifugeRecipes //Plantball/Bio Chaff - if(!IC2Classic.isIc2ClassicLoaded()){ + if (!IC2Classic.isIc2ClassicLoaded()) { RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.grass, 16), null, new ItemStack(IC2Items.getItem("biochaff").getItem(), 8), new ItemStack(IC2Items.getItem("plantBall").getItem(), 8), new ItemStack(Items.clay_ball), new ItemStack(Blocks.sand, 8), 2500, 5)); RecipeHandler.addRecipe(new CentrifugeRecipe(new ItemStack(Blocks.dirt, 16), null, new ItemStack(IC2Items.getItem("biochaff").getItem(), 4), new ItemStack(IC2Items.getItem("plantBall").getItem(), 4), new ItemStack(Items.clay_ball), new ItemStack(Blocks.sand, 8), 2500, 5)); } @@ -1112,23 +1113,23 @@ public class RecipesIC2 implements ICompatModule { } static void removeIc2Recipes() { - if (ConfigTechReborn.ExpensiveMacerator){ + if (ConfigTechReborn.ExpensiveMacerator) { RecipeRemover.removeAnyRecipe(IC2Items.getItem("macerator")); } - if (ConfigTechReborn.ExpensiveDrill){ + if (ConfigTechReborn.ExpensiveDrill) { RecipeRemover.removeAnyRecipe(IC2Items.getItem("miningDrill")); } - if (ConfigTechReborn.ExpensiveDiamondDrill){ + if (ConfigTechReborn.ExpensiveDiamondDrill) { RecipeRemover.removeAnyRecipe(IC2Items.getItem("diamondDrill")); } - if (ConfigTechReborn.ExpensiveSolar){ + if (ConfigTechReborn.ExpensiveSolar) { RecipeRemover.removeAnyRecipe(IC2Items.getItem("solarPanel")); } - if (ConfigTechReborn.ExpensiveWatermill){ - RecipeRemover.removeAnyRecipe(IC2Items.getItem("waterMill")); + if (ConfigTechReborn.ExpensiveWatermill) { + RecipeRemover.removeAnyRecipe(IC2Items.getItem("waterMill")); } - if (ConfigTechReborn.ExpensiveWindmill){ - RecipeRemover.removeAnyRecipe(IC2Items.getItem("windMill")); + if (ConfigTechReborn.ExpensiveWindmill) { + RecipeRemover.removeAnyRecipe(IC2Items.getItem("windMill")); } LogHelper.info("IC2 Recipes Removed"); @@ -1137,7 +1138,7 @@ public class RecipesIC2 implements ICompatModule { static void addShappedIc2Recipes() { Item drill = IC2Items.getItem("miningDrill").getItem(); ItemStack drillStack = new ItemStack(drill, 1, OreDictionary.WILDCARD_VALUE); - + if (ConfigTechReborn.ExpensiveMacerator) CraftingHelper.addShapedOreRecipe(IC2Items.getItem("macerator"), "FDF", "DMD", "FCF", @@ -1314,7 +1315,7 @@ public class RecipesIC2 implements ICompatModule { Recipes.macerator.addRecipe(new RecipeInputOreDict("blockBasalt"), null, ItemDusts.getDustByName("basalt", 2)); } if (OreDictionary.doesOreNameExist("gemRuby")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("gemRuby"), null, ItemDusts.getDustByName("ruby", 2)); + Recipes.macerator.getRecipes().put(new RecipeInputOreDict("gemRuby"), new RecipeOutput(new NBTTagCompound(), ItemDusts.getDustByName("ruby"))); } } diff --git a/src/main/resources/assets/techreborn/textures/items/component/superconductor.png b/src/main/resources/assets/techreborn/textures/items/component/superConductor.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/component/superconductor.png rename to src/main/resources/assets/techreborn/textures/items/component/superConductor.png