Merge remote-tracking branch 'remotes/origin/1.15' into 1.16

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/GuiHandler.java
This commit is contained in:
modmuss50 2020-04-09 00:55:38 +01:00
commit 0bf6159801
30 changed files with 374 additions and 231 deletions

View file

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

View file

@ -39,7 +39,7 @@ import techreborn.init.TRContent;
public class SoildCanningMachineBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
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);