fix bad BlockBasicType constructor param names
@@ -119,31 +119,31 @@ public class BlockStateBasic extends ExtendedBlockState {
public boolean isFullBlock;
public boolean isOpaqueCube;
- BasicBlockType(@Nonnull BasicBlock block, int metadata, String s, Supplier<TileEntity> tileClass, boolean hasDesc, Predicate<EnumFacing> facingAllowed,
- boolean activeState, boolean t, boolean beaconBase) {
- this(block, metadata, s, tileClass, hasDesc, facingAllowed, activeState, t, beaconBase, false);
+ BasicBlockType(@Nonnull BasicBlock block, int metadata, String nameIn, Supplier<TileEntity> tileClass, boolean hasDesc, Predicate<EnumFacing> facingAllowed,
+ boolean activeState, boolean hasTiers, boolean beaconBase) {
+ this(block, metadata, nameIn, tileClass, hasDesc, facingAllowed, activeState, hasTiers, beaconBase, false);
}
- BasicBlockType(@Nonnull BasicBlock block, int metadata, String s, Supplier<TileEntity> tileClass, boolean hasDesc, Predicate<EnumFacing> facingAllowed,
- boolean activeState, boolean t, boolean beaconBase, boolean hasRedstoneOutput) {
- this(block, metadata, s, tileClass, hasDesc, facingAllowed, activeState, t, beaconBase, hasRedstoneOutput, true);
+ BasicBlockType(@Nonnull BasicBlock block, int metadata, String nameIn, Supplier<TileEntity> tileClass, boolean hasDesc, Predicate<EnumFacing> facingAllowed,
+ boolean activeState, boolean hasTiers, boolean beaconBase, boolean hasRedstoneOutput) {
+ this(block, metadata, nameIn, tileClass, hasDesc, facingAllowed, activeState, hasTiers, beaconBase, hasRedstoneOutput, true);
}
- BasicBlockType(@Nonnull BasicBlock block, int metadata, String s, Supplier<TileEntity> tileClass, boolean hasDesc, Predicate<EnumFacing> facingAllowed,
- boolean activeState, boolean t, boolean beaconBase, boolean hasRedstoneOutput, boolean fullBlock) {
- this(block, metadata, s, tileClass, hasDesc, facingAllowed, activeState, t, beaconBase, hasRedstoneOutput, fullBlock, true);
+ BasicBlockType(@Nonnull BasicBlock block, int metadata, String nameIn, Supplier<TileEntity> tileClass, boolean hasDesc, Predicate<EnumFacing> facingAllowed,
+ boolean activeState, boolean hasTiers, boolean beaconBase, boolean hasRedstoneOutput, boolean fullBlock) {
+ this(block, metadata, nameIn, tileClass, hasDesc, facingAllowed, activeState, hasTiers, beaconBase, hasRedstoneOutput, fullBlock, true);
}
- BasicBlockType(@Nonnull BasicBlock block, int metadata, String s, Supplier<TileEntity> tileClass, boolean hasDesc, Predicate<EnumFacing> facingAllowed,
- boolean activeState, boolean t, boolean beaconBase, boolean hasRedstoneOutput, boolean fullBlock, boolean opaque) {
+ BasicBlockType(@Nonnull BasicBlock block, int metadata, String nameIn, Supplier<TileEntity> tileClass, boolean hasDesc, Predicate<EnumFacing> facingAllowed,
+ boolean activeState, boolean hasTiers, boolean beaconBase, boolean hasRedstoneOutput, boolean fullBlock, boolean opaque) {
blockType = block;
meta = metadata;
- name = s;
+ name = nameIn;
tileEntitySupplier = tileClass;
hasDescription = hasDesc;
facingPredicate = facingAllowed;
activable = activeState;
- tiers = t;
+ tiers = hasTiers;
isBeaconBase = beaconBase;
this.hasRedstoneOutput = hasRedstoneOutput;
isFullBlock = fullBlock;
