From 0845b923b50abf670fbfecc1809602137aa38d7f Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 6 Apr 2020 14:05:44 +0300 Subject: [PATCH] More fixes for unused configs --- .../multiblock/FusionControlComputerBlockEntity.java | 2 +- .../machine/tier1/SoildCanningMachineBlockEntity.java | 2 +- src/main/java/techreborn/config/TechRebornConfig.java | 6 ------ src/main/java/techreborn/world/WorldGenerator.java | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java index aa88bd6af..9897b94e5 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java @@ -334,7 +334,7 @@ public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity if (!hasStartedCrafting) { return 0; } - return Integer.MAX_VALUE; + return TechRebornConfig.fusionControlComputerMaxOutput; } @Override diff --git a/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java index ba9abc1b2..e3d79ca29 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java @@ -39,7 +39,7 @@ import techreborn.init.TRContent; public class SoildCanningMachineBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { public SoildCanningMachineBlockEntity() { - super(TRBlockEntities.SOLID_CANNING_MACHINE, "SolidCanningMachine", TechRebornConfig.solidCanningMachineMaxInput, TechRebornConfig.solidFuelGeneratorMaxEnergy, TRContent.Machine.SOLID_CANNING_MACHINE.block, 3); + super(TRBlockEntities.SOLID_CANNING_MACHINE, "SolidCanningMachine", TechRebornConfig.solidCanningMachineMaxInput, TechRebornConfig.solidCanningMachineMaxEnergy, TRContent.Machine.SOLID_CANNING_MACHINE.block, 3); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2 }; this.inventory = new RebornInventory<>(4, "SolidCanningMachineBlockEntity", 64, this); diff --git a/src/main/java/techreborn/config/TechRebornConfig.java b/src/main/java/techreborn/config/TechRebornConfig.java index 0ac0dc068..09d91f7dd 100644 --- a/src/main/java/techreborn/config/TechRebornConfig.java +++ b/src/main/java/techreborn/config/TechRebornConfig.java @@ -309,12 +309,6 @@ public class TechRebornConfig { // Machines - @Config(config = "machines", category = "grinder", key = "GrinderInput", comment = "Grinder Max Input (Value in EU)") - public static int grinderMaxInput = 32; - - @Config(config = "machines", category = "grinder", key = "GrinderMaxEnergy", comment = "Grinder Max Energy (Value in EU)") - public static int grinderMaxEnergy = 1_000; - @Config(config = "machines", category = "lesu", key = "LesuMaxEnergyPerBlock", comment = "LESU Max Energy Per Block") public static int lesuStoragePerBlock = 1_000_000; diff --git a/src/main/java/techreborn/world/WorldGenerator.java b/src/main/java/techreborn/world/WorldGenerator.java index 3f5b6a95e..1eefc827e 100644 --- a/src/main/java/techreborn/world/WorldGenerator.java +++ b/src/main/java/techreborn/world/WorldGenerator.java @@ -119,7 +119,7 @@ public class WorldGenerator { addOre(biome, OreFeatureConfig.Target.NETHERRACK, TRContent.Ores.SPHALERITE); } } else if (biome.getCategory() == Category.THEEND) { - if (TechRebornConfig.enableSphaleriteOre){ + if (TechRebornConfig.enablePeridotOre){ addEndOre(biome, TRContent.Ores.PERIDOT); } if (TechRebornConfig.enableSheldoniteOre){