Fix config changes etc.

This commit is contained in:
Stuart Pomeroy 2016-03-28 20:51:23 +01:00
parent 83190fc39f
commit 2209177e1a
12 changed files with 27 additions and 62 deletions

View file

@ -144,7 +144,7 @@ public class Core
MinecraftForge.EVENT_BUS.register(new OreUnifier()); MinecraftForge.EVENT_BUS.register(new OreUnifier());
MinecraftForge.EVENT_BUS.register(worldGen.retroGen); MinecraftForge.EVENT_BUS.register(worldGen.retroGen);
// Scrapbox // Scrapbox
if (config.scrapboxDispenser) if (config.ScrapboxDispenser)
{ {
BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox()); BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox());
} }

View file

@ -106,7 +106,7 @@ public class ContainerLesu extends RebornContainer
{ {
this.euStorage = value; this.euStorage = value;
} }
this.euStorage = ((connectedBlocks + 1) * ConfigTechReborn.lesuStoragePerBlock); this.euStorage = ((connectedBlocks + 1) * ConfigTechReborn.LesuStoragePerBlock);
} }
} }

View file

@ -1,10 +1,5 @@
package techreborn.compat.jei; 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.BlankModPlugin;
import mezz.jei.api.IGuiHelper; import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiHelpers;
@ -19,42 +14,8 @@ import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.RecipeHandler;
import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.api.recipe.machines.AssemblingMachineRecipe;
import techreborn.api.recipe.machines.ImplosionCompressorRecipe; import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
import techreborn.blocks.fluid.BlockFluidTechReborn; import techreborn.client.container.*;
import techreborn.client.container.ContainerAlloyFurnace; import techreborn.client.gui.*;
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.compat.jei.alloySmelter.AlloySmelterRecipeCategory; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory;
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler;
import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory; import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory;
@ -95,6 +56,10 @@ import techreborn.init.ModFluids;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.items.ItemParts; import techreborn.items.ItemParts;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
@mezz.jei.api.JEIPlugin @mezz.jei.api.JEIPlugin
public class TechRebornJeiPlugin extends BlankModPlugin public class TechRebornJeiPlugin extends BlankModPlugin
{ {
@ -190,7 +155,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin
registry.addDescription(ItemParts.getPartByName("rubberSap"), registry.addDescription(ItemParts.getPartByName("rubberSap"),
I18n.translateToLocal("techreborn.desc.rubberSap")); I18n.translateToLocal("techreborn.desc.rubberSap"));
if (!ConfigTechReborn.scrapboxDispenser) if (!ConfigTechReborn.ScrapboxDispenser)
{ {
registry.addDescription(new ItemStack(ModItems.scrapBox), registry.addDescription(new ItemStack(ModItems.scrapBox),
I18n.translateToLocal("techreborn.desc.scrapBoxNoDispenser")); I18n.translateToLocal("techreborn.desc.scrapBoxNoDispenser"));

View file

@ -1,9 +1,9 @@
package techreborn.config; package techreborn.config;
import java.io.File;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import java.io.File;
public class ConfigTechReborn public class ConfigTechReborn
{ {
public static String CATEGORY_WORLD = "world"; public static String CATEGORY_WORLD = "world";

View file

@ -1,7 +1,5 @@
package techreborn.events; package techreborn.events;
import java.util.HashMap;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -12,6 +10,8 @@ import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.ItemUtils; import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import java.util.HashMap;
public class OreUnifier public class OreUnifier
{ {
@ -36,7 +36,7 @@ public class OreUnifier
@SubscribeEvent @SubscribeEvent
public void itemTick(TickEvent.PlayerTickEvent event) 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) && event.player.worldObj.getTotalWorldTime() % 10 == 0)
{ {
if (event.player.getHeldItem(EnumHand.MAIN_HAND) != null) if (event.player.getHeldItem(EnumHand.MAIN_HAND) != null)

View file

@ -14,8 +14,8 @@ import ic2.api.tile.IWrenchable;
public class TileAesu extends TilePowerAcceptor implements IWrenchable public class TileAesu extends TilePowerAcceptor implements IWrenchable
{ {
public static final int MAX_OUTPUT = ConfigTechReborn.aesuMaxOutput; public static final int MAX_OUTPUT = ConfigTechReborn.AesuMaxOutput;
public static final int MAX_STORAGE = ConfigTechReborn.aesuMaxStorage; public static final int MAX_STORAGE = ConfigTechReborn.AesuMaxStorage;
public Inventory inventory = new Inventory(4, "TileAesu", 64, this); public Inventory inventory = new Inventory(4, "TileAesu", 64, this);
private int OUTPUT = 64; // The current output private int OUTPUT = 64; // The current output
private double euLastTick = 0; private double euLastTick = 0;
@ -31,7 +31,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable
public void updateEntity() public void updateEntity()
{ {
super.updateEntity(); super.updateEntity();
if (ticks == ConfigTechReborn.aveargeEuOutTickTime) if (ticks == ConfigTechReborn.AverageEuOutTickTime)
{ {
euChange = -1; euChange = -1;
ticks = 0; ticks = 0;

View file

@ -27,7 +27,7 @@ import ic2.api.tile.IWrenchable;
public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory 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 Tank tank = new Tank("TileDieselGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this);
public Inventory inventory = new Inventory(3, "TileDieselGenerator", 64, this); public Inventory inventory = new Inventory(3, "TileDieselGenerator", 64, this);

View file

@ -18,7 +18,7 @@ import ic2.api.tile.IWrenchable;
public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrenchable, IInventory 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 Inventory inventory = new Inventory(3, "TileAlloySmelter", 64, this);
public TileDragonEggSiphoner() public TileDragonEggSiphoner()

View file

@ -14,7 +14,7 @@ import ic2.api.tile.IWrenchable;
public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable
{ {
public static final int euTick = ConfigTechReborn.heatGeneratorOutput; public static final int euTick = ConfigTechReborn.HeatGeneratorOutput;
public TileHeatGenerator() public TileHeatGenerator()
{ {

View file

@ -30,7 +30,7 @@ import ic2.api.tile.IWrenchable;
public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory 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 Tank tank = new Tank("TileThermalGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this);
public Inventory inventory = new Inventory(3, "TileThermalGenerator", 64, this); public Inventory inventory = new Inventory(3, "TileThermalGenerator", 64, this);

View file

@ -135,7 +135,7 @@ public class TileIDSU extends TilePowerAcceptor
{ {
super.updateEntity(); super.updateEntity();
if (ticks == ConfigTechReborn.aveargeEuOutTickTime) if (ticks == ConfigTechReborn.AverageEuOutTickTime)
{ {
euChange = -1; euChange = -1;
ticks = 0; ticks = 0;

View file

@ -1,7 +1,5 @@
package techreborn.tiles.lesu; package techreborn.tiles.lesu;
import java.util.ArrayList;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import reborncore.api.power.EnumPowerTier; import reborncore.api.power.EnumPowerTier;
@ -9,6 +7,8 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import java.util.ArrayList;
public class TileLesu extends TilePowerAcceptor public class TileLesu extends TilePowerAcceptor
{// TODO wrench {// TODO wrench
@ -62,10 +62,10 @@ public class TileLesu extends TilePowerAcceptor
} }
} }
} }
maxStorage = ((connectedBlocks + 1) * ConfigTechReborn.lesuStoragePerBlock); maxStorage = ((connectedBlocks + 1) * ConfigTechReborn.LesuStoragePerBlock);
output = (connectedBlocks * ConfigTechReborn.extraOutputPerLesuBlock) + ConfigTechReborn.baseLesuOutput; output = (connectedBlocks * ConfigTechReborn.ExtraOutputPerLesuBlock) + ConfigTechReborn.BaseLesuOutput;
if (ticks == ConfigTechReborn.aveargeEuOutTickTime) if (ticks == ConfigTechReborn.AverageEuOutTickTime)
{ {
euChange = -1; euChange = -1;
ticks = 0; ticks = 0;