maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More fixes for unused configs

Browse source
This commit is contained in:
drcrazy 2020-04-06 14:05:44 +03:00
parent 35e4675c6d
commit 0845b923b5
4 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java
View file

@ -334,7 +334,7 @@ public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity
if (!hasStartedCrafting) { if (!hasStartedCrafting) {
return 0; return 0;
} }
return Integer.MAX_VALUE; return TechRebornConfig.fusionControlComputerMaxOutput;
} }
@Override @Override

2
src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java
View file

@ -39,7 +39,7 @@ import techreborn.init.TRContent;
public class SoildCanningMachineBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { public class SoildCanningMachineBlockEntity extends GenericMachineBlockEntity implements IContainerProvider {
public SoildCanningMachineBlockEntity() { 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[] inputs = new int[] { 0, 1 };
final int[] outputs = new int[] { 2 }; final int[] outputs = new int[] { 2 };
this.inventory = new RebornInventory<>(4, "SolidCanningMachineBlockEntity", 64, this); this.inventory = new RebornInventory<>(4, "SolidCanningMachineBlockEntity", 64, this);

6
src/main/java/techreborn/config/TechRebornConfig.java
View file

@ -309,12 +309,6 @@ public class TechRebornConfig {
// Machines // 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") @Config(config = "machines", category = "lesu", key = "LesuMaxEnergyPerBlock", comment = "LESU Max Energy Per Block")
public static int lesuStoragePerBlock = 1_000_000; public static int lesuStoragePerBlock = 1_000_000;

2
src/main/java/techreborn/world/WorldGenerator.java
View file

@ -119,7 +119,7 @@ public class WorldGenerator {
addOre(biome, OreFeatureConfig.Target.NETHERRACK, TRContent.Ores.SPHALERITE); addOre(biome, OreFeatureConfig.Target.NETHERRACK, TRContent.Ores.SPHALERITE);
} }
} else if (biome.getCategory() == Category.THEEND) { } else if (biome.getCategory() == Category.THEEND) {
if (TechRebornConfig.enableSphaleriteOre){ if (TechRebornConfig.enablePeridotOre){
addEndOre(biome, TRContent.Ores.PERIDOT); addEndOre(biome, TRContent.Ores.PERIDOT);
} }
if (TechRebornConfig.enableSheldoniteOre){ if (TechRebornConfig.enableSheldoniteOre){