diff --git a/src/main/java/techreborn/tiles/multiblock/TileDistillationTower.java b/src/main/java/techreborn/tiles/multiblock/TileDistillationTower.java index c89237373..6a5054c38 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileDistillationTower.java +++ b/src/main/java/techreborn/tiles/multiblock/TileDistillationTower.java @@ -37,6 +37,7 @@ import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.api.Reference; @@ -44,7 +45,9 @@ import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileDistillationTower extends TilePowerAcceptor implements IToolDrop, IRecipeCrafterProvider, IInventoryProvider, IContainerProvider { diff --git a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java index e8949fd8d..4b82d9539 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java @@ -34,15 +34,24 @@ import reborncore.api.tile.IInventoryProvider; import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileImplosionCompressor extends TilePowerAcceptor implements IToolDrop, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { + + @ConfigRegistry(config = "machines", category = "implosion_compressor", key = "ImplosionCompressorMaxInput", comment = "Implosion Compressor Max Input (Value in EU)") + public static int maxInput = 64; + @ConfigRegistry(config = "machines", category = "implosion_compressor", key = "ImplosionCompressorMaxEnergy", comment = "Implosion Compressor Max Energy (Value in EU)") + public static int maxEnergy = 64000; public Inventory inventory = new Inventory(5, "TileImplosionCompressor", 64, this); public MultiblockChecker multiblockChecker; @@ -119,7 +128,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor @Override public double getBaseMaxPower() { - return 64000; + return maxEnergy; } @Override @@ -139,7 +148,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor @Override public double getBaseMaxInput() { - return 64; + return maxInput; } @Override diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java index e1d829a27..f83578c36 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java @@ -40,6 +40,8 @@ import reborncore.api.IToolDrop; import reborncore.common.multiblock.IMultiblockPart; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.api.Reference; import techreborn.api.recipe.ITileRecipeHandler; @@ -49,11 +51,18 @@ import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; import techreborn.multiblocks.MultiBlockCasing; import techreborn.tiles.TileMachineCasing; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements IToolDrop, IInventoryProvider, ITileRecipeHandler, IRecipeCrafterProvider, IContainerProvider { + + @ConfigRegistry(config = "machines", category = "industrial_furnace", key = "IndustrialFurnaceMaxInput", comment = "Industrial Blast Furnace Max Input (Value in EU)") + public static int maxInput = 128; + @ConfigRegistry(config = "machines", category = "industrial_furnace", key = "IndustrialFurnaceMaxEnergy", comment = "Industrial Blast Furnace Max Energy (Value in EU)") + public static int maxEnergy = 10000; public Inventory inventory; public RecipeCrafter crafter; @@ -62,14 +71,9 @@ public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements ITo public TileIndustrialBlastFurnace() { super(); - // TODO configs this.inventory = new Inventory(5, "TileIndustrialBlastFurnace", 64, this); - final int[] inputs = new int[2]; - inputs[0] = 0; - inputs[1] = 1; - final int[] outputs = new int[2]; - outputs[0] = 2; - outputs[1] = 3; + final int[] inputs = new int[] { 0, 1 }; + final int[] outputs = new int[] { 2, 3 }; this.crafter = new RecipeCrafter(Reference.blastFurnaceRecipe, this, 2, 2, this.inventory, inputs, outputs); } @@ -194,7 +198,7 @@ public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements ITo @Override public double getBaseMaxPower() { - return 10000; + return maxEnergy; } @Override @@ -214,7 +218,7 @@ public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements ITo @Override public double getBaseMaxInput() { - return 128; + return maxInput; } @Override diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 712d3ab72..1fc2bc87e 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -40,6 +40,8 @@ import reborncore.api.tile.IInventoryProvider; import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; @@ -50,11 +52,18 @@ import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileIndustrialGrinder extends TilePowerAcceptor implements IToolDrop, IInventoryProvider, ITileRecipeHandler, IRecipeCrafterProvider, IContainerProvider { + + @ConfigRegistry(config = "machines", category = "industrial_grinder", key = "IndustrialGrinderMaxInput", comment = "Industrial Grinder Max Input (Value in EU)") + public static int maxInput = 128; + @ConfigRegistry(config = "machines", category = "industrial_grinder", key = "IndustrialGrinderMaxEnergy", comment = "Industrial Grinder Max Energy (Value in EU)") + public static int maxEnergy = 10000; + public static final int TANK_CAPACITY = 16000; - public Inventory inventory; public Tank tank; public RecipeCrafter crafter; @@ -63,19 +72,11 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IToolDro public TileIndustrialGrinder() { super(); - // TODO configs - - tank = new Tank("TileIndustrialGrinder", TileIndustrialGrinder.TANK_CAPACITY, this); - inventory = new Inventory(8, "TileIndustrialGrinder", 64, this); - ticksSinceLastChange = 0; - final int[] inputs = new int[2]; - inputs[0] = 0; - inputs[1] = 1; - final int[] outputs = new int[4]; - outputs[0] = 2; - outputs[1] = 3; - outputs[2] = 4; - outputs[3] = 5; + this.tank = new Tank("TileIndustrialGrinder", TileIndustrialGrinder.TANK_CAPACITY, this); + this.inventory = new Inventory(8, "TileIndustrialGrinder", 64, this); + this.ticksSinceLastChange = 0; + final int[] inputs = new int[] { 0, 1 }; + final int[] outputs = new int[] {2, 3, 4, 5}; this.crafter = new RecipeCrafter(Reference.industrialGrinderRecipe, this, 1, 4, this.inventory, inputs, outputs); } @@ -192,7 +193,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IToolDro @Override public double getBaseMaxPower() { - return 10000; + return maxEnergy; } @Override @@ -212,7 +213,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IToolDro @Override public double getBaseMaxInput() { - return 64; + return maxInput; } @Override