diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 9f43c39c7..4a11866dd 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -144,7 +144,7 @@ public class Core MinecraftForge.EVENT_BUS.register(new OreUnifier()); MinecraftForge.EVENT_BUS.register(worldGen.retroGen); // Scrapbox - if (config.scrapboxDispenser) + if (config.ScrapboxDispenser) { BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox()); } diff --git a/src/main/java/techreborn/client/container/ContainerLesu.java b/src/main/java/techreborn/client/container/ContainerLesu.java index 8e4dfc84c..64b48da81 100644 --- a/src/main/java/techreborn/client/container/ContainerLesu.java +++ b/src/main/java/techreborn/client/container/ContainerLesu.java @@ -106,7 +106,7 @@ public class ContainerLesu extends RebornContainer { this.euStorage = value; } - this.euStorage = ((connectedBlocks + 1) * ConfigTechReborn.lesuStoragePerBlock); + this.euStorage = ((connectedBlocks + 1) * ConfigTechReborn.LesuStoragePerBlock); } } diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index e85c474b9..3209f1ca4 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -1,10 +1,5 @@ package techreborn.compat.jei; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; @@ -19,42 +14,8 @@ import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.api.recipe.machines.ImplosionCompressorRecipe; -import techreborn.blocks.fluid.BlockFluidTechReborn; -import techreborn.client.container.ContainerAlloyFurnace; -import techreborn.client.container.ContainerAlloySmelter; -import techreborn.client.container.ContainerAssemblingMachine; -import techreborn.client.container.ContainerBlastFurnace; -import techreborn.client.container.ContainerCentrifuge; -import techreborn.client.container.ContainerChemicalReactor; -import techreborn.client.container.ContainerCompressor; -import techreborn.client.container.ContainerExtractor; -import techreborn.client.container.ContainerFusionReactor; -import techreborn.client.container.ContainerGrinder; -import techreborn.client.container.ContainerImplosionCompressor; -import techreborn.client.container.ContainerIndustrialElectrolyzer; -import techreborn.client.container.ContainerIndustrialGrinder; -import techreborn.client.container.ContainerIndustrialSawmill; -import techreborn.client.container.ContainerRollingMachine; -import techreborn.client.container.ContainerVacuumFreezer; -import techreborn.client.gui.GuiAlloyFurnace; -import techreborn.client.gui.GuiAlloySmelter; -import techreborn.client.gui.GuiAssemblingMachine; -import techreborn.client.gui.GuiBlastFurnace; -import techreborn.client.gui.GuiCentrifuge; -import techreborn.client.gui.GuiChemicalReactor; -import techreborn.client.gui.GuiCompressor; -import techreborn.client.gui.GuiElectricFurnace; -import techreborn.client.gui.GuiExtractor; -import techreborn.client.gui.GuiFusionReactor; -import techreborn.client.gui.GuiGrinder; -import techreborn.client.gui.GuiImplosionCompressor; -import techreborn.client.gui.GuiIndustrialElectrolyzer; -import techreborn.client.gui.GuiIndustrialGrinder; -import techreborn.client.gui.GuiIndustrialSawmill; -import techreborn.client.gui.GuiIronFurnace; -import techreborn.client.gui.GuiRecycler; -import techreborn.client.gui.GuiRollingMachine; -import techreborn.client.gui.GuiVacuumFreezer; +import techreborn.client.container.*; +import techreborn.client.gui.*; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler; import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory; @@ -95,6 +56,10 @@ import techreborn.init.ModFluids; import techreborn.init.ModItems; import techreborn.items.ItemParts; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + @mezz.jei.api.JEIPlugin public class TechRebornJeiPlugin extends BlankModPlugin { @@ -190,7 +155,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin registry.addDescription(ItemParts.getPartByName("rubberSap"), I18n.translateToLocal("techreborn.desc.rubberSap")); - if (!ConfigTechReborn.scrapboxDispenser) + if (!ConfigTechReborn.ScrapboxDispenser) { registry.addDescription(new ItemStack(ModItems.scrapBox), I18n.translateToLocal("techreborn.desc.scrapBoxNoDispenser")); diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 8d356d98c..427c5957b 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -1,9 +1,9 @@ package techreborn.config; -import java.io.File; - import net.minecraftforge.common.config.Configuration; +import java.io.File; + public class ConfigTechReborn { public static String CATEGORY_WORLD = "world"; diff --git a/src/main/java/techreborn/events/OreUnifier.java b/src/main/java/techreborn/events/OreUnifier.java index 33ff3f569..8ed3a06be 100644 --- a/src/main/java/techreborn/events/OreUnifier.java +++ b/src/main/java/techreborn/events/OreUnifier.java @@ -1,7 +1,5 @@ package techreborn.events; -import java.util.HashMap; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -12,6 +10,8 @@ import net.minecraftforge.oredict.OreDictionary; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; +import java.util.HashMap; + public class OreUnifier { @@ -36,7 +36,7 @@ public class OreUnifier @SubscribeEvent public void itemTick(TickEvent.PlayerTickEvent event) { - if (ConfigTechReborn.oreUnifer && !event.player.worldObj.isRemote + if (ConfigTechReborn.OreUnifer && !event.player.worldObj.isRemote && event.player.worldObj.getTotalWorldTime() % 10 == 0) { if (event.player.getHeldItem(EnumHand.MAIN_HAND) != null) diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index 872c6a8dd..5098f819f 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -14,8 +14,8 @@ import ic2.api.tile.IWrenchable; public class TileAesu extends TilePowerAcceptor implements IWrenchable { - public static final int MAX_OUTPUT = ConfigTechReborn.aesuMaxOutput; - public static final int MAX_STORAGE = ConfigTechReborn.aesuMaxStorage; + public static final int MAX_OUTPUT = ConfigTechReborn.AesuMaxOutput; + public static final int MAX_STORAGE = ConfigTechReborn.AesuMaxStorage; public Inventory inventory = new Inventory(4, "TileAesu", 64, this); private int OUTPUT = 64; // The current output private double euLastTick = 0; @@ -31,7 +31,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable public void updateEntity() { super.updateEntity(); - if (ticks == ConfigTechReborn.aveargeEuOutTickTime) + if (ticks == ConfigTechReborn.AverageEuOutTickTime) { euChange = -1; ticks = 0; diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index 0ba4bb90f..974ab778b 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -27,7 +27,7 @@ import ic2.api.tile.IWrenchable; public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory { - public static final int euTick = ConfigTechReborn.ThermalGenertaorOutput; + public static final int euTick = ConfigTechReborn.ThermalGeneratorOutput; public Tank tank = new Tank("TileDieselGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this); public Inventory inventory = new Inventory(3, "TileDieselGenerator", 64, this); diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java index 6c55483fe..32abacb33 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java @@ -18,7 +18,7 @@ import ic2.api.tile.IWrenchable; public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrenchable, IInventory { - public static final int euTick = ConfigTechReborn.DragoneggsiphonerOutput; + public static final int euTick = ConfigTechReborn.DragonEggSiphonerOutput; public Inventory inventory = new Inventory(3, "TileAlloySmelter", 64, this); public TileDragonEggSiphoner() diff --git a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java index 060bf64d4..becbb9fd5 100644 --- a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java @@ -14,7 +14,7 @@ import ic2.api.tile.IWrenchable; public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable { - public static final int euTick = ConfigTechReborn.heatGeneratorOutput; + public static final int euTick = ConfigTechReborn.HeatGeneratorOutput; public TileHeatGenerator() { diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index 6489f273c..e207ea0f4 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -30,7 +30,7 @@ import ic2.api.tile.IWrenchable; public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory { - public static final int euTick = ConfigTechReborn.ThermalGenertaorOutput; + public static final int euTick = ConfigTechReborn.ThermalGeneratorOutput; public Tank tank = new Tank("TileThermalGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this); public Inventory inventory = new Inventory(3, "TileThermalGenerator", 64, this); diff --git a/src/main/java/techreborn/tiles/idsu/TileIDSU.java b/src/main/java/techreborn/tiles/idsu/TileIDSU.java index 3b0995677..9d3e47a61 100644 --- a/src/main/java/techreborn/tiles/idsu/TileIDSU.java +++ b/src/main/java/techreborn/tiles/idsu/TileIDSU.java @@ -135,7 +135,7 @@ public class TileIDSU extends TilePowerAcceptor { super.updateEntity(); - if (ticks == ConfigTechReborn.aveargeEuOutTickTime) + if (ticks == ConfigTechReborn.AverageEuOutTickTime) { euChange = -1; ticks = 0; diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index f5cb0a8c6..8606a339b 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -1,7 +1,5 @@ package techreborn.tiles.lesu; -import java.util.ArrayList; - import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.api.power.EnumPowerTier; @@ -9,6 +7,8 @@ import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.config.ConfigTechReborn; +import java.util.ArrayList; + public class TileLesu extends TilePowerAcceptor {// TODO wrench @@ -62,10 +62,10 @@ public class TileLesu extends TilePowerAcceptor } } } - maxStorage = ((connectedBlocks + 1) * ConfigTechReborn.lesuStoragePerBlock); - output = (connectedBlocks * ConfigTechReborn.extraOutputPerLesuBlock) + ConfigTechReborn.baseLesuOutput; + maxStorage = ((connectedBlocks + 1) * ConfigTechReborn.LesuStoragePerBlock); + output = (connectedBlocks * ConfigTechReborn.ExtraOutputPerLesuBlock) + ConfigTechReborn.BaseLesuOutput; - if (ticks == ConfigTechReborn.aveargeEuOutTickTime) + if (ticks == ConfigTechReborn.AverageEuOutTickTime) { euChange = -1; ticks = 0;