diff --git a/build.gradle b/build.gradle index ee72ae275..4b378b4ca 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ archivesBaseName = config.mod_name sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: '20180921-1.13' + mappings channel: 'snapshot', version: '20190214-1.13.1' runs { client = { properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP' @@ -50,7 +50,7 @@ minecraft { } dependencies { - minecraft 'net.minecraftforge.test:forge:1.13-24.0.150-1.13-pre' + minecraft 'net.minecraftforge:forge:1.13.2-25.0.10' } repositories { diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 67bab2434..1adadf00e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -41,7 +41,7 @@ import javax.annotation.Nonnull; public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable { - public BlockAlfPortal(Builder builder) { + public BlockAlfPortal(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 460463af8..a603a4397 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -56,7 +56,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { private final Variant variant; - public BlockAltGrass(Variant v, Builder builder) { + public BlockAltGrass(Variant v, Properties builder) { super(builder); this.variant = v; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index f0817502d..a0828a53c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -76,7 +76,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { public final Variant variant; - protected BlockAltar(Variant v, Block.Builder builder) { + protected BlockAltar(Variant v, Block.Properties builder) { super(builder); this.variant = v; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index e9aad6fc7..be0d26c8b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -44,7 +44,7 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 4, 16); - public BlockAnimatedTorch(Builder builder) { + public BlockAnimatedTorch(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 1a4833732..8970ddb83 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -52,7 +52,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { private static final VoxelShape X_AABB = makeCuboidShape(5, 0, 3.5, 11, 17, 12.5); private static final VoxelShape Z_AABB = makeCuboidShape(3.5, 0, 5, 12.5, 17, 11); - protected BlockAvatar(Builder builder) { + protected BlockAvatar(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index dfa2b68b4..cdcf9586c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -28,7 +28,7 @@ import java.util.Random; public class BlockBifrost extends BlockBifrostPerm implements ILexiconable { - public BlockBifrost(Builder builder) { + public BlockBifrost(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index b8e529725..509f740b6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -31,7 +31,7 @@ import javax.annotation.Nonnull; import java.util.Random; public class BlockBifrostPerm extends BlockMod implements ILexiconable { - public BlockBifrostPerm(Builder builder) { + public BlockBifrostPerm(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 5cfe47196..18d420c2a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -34,7 +34,7 @@ import java.util.List; public class BlockCacophonium extends BlockMod { - protected BlockCacophonium(Builder builder) { + protected BlockCacophonium(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index c848cec03..122a2e0a6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -26,7 +26,7 @@ import vazkii.botania.common.block.tile.TileCamo; public abstract class BlockCamo extends BlockMod { - protected BlockCamo(Builder builder) { + protected BlockCamo(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 9eec58206..872900402 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -33,7 +33,7 @@ import java.util.Random; public class BlockCell extends BlockMod implements ILexiconable { - public BlockCell(Builder builder) { + public BlockCell(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index e84a5876b..4a4aec549 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -41,7 +41,7 @@ public class BlockCocoon extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(3, 0, 3, 13, 14, 13);; - protected BlockCocoon(Builder builder) { + protected BlockCocoon(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java index 6c1bfa19e..ba61e6d96 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java @@ -28,7 +28,7 @@ import javax.annotation.Nonnull; public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD { - public BlockCraftyCrate(Builder builder) { + public BlockCraftyCrate(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 8e0a9b9bf..2d9412075 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -35,7 +35,7 @@ import java.util.Random; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { - public BlockEnchantedSoil(Builder builder) { + public BlockEnchantedSoil(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 22b9cf93c..1d63ee70c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -34,7 +34,7 @@ import javax.annotation.Nonnull; public class BlockEnderEye extends BlockMod implements ILexiconable { - protected BlockEnderEye(Builder builder) { + protected BlockEnderEye(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index bcbe4b19b..4c26f6735 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -38,7 +38,7 @@ public class BlockFakeAir extends BlockAir { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); - public BlockFakeAir(Builder builder) { + public BlockFakeAir(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index be465431e..2de752e7a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -48,7 +48,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final ResourceLocation LOOT_TABLE = new ResourceLocation(LibMisc.MOD_ID, "fel_blaze"); private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; - public BlockFelPumpkin(Builder builder) { + public BlockFelPumpkin(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.HORIZONTAL_FACING, EnumFacing.SOUTH)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 50f5f2625..8c3678db3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -31,7 +31,7 @@ public class BlockForestEye extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(4, 4, 4, 12, 12, 12); - public BlockForestEye(Builder builder) { + public BlockForestEye(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 4e25e920b..dddb41eae 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -41,7 +41,7 @@ import java.util.Random; public class BlockGaiaHead extends BlockAbstractSkull { public static final BlockSkull.ISkullType GAIA_TYPE = new BlockSkull.ISkullType() {}; - public BlockGaiaHead(Builder builder) { + public BlockGaiaHead(Properties builder) { super(GAIA_TYPE, builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 49a005d8e..823b43d61 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -45,7 +45,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IMode private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; - public BlockGhostRail(Builder builder) { + public BlockGhostRail(Properties builder) { super(true, builder); setDefaultState(stateContainer.getBaseState().with(BlockStateProperties.RAIL_SHAPE_STRAIGHT, RailShape.NORTH_SOUTH)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 27610d8c8..289f82228 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -55,7 +55,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, private static final VoxelShape SHAPE = makeCuboidShape(4, 0, 4, 12, 18.4, 12); - protected BlockHourglass(Builder builder) { + protected BlockHourglass(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 21afb433e..c1d8776c0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -40,7 +40,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { private static final VoxelShape X_SHAPE = makeCuboidShape(6, 0, 2, 10, 1, 14); private static final VoxelShape Z_SHAPE = makeCuboidShape(2, 0, 6, 14, 1, 10); - protected BlockIncensePlate(Builder builder) { + protected BlockIncensePlate(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index dda5399bd..3cfd92116 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -41,7 +41,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 4, 16); - public BlockLightLauncher(Builder builder) { + public BlockLightLauncher(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index e896d2233..afee06fec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -42,7 +42,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable private static final VoxelShape SHAPE = makeCuboidShape(5, 5, 5, 11, 11, 11); private final LuminizerVariant variant; - protected BlockLightRelay(LuminizerVariant variant, Builder builder) { + protected BlockLightRelay(LuminizerVariant variant, Properties builder) { super(builder); this.variant = variant; setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index e722bdd9d..ab56df67d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -27,7 +27,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconable { - public BlockManaBomb(Builder builder) { + public BlockManaBomb(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 32f21b57d..1ae1edaf6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -26,7 +26,7 @@ import vazkii.botania.common.lib.LibMisc; public abstract class BlockMod extends Block { - public BlockMod(Block.Builder builder) { + public BlockMod(Block.Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 1bbcb1f49..c7fe53590 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -60,7 +60,7 @@ import java.util.Random; public class BlockModDoubleFlower extends BlockTallFlower implements ILexiconable, IShearable { private final EnumDyeColor color; - public BlockModDoubleFlower(EnumDyeColor color, Builder builder) { + public BlockModDoubleFlower(EnumDyeColor color, Properties builder) { super(builder); this.color = color; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 07eefac43..3686203b7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -46,7 +46,7 @@ import java.util.Random; public class BlockModFlower extends BlockFlower implements ILexiconable, IGrowable { protected final EnumDyeColor color; - protected BlockModFlower(EnumDyeColor color, Builder builder) { + protected BlockModFlower(EnumDyeColor color, Properties builder) { super(builder); this.color = color; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java b/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java index e56012192..87ad7a236 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java +++ b/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java @@ -10,7 +10,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; public class BlockModLexiconable extends BlockMod implements ILexiconable { private final ILexiconable delegate; - public BlockModLexiconable(Builder builder, ILexiconable delegate) { + public BlockModLexiconable(Properties builder, ILexiconable delegate) { super(builder); this.delegate = delegate; } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 200d08dcd..cb5e241f6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -33,7 +33,7 @@ import javax.annotation.Nonnull; public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable { - protected BlockOpenCrate(Builder builder) { + protected BlockOpenCrate(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 6d74cec94..fee4235d7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -67,7 +67,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl private final Set checkedCoords = new HashSet<>(); private final Map coordsToCheck = new HashMap<>(); - public BlockPistonRelay(Builder builder) { + public BlockPistonRelay(Properties builder) { super(builder); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 27c266fd9..f6f10be52 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -66,7 +66,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, public final Variant variant; - public BlockPlatform(Variant v, Builder builder) { + public BlockPlatform(Variant v, Properties builder) { super(builder); this.variant = v; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index f819faba9..4cb1e1a27 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -54,7 +54,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } public final Variant variant; - public BlockPylon(Variant v, Builder builder) { + public BlockPylon(Variant v, Properties builder) { super(builder); this.variant = v; } diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index effa4c977..fdf574274 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -30,7 +30,7 @@ import java.util.Random; public class BlockRoot extends BlockMod implements ILexiconable { - public BlockRoot(Builder builder) { + public BlockRoot(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index ad6f21bde..2250efe22 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -34,7 +34,7 @@ import java.util.Random; public class BlockSolidVines extends BlockVine implements ILexiconable { - public BlockSolidVines(Builder builder) { + public BlockSolidVines(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 779f9d35e..bea4cc4ee 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -43,7 +43,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 3, 16); - public BlockSparkChanger(Builder builder) { + public BlockSparkChanger(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, true)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 11b1e411e..28a4e85e7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -29,7 +29,7 @@ import java.util.Locale; public class BlockStorage extends BlockMod implements IElvenItem, ILexiconable { - public BlockStorage(Builder builder) { + public BlockStorage(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 246207b9e..28fcdc84a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -39,7 +39,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(4, 0.16, 4, 12, 15.84, 12); - public BlockTeruTeruBozu(Builder builder) { + public BlockTeruTeruBozu(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 9c3f5c253..9c1373fd8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -37,7 +37,7 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl private static final VoxelShape AABB = makeCuboidShape(3, 3, 3, 13, 13, 13); - protected BlockTinyPlanet(Builder builder) { + protected BlockTinyPlanet(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index bb2aaf988..66231a695 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -371,25 +371,25 @@ public final class ModBlocks { ILexiconable decorative = (w, po, pl, st) -> LexiconData.decorativeBlocks; ILexiconable elvenResource = (w, po, pl, st) -> LexiconData.elvenResources; - Block.Builder builder = Block.Builder.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT); + Block.Properties builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT); for(EnumDyeColor color : EnumDyeColor.values()) { register(r, new BlockModFlower(color, builder), color.getName() + LibBlockNames.MYSTICAL_FLOWER_SUFFIX); } - builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(3.5F).sound(SoundType.STONE); + builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(3.5F).sound(SoundType.STONE); for(BlockAltar.Variant v : BlockAltar.Variant.values()) { r.register(new BlockAltar(v, builder) .setRegistryName(LibMisc.MOD_ID, LibBlockNames.APOTHECARY_PREFIX + v.name().toLowerCase(Locale.ROOT))); } - builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); + builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); register(r, new BlockModLexiconable(builder, (w, po, pl, st) -> LexiconData.pureDaisy), LibBlockNames.LIVING_ROCK); register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_ROCK_BRICK); register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_ROCK_BRICK_MOSSY); register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_ROCK_BRICK_CRACKED); register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_ROCK_BRICK_CHISELED); - builder = Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); + builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); // todo 1.13: livingwood should support leaves register(r, new BlockModLexiconable(builder, (w, po, pl, st) -> LexiconData.pureDaisy), LibBlockNames.LIVING_WOOD); register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_WOOD_PLANKS); @@ -400,73 +400,73 @@ public final class ModBlocks { r.register(specialFlower); - builder = Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); + builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); register(r, new BlockSpreader(BlockSpreader.Variant.MANA, builder), LibBlockNames.SPREADER); register(r, new BlockSpreader(BlockSpreader.Variant.REDSTONE, builder), LibBlockNames.SPREADER_REDSTONE); register(r, new BlockSpreader(BlockSpreader.Variant.ELVEN, builder), LibBlockNames.SPREADER_ELVEN); register(r, new BlockSpreader(BlockSpreader.Variant.GAIA, builder), LibBlockNames.SPREADER_GAIA); - builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); + builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); register(r, new BlockPool(BlockPool.Variant.DEFAULT, builder), LibBlockNames.POOL); register(r, new BlockPool(BlockPool.Variant.CREATIVE, builder), LibBlockNames.POOL_CREATIVE); register(r, new BlockPool(BlockPool.Variant.DILUTED, builder), LibBlockNames.POOL_DILUTED); register(r, new BlockPool(BlockPool.Variant.FABULOUS, builder), LibBlockNames.POOL_FABULOUS); - builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); + builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); register(r, new BlockRuneAltar(builder), LibBlockNames.RUNE_ALTAR); - builder = Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).lightValue(7); + builder = Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).lightValue(7); register(r, new BlockPylon(BlockPylon.Variant.MANA, builder), LibBlockNames.PYLON); register(r, new BlockPylon(BlockPylon.Variant.NATURA, builder), LibBlockNames.PYLON_NATURA); register(r, new BlockPylon(BlockPylon.Variant.GAIA, builder), LibBlockNames.PYLON_GAIA); - builder = Block.Builder.create(Material.GOURD).hardnessAndResistance(2, 10).sound(SoundType.METAL); + builder = Block.Properties.create(Material.GOURD).hardnessAndResistance(2, 10).sound(SoundType.METAL); register(r, new BlockPistonRelay(builder), LibBlockNames.PISTON_RELAY); - builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); + builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); register(r, new BlockDistributor(builder), LibBlockNames.DISTRIBUTOR); - builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 2000).sound(SoundType.STONE); + builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 2000).sound(SoundType.STONE); register(r, new BlockManaVoid(builder), LibBlockNames.MANA_VOID); - builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); + builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); register(r, new BlockDistributor(builder), LibBlockNames.MANA_DETECTOR); - register(r, new BlockEnchanter(Block.Builder.create(Material.ROCK).hardnessAndResistance(3, 5).lightValue(15).sound(SoundType.STONE)), LibBlockNames.ENCHANTER); - register(r, new BlockTurntable(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.TURNTABLE); - register(r, new BlockTinyPlanet(Block.Builder.create(Material.ROCK).hardnessAndResistance(20, 100).sound(SoundType.STONE)), LibBlockNames.TINY_PLANET); - register(r, new BlockAlchemyCatalyst(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.ALCHEMY_CATALYST); + register(r, new BlockEnchanter(Block.Properties.create(Material.ROCK).hardnessAndResistance(3, 5).lightValue(15).sound(SoundType.STONE)), LibBlockNames.ENCHANTER); + register(r, new BlockTurntable(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.TURNTABLE); + register(r, new BlockTinyPlanet(Block.Properties.create(Material.ROCK).hardnessAndResistance(20, 100).sound(SoundType.STONE)), LibBlockNames.TINY_PLANET); + register(r, new BlockAlchemyCatalyst(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.ALCHEMY_CATALYST); - builder = Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); + builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); register(r, new BlockOpenCrate(builder), LibBlockNames.OPEN_CRATE); register(r, new BlockCraftyCrate(builder), LibBlockNames.CRAFT_CRATE); - register(r, new BlockForestEye(Block.Builder.create(Material.IRON).hardnessAndResistance(5, 10).sound(SoundType.METAL)), LibBlockNames.FOREST_EYE); + register(r, new BlockForestEye(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 10).sound(SoundType.METAL)), LibBlockNames.FOREST_EYE); - builder = Block.Builder.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL); + builder = Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL); register(r, new BlockStorage(builder), LibBlockNames.MANASTEEL_BLOCK); register(r, new BlockStorage(builder), LibBlockNames.TERRASTEEL_BLOCK); register(r, new BlockStorage(builder), LibBlockNames.ELEMENTIUM_BLOCK); register(r, new BlockStorage(builder), LibBlockNames.MANA_DIAMOND_BLOCK); register(r, new BlockStorage(builder), LibBlockNames.DRAGONSTONE_BLOCK); - builder = Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); + builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); register(r, new BlockForestDrum(BlockForestDrum.Variant.WILD, builder), LibBlockNames.DRUM_WILD); register(r, new BlockForestDrum(BlockForestDrum.Variant.CANOPY, builder), LibBlockNames.DRUM_CANOPY); register(r, new BlockForestDrum(BlockForestDrum.Variant.GATHERING, builder), LibBlockNames.DRUM_GATHERING); - builder = Block.Builder.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(15); + builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(15); for (EnumDyeColor color : EnumDyeColor.values()) { register(r, new BlockShinyFlower(color, builder), color.getName() + LibBlockNames.SHINY_FLOWER_SUFFIX); } - builder = Block.Builder.create(Material.WOOD).hardnessAndResistance(2, 5).sound(SoundType.WOOD); + builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2, 5).sound(SoundType.WOOD); register(r, new BlockPlatform(BlockPlatform.Variant.ABSTRUSE, builder), LibBlockNames.PLATFORM_ABSTRUSE); register(r, new BlockPlatform(BlockPlatform.Variant.SPECTRAL, builder), LibBlockNames.PLATFORM_SPECTRAL); register(r, new BlockPlatform(BlockPlatform.Variant.INFRANGIBLE, builder), LibBlockNames.PLATFORM_INFRANGIBLE); - register(r, new BlockAlfPortal(Block.Builder.create(Material.WOOD).hardnessAndResistance(10).sound(SoundType.WOOD)), LibBlockNames.ALF_PORTAL); + register(r, new BlockAlfPortal(Block.Properties.create(Material.WOOD).hardnessAndResistance(10).sound(SoundType.WOOD)), LibBlockNames.ALF_PORTAL); - builder = Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); + builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); // todo 1.13: dreamwood should support leaves? register(r, new BlockModLexiconable(builder, elvenResource), LibBlockNames.DREAM_WOOD); register(r, new BlockModLexiconable(builder, elvenResource), LibBlockNames.DREAM_WOOD_PLANKS); @@ -475,34 +475,34 @@ public final class ModBlocks { register(r, new BlockModLexiconable(builder, elvenResource), LibBlockNames.DREAM_WOOD_PATTERN_FRAMED); register(r, new BlockModLexiconable(builder.lightValue(12), elvenResource), LibBlockNames.DREAM_WOOD_GLIMMERING); - register(r, new BlockConjurationCatalyst(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.CONJURATION_CATALYST); - register(r, new BlockBifrost(Block.Builder.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).lightValue(15).sound(SoundType.GLASS)), LibBlockNames.BIFROST); - register(r, new BlockSolidVines(Block.Builder.create(Material.VINE).hardnessAndResistance(0.2F).sound(SoundType.PLANT)), LibBlockNames.SOLID_VINE); + register(r, new BlockConjurationCatalyst(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.CONJURATION_CATALYST); + register(r, new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).lightValue(15).sound(SoundType.GLASS)), LibBlockNames.BIFROST); + register(r, new BlockSolidVines(Block.Properties.create(Material.VINE).hardnessAndResistance(0.2F).sound(SoundType.PLANT)), LibBlockNames.SOLID_VINE); - builder = Block.Builder.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(4); + builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(4); for(EnumDyeColor color : EnumDyeColor.values()) { register(r, new BlockBuriedPetals(color, builder), color.getName() + LibBlockNames.BURIED_PETALS_SUFFIX); } r.register(floatingFlower); - register(r, new BlockTinyPotato(Block.Builder.create(Material.CLOTH).hardnessAndResistance(0.25F)), LibBlockNames.TINY_POTATO); - register(r, new BlockSpawnerClaw(Block.Builder.create(Material.IRON).hardnessAndResistance(3)), LibBlockNames.SPAWNER_CLAW); + register(r, new BlockTinyPotato(Block.Properties.create(Material.CLOTH).hardnessAndResistance(0.25F)), LibBlockNames.TINY_POTATO); + register(r, new BlockSpawnerClaw(Block.Properties.create(Material.IRON).hardnessAndResistance(3)), LibBlockNames.SPAWNER_CLAW); - builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 5).sound(SoundType.STONE); + builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 5).sound(SoundType.STONE); ILexiconable azulejo = (w, po ,pl, st) -> LexiconData.azulejo; for (int i = 0; i < 15; i++) { register(r, new BlockModLexiconable(builder, azulejo), LibBlockNames.AZULEJO_PREFIX + i); } - register(r, new BlockEnderEye(Block.Builder.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)), LibBlockNames.ENDER_EYE_BLOCK); - register(r, new BlockStarfield(Block.Builder.create(Material.IRON).hardnessAndResistance(5, 2000).sound(SoundType.METAL)), LibBlockNames.STARFIELD); - register(r, new BlockRFGenerator(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.RF_GENERATOR); - register(r, new BlockElfGlass(Block.Builder.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15)), LibBlockNames.ELF_GLASS); - register(r, new BlockBrewery(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.BREWERY); - register(r, new BlockManaGlass(Block.Builder.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15)), LibBlockNames.MANA_GLASS); - register(r, new BlockTerraPlate(Block.Builder.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)), LibBlockNames.TERRA_PLATE); + register(r, new BlockEnderEye(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)), LibBlockNames.ENDER_EYE_BLOCK); + register(r, new BlockStarfield(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 2000).sound(SoundType.METAL)), LibBlockNames.STARFIELD); + register(r, new BlockRFGenerator(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.RF_GENERATOR); + register(r, new BlockElfGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15)), LibBlockNames.ELF_GLASS); + register(r, new BlockBrewery(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.BREWERY); + register(r, new BlockManaGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15)), LibBlockNames.MANA_GLASS); + register(r, new BlockTerraPlate(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)), LibBlockNames.TERRA_PLATE); - builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); + builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); register(r, new BlockRedStringContainer(builder), LibBlockNames.RED_STRING_CONTAINER); register(r, new BlockRedStringDispenser(builder), LibBlockNames.RED_STRING_DISPENSER); register(r, new BlockRedStringFertilizer(builder), LibBlockNames.RED_STRING_FERTILIZER); @@ -510,68 +510,68 @@ public final class ModBlocks { register(r, new BlockRedStringRelay(builder), LibBlockNames.RED_STRING_RELAY); register(r, new BlockRedStringInterceptor(builder), LibBlockNames.RED_STRING_INTERCEPTOR); r.register(floatingSpecialFlower); - register(r, new BlockManaFlame(Block.Builder.create(Material.CLOTH).sound(SoundType.CLOTH).lightValue(15).doesNotBlockMovement()), LibBlockNames.MANA_FLAME); - register(r, new BlockPrism(Block.Builder.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).doesNotBlockMovement()), LibBlockNames.PRISM); - register(r, new BlockEnchantedSoil(Block.Builder.create(Material.GRASS).hardnessAndResistance(0.6F).sound(SoundType.PLANT)), LibBlockNames.ENCHANTED_SOIL); + register(r, new BlockManaFlame(Block.Properties.create(Material.CLOTH).sound(SoundType.CLOTH).lightValue(15).doesNotBlockMovement()), LibBlockNames.MANA_FLAME); + register(r, new BlockPrism(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).doesNotBlockMovement()), LibBlockNames.PRISM); + register(r, new BlockEnchantedSoil(Block.Properties.create(Material.GRASS).hardnessAndResistance(0.6F).sound(SoundType.PLANT)), LibBlockNames.ENCHANTED_SOIL); - builder = Block.Builder.create(Material.PLANTS).hardnessAndResistance(0.4F).sound(SoundType.PLANT); + builder = Block.Properties.create(Material.PLANTS).hardnessAndResistance(0.4F).sound(SoundType.PLANT); for(EnumDyeColor color : EnumDyeColor.values()) { register(r, new BlockPetalBlock(color, builder), color.getName() + LibBlockNames.PETAL_BLOCK_SUFFIX); } - register(r, new BlockCorporeaIndex(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_INDEX); - register(r, new BlockCorporeaFunnel(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_FUNNEL); + register(r, new BlockCorporeaIndex(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_INDEX); + register(r, new BlockCorporeaFunnel(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_FUNNEL); - builder = Block.Builder.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(3); + builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(3); for(EnumDyeColor color : EnumDyeColor.values()) { register(r, new BlockModMushroom(color, builder), color.getName() + LibBlockNames.MUSHROOM_SUFFIX); } - register(r, new BlockPump(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.PUMP); + register(r, new BlockPump(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.PUMP); - builder = Block.Builder.create(Material.VINE).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT); + builder = Block.Properties.create(Material.VINE).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT); for(EnumDyeColor color : EnumDyeColor.values()) { register(r, new BlockModDoubleFlower(color, builder), color.getName() + LibBlockNames.DOUBLE_FLOWER_SUFFIX); } - register(r, new BlockFakeAir(Block.Builder.create(Material.STRUCTURE_VOID).needsRandomTick()), LibBlockNames.FAKE_AIR); - register(r, new BlockModLexiconable(Block.Builder.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL).lightValue(15), (w, po, pl, st) -> LexiconData.blazeBlock), LibBlockNames.BLAZE_BLOCK)); - register(r, new BlockCorporeaInterceptor(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_INTERCEPTOR); - register(r, new BlockCorporeaCrystalCube(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_CRYSTAL_CUBE); - register(r, new BlockIncensePlate(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.INCENSE_PLATE); - register(r, new BlockHourglass(Block.Builder.create(Material.IRON).hardnessAndResistance(2).sound(SoundType.METAL)), LibBlockNames.HOURGLASS); - register(r, new BlockGhostRail(Block.Builder.create(Material.CIRCUITS).doesNotBlockMovement().hardnessAndResistance(0.7F).sound(SoundType.METAL)), LibBlockNames.GHOST_RAIL); - register(r, new BlockSparkChanger(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.SPARK_CHANGER); - register(r, new BlockRoot(Block.Builder.create(Material.PLANTS).hardnessAndResistance(1.2F).sound(SoundType.WOOD)), LibBlockNames.ROOT); - register(r, new BlockFelPumpkin(Block.Builder.from(Blocks.CARVED_PUMPKIN)), LibBlockNames.FEL_PUMPKIN); - register(r, new BlockCocoon(Block.Builder.create(Material.CLOTH).hardnessAndResistance(3, 60).sound(SoundType.CLOTH)), LibBlockNames.COCOON); + register(r, new BlockFakeAir(Block.Properties.create(Material.STRUCTURE_VOID).needsRandomTick()), LibBlockNames.FAKE_AIR); + register(r, new BlockModLexiconable(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL).lightValue(15), (w, po, pl, st) -> LexiconData.blazeBlock), LibBlockNames.BLAZE_BLOCK); + register(r, new BlockCorporeaInterceptor(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_INTERCEPTOR); + register(r, new BlockCorporeaCrystalCube(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_CRYSTAL_CUBE); + register(r, new BlockIncensePlate(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.INCENSE_PLATE); + register(r, new BlockHourglass(Block.Properties.create(Material.IRON).hardnessAndResistance(2).sound(SoundType.METAL)), LibBlockNames.HOURGLASS); + register(r, new BlockGhostRail(Block.Properties.create(Material.CIRCUITS).doesNotBlockMovement().hardnessAndResistance(0.7F).sound(SoundType.METAL)), LibBlockNames.GHOST_RAIL); + register(r, new BlockSparkChanger(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.SPARK_CHANGER); + register(r, new BlockRoot(Block.Properties.create(Material.PLANTS).hardnessAndResistance(1.2F).sound(SoundType.WOOD)), LibBlockNames.ROOT); + register(r, new BlockFelPumpkin(Block.Properties.from(Blocks.CARVED_PUMPKIN)), LibBlockNames.FEL_PUMPKIN); + register(r, new BlockCocoon(Block.Properties.create(Material.CLOTH).hardnessAndResistance(3, 60).sound(SoundType.CLOTH)), LibBlockNames.COCOON); - builder = Block.Builder.create(Material.GLASS).doesNotBlockMovement(); + builder = Block.Properties.create(Material.GLASS).doesNotBlockMovement(); register(r, new BlockLightRelay(LuminizerVariant.DEFAULT, builder), LibBlockNames.LIGHT_RELAY); register(r, new BlockLightRelay(LuminizerVariant.DETECTOR, builder), "detector" + LibBlockNames.LIGHT_RELAY_SUFFIX); register(r, new BlockLightRelay(LuminizerVariant.FORK, builder), "fork" + LibBlockNames.LIGHT_RELAY_SUFFIX); register(r, new BlockLightRelay(LuminizerVariant.TOGGLE, builder), "toggle" + LibBlockNames.LIGHT_RELAY_SUFFIX); - register(r, new BlockLightLauncher(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.LIGHT_LAUNCHER); - register(r, new BlockManaBomb(Block.Builder.create(Material.WOOD).hardnessAndResistance(12).sound(SoundType.WOOD)), LibBlockNames.MANA_BOMB); - register(r, new BlockCacophonium(Block.Builder.create(Material.WOOD).hardnessAndResistance(0.8F)), LibBlockNames.CACOPHONIUM); - register(r, new BlockBellows(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.BELLOWS); - register(r, new BlockBifrostPerm(Block.Builder.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS)), LibBlockNames.BIFROST_PERM); - register(r, new BlockCell(Block.Builder.create(Material.GOURD).sound(SoundType.CLOTH)), LibBlockNames.CELL_BLOCK); - register(r, new BlockGaiaHead(Block.Builder.create(Material.CIRCUITS).hardnessAndResistance(1)), LibBlockNames.GAIA_HEAD); - register(r, new BlockCorporeaRetainer(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_RETAINER); - register(r, new BlockTeruTeruBozu(Block.Builder.create(Material.CLOTH)), LibBlockNames.TERU_TERU_BOZU); + register(r, new BlockLightLauncher(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.LIGHT_LAUNCHER); + register(r, new BlockManaBomb(Block.Properties.create(Material.WOOD).hardnessAndResistance(12).sound(SoundType.WOOD)), LibBlockNames.MANA_BOMB); + register(r, new BlockCacophonium(Block.Properties.create(Material.WOOD).hardnessAndResistance(0.8F)), LibBlockNames.CACOPHONIUM); + register(r, new BlockBellows(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.BELLOWS); + register(r, new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS)), LibBlockNames.BIFROST_PERM); + register(r, new BlockCell(Block.Properties.create(Material.GOURD).sound(SoundType.CLOTH)), LibBlockNames.CELL_BLOCK); + register(r, new BlockGaiaHead(Block.Properties.create(Material.CIRCUITS).hardnessAndResistance(1)), LibBlockNames.GAIA_HEAD); + register(r, new BlockCorporeaRetainer(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_RETAINER); + register(r, new BlockTeruTeruBozu(Block.Properties.create(Material.CLOTH)), LibBlockNames.TERU_TERU_BOZU); ILexiconable rainbowRod = (w, po, pl, st) -> LexiconData.rainbowRod; - register(r, new BlockModLexiconable(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE), rainbowRod), LibBlockNames.SHIMMERROCK); - register(r, new BlockModLexiconable(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD), rainbowRod), LibBlockNames.SHIMMERWOOD_PLANKS); - register(r, new BlockAvatar(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.AVATAR); + register(r, new BlockModLexiconable(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE), rainbowRod), LibBlockNames.SHIMMERROCK); + register(r, new BlockModLexiconable(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD), rainbowRod), LibBlockNames.SHIMMERWOOD_PLANKS); + register(r, new BlockAvatar(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.AVATAR); - builder = Block.Builder.create(Material.GRASS).hardnessAndResistance(0.6F).needsRandomTick().sound(SoundType.PLANT); + builder = Block.Properties.create(Material.GRASS).hardnessAndResistance(0.6F).needsRandomTick().sound(SoundType.PLANT); for(BlockAltGrass.Variant v : BlockAltGrass.Variant.values()) { register(r, new BlockAltGrass(v, builder), v.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX); } - register(r, new BlockAnimatedTorch(Block.Builder.create(Material.CIRCUITS).lightValue(7)), LibBlockNames.ANIMATED_TORCH); + register(r, new BlockAnimatedTorch(Block.Properties.create(Material.CIRCUITS).lightValue(7)), LibBlockNames.ANIMATED_TORCH); RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState(); RecipeManaInfusion.conjurationState = conjurationCatalyst.getDefaultState(); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 8fe760497..c89140551 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -23,7 +23,7 @@ import javax.annotation.Nonnull; public abstract class BlockCorporeaBase extends BlockMod { - public BlockCorporeaBase(Block.Builder builder) { + public BlockCorporeaBase(Block.Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 4799efdce..6860a994c 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -47,7 +47,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 1, 13.0/16); - public BlockCorporeaCrystalCube(Block.Builder builder) { + public BlockCorporeaCrystalCube(Block.Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(Properties.StaticProperty, true)); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 8f49bacdf..c8e51f393 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -32,7 +32,7 @@ import javax.annotation.Nonnull; public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { - public BlockCorporeaFunnel(Builder builder) { + public BlockCorporeaFunnel(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 77d647442..bbe518496 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -46,7 +46,7 @@ import javax.annotation.Nonnull; public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconable { - public BlockCorporeaIndex(Block.Builder builder) { + public BlockCorporeaIndex(Block.Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index b0951ae09..1f62c7d5f 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -35,7 +35,7 @@ import java.util.Random; public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { - public BlockCorporeaInterceptor(Block.Builder builder) { + public BlockCorporeaInterceptor(Block.Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 3f9945bf7..532e5b064 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -34,7 +34,7 @@ import javax.annotation.Nonnull; public class BlockCorporeaRetainer extends BlockMod implements ILexiconable { - public BlockCorporeaRetainer(Block.Builder builder) { + public BlockCorporeaRetainer(Block.Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 7a9b0df64..52737afdd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -36,7 +36,7 @@ public class BlockBuriedPetals extends BlockModFlower { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 1.6, 16); - public BlockBuriedPetals(EnumDyeColor color, Builder builder) { + public BlockBuriedPetals(EnumDyeColor color, Properties builder) { super(color, builder); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 3f8c859d2..f34183636 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -22,7 +22,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexiconable { - public BlockElfGlass(Builder builder) { + public BlockElfGlass(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 4aa9b32f0..5271ca134 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -41,7 +41,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(4, 4, 4, 12, 12, 12); - public BlockManaFlame(Builder builder) { + public BlockManaFlame(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index f22ce086c..7de2c687e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -32,7 +32,7 @@ import javax.annotation.Nonnull; public class BlockManaGlass extends BlockMod implements ILexiconable { - public BlockManaGlass(Builder builder) { + public BlockManaGlass(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index ab9f73018..e22053138 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -53,7 +53,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8); private final EnumDyeColor color; - public BlockModMushroom(EnumDyeColor color, Builder builder) { + public BlockModMushroom(EnumDyeColor color, Properties builder) { super(builder); this.color = color; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 719212a0a..5796d4c60 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -35,7 +35,7 @@ import javax.annotation.Nonnull; public class BlockPetalBlock extends BlockMod implements ILexiconable { public final EnumDyeColor color; - public BlockPetalBlock(EnumDyeColor color, Builder builder) { + public BlockPetalBlock(EnumDyeColor color, Properties builder) { super(builder); this.color = color; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 6cc29ebd6..e067f6c63 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -36,7 +36,7 @@ import javax.annotation.Nonnull; @Optional.Interface(modid = "thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { - public BlockShinyFlower(EnumDyeColor color, Builder builder) { + public BlockShinyFlower(EnumDyeColor color, Properties builder) { super(color, builder); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index efca3dd7f..49864378a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -36,7 +36,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 4, 16); - public BlockStarfield(Builder builder) { + public BlockStarfield(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 0557ed27f..d41f09f58 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -45,7 +45,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(6, 0, 6, 10, 6, 10); - public BlockTinyPotato(Builder builder) { + public BlockTinyPotato(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState() .with(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index a1aa538a9..ae56692e2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -22,7 +22,7 @@ import vazkii.botania.common.lib.LibMisc; public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister { - public BlockModStairs(IBlockState state, Block.Builder builder) { + public BlockModStairs(IBlockState state, Block.Properties builder) { super(state, builder); setCreativeTab(BotaniaCreativeTab.INSTANCE); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index c411e4c28..60cfe84a6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -29,7 +29,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoolOverlayProvider { - public BlockAlchemyCatalyst(Builder builder) { + public BlockAlchemyCatalyst(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index eba3e304f..16e0c8c11 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -41,7 +41,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(3, 0, 3, 13, 10.0, 13); - public BlockBellows(Builder builder) { + public BlockBellows(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index f54aa5817..33f45a35d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -51,7 +51,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { private static final VoxelShape SHAPE = makeCuboidShape(6, 0.8, 6, 10, 15.2, 10); - public BlockBrewery(Builder builder) { + public BlockBrewery(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java index 5370afa20..9965199f5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java @@ -24,7 +24,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { - public BlockConjurationCatalyst(Builder builder) { + public BlockConjurationCatalyst(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 53fa83dc4..d9e19262f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -35,7 +35,7 @@ public class BlockDistributor extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = Block.makeCuboidShape(4, 0, 4, 12, 16, 12); - public BlockDistributor(Builder builder) { + public BlockDistributor(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index a2cd093e0..f7ad3fbd3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -49,7 +49,7 @@ import java.util.Random; public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD { - public BlockEnchanter(Builder builder) { + public BlockEnchanter(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 93207e695..eddeceb8c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -59,7 +59,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona private static final VoxelShape SHAPE = Block.makeCuboidShape(3, 1, 3, 13, 15, 13); private final Variant variant; - public BlockForestDrum(Variant v, Builder builder) { + public BlockForestDrum(Variant v, Properties builder) { super(builder); this.variant = v; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 3a246d59a..119d8bd2b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -39,7 +39,7 @@ import java.util.List; public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCollisionGhost { - public BlockManaDetector(Builder builder) { + public BlockManaDetector(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index ef4a70e6e..9e01e5d45 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -34,7 +34,7 @@ import javax.annotation.Nonnull; public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider { - public BlockManaVoid(Builder builder) { + public BlockManaVoid(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index ff16df757..8d46b0a63 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -67,7 +67,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon public final Variant variant; - public BlockPool(Variant v, Builder builder) { + public BlockPool(Variant v, Properties builder) { super(builder); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); setDefaultState(stateContainer.getBaseState() diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 77612d665..90b9527da 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -46,7 +46,7 @@ import javax.annotation.Nonnull; public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, IManaCollisionGhost { private static final VoxelShape SHAPE = makeCuboidShape(4, 0, 4, 12, 16, 12); - public BlockPrism(Builder builder) { + public BlockPrism(Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState() .with(BotaniaStateProps.POWERED, false) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 02e950649..6c764031a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -44,7 +44,7 @@ public class BlockPump extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0, 0, 0.25, 1, 0.5, 0.75); private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(0.25, 0, 0, 0.75, 0.5, 1); - public BlockPump(Builder builder) { + public BlockPump(Properties builder) { super(builder); setDefaultState(blockState.getBaseState().with(Properties.StaticProperty, true).with(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 302d00c17..9e466e487 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -30,7 +30,7 @@ import javax.annotation.Nonnull; public class BlockRFGenerator extends BlockMod implements ILexiconable { - public BlockRFGenerator(Builder builder) { + public BlockRFGenerator(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 2d2e4efa5..63660f098 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -40,7 +40,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable private static final VoxelShape SHAPE = Block.makeCuboidShape(0, 0, 0, 16, 12, 16); - public BlockRuneAltar(Builder builder) { + public BlockRuneAltar(Properties builder) { super(builder); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index 92979b958..e899eafcc 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -38,7 +38,7 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(2, 0, 2, 14, 2, 14); - public BlockSpawnerClaw(Builder builder) { + public BlockSpawnerClaw(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index dfd3d1285..6a9d8dc81 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -64,7 +64,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } public final Variant variant; - public BlockSpreader(Variant v, Builder builder) { + public BlockSpreader(Variant v, Properties builder) { super(builder); this.variant = v; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 02c793d60..9bf9127ff 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -41,7 +41,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 3, 16); - public BlockTerraPlate(Builder builder) { + public BlockTerraPlate(Properties builder) { super(builder); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index 35dacae4e..9e18f0d6c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -36,7 +36,7 @@ import javax.annotation.Nonnull; public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable { - public BlockTurntable(Builder builder) { + public BlockTurntable(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index d5f3c2d51..6cd0b4786 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -33,7 +33,7 @@ import javax.annotation.Nonnull; public abstract class BlockRedString extends BlockMod implements ILexiconable { - public BlockRedString(Block.Builder builder) { + public BlockRedString(Block.Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index ec7fb1428..999b26a0e 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -25,7 +25,7 @@ import javax.annotation.Nonnull; public class BlockRedStringComparator extends BlockRedString { - public BlockRedStringComparator(Block.Builder builder) { + public BlockRedStringComparator(Block.Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, EnumFacing.DOWN)); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index 7d0de4584..7bf4bf488 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -24,7 +24,7 @@ import javax.annotation.Nonnull; public class BlockRedStringContainer extends BlockRedString { - public BlockRedStringContainer(Block.Builder builder) { + public BlockRedStringContainer(Block.Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, EnumFacing.DOWN)); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index 7814b0a10..16293b18e 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -27,7 +27,7 @@ import javax.annotation.Nonnull; public class BlockRedStringDispenser extends BlockRedString { - public BlockRedStringDispenser(Block.Builder builder) { + public BlockRedStringDispenser(Block.Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, EnumFacing.DOWN).with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index 6a734a6c0..47b786183 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -27,7 +27,7 @@ import java.util.Random; public class BlockRedStringFertilizer extends BlockRedString implements IGrowable { - public BlockRedStringFertilizer(Block.Builder builder) { + public BlockRedStringFertilizer(Block.Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, EnumFacing.DOWN)); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 6e181b6c2..b6e45a5cb 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -33,7 +33,7 @@ import java.util.Random; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class BlockRedStringInterceptor extends BlockRedString { - public BlockRedStringInterceptor(Block.Builder builder) { + public BlockRedStringInterceptor(Block.Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, EnumFacing.DOWN).with(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index a2123b01c..ea137312f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -24,7 +24,7 @@ import javax.annotation.Nonnull; public class BlockRedStringRelay extends BlockRedString { - public BlockRedStringRelay(Block.Builder builder) { + public BlockRedStringRelay(Block.Properties builder) { super(builder); setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.FACING, EnumFacing.DOWN)); }