diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IAtomicReconstructor.java index 5fd2ad1a1..4e121a0b6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IAtomicReconstructor.java @@ -11,7 +11,7 @@ package de.ellpeck.actuallyadditions.api.internal; import de.ellpeck.actuallyadditions.api.lens.Lens; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; /** * This is a helper interface for Lens' invoke() method. @@ -23,5 +23,5 @@ public interface IAtomicReconstructor extends IEnergyTile { Lens getLens(); - EnumFacing getOrientation(); + Direction getOrientation(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IFarmer.java index 07f8b51bb..2796cff84 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IFarmer.java @@ -13,7 +13,7 @@ package de.ellpeck.actuallyadditions.api.internal; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; /** * This is a helper interface for IFarmerBehavior. @@ -23,7 +23,7 @@ import net.minecraft.util.EnumFacing; */ public interface IFarmer extends IEnergyTile { - EnumFacing getOrientation(); + Direction getOrientation(); boolean canAddToSeeds(List stacks); diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java b/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java index e779c9ba3..6724a035b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java @@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.api.lens; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import net.minecraft.block.state.BlockState; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; /** @@ -42,7 +42,7 @@ public abstract class Lens { /** * @return If the lens can be invoked at the current time */ - public boolean canInvoke(IAtomicReconstructor tile, EnumFacing sideToShootTo, int energyUsePerShot) { + public boolean canInvoke(IAtomicReconstructor tile, Direction sideToShootTo, int energyUsePerShot) { return true; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index b3b30ef06..de0ed6a6f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -35,7 +35,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -54,8 +54,8 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud public static final int NAME_FLAVOR_AMOUNTS_1 = 12; public static final int NAME_FLAVOR_AMOUNTS_2 = 14; - public BlockAtomicReconstructor(String name) { - super(Material.ROCK, name); + public BlockAtomicReconstructor() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(10F); this.setResistance(80F); @@ -68,7 +68,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { ItemStack heldItem = player.getHeldItem(hand); if (this.tryToggleRedstone(world, pos, player)) { return true; @@ -136,7 +136,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud @Override public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, EntityLivingBase player, ItemStack stack) { - int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal(); + int rotation = Direction.getDirectionFromEntityLiving(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); @@ -144,7 +144,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockDirectional.FACING, EnumFacing.byIndex(meta)); + return this.getDefaultState().withProperty(BlockDirectional.FACING, Direction.byIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java index 486c5bb7d..cac786cc6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java @@ -21,7 +21,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -30,8 +30,8 @@ import net.minecraft.world.World; public class BlockBatteryBox extends BlockContainerBase { - public BlockBatteryBox(String name) { - super(Material.ROCK, name); + public BlockBatteryBox() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -49,7 +49,7 @@ public class BlockBatteryBox extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityBatteryBox) { TileEntityBatteryBox box = (TileEntityBatteryBox) tile; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java index 5d2fcac3f..888d3db40 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java @@ -21,15 +21,15 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockBioReactor extends BlockContainerBase { - public BlockBioReactor(String name) { - super(Material.ROCK, name); + public BlockBioReactor() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(2.0F); @@ -43,7 +43,7 @@ public class BlockBioReactor extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { if (world.getTileEntity(pos) instanceof TileEntityBioReactor) { player.openGui(ActuallyAdditions.INSTANCE, GuiHandler.GuiTypes.BIO_REACTOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java index c64dd7f0b..e8bc30d64 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java @@ -14,8 +14,8 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBushBase; public class BlockBlackLotus extends BlockBushBase { - public BlockBlackLotus(String name) { - super(name); + public BlockBlackLotus() { + super(this.name); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java index e0c0395d2..63f12a77d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java @@ -18,14 +18,14 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityPlacer; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -36,8 +36,8 @@ public class BlockBreaker extends BlockContainerBase { private final boolean isPlacer; - public BlockBreaker(boolean isPlacer, String name) { - super(Material.ROCK, name); + public BlockBreaker(boolean isPlacer) { + super(Material.ROCK, this.name); this.isPlacer = isPlacer; this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); @@ -53,7 +53,7 @@ public class BlockBreaker extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (this.tryToggleRedstone(world, pos, player)) { return true; } @@ -74,7 +74,7 @@ public class BlockBreaker extends BlockContainerBase { @Override public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, EntityLivingBase player, ItemStack stack) { - int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal(); + int rotation = Direction.getDirectionFromEntityLiving(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); @@ -82,7 +82,7 @@ public class BlockBreaker extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockDirectional.FACING, EnumFacing.byIndex(meta)); + return this.getDefaultState().withProperty(BlockDirectional.FACING, Direction.byIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java index aed103c9e..bc63f2ce2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java @@ -21,15 +21,15 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockCanolaPress extends BlockContainerBase { - public BlockCanolaPress(String name) { - super(Material.ROCK, name); + public BlockCanolaPress() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -52,7 +52,7 @@ public class BlockCanolaPress extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityCanolaPress press = (TileEntityCanolaPress) world.getTileEntity(pos); if (press != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java index f4cdba1b7..65b115b90 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -17,25 +17,28 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.Random; public class BlockCoalGenerator extends BlockContainerBase { - public BlockCoalGenerator(String name) { - super(Material.ROCK, name); + public BlockCoalGenerator() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -72,7 +75,7 @@ public class BlockCoalGenerator extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityCoalGenerator press = (TileEntityCoalGenerator) world.getTileEntity(pos); if (press != null) { @@ -97,7 +100,7 @@ public class BlockCoalGenerator extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockHorizontal.FACING, EnumFacing.byHorizontalIndex(meta)); + return this.getDefaultState().withProperty(BlockHorizontal.FACING, Direction.byHorizontalIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index 93edc7a26..f6f3228b3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -17,14 +17,14 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -38,8 +38,8 @@ public class BlockCoffeeMachine extends BlockContainerBase { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.0625, 0, 0.0625, 1 - 0.0625, 1 - 0.0625 * 2, 1 - 0.0625); - public BlockCoffeeMachine(String name) { - super(Material.ROCK, name); + public BlockCoffeeMachine() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -62,7 +62,7 @@ public class BlockCoffeeMachine extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing f6, float f7, float f8, float f9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction f6, float f7, float f8, float f9) { if (!world.isRemote) { TileEntityCoffeeMachine machine = (TileEntityCoffeeMachine) world.getTileEntity(pos); if (machine != null) { @@ -107,7 +107,7 @@ public class BlockCoffeeMachine extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockHorizontal.FACING, EnumFacing.byHorizontalIndex(meta)); + return this.getDefaultState().withProperty(BlockHorizontal.FACING, Direction.byHorizontalIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java index 89fe6ed20..d0c3de349 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -20,20 +20,20 @@ import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; import net.minecraftforge.oredict.OreDictionary; @@ -45,7 +45,7 @@ public class BlockColoredLamp extends BlockBase { public static final PropertyEnum TYPE = PropertyEnum.create("type", TheColoredLampColors.class); public final boolean isOn; - public BlockColoredLamp(boolean isOn, String name) { + public BlockColoredLamp(boolean isOn) { super(Material.REDSTONE_LIGHT, name); this.setHarvestLevel("pickaxe", 0); this.setHardness(0.5F); @@ -64,7 +64,7 @@ public class BlockColoredLamp extends BlockBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); //Turning On if (hand == Hand.MAIN_HAND && stack.isEmpty()) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java index 961104e8d..15d9a34a5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java @@ -20,8 +20,8 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.Entity; @@ -30,7 +30,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -38,10 +38,10 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.OnlyIn; import org.apache.commons.lang3.tuple.Pair; @@ -56,8 +56,8 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay { protected static final AxisAlignedBB AABB_WALL_WEST = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.125D, 1.0D, 1.0D); private static final AxisAlignedBB AABB = new AxisAlignedBB(0.0625, 0, 0.0625, 1 - 0.0625, 11 * 0.0625, 1 - 0.0625); - public BlockCompost(String name) { - super(Material.WOOD, name); + public BlockCompost() { + super(Material.WOOD); this.setHarvestLevel("axe", 0); this.setHardness(0.5F); this.setResistance(5.0F); @@ -90,7 +90,7 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing f6, float f7, float f8, float f9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction f6, float f7, float f8, float f9) { ItemStack stackPlayer = player.getHeldItem(hand); if (!world.isRemote) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index d77296a65..480a43edb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -18,14 +18,14 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.IRarity; -import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.OnlyIn; public class BlockCrystal extends BlockBase { @@ -35,7 +35,7 @@ public class BlockCrystal extends BlockBase { private final boolean isEmpowered; - public BlockCrystal(String name, boolean isEmpowered) { + public BlockCrystal(boolean isEmpowered) { super(Material.ROCK, name); this.isEmpowered = isEmpowered; this.setHardness(1.5F); @@ -85,7 +85,9 @@ public class BlockCrystal extends BlockBase { @Override public IRarity getRarity(ItemStack stack) { - return stack.getItemDamage() >= ALL_CRYSTALS.length ? EnumRarity.COMMON : ALL_CRYSTALS[stack.getItemDamage()].rarity; + return stack.getItemDamage() >= ALL_CRYSTALS.length + ? EnumRarity.COMMON + : ALL_CRYSTALS[stack.getItemDamage()].rarity; } public static class TheItemBlock extends ItemBlockBase { @@ -98,7 +100,9 @@ public class BlockCrystal extends BlockBase { @Override public String getTranslationKey(ItemStack stack) { - return stack.getItemDamage() >= ALL_CRYSTALS.length ? StringUtil.BUGGED_ITEM_NAME : this.getTranslationKey() + "_" + ALL_CRYSTALS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_CRYSTALS.length + ? StringUtil.BUGGED_ITEM_NAME + : this.getTranslationKey() + "_" + ALL_CRYSTALS[stack.getItemDamage()].name; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystalCluster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystalCluster.java index 5c59c8294..037602c5f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystalCluster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystalCluster.java @@ -10,10 +10,6 @@ package de.ellpeck.actuallyadditions.mod.blocks; -import java.util.Random; - -import org.apache.commons.lang3.ArrayUtils; - import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import de.ellpeck.actuallyadditions.mod.gen.WorldGenLushCaves; import de.ellpeck.actuallyadditions.mod.items.InitItems; @@ -23,8 +19,8 @@ import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.entity.EntityLivingBase; @@ -33,20 +29,23 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; +import org.apache.commons.lang3.ArrayUtils; + +import java.util.Random; public class BlockCrystalCluster extends BlockBase implements IColorProvidingBlock, IColorProvidingItem { private final TheCrystals crystal; - public BlockCrystalCluster(String name, TheCrystals crystal) { + public BlockCrystalCluster(TheCrystals crystal) { super(Material.GLASS, name); this.crystal = crystal; @@ -68,7 +67,7 @@ public class BlockCrystalCluster extends BlockBase implements IColorProvidingBlo } @Override - public BlockState getStateForPlacement(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base) { + public BlockState getStateForPlacement(World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base) { return this.getStateFromMeta(side.ordinal()); } @@ -79,7 +78,7 @@ public class BlockCrystalCluster extends BlockBase implements IColorProvidingBlo @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockDirectional.FACING, EnumFacing.byIndex(meta)); + return this.getDefaultState().withProperty(BlockDirectional.FACING, Direction.byIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java index 08c4fe6fd..038da5f81 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java @@ -17,14 +17,14 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -33,8 +33,8 @@ import net.minecraft.world.World; public class BlockDirectionalBreaker extends BlockContainerBase { - public BlockDirectionalBreaker(String name) { - super(Material.ROCK, name); + public BlockDirectionalBreaker() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -47,7 +47,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (this.tryToggleRedstone(world, pos, player)) { return true; } @@ -68,7 +68,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase { @Override public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, EntityLivingBase player, ItemStack stack) { - int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal(); + int rotation = Direction.getDirectionFromEntityLiving(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); @@ -76,7 +76,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockDirectional.FACING, EnumFacing.byIndex(meta)); + return this.getDefaultState().withProperty(BlockDirectional.FACING, Direction.byIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java index b383ae235..073100e49 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -31,8 +31,8 @@ import net.minecraft.world.World; public class BlockDisplayStand extends BlockContainerBase { - public BlockDisplayStand(String name) { - super(Material.ROCK, name); + public BlockDisplayStand() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); @@ -51,7 +51,7 @@ public class BlockDisplayStand extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { ItemStack heldItem = player.getHeldItem(hand); if (!world.isRemote) { TileEntityDisplayStand stand = (TileEntityDisplayStand) world.getTileEntity(pos); @@ -101,8 +101,8 @@ public class BlockDisplayStand extends BlockContainerBase { } @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess world, BlockState state, BlockPos pos, EnumFacing face) { - if (face == EnumFacing.DOWN) { + public BlockFaceShape getBlockFaceShape(IBlockAccess world, BlockState state, BlockPos pos, Direction face) { + if (face == Direction.DOWN) { return BlockFaceShape.SOLID; } return BlockFaceShape.UNDEFINED; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java index 4f1582d42..a7866ab95 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java @@ -17,14 +17,14 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -33,8 +33,8 @@ import net.minecraft.world.World; public class BlockDropper extends BlockContainerBase { - public BlockDropper(String name) { - super(Material.ROCK, name); + public BlockDropper() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -47,7 +47,7 @@ public class BlockDropper extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (this.tryToggleRedstone(world, pos, player)) { return true; } @@ -68,7 +68,7 @@ public class BlockDropper extends BlockContainerBase { @Override public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, EntityLivingBase player, ItemStack stack) { - int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal(); + int rotation = Direction.getDirectionFromEntityLiving(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); @@ -76,7 +76,7 @@ public class BlockDropper extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockDirectional.FACING, EnumFacing.byIndex(meta)); + return this.getDefaultState().withProperty(BlockDirectional.FACING, Direction.byIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java index d76e84c23..0ad462634 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java @@ -21,7 +21,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -30,8 +30,8 @@ import net.minecraft.world.World; public class BlockEmpowerer extends BlockContainerBase { - public BlockEmpowerer(String name) { - super(Material.ROCK, name); + public BlockEmpowerer() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); @@ -50,7 +50,7 @@ public class BlockEmpowerer extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { ItemStack heldItem = player.getHeldItem(hand); if (!world.isRemote) { TileEntityEmpowerer empowerer = (TileEntityEmpowerer) world.getTileEntity(pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java index 86109c7cd..a699e9dbb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -31,8 +31,8 @@ public class BlockEnergizer extends BlockContainerBase { private final boolean isEnergizer; - public BlockEnergizer(boolean isEnergizer, String name) { - super(Material.ROCK, name); + public BlockEnergizer(boolean isEnergizer) { + super(Material.ROCK, this.name); this.isEnergizer = isEnergizer; this.setHarvestLevel("pickaxe", 0); this.setHardness(2.0F); @@ -48,7 +48,7 @@ public class BlockEnergizer extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { if (this.isEnergizer) { TileEntityEnergizer energizer = (TileEntityEnergizer) world.getTileEntity(pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java index c96edc705..1dc98e884 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java @@ -17,14 +17,14 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityFarmer; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -33,8 +33,8 @@ import net.minecraft.world.World; public class BlockFarmer extends BlockContainerBase { - public BlockFarmer(String name) { - super(Material.ROCK, name); + public BlockFarmer() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -47,7 +47,7 @@ public class BlockFarmer extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityFarmer farmer = (TileEntityFarmer) world.getTileEntity(pos); if (farmer != null) { @@ -72,7 +72,7 @@ public class BlockFarmer extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockHorizontal.FACING, EnumFacing.byHorizontalIndex(meta)); + return this.getDefaultState().withProperty(BlockHorizontal.FACING, Direction.byHorizontalIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java index 922b29cc5..f592b696c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java @@ -21,15 +21,15 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockFeeder extends BlockContainerBase { - public BlockFeeder(String name) { - super(Material.ROCK, name); + public BlockFeeder() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(0.5F); this.setResistance(6.0F); @@ -42,7 +42,7 @@ public class BlockFeeder extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityFeeder feeder = (TileEntityFeeder) world.getTileEntity(pos); if (feeder != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java index c7bb449a1..9f610874b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java @@ -21,15 +21,15 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockFermentingBarrel extends BlockContainerBase { - public BlockFermentingBarrel(String name) { - super(Material.WOOD, name); + public BlockFermentingBarrel() { + super(Material.WOOD, this.name); this.setHarvestLevel("axe", 0); this.setHardness(0.5F); this.setResistance(5.0F); @@ -52,7 +52,7 @@ public class BlockFermentingBarrel extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityFermentingBarrel press = (TileEntityFermentingBarrel) world.getTileEntity(pos); if (press != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java index 8c095d22a..955eed367 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java @@ -21,15 +21,15 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockFireworkBox extends BlockContainerBase { - public BlockFireworkBox(String name) { - super(Material.ROCK, name); + public BlockFireworkBox() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -37,7 +37,7 @@ public class BlockFireworkBox extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (this.tryToggleRedstone(world, pos, player)) { return true; } else if (!world.isRemote) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java index 63494c662..3bf8ea9af 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java @@ -27,8 +27,8 @@ public class BlockFishingNet extends BlockContainerBase { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.0625, 1); - public BlockFishingNet(String name) { - super(Material.WOOD, name); + public BlockFishingNet() { + super(Material.WOOD, this.name); this.setHarvestLevel("axe", 0); this.setHardness(0.5F); this.setResistance(3.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java index 080d7a7f0..bf8a85466 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java @@ -18,14 +18,14 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidPlacer; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -36,8 +36,8 @@ public class BlockFluidCollector extends BlockContainerBase { private final boolean isPlacer; - public BlockFluidCollector(boolean isPlacer, String name) { - super(Material.ROCK, name); + public BlockFluidCollector(boolean isPlacer) { + super(Material.ROCK, this.name); this.isPlacer = isPlacer; this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); @@ -53,7 +53,7 @@ public class BlockFluidCollector extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (this.tryToggleRedstone(world, pos, player)) { return true; } @@ -76,7 +76,7 @@ public class BlockFluidCollector extends BlockContainerBase { @Override public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, EntityLivingBase player, ItemStack stack) { - int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal(); + int rotation = Direction.getDirectionFromEntityLiving(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); @@ -84,7 +84,7 @@ public class BlockFluidCollector extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockDirectional.FACING, EnumFacing.byIndex(meta)); + return this.getDefaultState().withProperty(BlockDirectional.FACING, Direction.byIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java index 6d52eafe3..e3c7622c2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -21,20 +21,23 @@ import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.List; @@ -44,8 +47,8 @@ public class BlockFurnaceDouble extends BlockContainerBase { public static final PropertyBool IS_ON = PropertyBool.create("on"); - public BlockFurnaceDouble(String name) { - super(Material.ROCK, name); + public BlockFurnaceDouble() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -69,7 +72,7 @@ public class BlockFurnaceDouble extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityFurnaceDouble furnace = (TileEntityFurnaceDouble) world.getTileEntity(pos); if (furnace != null) { @@ -102,7 +105,7 @@ public class BlockFurnaceDouble extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { boolean isOn = meta >= 4; - EnumFacing facing = EnumFacing.byHorizontalIndex(isOn + Direction facing = Direction.byHorizontalIndex(isOn ? meta - 4 : meta); return this.getDefaultState().withProperty(BlockHorizontal.FACING, facing).withProperty(IS_ON, isOn); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java index 11bcc36f7..d4e7f12c9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java @@ -27,8 +27,8 @@ public class BlockFurnaceSolar extends BlockContainerBase { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 6 * 0.0625, 1); - public BlockFurnaceSolar(String name) { - super(Material.ROCK, name); + public BlockFurnaceSolar() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java index a7c1a01c3..95f9d8c75 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java @@ -18,8 +18,8 @@ import net.minecraft.item.ItemStack; public class BlockGeneric extends BlockBase { - public BlockGeneric(String name) { - this(name, Material.ROCK, SoundType.STONE, 1.5F, 10.0F, "pickaxe", 0); + public BlockGeneric() { + this(Material.ROCK, SoundType.STONE, 1.5F, 10.0F, "pickaxe", 0); } public BlockGeneric(String name, Material material, SoundType sound, float hardness, float resistance, String harvestTool, int harvestLevel) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java index e6a20a913..b83fa751e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java @@ -34,7 +34,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; @@ -83,7 +83,7 @@ public class BlockGiantChest extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityGiantChest chest = (TileEntityGiantChest) world.getTileEntity(pos); if (chest != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java index 99eb56fa3..6811f3096 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java @@ -10,10 +10,6 @@ package de.ellpeck.actuallyadditions.mod.blocks; -import java.util.Random; - -import org.apache.commons.lang3.tuple.Triple; - import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; @@ -23,16 +19,19 @@ import net.minecraft.block.state.BlockState; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; +import org.apache.commons.lang3.tuple.Triple; + +import java.util.Random; public class BlockGreenhouseGlass extends BlockBase { - public BlockGreenhouseGlass(String name) { + public BlockGreenhouseGlass() { super(Material.GLASS, name); this.setHarvestLevel("pickaxe", 0); this.setHardness(0.5F); @@ -59,7 +58,7 @@ public class BlockGreenhouseGlass extends BlockBase { @Override @Deprecated @OnlyIn(Dist.CLIENT) - public boolean shouldSideBeRendered(BlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { BlockState otherState = world.getBlockState(pos.offset(side)); Block block = otherState.getBlock(); @@ -79,18 +78,28 @@ public class BlockGreenhouseGlass extends BlockBase { @Override public void updateTick(World world, BlockPos pos, BlockState state, Random rand) { - if (world.isRemote) return; + if (world.isRemote) { + return; + } if (world.canBlockSeeSky(pos) && world.isDaytime()) { - Triple trip = firstBlock(world, pos); + Triple trip = this.firstBlock(world, pos); boolean once = false; - if (trip != null) for (int i = 0; i < 3; i++) { - BlockState growState = i == 0 ? trip.getMiddle() : world.getBlockState(trip.getLeft()); - if (growState.getBlock() == trip.getRight() && trip.getRight().canGrow(world, trip.getLeft(), growState, false)) { - trip.getRight().grow(world, rand, trip.getLeft(), growState); - once = true; + if (trip != null) { + for (int i = 0; i < 3; i++) { + BlockState growState = i == 0 + ? trip.getMiddle() + : world.getBlockState(trip.getLeft()); + if (growState.getBlock() == trip.getRight() && trip.getRight().canGrow(world, trip.getLeft(), growState, false)) { + trip.getRight().grow(world, rand, trip.getLeft(), growState); + once = true; + } } } - if (once) world.playEvent(2005, trip.getMiddle().isOpaqueCube() ? trip.getLeft().up() : trip.getLeft(), 0); + if (once) { + world.playEvent(2005, trip.getMiddle().isOpaqueCube() + ? trip.getLeft().up() + : trip.getLeft(), 0); + } } } @@ -98,11 +107,16 @@ public class BlockGreenhouseGlass extends BlockBase { BlockPos.MutableBlockPos mut = new BlockPos.MutableBlockPos(glassPos); while (true) { mut.setPos(mut.getX(), mut.getY() - 1, mut.getZ()); - if (mut.getY() < 0) return null; + if (mut.getY() < 0) { + return null; + } BlockState state = world.getBlockState(mut); if (state.isOpaqueCube() || state.getBlock() instanceof IGrowable || state.getBlock() == this) { - if (state.getBlock() instanceof IGrowable) return Triple.of(mut.toImmutable(), state, (IGrowable) state.getBlock()); - else return null; + if (state.getBlock() instanceof IGrowable) { + return Triple.of(mut.toImmutable(), state, (IGrowable) state.getBlock()); + } else { + return null; + } } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java index 32598c77b..1d65a8d89 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java @@ -17,19 +17,19 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinderDouble; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.Random; @@ -38,8 +38,8 @@ public class BlockGrinder extends BlockContainerBase { private final boolean isDouble; - public BlockGrinder(boolean isDouble, String name) { - super(Material.ROCK, name); + public BlockGrinder(boolean isDouble) { + super(Material.ROCK, this.name); this.isDouble = isDouble; this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); @@ -69,7 +69,7 @@ public class BlockGrinder extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityGrinder grinder = (TileEntityGrinder) world.getTileEntity(pos); if (grinder != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java index 8f61f1494..c35b47691 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java @@ -21,8 +21,8 @@ import net.minecraft.world.World; public class BlockHeatCollector extends BlockContainerBase { - public BlockHeatCollector(String name) { - super(Material.ROCK, name); + public BlockHeatCollector() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(2.5F); this.setResistance(10.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java index 32ec60ffd..1ef73dbc6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java @@ -26,7 +26,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -39,8 +39,8 @@ public class BlockInputter extends BlockContainerBase { public final boolean isAdvanced; - public BlockInputter(boolean isAdvanced, String name) { - super(Material.ROCK, name); + public BlockInputter(boolean isAdvanced) { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -57,7 +57,7 @@ public class BlockInputter extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityInputter inputter = (TileEntityInputter) world.getTileEntity(pos); if (inputter != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java index 07149b021..085f76c97 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java @@ -21,7 +21,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -29,8 +29,8 @@ import net.minecraft.world.World; public class BlockItemRepairer extends BlockContainerBase { - public BlockItemRepairer(String name) { - super(Material.ROCK, name); + public BlockItemRepairer() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(20.0F); this.setResistance(15.0F); @@ -44,7 +44,7 @@ public class BlockItemRepairer extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityItemRepairer repairer = (TileEntityItemRepairer) world.getTileEntity(pos); if (repairer != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java index a983c8b4b..0c78ec42e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java @@ -21,8 +21,8 @@ import net.minecraft.world.World; public class BlockItemViewer extends BlockContainerBase { - public BlockItemViewer(String name) { - super(Material.ROCK, name); + public BlockItemViewer() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java index 6373194d7..26a2eebee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java @@ -10,30 +10,30 @@ package de.ellpeck.actuallyadditions.mod.blocks; -import java.util.List; - import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemViewerHopping; import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; +import java.util.List; + //Most of this is just copied from BlockHopper, no credit taken. Or clue what it is. public class BlockItemViewerHopping extends BlockItemViewer { - public static final PropertyDirection FACING = PropertyDirection.create("facing", facing -> facing != EnumFacing.UP); + public static final PropertyDirection FACING = PropertyDirection.create("facing", facing -> facing != Direction.UP); private static final AxisAlignedBB BASE_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.625D, 1.0D); private static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.125D); @@ -41,8 +41,8 @@ public class BlockItemViewerHopping extends BlockItemViewer { private static final AxisAlignedBB WEST_AABB = new AxisAlignedBB(0.875D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); private static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.125D, 1.0D, 1.0D); - public BlockItemViewerHopping(String name) { - super(name); + public BlockItemViewerHopping() { + super(this.name); } @Override @@ -53,11 +53,11 @@ public class BlockItemViewerHopping extends BlockItemViewer { @Override @Deprecated public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, Entity entityIn, boolean someBool) { - addCollisionBoxToList(pos, entityBox, collidingBoxes, BASE_AABB); - addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_AABB); - addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_AABB); - addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_AABB); - addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_AABB); + this.addCollisionBoxToList(pos, entityBox, collidingBoxes, BASE_AABB); + this.addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_AABB); + this.addCollisionBoxToList(pos, entityBox, collidingBoxes, WEST_AABB); + this.addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_AABB); + this.addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_AABB); } @Override @@ -66,9 +66,11 @@ public class BlockItemViewerHopping extends BlockItemViewer { } @Override - public BlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { - EnumFacing opp = facing.getOpposite(); - return this.getDefaultState().withProperty(FACING, opp == EnumFacing.UP ? EnumFacing.DOWN : opp); + public BlockState getStateForPlacement(World worldIn, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + Direction opp = facing.getOpposite(); + return this.getDefaultState().withProperty(FACING, opp == Direction.UP + ? Direction.DOWN + : opp); } @Override //was isFullyOpaque, not sure if correct change. @@ -88,7 +90,7 @@ public class BlockItemViewerHopping extends BlockItemViewer { @Override @OnlyIn(Dist.CLIENT) - public boolean shouldSideBeRendered(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, Direction side) { return true; } @@ -99,7 +101,7 @@ public class BlockItemViewerHopping extends BlockItemViewer { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(FACING, EnumFacing.byIndex(meta)); + return this.getDefaultState().withProperty(FACING, Direction.byIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java index a1a795c0e..d01f4afae 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java @@ -10,29 +10,29 @@ package de.ellpeck.actuallyadditions.mod.blocks; -import java.util.ArrayList; -import java.util.List; - import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.ArrayList; +import java.util.List; + public class BlockLampPowerer extends BlockBase { - public BlockLampPowerer(String name) { + public BlockLampPowerer() { super(Material.ROCK, name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); @@ -52,7 +52,7 @@ public class BlockLampPowerer extends BlockBase { @Override public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, EntityLivingBase player, ItemStack stack) { - int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal(); + int rotation = Direction.getDirectionFromEntityLiving(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); @@ -86,7 +86,7 @@ public class BlockLampPowerer extends BlockBase { } private void updateSurrounding(World world, BlockPos pos, boolean powered, List updatedAlready) { - for (EnumFacing side : EnumFacing.values()) { + for (Direction side : Direction.values()) { BlockPos offset = pos.offset(side); if (!updatedAlready.contains(offset)) { updatedAlready.add(pos); @@ -102,7 +102,7 @@ public class BlockLampPowerer extends BlockBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockDirectional.FACING, EnumFacing.byIndex(meta)); + return this.getDefaultState().withProperty(BlockDirectional.FACING, Direction.byIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index c52de9cf8..16f638562 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -26,8 +26,8 @@ import net.minecraft.block.BlockDirectional; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; @@ -35,7 +35,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -45,11 +45,11 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.OnlyIn; public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay { @@ -65,8 +65,8 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay { private final Type type; - public BlockLaserRelay(String name, Type type) { - super(Material.ROCK, name); + public BlockLaserRelay(Type type) { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -125,7 +125,7 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay { } @Override - public BlockState getStateForPlacement(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base) { + public BlockState getStateForPlacement(World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base) { return this.getStateFromMeta(side.ordinal()); } @@ -136,7 +136,7 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockDirectional.FACING, EnumFacing.byIndex(meta)); + return this.getDefaultState().withProperty(BlockDirectional.FACING, Direction.byIndex(meta)); } @Override @@ -160,7 +160,7 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { ItemStack stack = player.getHeldItem(hand); TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityLaserRelay) { @@ -280,7 +280,7 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay { } @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, BlockState state, BlockPos pos, EnumFacing face) { + public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, BlockState state, BlockPos pos, Direction face) { return BlockFaceShape.UNDEFINED; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index e4f00d81c..db5584562 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -24,13 +24,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; public class BlockLavaFactoryController extends BlockContainerBase implements IHudDisplay { - public BlockLavaFactoryController(String name) { - super(Material.ROCK, name); + public BlockLavaFactoryController() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(4.5F); this.setResistance(20.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java index 45fd23b00..1aef64763 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java @@ -21,8 +21,8 @@ import net.minecraft.world.World; public class BlockLeafGenerator extends BlockContainerBase { - public BlockLeafGenerator(String name) { - super(Material.IRON, name); + public BlockLeafGenerator() { + super(Material.IRON, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(5.0F); this.setResistance(10.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java index 7482d9a71..9afd03707 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java @@ -24,18 +24,18 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; public class BlockMiner extends BlockContainerBase implements IHudDisplay { - public BlockMiner(String name) { - super(Material.ROCK, name); + public BlockMiner() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(8F); this.setResistance(30F); @@ -48,7 +48,7 @@ public class BlockMiner extends BlockContainerBase implements IHudDisplay { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityMiner) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java index e30438e66..e8e397856 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java @@ -18,8 +18,8 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -30,8 +30,8 @@ public class BlockMisc extends BlockBase { public static final TheMiscBlocks[] ALL_MISC_BLOCKS = TheMiscBlocks.values(); public static final PropertyEnum TYPE = PropertyEnum.create("type", TheMiscBlocks.class); - public BlockMisc(String name) { - super(Material.ROCK, name); + public BlockMisc() { + super(Material.ROCK); this.setHardness(1.5F); this.setResistance(10.0F); this.setHarvestLevel("pickaxe", 1); @@ -63,7 +63,9 @@ public class BlockMisc extends BlockBase { @Override public EnumRarity getRarity(ItemStack stack) { - return stack.getItemDamage() >= ALL_MISC_BLOCKS.length ? EnumRarity.COMMON : ALL_MISC_BLOCKS[stack.getItemDamage()].rarity; + return stack.getItemDamage() >= ALL_MISC_BLOCKS.length + ? EnumRarity.COMMON + : ALL_MISC_BLOCKS[stack.getItemDamage()].rarity; } @Override @@ -91,12 +93,16 @@ public class BlockMisc extends BlockBase { @Override public String getTranslationKey(ItemStack stack) { - return stack.getItemDamage() >= ALL_MISC_BLOCKS.length ? StringUtil.BUGGED_ITEM_NAME : this.getTranslationKey() + "_" + ALL_MISC_BLOCKS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_MISC_BLOCKS.length + ? StringUtil.BUGGED_ITEM_NAME + : this.getTranslationKey() + "_" + ALL_MISC_BLOCKS[stack.getItemDamage()].name; } @Override public int getItemBurnTime(ItemStack stack) { - if (stack.getMetadata() == TheMiscBlocks.CHARCOAL_BLOCK.ordinal()) return 16000; + if (stack.getMetadata() == TheMiscBlocks.CHARCOAL_BLOCK.ordinal()) { + return 16000; + } return super.getItemBurnTime(stack); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index 3ca1dac2d..9cc8ce2ba 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -17,25 +17,28 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.Random; public class BlockOilGenerator extends BlockContainerBase { - public BlockOilGenerator(String name) { - super(Material.ROCK, name); + public BlockOilGenerator() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -72,7 +75,7 @@ public class BlockOilGenerator extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityOilGenerator generator = (TileEntityOilGenerator) world.getTileEntity(pos); if (generator != null) { @@ -99,7 +102,7 @@ public class BlockOilGenerator extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockHorizontal.FACING, EnumFacing.byHorizontalIndex(meta)); + return this.getDefaultState().withProperty(BlockHorizontal.FACING, Direction.byHorizontalIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java index c88b566fa..5aa5b0d12 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -26,7 +26,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -35,15 +35,15 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; public class BlockPhantom extends BlockContainerBase implements IHudDisplay { public final Type type; - public BlockPhantom(Type type, String name) { - super(Material.ROCK, name); + public BlockPhantom(Type type) { + super(Material.ROCK, this.name); this.type = type; this.setHarvestLevel("pickaxe", 0); this.setHardness(4.5F); @@ -57,7 +57,7 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay { } @Override - public int getWeakPower(BlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public int getWeakPower(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { if (this.type == Type.REDSTONEFACE) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityPhantomRedstoneface) { @@ -68,7 +68,7 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay { } @Override - public int getStrongPower(BlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public int getStrongPower(BlockState state, IBlockAccess world, BlockPos pos, Direction side) { if (this.type == Type.REDSTONEFACE) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityPhantomRedstoneface) { @@ -102,7 +102,7 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction side, float hitX, float hitY, float hitZ) { if (this.tryToggleRedstone(world, pos, player)) { return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java index 3f91d538c..ad6eab4eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java @@ -27,8 +27,8 @@ public class BlockPhantomBooster extends BlockContainerBase { private static final AxisAlignedBB AABB = new AxisAlignedBB(2 * 0.0625, 0, 2 * 0.0625, 1 - 2 * 0.0625, 1, 1 - 2 * 0.0625); - public BlockPhantomBooster(String name) { - super(Material.ROCK, name); + public BlockPhantomBooster() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java index e70f63d9b..c2fb28b31 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java @@ -27,13 +27,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; public class BlockPlayerInterface extends BlockContainerBase implements IHudDisplay { - public BlockPlayerInterface(String name) { - super(Material.ROCK, name); + public BlockPlayerInterface() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(4.5F); this.setResistance(10.0F); @@ -73,7 +73,9 @@ public class BlockPlayerInterface extends BlockContainerBase implements IHudDisp if (tile != null) { if (tile instanceof TileEntityPlayerInterface) { TileEntityPlayerInterface face = (TileEntityPlayerInterface) tile; - String name = face.playerName == null ? "Unknown" : face.playerName; + String name = face.playerName == null + ? "Unknown" + : face.playerName; minecraft.fontRenderer.drawStringWithShadow("Bound to: " + TextFormatting.RED + name, resolution.getScaledWidth() / 2 + 5, resolution.getScaledHeight() / 2 + 5, StringUtil.DECIMAL_COLOR_WHITE); minecraft.fontRenderer.drawStringWithShadow("UUID: " + TextFormatting.DARK_GREEN + face.connectedPlayer, resolution.getScaledWidth() / 2 + 5, resolution.getScaledHeight() / 2 + 15, StringUtil.DECIMAL_COLOR_WHITE); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java index 66280ce71..158b2fdff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java @@ -21,15 +21,15 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockRangedCollector extends BlockContainerBase { - public BlockRangedCollector(String name) { - super(Material.ROCK, name); + public BlockRangedCollector() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(1.5F); this.setResistance(10.0F); @@ -42,7 +42,7 @@ public class BlockRangedCollector extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (this.tryToggleRedstone(world, pos, player)) { return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java index d316d4c9f..3d297883e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java @@ -10,10 +10,6 @@ package de.ellpeck.actuallyadditions.mod.blocks; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityShockSuppressor; import net.minecraft.block.SoundType; @@ -28,10 +24,14 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class BlockShockSuppressor extends BlockContainerBase { - public BlockShockSuppressor(String name) { - super(Material.ROCK, name); + public BlockShockSuppressor() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(20.0F); this.setResistance(2000.0F); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java index 83fc723dc..ad2518e76 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java @@ -23,7 +23,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; @@ -62,7 +62,7 @@ public class BlockSlabs extends BlockBase { } @Override - public BlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + public BlockState getStateForPlacement(World world, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { if (facing.ordinal() == 1) { return this.getStateFromMeta(meta); } @@ -117,14 +117,14 @@ public class BlockSlabs extends BlockBase { } @Override - public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); if (StackUtil.isValid(stack) && player.canPlayerEdit(pos.offset(facing), facing, stack)) { BlockState state = world.getBlockState(pos); if (state.getBlock() == this.block) { BlockSlabs theBlock = (BlockSlabs) this.block; - if (facing == EnumFacing.UP && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM || facing == EnumFacing.DOWN && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP) { + if (facing == Direction.UP && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM || facing == Direction.DOWN && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP) { BlockState newState = theBlock.fullBlockState; AxisAlignedBB bound = newState.getCollisionBoundingBox(world, pos); @@ -148,11 +148,11 @@ public class BlockSlabs extends BlockBase { @Override @OnlyIn(Dist.CLIENT) - public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side, PlayerEntity player, ItemStack stack) { + public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, Direction side, PlayerEntity player, ItemStack stack) { BlockState state = worldIn.getBlockState(pos); if (state.getBlock() == this.block) { - if (side == EnumFacing.UP && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM || side == EnumFacing.DOWN && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP) { + if (side == Direction.UP && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM || side == Direction.DOWN && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP) { return true; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java index 60ba3cbe1..dca568096 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java @@ -17,25 +17,28 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.Random; public class BlockSmileyCloud extends BlockContainerBase { - public BlockSmileyCloud(String name) { - super(Material.CLOTH, name); + public BlockSmileyCloud() { + super(Material.CLOTH, this.name); this.setHardness(0.5F); this.setResistance(5.0F); this.setSoundType(SoundType.CLOTH); @@ -66,7 +69,7 @@ public class BlockSmileyCloud extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing f6, float f7, float f8, float f9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction f6, float f7, float f8, float f9) { if (!world.isRemote) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntitySmileyCloud) { @@ -97,7 +100,7 @@ public class BlockSmileyCloud extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockHorizontal.FACING, EnumFacing.byHorizontalIndex(meta)); + return this.getDefaultState().withProperty(BlockHorizontal.FACING, Direction.byHorizontalIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java index 9cb661cc4..bc3b25d88 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java @@ -10,31 +10,28 @@ package de.ellpeck.actuallyadditions.mod.blocks; -import java.util.Random; - -import javax.annotation.Nullable; - import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; +import javax.annotation.Nullable; +import java.util.Random; + //Copied from BlockTorch. //I have no idea what all of this means. public class BlockTinyTorch extends BlockBase { @@ -47,9 +44,9 @@ public class BlockTinyTorch extends BlockBase { private static final AxisAlignedBB TORCH_WEST_AABB = new AxisAlignedBB(0.8125D, 0.25D, 0.4375D, 1.0D, 0.5625D, 0.5625D); private static final AxisAlignedBB TORCH_EAST_AABB = new AxisAlignedBB(0.0D, 0.25D, 0.4375D, 0.1875D, 0.5625D, 0.5625D); - public BlockTinyTorch(String name) { + public BlockTinyTorch() { super(Material.CIRCUITS, name); - this.setDefaultState(this.blockState.getBaseState().withProperty(BlockTorch.FACING, EnumFacing.UP)); + this.setDefaultState(this.blockState.getBaseState().withProperty(BlockTorch.FACING, Direction.UP)); this.setTickRandomly(true); this.setHardness(0.0F); @@ -60,16 +57,16 @@ public class BlockTinyTorch extends BlockBase { @Override public AxisAlignedBB getBoundingBox(BlockState state, IBlockAccess source, BlockPos pos) { switch (state.getValue(BlockTorch.FACING)) { - case EAST: - return TORCH_EAST_AABB; - case WEST: - return TORCH_WEST_AABB; - case SOUTH: - return TORCH_SOUTH_AABB; - case NORTH: - return TORCH_NORTH_AABB; - default: - return STANDING_AABB; + case EAST: + return TORCH_EAST_AABB; + case WEST: + return TORCH_WEST_AABB; + case SOUTH: + return TORCH_SOUTH_AABB; + case NORTH: + return TORCH_NORTH_AABB; + default: + return STANDING_AABB; } } @@ -95,37 +92,41 @@ public class BlockTinyTorch extends BlockBase { } @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess world, BlockState state, BlockPos pos, EnumFacing facing) { + public BlockFaceShape getBlockFaceShape(IBlockAccess world, BlockState state, BlockPos pos, Direction facing) { return BlockFaceShape.UNDEFINED; } private boolean canPlaceOn(World worldIn, BlockPos pos) { BlockState state = worldIn.getBlockState(pos); - return state.isSideSolid(worldIn, pos, EnumFacing.UP) || state.getBlock().canPlaceTorchOnTop(state, worldIn, pos); + return state.isSideSolid(worldIn, pos, Direction.UP) || state.getBlock().canPlaceTorchOnTop(state, worldIn, pos); } @Override public boolean canPlaceBlockAt(World worldIn, BlockPos pos) { - for (EnumFacing enumfacing : BlockTorch.FACING.getAllowedValues()) { - if (this.canPlaceAt(worldIn, pos, enumfacing)) { return true; } + for (Direction enumfacing : BlockTorch.FACING.getAllowedValues()) { + if (this.canPlaceAt(worldIn, pos, enumfacing)) { + return true; + } } return false; } - private boolean canPlaceAt(World worldIn, BlockPos pos, EnumFacing facing) { + private boolean canPlaceAt(World worldIn, BlockPos pos, Direction facing) { BlockPos blockpos = pos.offset(facing.getOpposite()); boolean flag = facing.getAxis().isHorizontal(); - return flag && worldIn.isSideSolid(blockpos, facing, true) || facing.equals(EnumFacing.UP) && this.canPlaceOn(worldIn, blockpos); + return flag && worldIn.isSideSolid(blockpos, facing, true) || facing.equals(Direction.UP) && this.canPlaceOn(worldIn, blockpos); } @Override - public BlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + public BlockState getStateForPlacement(World worldIn, BlockPos pos, Direction facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { if (this.canPlaceAt(worldIn, pos, facing)) { return this.getDefaultState().withProperty(BlockTorch.FACING, facing); } else { - for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) { - if (worldIn.isSideSolid(pos.offset(enumfacing.getOpposite()), enumfacing, true)) { return this.getDefaultState().withProperty(BlockTorch.FACING, enumfacing); } + for (Direction enumfacing : Direction.Plane.HORIZONTAL) { + if (worldIn.isSideSolid(pos.offset(enumfacing.getOpposite()), enumfacing, true)) { + return this.getDefaultState().withProperty(BlockTorch.FACING, enumfacing); + } } return this.getDefaultState(); @@ -146,9 +147,9 @@ public class BlockTinyTorch extends BlockBase { if (!this.checkForDrop(worldIn, pos, state)) { return true; } else { - EnumFacing enumfacing = state.getValue(BlockTorch.FACING); - EnumFacing.Axis axis = enumfacing.getAxis(); - EnumFacing enumfacing1 = enumfacing.getOpposite(); + Direction enumfacing = state.getValue(BlockTorch.FACING); + Direction.Axis axis = enumfacing.getAxis(); + Direction enumfacing1 = enumfacing.getOpposite(); boolean flag = false; if (axis.isHorizontal() && !worldIn.isSideSolid(pos.offset(enumfacing1), enumfacing, true)) { @@ -184,13 +185,13 @@ public class BlockTinyTorch extends BlockBase { @OnlyIn(Dist.CLIENT) public void randomDisplayTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) { if (rand.nextBoolean()) { - EnumFacing enumfacing = stateIn.getValue(BlockTorch.FACING); + Direction enumfacing = stateIn.getValue(BlockTorch.FACING); double d0 = pos.getX() + 0.5D; double d1 = pos.getY() + 0.4D; double d2 = pos.getZ() + 0.5D; if (enumfacing.getAxis().isHorizontal()) { - EnumFacing enumfacing1 = enumfacing.getOpposite(); + Direction enumfacing1 = enumfacing.getOpposite(); worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + 0.35D * enumfacing1.getXOffset(), d1 + 0.22D, d2 + 0.35D * enumfacing1.getZOffset(), 0.0D, 0.0D, 0.0D); worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + 0.35D * enumfacing1.getXOffset(), d1 + 0.22D, d2 + 0.35D * enumfacing1.getZOffset(), 0.0D, 0.0D, 0.0D); } else { @@ -205,21 +206,21 @@ public class BlockTinyTorch extends BlockBase { BlockState iblockstate = this.getDefaultState(); switch (meta) { - case 1: - iblockstate = iblockstate.withProperty(BlockTorch.FACING, EnumFacing.EAST); - break; - case 2: - iblockstate = iblockstate.withProperty(BlockTorch.FACING, EnumFacing.WEST); - break; - case 3: - iblockstate = iblockstate.withProperty(BlockTorch.FACING, EnumFacing.SOUTH); - break; - case 4: - iblockstate = iblockstate.withProperty(BlockTorch.FACING, EnumFacing.NORTH); - break; - case 5: - default: - iblockstate = iblockstate.withProperty(BlockTorch.FACING, EnumFacing.UP); + case 1: + iblockstate = iblockstate.withProperty(BlockTorch.FACING, Direction.EAST); + break; + case 2: + iblockstate = iblockstate.withProperty(BlockTorch.FACING, Direction.WEST); + break; + case 3: + iblockstate = iblockstate.withProperty(BlockTorch.FACING, Direction.SOUTH); + break; + case 4: + iblockstate = iblockstate.withProperty(BlockTorch.FACING, Direction.NORTH); + break; + case 5: + default: + iblockstate = iblockstate.withProperty(BlockTorch.FACING, Direction.UP); } return iblockstate; @@ -235,22 +236,22 @@ public class BlockTinyTorch extends BlockBase { int i = 0; switch (state.getValue(BlockTorch.FACING)) { - case EAST: - i = i | 1; - break; - case WEST: - i = i | 2; - break; - case SOUTH: - i = i | 3; - break; - case NORTH: - i = i | 4; - break; - case DOWN: - case UP: - default: - i = i | 5; + case EAST: + i = i | 1; + break; + case WEST: + i = i | 2; + break; + case SOUTH: + i = i | 3; + break; + case NORTH: + i = i | 4; + break; + case DOWN: + case UP: + default: + i = i | 5; } return i; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java index 2c27021cd..fd264e6ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java @@ -16,13 +16,12 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.init.Items; -import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -30,14 +29,14 @@ import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.Random; public class BlockTreasureChest extends BlockBase { - public BlockTreasureChest(String name) { + public BlockTreasureChest() { super(Material.WOOD, name); this.setHarvestLevel("axe", 0); this.setHardness(300.0F); @@ -64,7 +63,7 @@ public class BlockTreasureChest extends BlockBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { world.playSound(null, pos, SoundEvents.BLOCK_CHEST_OPEN, SoundCategory.BLOCKS, 0.2F, world.rand.nextFloat() * 0.1F + 0.9F); this.dropItems(world, pos); @@ -112,7 +111,7 @@ public class BlockTreasureChest extends BlockBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockHorizontal.FACING, EnumFacing.byHorizontalIndex(meta)); + return this.getDefaultState().withProperty(BlockHorizontal.FACING, Direction.byHorizontalIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java index c7f883265..c9e698472 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java @@ -15,26 +15,26 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockWall; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; public class BlockWallAA extends BlockBase { - protected static final AxisAlignedBB[] AABB_BY_INDEX = new AxisAlignedBB[] { new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.3125D, 0.0D, 0.0D, 0.6875D, 0.875D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.3125D, 1.0D, 0.875D, 0.6875D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D) }; - protected static final AxisAlignedBB[] CLIP_AABB_BY_INDEX = new AxisAlignedBB[] { AABB_BY_INDEX[0].setMaxY(1.5D), AABB_BY_INDEX[1].setMaxY(1.5D), AABB_BY_INDEX[2].setMaxY(1.5D), AABB_BY_INDEX[3].setMaxY(1.5D), AABB_BY_INDEX[4].setMaxY(1.5D), AABB_BY_INDEX[5].setMaxY(1.5D), AABB_BY_INDEX[6].setMaxY(1.5D), AABB_BY_INDEX[7].setMaxY(1.5D), AABB_BY_INDEX[8].setMaxY(1.5D), AABB_BY_INDEX[9].setMaxY(1.5D), AABB_BY_INDEX[10].setMaxY(1.5D), AABB_BY_INDEX[11].setMaxY(1.5D), AABB_BY_INDEX[12].setMaxY(1.5D), AABB_BY_INDEX[13].setMaxY(1.5D), AABB_BY_INDEX[14].setMaxY(1.5D), AABB_BY_INDEX[15].setMaxY(1.5D) }; + protected static final AxisAlignedBB[] AABB_BY_INDEX = new AxisAlignedBB[]{new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.3125D, 0.0D, 0.0D, 0.6875D, 0.875D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.3125D, 1.0D, 0.875D, 0.6875D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D)}; + protected static final AxisAlignedBB[] CLIP_AABB_BY_INDEX = new AxisAlignedBB[]{AABB_BY_INDEX[0].setMaxY(1.5D), AABB_BY_INDEX[1].setMaxY(1.5D), AABB_BY_INDEX[2].setMaxY(1.5D), AABB_BY_INDEX[3].setMaxY(1.5D), AABB_BY_INDEX[4].setMaxY(1.5D), AABB_BY_INDEX[5].setMaxY(1.5D), AABB_BY_INDEX[6].setMaxY(1.5D), AABB_BY_INDEX[7].setMaxY(1.5D), AABB_BY_INDEX[8].setMaxY(1.5D), AABB_BY_INDEX[9].setMaxY(1.5D), AABB_BY_INDEX[10].setMaxY(1.5D), AABB_BY_INDEX[11].setMaxY(1.5D), AABB_BY_INDEX[12].setMaxY(1.5D), AABB_BY_INDEX[13].setMaxY(1.5D), AABB_BY_INDEX[14].setMaxY(1.5D), AABB_BY_INDEX[15].setMaxY(1.5D)}; @SuppressWarnings("deprecation") - public BlockWallAA(String name, Block blocc) { + public BlockWallAA(Block blocc) { super(blocc.getDefaultState().getMaterial(), name); this.setHardness(1.5F); this.setResistance(10F); @@ -46,19 +46,19 @@ public class BlockWallAA extends BlockBase { int i = 0; if (state.getValue(BlockWall.NORTH)) { - i |= 1 << EnumFacing.NORTH.getHorizontalIndex(); + i |= 1 << Direction.NORTH.getHorizontalIndex(); } if (state.getValue(BlockWall.EAST)) { - i |= 1 << EnumFacing.EAST.getHorizontalIndex(); + i |= 1 << Direction.EAST.getHorizontalIndex(); } if (state.getValue(BlockWall.SOUTH)) { - i |= 1 << EnumFacing.SOUTH.getHorizontalIndex(); + i |= 1 << Direction.SOUTH.getHorizontalIndex(); } if (state.getValue(BlockWall.WEST)) { - i |= 1 << EnumFacing.WEST.getHorizontalIndex(); + i |= 1 << Direction.WEST.getHorizontalIndex(); } return i; @@ -87,8 +87,8 @@ public class BlockWallAA extends BlockBase { @Override @OnlyIn(Dist.CLIENT) @Deprecated - public boolean shouldSideBeRendered(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { - return side != EnumFacing.DOWN || super.shouldSideBeRendered(blockState, blockAccess, pos, side); + public boolean shouldSideBeRendered(BlockState blockState, IBlockAccess blockAccess, BlockPos pos, Direction side) { + return side != Direction.DOWN || super.shouldSideBeRendered(blockState, blockAccess, pos, side); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java index d033991d2..aed56e913 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java @@ -21,13 +21,13 @@ import net.minecraft.block.BlockCrops; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -39,8 +39,8 @@ public class BlockWildPlant extends BlockBushBase { public static final TheWildPlants[] ALL_WILD_PLANTS = TheWildPlants.values(); public static final PropertyEnum TYPE = PropertyEnum.create("type", TheWildPlants.class); - public BlockWildPlant(String name) { - super(name); + public BlockWildPlant() { + super(this.name); this.setSoundType(SoundType.PLANT); } @@ -49,7 +49,9 @@ public class BlockWildPlant extends BlockBushBase { BlockPos offset = pos.down(); BlockState offsetState = world.getBlockState(offset); Block offsetBlock = offsetState.getBlock(); - return state.getValue(TYPE) == TheWildPlants.RICE ? offsetState.getMaterial() == Material.WATER : offsetBlock.canSustainPlant(offsetState, world, offset, EnumFacing.UP, this); + return state.getValue(TYPE) == TheWildPlants.RICE + ? offsetState.getMaterial() == Material.WATER + : offsetBlock.canSustainPlant(offsetState, world, offset, Direction.UP, this); } @Override @@ -110,7 +112,9 @@ public class BlockWildPlant extends BlockBushBase { @Override public EnumRarity getRarity(ItemStack stack) { - return stack.getItemDamage() >= ALL_WILD_PLANTS.length ? EnumRarity.COMMON : ALL_WILD_PLANTS[stack.getItemDamage()].getRarity(); + return stack.getItemDamage() >= ALL_WILD_PLANTS.length + ? EnumRarity.COMMON + : ALL_WILD_PLANTS[stack.getItemDamage()].getRarity(); } public static class TheItemBlock extends ItemBlockBase { @@ -123,7 +127,9 @@ public class BlockWildPlant extends BlockBushBase { @Override public String getTranslationKey(ItemStack stack) { - return stack.getItemDamage() >= ALL_WILD_PLANTS.length ? StringUtil.BUGGED_ITEM_NAME : this.getTranslationKey() + "_" + ALL_WILD_PLANTS[stack.getItemDamage()].getName(); + return stack.getItemDamage() >= ALL_WILD_PLANTS.length + ? StringUtil.BUGGED_ITEM_NAME + : this.getTranslationKey() + "_" + ALL_WILD_PLANTS[stack.getItemDamage()].getName(); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java index 4e835cb97..a28479c59 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java @@ -17,14 +17,14 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; @@ -33,8 +33,8 @@ import net.minecraft.world.World; public class BlockXPSolidifier extends BlockContainerBase { - public BlockXPSolidifier(String name) { - super(Material.ROCK, name); + public BlockXPSolidifier() { + super(Material.ROCK, this.name); this.setHarvestLevel("pickaxe", 0); this.setHardness(2.5F); this.setResistance(10.0F); @@ -47,7 +47,7 @@ public class BlockXPSolidifier extends BlockContainerBase { } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction par6, float par7, float par8, float par9) { if (!world.isRemote) { TileEntityXPSolidifier solidifier = (TileEntityXPSolidifier) world.getTileEntity(pos); if (solidifier != null) { @@ -72,7 +72,7 @@ public class BlockXPSolidifier extends BlockContainerBase { @Override public BlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(BlockHorizontal.FACING, EnumFacing.byHorizontalIndex(meta)); + return this.getDefaultState().withProperty(BlockHorizontal.FACING, Direction.byHorizontalIndex(meta)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java index f2d793a71..9893a9d7e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java @@ -11,208 +11,115 @@ package de.ellpeck.actuallyadditions.mod.blocks; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.blocks.BlockLaserRelay.Type; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant; -import de.ellpeck.actuallyadditions.mod.blocks.base.BlockStair; -import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; -import net.minecraft.block.Block; +import net.minecraft.block.*; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; public final class InitBlocks { + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ActuallyAdditions.MODID); - public static Block blockCompost; - public static Block blockMisc; - public static Block blockWildPlant; - public static Block blockFeeder; - public static Block blockGiantChest; - public static Block blockGiantChestMedium; - public static Block blockGiantChestLarge; - public static Block blockGrinder; - public static Block blockGrinderDouble; - public static Block blockFurnaceDouble; - public static Block blockInputter; - public static Block blockInputterAdvanced; - public static Block blockFishingNet; - public static Block blockFurnaceSolar; - public static Block blockHeatCollector; - public static Block blockItemRepairer; - public static Block blockGreenhouseGlass; - public static Block blockBreaker; - public static Block blockPlacer; - public static Block blockDropper; - public static Block blockRice; - public static Block blockCanola; - public static Block blockFlax; - public static Block blockCoffee; - public static Block blockCanolaPress; - public static Block blockFermentingBarrel; - public static Block blockCoalGenerator; - public static Block blockOilGenerator; - public static Block blockPhantomface; - public static Block blockPhantomPlacer; - public static Block blockPhantomBreaker; - public static Block blockPhantomLiquiface; - public static Block blockPhantomEnergyface; - public static Block blockPhantomRedstoneface; - public static Block blockPlayerInterface; - public static Block blockFluidPlacer; - public static Block blockFluidCollector; - public static Block blockLavaFactoryController; - public static Block blockCoffeeMachine; - public static Block blockPhantomBooster; - public static Block blockEnergizer; - public static Block blockEnervator; - public static Block blockTestifiBucksGreenWall; - public static Block blockTestifiBucksWhiteWall; - public static Block blockTestifiBucksGreenStairs; - public static Block blockTestifiBucksWhiteStairs; - public static Block blockTestifiBucksGreenSlab; - public static Block blockTestifiBucksWhiteSlab; - public static Block blockTestifiBucksGreenFence; - public static Block blockTestifiBucksWhiteFence; - public static Block blockColoredLamp; - public static Block blockColoredLampOn; - public static Block blockLampPowerer; - public static Block blockTreasureChest; - public static Block blockXPSolidifier; - public static Block blockSmileyCloud; - public static Block blockLeafGenerator; - public static Block blockDirectionalBreaker; - public static Block blockRangedCollector; - public static Block blockLaserRelay; - public static Block blockLaserRelayAdvanced; - public static Block blockLaserRelayExtreme; - public static Block blockLaserRelayFluids; - public static Block blockLaserRelayItem; - public static Block blockLaserRelayItemWhitelist; - public static Block blockItemViewer; - public static Block blockItemViewerHopping; - public static Block blockBlackLotus; - public static Block blockCrystal; - public static Block blockCrystalEmpowered; - public static Block blockAtomicReconstructor; - public static Block blockMiner; - public static Block blockFireworkBox; - public static Block blockQuartzWall; - public static Block blockQuartzStair; - public static Block blockQuartzSlab; - public static Block blockChiseledQuartzWall; - public static Block blockChiseledQuartzStair; - public static Block blockChiseledQuartzSlab; - public static Block blockPillarQuartzWall; - public static Block blockPillarQuartzStair; - public static Block blockPillarQuartzSlab; - public static Block blockDisplayStand; - public static Block blockShockSuppressor; - public static Block blockEmpowerer; - public static Block blockBioReactor; - public static Block blockTinyTorch; - public static Block blockFarmer; - public static Block blockBatteryBox; - public static Block blockCrystalClusterRedstone; - public static Block blockCrystalClusterLapis; - public static Block blockCrystalClusterDiamond; - public static Block blockCrystalClusterCoal; - public static Block blockCrystalClusterEmerald; - public static Block blockCrystalClusterIron; + public static final RegistryObject blockCompost = BLOCKS.register("block_compost", BlockCompost::new); + public static final RegistryObject blockMisc = BLOCKS.register("block_misc", BlockMisc::new); + public static final RegistryObject blockWildPlant = BLOCKS.register("block_wild", BlockWildPlant::new); + public static final RegistryObject blockFeeder = BLOCKS.register("block_feeder", BlockFeeder::new); + // public static final RegistryObject blockGiantChest = BLOCKS.register("", ); + // public static final RegistryObject blockGiantChestMedium = BLOCKS.register("", ); + // public static final RegistryObject blockGiantChestLarge = BLOCKS.register("", ); + public static final RegistryObject blockGrinder = BLOCKS.register("block_grinder", () -> new BlockGrinder(false)); + public static final RegistryObject blockGrinderDouble = BLOCKS.register("block_grinder_double", () -> new BlockGrinder(true)); + + public static final RegistryObject blockCrystalClusterRedstone = BLOCKS.register("block_crystal_cluster_redstone", () -> new BlockCrystalCluster(TheCrystals.REDSTONE)); + public static final RegistryObject blockCrystalClusterLapis = BLOCKS.register("block_crystal_cluster_lapis", () -> new BlockCrystalCluster(TheCrystals.LAPIS)); + public static final RegistryObject blockCrystalClusterDiamond = BLOCKS.register("block_crystal_cluster_diamond", () -> new BlockCrystalCluster(TheCrystals.DIAMOND)); + public static final RegistryObject blockCrystalClusterCoal = BLOCKS.register("block_crystal_cluster_coal", () -> new BlockCrystalCluster(TheCrystals.COAL)); + public static final RegistryObject blockCrystalClusterEmerald = BLOCKS.register("block_crystal_cluster_emerald", () -> new BlockCrystalCluster(TheCrystals.EMERALD)); + public static final RegistryObject blockCrystalClusterIron = BLOCKS.register("block_crystal_cluster_iron", () -> new BlockCrystalCluster(TheCrystals.IRON)); + public static final RegistryObject blockBatteryBox = BLOCKS.register("block_battery_box", BlockBatteryBox::new); + public static final RegistryObject blockItemViewerHopping = BLOCKS.register("block_item_viewer_hopping", BlockItemViewerHopping::new); + public static final RegistryObject blockFarmer = BLOCKS.register("block_farmer", BlockFarmer::new); + public static final RegistryObject blockBioReactor = BLOCKS.register("block_bio_reactor", BlockBioReactor::new); + public static final RegistryObject blockEmpowerer = BLOCKS.register("block_empowerer", BlockEmpowerer::new); + public static final RegistryObject blockTinyTorch = BLOCKS.register("block_tiny_torch", BlockTinyTorch::new); + public static final RegistryObject blockShockSuppressor = BLOCKS.register("block_shock_suppressor", BlockShockSuppressor::new); + public static final RegistryObject blockDisplayStand = BLOCKS.register("block_display_stand", BlockDisplayStand::new); + public static final RegistryObject blockPlayerInterface = BLOCKS.register("block_player_interface", BlockPlayerInterface::new); + public static final RegistryObject blockItemViewer = BLOCKS.register("block_item_viewer", BlockItemViewer::new); + public static final RegistryObject blockFireworkBox = BLOCKS.register("block_firework_box", BlockFireworkBox::new); + public static final RegistryObject blockMiner = BLOCKS.register("block_miner", BlockMiner::new); + public static final RegistryObject blockAtomicReconstructor = BLOCKS.register("block_atomic_reconstructor", BlockAtomicReconstructor::new); + public static final RegistryObject blockCrystal = BLOCKS.register("block_crystal", () -> new BlockCrystal(false)); + public static final RegistryObject blockCrystalEmpowered = BLOCKS.register("block_crystal_empowered", () -> new BlockCrystal(true)); + public static final RegistryObject blockBlackLotus = BLOCKS.register("block_black_lotus", BlockBlackLotus::new); + public static final RegistryObject blockLaserRelay = BLOCKS.register("block_laser_relay", () -> new BlockLaserRelay(BlockLaserRelay.Type.ENERGY_BASIC)); + public static final RegistryObject blockLaserRelayAdvanced = BLOCKS.register("block_laser_relay_advanced", () -> new BlockLaserRelay(BlockLaserRelay.Type.ENERGY_ADVANCED)); + public static final RegistryObject blockLaserRelayExtreme = BLOCKS.register("block_laser_relay_extreme", () -> new BlockLaserRelay(BlockLaserRelay.Type.ENERGY_EXTREME)); + public static final RegistryObject blockLaserRelayFluids = BLOCKS.register("block_laser_relay_fluids", () -> new BlockLaserRelay(BlockLaserRelay.Type.FLUIDS)); + public static final RegistryObject blockLaserRelayItem = BLOCKS.register("block_laser_relay_item", () -> new BlockLaserRelay(BlockLaserRelay.Type.ITEM)); + public static final RegistryObject blockLaserRelayItemWhitelist = BLOCKS.register("block_laser_relay_item_whitelist", () -> new BlockLaserRelay(BlockLaserRelay.Type.ITEM_WHITELIST)); + public static final RegistryObject blockRangedCollector = BLOCKS.register("block_ranged_collector", BlockRangedCollector::new); + public static final RegistryObject blockDirectionalBreaker = BLOCKS.register("block_directional_breaker", BlockDirectionalBreaker::new); + public static final RegistryObject blockLeafGenerator = BLOCKS.register("block_leaf_generator", BlockLeafGenerator::new); + public static final RegistryObject blockSmileyCloud = BLOCKS.register("block_smiley_cloud", BlockSmileyCloud::new); + public static final RegistryObject blockXPSolidifier = BLOCKS.register("block_xp_solidifier", BlockXPSolidifier::new); + public static final RegistryObject blockTestifiBucksGreenWall = BLOCKS.register("block_testifi_bucks_green_wall", BlockGeneric::new); + public static final RegistryObject blockTestifiBucksWhiteWall = BLOCKS.register("block_testifi_bucks_white_wall", BlockGeneric::new); + public static final RegistryObject blockTestifiBucksGreenStairs = BLOCKS.register("block_testifi_bucks_green_stairs", () -> new StairsBlock(() -> blockTestifiBucksGreenWall.get().getDefaultState(), AbstractBlock.Properties.from(blockTestifiBucksGreenWall.get()))); + public static final RegistryObject blockTestifiBucksWhiteStairs = BLOCKS.register("block_testifi_bucks_white_stairs", () -> new StairsBlock(() -> blockTestifiBucksWhiteWall.get().getDefaultState(), AbstractBlock.Properties.from(blockTestifiBucksWhiteWall.get()))); + public static final RegistryObject blockTestifiBucksGreenSlab = BLOCKS.register("block_testifi_bucks_green_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockTestifiBucksGreenWall.get()))); + public static final RegistryObject blockTestifiBucksWhiteSlab = BLOCKS.register("block_testifi_bucks_white_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockTestifiBucksWhiteWall.get()))); + public static final RegistryObject blockTestifiBucksGreenFence = BLOCKS.register("block_testifi_bucks_green_fence", () -> new WallBlock(AbstractBlock.Properties.from(blockTestifiBucksGreenWall.get()))); + public static final RegistryObject blockTestifiBucksWhiteFence = BLOCKS.register("block_testifi_bucks_white_fence", () -> new WallBlock(AbstractBlock.Properties.from(blockTestifiBucksWhiteWall.get()))); + public static final RegistryObject blockColoredLamp = BLOCKS.register("block_colored_lamp", () -> new BlockColoredLamp(false)); + public static final RegistryObject blockColoredLampOn = BLOCKS.register("block_colored_lamp_on", () -> new BlockColoredLamp(true)); + public static final RegistryObject blockLampPowerer = BLOCKS.register("block_lamp_powerer", BlockLampPowerer::new); + // public static final RegistryObject blockTreasureChest = BLOCKS.register("block_treasure_chest", BlockTreasureChest::new); + public static final RegistryObject blockEnergizer = BLOCKS.register("block_energizer", () -> new BlockEnergizer(true)); + public static final RegistryObject blockEnervator = BLOCKS.register("block_enervator", () -> new BlockEnergizer(false)); + public static final RegistryObject blockLavaFactoryController = BLOCKS.register("block_lava_factory_controller", BlockLavaFactoryController::new); + public static final RegistryObject blockCanolaPress = BLOCKS.register("block_canola_press", BlockCanolaPress::new); + public static final RegistryObject blockPhantomface = BLOCKS.register("block_phantomface", () -> new BlockPhantom(BlockPhantom.Type.FACE)); + public static final RegistryObject blockPhantomPlacer = BLOCKS.register("block_phantom_placer", () -> new BlockPhantom(BlockPhantom.Type.PLACER)); + public static final RegistryObject blockPhantomLiquiface = BLOCKS.register("block_phantom_liquiface", () -> new BlockPhantom(BlockPhantom.Type.LIQUIFACE)); + public static final RegistryObject blockPhantomEnergyface = BLOCKS.register("block_phantom_energyface", () -> new BlockPhantom(BlockPhantom.Type.ENERGYFACE)); + public static final RegistryObject blockPhantomRedstoneface = BLOCKS.register("block_phantom_redstoneface", () -> new BlockPhantom(BlockPhantom.Type.REDSTONEFACE)); + public static final RegistryObject blockPhantomBreaker = BLOCKS.register("block_phantom_breaker", () -> new BlockPhantom(BlockPhantom.Type.BREAKER)); + public static final RegistryObject blockCoalGenerator = BLOCKS.register("block_coal_generator", BlockCoalGenerator::new); + public static final RegistryObject blockOilGenerator = BLOCKS.register("block_oil_generator", BlockOilGenerator::new); + public static final RegistryObject blockFermentingBarrel = BLOCKS.register("block_fermenting_barrel", BlockFermentingBarrel::new); + public static final RegistryObject blockRice = BLOCKS.register("block_rice", () -> new BlockPlant(1, 2)); + public static final RegistryObject blockCanola = BLOCKS.register("block_canola", () -> new BlockPlant(2, 3)); + public static final RegistryObject blockFlax = BLOCKS.register("block_flax", () -> new BlockPlant(2, 4)); + public static final RegistryObject blockCoffee = BLOCKS.register("block_coffee", () -> new BlockPlant(2, 2)); + public static final RegistryObject blockFurnaceDouble = BLOCKS.register("block_furnace_double", BlockFurnaceDouble::new); + public static final RegistryObject blockInputter = BLOCKS.register("block_inputter", () -> new BlockInputter(false)); + public static final RegistryObject blockInputterAdvanced = BLOCKS.register("block_inputter_advanced", () -> new BlockInputter(true)); + public static final RegistryObject blockFishingNet = BLOCKS.register("block_fishing_net", BlockFishingNet::new); + public static final RegistryObject blockFurnaceSolar = BLOCKS.register("block_furnace_solar", BlockFurnaceSolar::new); + public static final RegistryObject blockHeatCollector = BLOCKS.register("block_heat_collector", BlockHeatCollector::new); + public static final RegistryObject blockItemRepairer = BLOCKS.register("block_item_repairer", BlockItemRepairer::new); + public static final RegistryObject blockGreenhouseGlass = BLOCKS.register("block_greenhouse_glass", BlockGreenhouseGlass::new); + public static final RegistryObject blockBreaker = BLOCKS.register("block_breaker", () -> new BlockBreaker(false)); + public static final RegistryObject blockPlacer = BLOCKS.register("block_placer", () -> new BlockBreaker(true)); + public static final RegistryObject blockDropper = BLOCKS.register("block_dropper", BlockDropper::new); + public static final RegistryObject blockFluidPlacer = BLOCKS.register("block_fluid_placer", () -> new BlockFluidCollector(true)); + public static final RegistryObject blockFluidCollector = BLOCKS.register("block_fluid_collector", () -> new BlockFluidCollector(false)); + public static final RegistryObject blockCoffeeMachine = BLOCKS.register("block_coffee_machine", BlockCoffeeMachine::new); + public static final RegistryObject blockPhantomBooster = BLOCKS.register("block_phantom_booster", BlockPhantomBooster::new); + public static final RegistryObject blockQuartzWall = BLOCKS.register("block_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject blockChiseledQuartzWall = BLOCKS.register("block_chiseled_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject blockPillarQuartzWall = BLOCKS.register("block_pillar_quartz_wall", () -> new WallBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject blockQuartzStair = BLOCKS.register("block_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject blockChiseledQuartzStair = BLOCKS.register("block_chiseled_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject blockPillarQuartzStair = BLOCKS.register("block_pillar_quartz_stair", () -> new StairsBlock(() -> blockMisc.get().getDefaultState(), AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject blockQuartzSlab = BLOCKS.register("block_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject blockChiseledQuartzSlab = BLOCKS.register("block_chiseled_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get()))); + public static final RegistryObject blockPillarQuartzSlab = BLOCKS.register("block_pillar_quartz_slab", () -> new SlabBlock(AbstractBlock.Properties.from(blockMisc.get()))); public static void init() { ActuallyAdditions.LOGGER.info("Initializing Blocks..."); - blockCrystalClusterRedstone = new BlockCrystalCluster("block_crystal_cluster_redstone", TheCrystals.REDSTONE); - blockCrystalClusterLapis = new BlockCrystalCluster("block_crystal_cluster_lapis", TheCrystals.LAPIS); - blockCrystalClusterDiamond = new BlockCrystalCluster("block_crystal_cluster_diamond", TheCrystals.DIAMOND); - blockCrystalClusterCoal = new BlockCrystalCluster("block_crystal_cluster_coal", TheCrystals.COAL); - blockCrystalClusterEmerald = new BlockCrystalCluster("block_crystal_cluster_emerald", TheCrystals.EMERALD); - blockCrystalClusterIron = new BlockCrystalCluster("block_crystal_cluster_iron", TheCrystals.IRON); - blockBatteryBox = new BlockBatteryBox("block_battery_box"); - blockItemViewerHopping = new BlockItemViewerHopping("block_item_viewer_hopping"); - blockFarmer = new BlockFarmer("block_farmer"); - blockBioReactor = new BlockBioReactor("block_bio_reactor"); - blockEmpowerer = new BlockEmpowerer("block_empowerer"); - blockTinyTorch = new BlockTinyTorch("block_tiny_torch"); - blockShockSuppressor = new BlockShockSuppressor("block_shock_suppressor"); - blockDisplayStand = new BlockDisplayStand("block_display_stand"); - blockPlayerInterface = new BlockPlayerInterface("block_player_interface"); - blockItemViewer = new BlockItemViewer("block_item_viewer"); - blockFireworkBox = new BlockFireworkBox("block_firework_box"); - blockMiner = new BlockMiner("block_miner"); - blockAtomicReconstructor = new BlockAtomicReconstructor("block_atomic_reconstructor"); - blockCrystal = new BlockCrystal("block_crystal", false); - blockCrystalEmpowered = new BlockCrystal("block_crystal_empowered", true); - blockBlackLotus = new BlockBlackLotus("block_black_lotus"); - blockLaserRelay = new BlockLaserRelay("block_laser_relay", Type.ENERGY_BASIC); - blockLaserRelayAdvanced = new BlockLaserRelay("block_laser_relay_advanced", Type.ENERGY_ADVANCED); - blockLaserRelayExtreme = new BlockLaserRelay("block_laser_relay_extreme", Type.ENERGY_EXTREME); - blockLaserRelayFluids = new BlockLaserRelay("block_laser_relay_fluids", Type.FLUIDS); - blockLaserRelayItem = new BlockLaserRelay("block_laser_relay_item", Type.ITEM); - blockLaserRelayItemWhitelist = new BlockLaserRelay("block_laser_relay_item_whitelist", Type.ITEM_WHITELIST); - blockRangedCollector = new BlockRangedCollector("block_ranged_collector"); - blockDirectionalBreaker = new BlockDirectionalBreaker("block_directional_breaker"); - blockLeafGenerator = new BlockLeafGenerator("block_leaf_generator"); - blockSmileyCloud = new BlockSmileyCloud("block_smiley_cloud"); - blockXPSolidifier = new BlockXPSolidifier("block_xp_solidifier"); - blockTestifiBucksGreenWall = new BlockGeneric("block_testifi_bucks_green_wall"); - blockTestifiBucksWhiteWall = new BlockGeneric("block_testifi_bucks_white_wall"); - blockTestifiBucksGreenStairs = new BlockStair(blockTestifiBucksGreenWall, "block_testifi_bucks_green_stairs"); - blockTestifiBucksWhiteStairs = new BlockStair(blockTestifiBucksWhiteWall, "block_testifi_bucks_white_stairs"); - blockTestifiBucksGreenSlab = new BlockSlabs("block_testifi_bucks_green_slab", blockTestifiBucksGreenWall); - blockTestifiBucksWhiteSlab = new BlockSlabs("block_testifi_bucks_white_slab", blockTestifiBucksWhiteWall); - blockTestifiBucksGreenFence = new BlockWallAA("block_testifi_bucks_green_fence", blockTestifiBucksGreenWall); - blockTestifiBucksWhiteFence = new BlockWallAA("block_testifi_bucks_white_fence", blockTestifiBucksWhiteWall); - blockColoredLamp = new BlockColoredLamp(false, "block_colored_lamp"); - blockColoredLampOn = new BlockColoredLamp(true, "block_colored_lamp_on"); - blockLampPowerer = new BlockLampPowerer("block_lamp_powerer"); - blockTreasureChest = new BlockTreasureChest("block_treasure_chest"); - blockEnergizer = new BlockEnergizer(true, "block_energizer"); - blockEnervator = new BlockEnergizer(false, "block_enervator"); - blockLavaFactoryController = new BlockLavaFactoryController("block_lava_factory_controller"); - blockCanolaPress = new BlockCanolaPress("block_canola_press"); - blockPhantomface = new BlockPhantom(BlockPhantom.Type.FACE, "block_phantomface"); - blockPhantomPlacer = new BlockPhantom(BlockPhantom.Type.PLACER, "block_phantom_placer"); - blockPhantomLiquiface = new BlockPhantom(BlockPhantom.Type.LIQUIFACE, "block_phantom_liquiface"); - blockPhantomEnergyface = new BlockPhantom(BlockPhantom.Type.ENERGYFACE, "block_phantom_energyface"); - blockPhantomRedstoneface = new BlockPhantom(BlockPhantom.Type.REDSTONEFACE, "block_phantom_redstoneface"); - blockPhantomBreaker = new BlockPhantom(BlockPhantom.Type.BREAKER, "block_phantom_breaker"); - blockCoalGenerator = new BlockCoalGenerator("block_coal_generator"); - blockOilGenerator = new BlockOilGenerator("block_oil_generator"); - blockFermentingBarrel = new BlockFermentingBarrel("block_fermenting_barrel"); - blockRice = new BlockPlant("block_rice", 1, 2); - blockCanola = new BlockPlant("block_canola", 2, 3); - blockFlax = new BlockPlant("block_flax", 2, 4); - blockCoffee = new BlockPlant("block_coffee", 2, 2); - blockCompost = new BlockCompost("block_compost"); - blockMisc = new BlockMisc("block_misc"); - blockFeeder = new BlockFeeder("block_feeder"); - blockGiantChest = new BlockGiantChest("block_giant_chest", 0); - blockGiantChestMedium = new BlockGiantChest("block_giant_chest_medium", 1); - blockGiantChestLarge = new BlockGiantChest("block_giant_chest_large", 2); - blockGrinder = new BlockGrinder(false, "block_grinder"); - blockGrinderDouble = new BlockGrinder(true, "block_grinder_double"); - blockFurnaceDouble = new BlockFurnaceDouble("block_furnace_double"); - blockInputter = new BlockInputter(false, "block_inputter"); - blockInputterAdvanced = new BlockInputter(true, "block_inputter_advanced"); - blockFishingNet = new BlockFishingNet("block_fishing_net"); - blockFurnaceSolar = new BlockFurnaceSolar("block_furnace_solar"); - blockHeatCollector = new BlockHeatCollector("block_heat_collector"); - blockItemRepairer = new BlockItemRepairer("block_item_repairer"); - blockGreenhouseGlass = new BlockGreenhouseGlass("block_greenhouse_glass"); - blockBreaker = new BlockBreaker(false, "block_breaker"); - blockPlacer = new BlockBreaker(true, "block_placer"); - blockDropper = new BlockDropper("block_dropper"); - blockFluidPlacer = new BlockFluidCollector(true, "block_fluid_placer"); - blockFluidCollector = new BlockFluidCollector(false, "block_fluid_collector"); - blockCoffeeMachine = new BlockCoffeeMachine("block_coffee_machine"); - blockPhantomBooster = new BlockPhantomBooster("block_phantom_booster"); - blockWildPlant = new BlockWildPlant("block_wild"); - blockQuartzWall = new BlockWallAA("block_quartz_wall", blockMisc); - blockChiseledQuartzWall = new BlockWallAA("block_chiseled_quartz_wall", blockMisc); - blockPillarQuartzWall = new BlockWallAA("block_pillar_quartz_wall", blockMisc); - blockQuartzStair = new BlockStair(blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ), "block_quartz_stair"); - blockChiseledQuartzStair = new BlockStair(blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ_CHISELED), "block_chiseled_quartz_stair"); - blockPillarQuartzStair = new BlockStair(blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ_PILLAR), "block_pillar_quartz_stair"); - blockQuartzSlab = new BlockSlabs("block_quartz_slab", blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ)); - blockChiseledQuartzSlab = new BlockSlabs("block_chiseled_quartz_slab", blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ_CHISELED)); - blockPillarQuartzSlab = new BlockSlabs("block_pillar_quartz_slab", blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ_PILLAR)); } -} \ No newline at end of file +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java index cb6a970cd..19887840a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java @@ -15,16 +15,8 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; public class BlockBase extends Block { - - private final String name; - - public BlockBase(Properties properties, String name) { + public BlockBase(Properties properties) { super(properties); - this.name = name; - } - - protected String getBaseName() { - return this.name; } protected ItemBlockBase getItemBlock() { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index ed1b6de80..3c51a161c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -13,13 +13,13 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import net.minecraft.block.BlockCrops; +import net.minecraft.block.CropsBlock; import net.minecraft.block.state.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; @@ -30,7 +30,7 @@ import net.minecraftforge.items.ItemHandlerHelper; import java.util.Random; -public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarity, IHasModel { +public class BlockPlant extends CropsBlock implements ItemBlockBase.ICustomRarity, IHasModel { private final String name; private final int minDropAmount; @@ -39,8 +39,8 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit private Item returnItem; private int returnMeta; - public BlockPlant(String name, int minDropAmount, int addDropAmount) { - this.name = name; + public BlockPlant(int minDropAmount, int addDropAmount) { + this.name = this.name; this.minDropAmount = minDropAmount; this.addDropAmount = addDropAmount; this.register(); @@ -91,7 +91,7 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit } @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { if (this.getMetaFromState(state) >= 7) { if (!world.isRemote) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java index bd9242774..7701db9ff 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java @@ -22,8 +22,8 @@ public class BlockStair extends BlockStairs implements ItemBlockBase.ICustomRari private final String name; - public BlockStair(Block block, String name) { - this(block.getDefaultState(), name); + public BlockStair(Block block) { + this(block.getDefaultState(), this.name); } public BlockStair(BlockState state, String name) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ActualCompostModel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ActualCompostModel.java index 931738b02..a22ecb3e2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ActualCompostModel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/ActualCompostModel.java @@ -14,7 +14,7 @@ //import net.minecraft.client.renderer.block.model.IBakedModel; //import net.minecraft.client.renderer.block.model.ItemOverrideList; //import net.minecraft.client.renderer.texture.TextureAtlasSprite; -//import net.minecraft.util.EnumFacing; +//import net.minecraft.util.Direction; //import net.minecraftforge.common.property.IExtendedBlockState; // //public class ActualCompostModel implements IBakedModel { @@ -23,7 +23,7 @@ // // @SuppressWarnings("unchecked") // @Override -// public List getQuads(BlockState state, EnumFacing side, long rand) { +// public List getQuads(BlockState state, Direction side, long rand) { // if (state instanceof IExtendedBlockState) { // Pair data = ((IExtendedBlockState) state).getValue(BlockCompost.COMPOST_PROP); // if (data == null || data.getRight() <= 0) return CompostModel.compostBase.getQuads(state, side, rand); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/CompostModel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/CompostModel.java index 8bf0c1cb7..701c5e241 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/CompostModel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/CompostModel.java @@ -18,14 +18,14 @@ //import net.minecraft.client.renderer.block.model.IBakedModel; //import net.minecraft.client.renderer.block.model.ItemOverrideList; //import net.minecraft.client.renderer.texture.TextureAtlasSprite; -//import net.minecraft.util.EnumFacing; +//import net.minecraft.util.Direction; //import net.minecraftforge.common.model.TRSRTransformation; // //public class CompostModel implements IBakedModel { // public static IBakedModel compostBase; // private final IBakedModel display; // private final ImmutableList general; -// private final ImmutableMap> faces; +// private final ImmutableMap> faces; // // public CompostModel(BlockState flowerState, float height) { // this.display = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(flowerState); @@ -33,9 +33,9 @@ // TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0, -.218F, 0), null, new Vector3f(0.75F, height / 1.81F, 0.75F), null)); // // ImmutableList.Builder builder; -// EnumMap> faces = new EnumMap<>(EnumFacing.class); +// EnumMap> faces = new EnumMap<>(Direction.class); // -// for (EnumFacing face : EnumFacing.values()) { +// for (Direction face : Direction.values()) { // builder = ImmutableList.builder(); // if (!this.display.isBuiltInRenderer()) { // for (BakedQuad quad : this.display.getQuads(flowerState, face, 0)) { @@ -63,7 +63,7 @@ // } // // @Override -// public List getQuads(@Nullable BlockState state, @Nullable EnumFacing side, long rand) { +// public List getQuads(@Nullable BlockState state, @Nullable Direction side, long rand) { // if (side == null) return this.general; // return this.faces.get(side); // } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java index 4faa4c26f..d316e7e84 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java @@ -21,7 +21,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.relauncher.OnlyIn; @@ -61,8 +61,8 @@ public class RenderEmpowerer extends TileEntitySpecialRenderer= 0 && ActuallyAdditionsAPI.EMPOWERER_RECIPES.size() > index) { EmpowererRecipe recipe = ActuallyAdditionsAPI.EMPOWERER_RECIPES.get(index); if (recipe != null) { - for (int i = 0; i < EnumFacing.HORIZONTALS.length; i++) { - EnumFacing facing = EnumFacing.HORIZONTALS[i]; + for (int i = 0; i < Direction.HORIZONTALS.length; i++) { + Direction facing = Direction.HORIZONTALS[i]; BlockPos offset = tile.getPos().offset(facing, 3); AssetUtil.renderLaser(tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, offset.getX() + 0.5, offset.getY() + 0.95, offset.getZ() + 0.5, 80, 1F, 0.1F, recipe.getParticleColors()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/AAWorldGen.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/AAWorldGen.java index 9aaf6ad9e..708561c7c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/AAWorldGen.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/AAWorldGen.java @@ -31,7 +31,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.pattern.BlockMatcher; import net.minecraft.init.Blocks; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -127,7 +127,7 @@ public class AAWorldGen implements IWorldGenerator { if (randomPos.getY() >= 25 && randomPos.getY() <= 45) { if (event.getWorld().getBlockState(randomPos).getMaterial() == Material.WATER) { if (event.getWorld().getBlockState(randomPos.down()).getMaterial().isSolid()) { - event.getWorld().setBlockState(randomPos, InitBlocks.blockTreasureChest.getDefaultState().withProperty(BlockHorizontal.FACING, EnumFacing.byHorizontalIndex(event.getRand().nextInt(4))), 2); + event.getWorld().setBlockState(randomPos, InitBlocks.blockTreasureChest.getDefaultState().withProperty(BlockHorizontal.FACING, Direction.byHorizontalIndex(event.getRand().nextInt(4))), 2); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java index c1662a929..7291541c6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java @@ -24,7 +24,7 @@ import net.minecraft.block.BlockDirectional; import net.minecraft.block.state.BlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -73,8 +73,8 @@ public class WorldGenLushCaves { } } else { if (ConfigBoolValues.DO_CRYSTAL_CLUSTERS.isEnabled() && rand.nextInt(20) == 0) { - EnumFacing[] values = EnumFacing.values(); - EnumFacing side = values[rand.nextInt(values.length)]; + Direction[] values = Direction.values(); + Direction side = values[rand.nextInt(values.length)]; BlockPos posSide = pos.offset(side); if (!this.checkIndestructable(world, posSide)) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentCustomCropField.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentCustomCropField.java index 591805d70..41b13ac90 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentCustomCropField.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentCustomCropField.java @@ -18,7 +18,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.block.state.BlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.structure.StructureBoundingBox; @@ -37,12 +37,12 @@ public class VillageComponentCustomCropField extends StructureVillagePieces.Hous } - public VillageComponentCustomCropField(StructureBoundingBox boundingBox, EnumFacing par5) { + public VillageComponentCustomCropField(StructureBoundingBox boundingBox, Direction par5) { this.setCoordBaseMode(par5); this.boundingBox = boundingBox; } - public static VillageComponentCustomCropField buildComponent(List pieces, int p1, int p2, int p3, EnumFacing p4) { + public static VillageComponentCustomCropField buildComponent(List pieces, int p1, int p2, int p3, Direction p4) { StructureBoundingBox boundingBox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, X_SIZE, Y_SIZE, Z_SIZE, p4); return canVillageGoDeeper(boundingBox) && StructureComponent.findIntersecting(pieces, boundingBox) == null ? new VillageComponentCustomCropField(boundingBox, p4) : null; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentEngineerHouse.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentEngineerHouse.java index 3dd219af9..a1944a2ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentEngineerHouse.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentEngineerHouse.java @@ -40,7 +40,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Rotation; @@ -70,12 +70,12 @@ public class VillageComponentEngineerHouse extends StructureVillagePieces.House1 } - public VillageComponentEngineerHouse(StructureBoundingBox boundingBox, EnumFacing par5) { + public VillageComponentEngineerHouse(StructureBoundingBox boundingBox, Direction par5) { this.setCoordBaseMode(par5); this.boundingBox = boundingBox; } - public static VillageComponentEngineerHouse buildComponent(List pieces, int p1, int p2, int p3, EnumFacing p4) { + public static VillageComponentEngineerHouse buildComponent(List pieces, int p1, int p2, int p3, Direction p4) { StructureBoundingBox boundingBox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, X_SIZE, Y_SIZE, Z_SIZE, p4); return canVillageGoDeeper(boundingBox) && StructureComponent.findIntersecting(pieces, boundingBox) == null ? new VillageComponentEngineerHouse(boundingBox, p4) : null; } @@ -185,17 +185,17 @@ public class VillageComponentEngineerHouse extends StructureVillagePieces.House1 MinecraftServer server = world.getMinecraftServer(); if (manager != null && server != null) { - EnumFacing facing = this.getCoordBaseMode(); + Direction facing = this.getCoordBaseMode(); Mirror mirror; Rotation rotation; - if (facing == EnumFacing.SOUTH) { + if (facing == Direction.SOUTH) { mirror = Mirror.NONE; rotation = Rotation.NONE; - } else if (facing == EnumFacing.WEST) { + } else if (facing == Direction.WEST) { mirror = Mirror.NONE; rotation = Rotation.CLOCKWISE_90; - } else if (facing == EnumFacing.EAST) { + } else if (facing == Direction.EAST) { mirror = Mirror.LEFT_RIGHT; rotation = Rotation.CLOCKWISE_90; } else { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentJamHouse.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentJamHouse.java index 0ccf60ba4..86fea0aef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentJamHouse.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/VillageComponentJamHouse.java @@ -26,7 +26,7 @@ import net.minecraft.block.BlockTorch; import net.minecraft.block.state.BlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -47,12 +47,12 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1 { } - public VillageComponentJamHouse(StructureBoundingBox boundingBox, EnumFacing par5) { + public VillageComponentJamHouse(StructureBoundingBox boundingBox, Direction par5) { this.setCoordBaseMode(par5); this.boundingBox = boundingBox; } - public static VillageComponentJamHouse buildComponent(List pieces, int p1, int p2, int p3, EnumFacing p4) { + public static VillageComponentJamHouse buildComponent(List pieces, int p1, int p2, int p3, Direction p4) { StructureBoundingBox boundingBox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, X_SIZE, Y_SIZE, Z_SIZE, p4); return canVillageGoDeeper(boundingBox) && StructureComponent.findIntersecting(pieces, boundingBox) == null ? new VillageComponentJamHouse(boundingBox, p4) : null; } @@ -155,8 +155,8 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1 { this.fillWithBlocks(world, sbb, 6, 1, 7, 8, 1, 7, Blocks.COBBLESTONE); this.fillWithBlocks(world, sbb, 6, 2, 7, 7, 2, 7, Blocks.GLASS_PANE); this.setBlockState(world, Blocks.PLANKS.getStateFromMeta(0), 8, 2, 7, sbb); - this.setBlockState(world, Blocks.SPRUCE_DOOR.getDefaultState().withProperty(BlockDoor.FACING, EnumFacing.SOUTH), 4, 1, 7, sbb); - this.setBlockState(world, Blocks.SPRUCE_DOOR.getDefaultState().withProperty(BlockDoor.FACING, EnumFacing.SOUTH).withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.UPPER), 4, 2, 7, sbb); + this.setBlockState(world, Blocks.SPRUCE_DOOR.getDefaultState().withProperty(BlockDoor.FACING, Direction.SOUTH), 4, 1, 7, sbb); + this.setBlockState(world, Blocks.SPRUCE_DOOR.getDefaultState().withProperty(BlockDoor.FACING, Direction.SOUTH).withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.UPPER), 4, 2, 7, sbb); //FENCE Supports this.fillWithBlocks(world, sbb, 0, 1, 8, 0, 3, 8, Blocks.OAK_FENCE); @@ -166,8 +166,8 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1 { //Roof this.fillWithBlocks(world, sbb, 1, 6, 3, 9, 6, 5, Blocks.PLANKS); - BlockState stairSouth = Blocks.OAK_STAIRS.getDefaultState().withProperty(BlockStairs.FACING, EnumFacing.SOUTH); - BlockState stairNorth = Blocks.OAK_STAIRS.getDefaultState().withProperty(BlockStairs.FACING, EnumFacing.NORTH); + BlockState stairSouth = Blocks.OAK_STAIRS.getDefaultState().withProperty(BlockStairs.FACING, Direction.SOUTH); + BlockState stairNorth = Blocks.OAK_STAIRS.getDefaultState().withProperty(BlockStairs.FACING, Direction.NORTH); this.fillWithBlocks(world, sbb, 0, 4, 0, 10, 4, 0, stairNorth, stairNorth, false); this.fillWithBlocks(world, sbb, 0, 5, 1, 10, 5, 1, stairNorth, stairNorth, false); this.fillWithBlocks(world, sbb, 0, 6, 2, 10, 6, 2, stairNorth, stairNorth, false); @@ -204,7 +204,7 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1 { this.setBlockState(world, Blocks.LEAVES.getDefaultState().withProperty(BlockLeaves.DECAYABLE, false), 8, 2, 2, sbb); this.setBlockState(world, Blocks.OAK_FENCE.getDefaultState(), 2, 1, 6, sbb); this.setBlockState(world, Blocks.LEAVES.getDefaultState().withProperty(BlockLeaves.DECAYABLE, false), 2, 2, 6, sbb); - BlockState stairWest = Blocks.OAK_STAIRS.getDefaultState().withProperty(BlockStairs.FACING, EnumFacing.WEST); + BlockState stairWest = Blocks.OAK_STAIRS.getDefaultState().withProperty(BlockStairs.FACING, Direction.WEST); this.fillWithBlocks(world, sbb, 2, 1, 3, 2, 1, 5, stairWest, stairWest, false); this.fillWithBlocks(world, sbb, 3, 1, 2, 5, 1, 3, Blocks.CARPET.getStateFromMeta(10), Blocks.CARPET.getStateFromMeta(10), false); this.fillWithBlocks(world, sbb, 3, 1, 4, 4, 1, 6, Blocks.CARPET.getStateFromMeta(10), Blocks.CARPET.getStateFromMeta(10), false); @@ -215,14 +215,14 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1 { } //Torches - this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.SOUTH), 6, 2, 0, sbb); - this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.SOUTH), 4, 2, 0, sbb); - this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.NORTH), 5, 2, 8, sbb); - this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.NORTH), 3, 2, 8, sbb); - this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.EAST), 2, 3, 2, sbb); - this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.EAST), 2, 3, 6, sbb); - this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.WEST), 8, 3, 2, sbb); - this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, EnumFacing.WEST), 8, 3, 6, sbb); + this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, Direction.SOUTH), 6, 2, 0, sbb); + this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, Direction.SOUTH), 4, 2, 0, sbb); + this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, Direction.NORTH), 5, 2, 8, sbb); + this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, Direction.NORTH), 3, 2, 8, sbb); + this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, Direction.EAST), 2, 3, 2, sbb); + this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, Direction.EAST), 2, 3, 6, sbb); + this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, Direction.WEST), 8, 3, 2, sbb); + this.setBlockState(world, Blocks.TORCH.getDefaultState().withProperty(BlockTorch.FACING, Direction.WEST), 8, 3, 6, sbb); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageCustomCropFieldHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageCustomCropFieldHandler.java index 491ac68eb..ddcbaf315 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageCustomCropFieldHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageCustomCropFieldHandler.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Random; import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentCustomCropField; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraftforge.fml.common.registry.VillagerRegistry; @@ -32,7 +32,7 @@ public class VillageCustomCropFieldHandler implements VillagerRegistry.IVillageC } @Override - public StructureVillagePieces.Village buildComponent(StructureVillagePieces.PieceWeight villagePiece, StructureVillagePieces.Start startPiece, List pieces, Random random, int p1, int p2, int p3, EnumFacing facing, int p5) { + public StructureVillagePieces.Village buildComponent(StructureVillagePieces.PieceWeight villagePiece, StructureVillagePieces.Start startPiece, List pieces, Random random, int p1, int p2, int p3, Direction facing, int p5) { return VillageComponentCustomCropField.buildComponent(pieces, p1, p2, p3, facing); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageEngineerHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageEngineerHouseHandler.java index 0b1144c82..8446228ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageEngineerHouseHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageEngineerHouseHandler.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Random; import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentEngineerHouse; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraftforge.fml.common.registry.VillagerRegistry; @@ -32,7 +32,7 @@ public class VillageEngineerHouseHandler implements VillagerRegistry.IVillageCre } @Override - public StructureVillagePieces.Village buildComponent(StructureVillagePieces.PieceWeight villagePiece, StructureVillagePieces.Start startPiece, List pieces, Random random, int p1, int p2, int p3, EnumFacing facing, int p5) { + public StructureVillagePieces.Village buildComponent(StructureVillagePieces.PieceWeight villagePiece, StructureVillagePieces.Start startPiece, List pieces, Random random, int p1, int p2, int p3, Direction facing, int p5) { return VillageComponentEngineerHouse.buildComponent(pieces, p1, p2, p3, facing); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java index c9a4a50e7..5fba44918 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/component/handler/VillageJamHouseHandler.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Random; import de.ellpeck.actuallyadditions.mod.gen.village.component.VillageComponentJamHouse; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraftforge.fml.common.registry.VillagerRegistry; @@ -32,7 +32,7 @@ public class VillageJamHouseHandler implements VillagerRegistry.IVillageCreation } @Override - public StructureVillagePieces.Village buildComponent(StructureVillagePieces.PieceWeight villagePiece, StructureVillagePieces.Start startPiece, List pieces, Random random, int p1, int p2, int p3, EnumFacing facing, int p5) { + public StructureVillagePieces.Village buildComponent(StructureVillagePieces.PieceWeight villagePiece, StructureVillagePieces.Start startPiece, List pieces, Random random, int p1, int p2, int p3, Direction facing, int p5) { return VillageComponentJamHouse.buildComponent(pieces, p1, p2, p3, facing); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java index 6a4dd1e96..05cf1df34 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java @@ -25,7 +25,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -69,7 +69,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem { } @Override - public EnumActionResult onItemUse(PlayerEntity playerIn, World worldIn, BlockPos pos, Hand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity playerIn, World worldIn, BlockPos pos, Hand hand, Direction side, float hitX, float hitY, float hitZ) { if (!playerIn.isSneaking()) { return Items.IRON_HOE.onItemUse(playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java index 8bde91052..34e2b13b6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java @@ -23,7 +23,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -41,7 +41,7 @@ public class ItemBag extends ItemBase { } @Override - public EnumActionResult onItemUse(PlayerEntity playerIn, World worldIn, BlockPos pos, Hand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity playerIn, World worldIn, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = playerIn.getHeldItem(hand); if (!this.isVoid) { TileEntity tile = worldIn.getTileEntity(pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java index b1824e5bf..39cac2ef0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java @@ -29,7 +29,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -53,7 +53,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay { } @Override - public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, EnumFacing face, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction face, float hitX, float hitY, float hitZ) { if (player.isSneaking()) { BlockState state = world.getBlockState(pos); Block block = state.getBlock(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java index c504e2f33..71f9bdc83 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java @@ -21,7 +21,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -40,7 +40,7 @@ public class ItemChestToCrateUpgrade extends ItemBase { } @Override - public EnumActionResult onItemUseFirst(PlayerEntity player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, Hand hand) { + public EnumActionResult onItemUseFirst(PlayerEntity player, World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ, Hand hand) { ItemStack heldStack = player.getHeldItem(hand); if (player.isSneaking()) { TileEntity tileHit = world.getTileEntity(pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java index 68a6d0381..3f643724f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java @@ -18,7 +18,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -32,7 +32,7 @@ public class ItemFertilizer extends ItemBase { } @Override - public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction side, float par8, float par9, float par10) { ItemStack stack = player.getHeldItem(hand); if (ItemDye.applyBonemeal(stack, world, pos, player, hand)) { if (!world.isRemote) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java index d111f2c06..7f11d1421 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java @@ -26,7 +26,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -81,7 +81,7 @@ public class ItemFillingWand extends ItemEnergy { } @Override - public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); if (!world.isRemote && player.getItemInUseCount() <= 0) { if (player.isSneaking()) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java index f8098be62..d103a5260 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java @@ -21,7 +21,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; @@ -38,7 +38,7 @@ public class ItemLaserWrench extends ItemBase { } @Override - public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, EnumFacing par7, float par8, float par9, float par10) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction par7, float par8, float par9, float par10) { ItemStack stack = player.getHeldItem(hand); TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityLaserRelay) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java index 24621381d..0e925236a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java @@ -22,7 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; @@ -85,7 +85,7 @@ public class ItemPhantomConnector extends ItemBase { } @Override - public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, EnumFacing par7, float par8, float par9, float par10) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction par7, float par8, float par9, float par10) { ItemStack stack = player.getHeldItem(hand); if (!world.isRemote) { //Passing Data to Phantoms diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java index f1028de14..522d9d66d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java @@ -23,7 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; @@ -65,7 +65,7 @@ public class ItemPlayerProbe extends ItemBase { } @Override - public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileEntityPlayerInterface) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java index 1913df305..32fe9cf8a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java @@ -20,7 +20,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -50,7 +50,7 @@ public class ItemShovelAA extends ItemToolAA { } @Override - public EnumActionResult onItemUse(PlayerEntity playerIn, World worldIn, BlockPos pos, Hand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity playerIn, World worldIn, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { return Items.IRON_SHOVEL.onItemUse(playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java index 54da2177d..a0e8a28fa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java @@ -26,7 +26,7 @@ import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -43,7 +43,7 @@ public class ItemSpawnerChanger extends ItemBase { } @Override - public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { if (!world.isRemote) { ItemStack stack = player.getHeldItemMainhand(); if (player.canPlayerEdit(pos.offset(facing), facing, stack)) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java index ba21658e5..daa1b002c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java @@ -102,7 +102,7 @@ public class ItemWaterBowl extends ItemBase { if (!world.isBlockModifiable(player, pos)) { return new ActionResult<>(EnumActionResult.FAIL, stack); } else { - BlockPos pos1 = world.getBlockState(pos).getBlock().isReplaceable(world, pos) && trace.sideHit == EnumFacing.UP + BlockPos pos1 = world.getBlockState(pos).getBlock().isReplaceable(world, pos) && trace.sideHit == Direction.UP ? pos : pos.offset(trace.sideHit); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java index 87f0ffa6c..3805578ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.MinecraftForge; @@ -167,7 +167,7 @@ public class ItemWingsOfTheBats extends ItemBase { } else { BlockPos pos = new BlockPos(player.posX, player.posY + player.height, player.posZ); BlockState state = player.world.getBlockState(pos); - if (state != null && state.isSideSolid(player.world, pos, EnumFacing.DOWN)) { + if (state != null && state.isSideSolid(player.world, pos, Direction.DOWN)) { deductTime = 10; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java index 72474027a..956d8f0a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java @@ -23,7 +23,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -58,7 +58,7 @@ public class ItemWorm extends ItemBase { } @Override - public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction side, float par8, float par9, float par10) { ItemStack stack = player.getHeldItem(hand); BlockState state = world.getBlockState(pos); if (EntityWorm.canWormify(world, pos, state)) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index 7562eb8a8..65711beed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java @@ -19,7 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -216,13 +216,13 @@ public abstract class ItemEnergy extends ItemBase { } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { + public boolean hasCapability(Capability capability, Direction facing) { return this.getCapability(capability, facing) != null; } @Nullable @Override - public T getCapability(Capability capability, EnumFacing facing) { + public T getCapability(Capability capability, Direction facing) { if (capability == CapabilityEnergy.ENERGY) { return CapabilityEnergy.ENERGY.cast(this.storage); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java index 53d8c5564..127befebb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java @@ -25,7 +25,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -61,7 +61,7 @@ public class LensColor extends Lens { ItemStack returnStack = this.tryConvert(new ItemStack(block, 1, meta), hitState, hitBlock, tile); if (returnStack != null && returnStack.getItem() instanceof ItemBlock) { Block toPlace = Block.getBlockFromItem(returnStack.getItem()); - BlockState state2Place = toPlace.getStateForPlacement(tile.getWorldObject(), hitBlock, EnumFacing.UP, 0, 0, 0, returnStack.getMetadata(), FakePlayerFactory.getMinecraft((WorldServer) tile.getWorldObject()), Hand.MAIN_HAND); + BlockState state2Place = toPlace.getStateForPlacement(tile.getWorldObject(), hitBlock, Direction.UP, 0, 0, 0, returnStack.getMetadata(), FakePlayerFactory.getMinecraft((WorldServer) tile.getWorldObject()), Hand.MAIN_HAND); tile.getWorldObject().setBlockState(hitBlock, state2Place, 2); tile.extractEnergy(ENERGY_USE); } @@ -107,7 +107,7 @@ public class LensColor extends Lens { } @Override - public boolean canInvoke(IAtomicReconstructor tile, EnumFacing sideToShootTo, int energyUsePerShot) { + public boolean canInvoke(IAtomicReconstructor tile, Direction sideToShootTo, int energyUsePerShot) { return tile.getEnergy() - energyUsePerShot >= ENERGY_USE; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java index d7b56b295..5efe7867d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java @@ -13,7 +13,7 @@ package de.ellpeck.actuallyadditions.mod.items.lens; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; import net.minecraft.block.state.BlockState; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; public class LensDetonation extends Lens { @@ -43,7 +43,7 @@ public class LensDetonation extends Lens { } @Override - public boolean canInvoke(IAtomicReconstructor tile, EnumFacing sideToShootTo, int energyUsePerShot) { + public boolean canInvoke(IAtomicReconstructor tile, Direction sideToShootTo, int energyUsePerShot) { return tile.getEnergy() - energyUsePerShot >= ENERGY_USE; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java index 2657acc98..f75881daf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java @@ -26,7 +26,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemEnchantedBook; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -114,7 +114,7 @@ public class LensDisenchanting extends Lens { } @Override - public boolean canInvoke(IAtomicReconstructor tile, EnumFacing sideToShootTo, int energyUsePerShot) { + public boolean canInvoke(IAtomicReconstructor tile, Direction sideToShootTo, int energyUsePerShot) { return tile.getEnergy() - energyUsePerShot >= ENERGY_USE; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java index ee283a9c4..df2abbc82 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java @@ -21,7 +21,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -82,7 +82,7 @@ public class LensDisruption extends Lens { } @Override - public boolean canInvoke(IAtomicReconstructor tile, EnumFacing sideToShootTo, int energyUsePerShot) { + public boolean canInvoke(IAtomicReconstructor tile, Direction sideToShootTo, int energyUsePerShot) { return tile.getEnergy() - energyUsePerShot >= ENERGY_USE; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java index e20cd09f2..722538c1f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java @@ -27,7 +27,7 @@ import net.minecraft.block.state.BlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.WeightedRandom; import net.minecraft.util.math.BlockPos; @@ -164,7 +164,7 @@ public class LensMining extends Lens { if (tile.getEnergy() >= adaptedUse) { Block block = Block.getBlockFromItem(stack.getItem()); if (block != Blocks.AIR) { - BlockState state = block.getStateForPlacement(tile.getWorldObject(), hitPos, EnumFacing.UP, 0, 0, 0, stack.getMetadata(), FakePlayerFactory.getMinecraft((WorldServer) tile.getWorldObject()), Hand.MAIN_HAND); + BlockState state = block.getStateForPlacement(tile.getWorldObject(), hitPos, Direction.UP, 0, 0, 0, stack.getMetadata(), FakePlayerFactory.getMinecraft((WorldServer) tile.getWorldObject()), Hand.MAIN_HAND); tile.getWorldObject().setBlockState(hitPos, state, 2); tile.getWorldObject().playEvent(2001, hitPos, Block.getStateId(state)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java index b8c8524a8..835132ead 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java @@ -15,14 +15,14 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; public class DispenserHandlerFertilize extends BehaviorDefaultDispenseItem { @Override public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { - EnumFacing facing = source.getBlockState().getValue(BlockDispenser.FACING); + Direction facing = source.getBlockState().getValue(BlockDispenser.FACING); BlockPos pos = source.getBlockPos().offset(facing); if (ItemDye.applyBonemeal(stack, source.getWorld(), pos)) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java index bb490a5fa..f343abc27 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java @@ -40,7 +40,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.CompoundNBT; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -154,11 +154,11 @@ public class MethodHandler implements IMethodHandler { int rangeY = 0; int rangeZ = 0; - EnumFacing facing = tile.getOrientation(); - if (facing != EnumFacing.UP && facing != EnumFacing.DOWN) { + Direction facing = tile.getOrientation(); + if (facing != Direction.UP && facing != Direction.DOWN) { rangeY = range; - if (facing == EnumFacing.NORTH || facing == EnumFacing.SOUTH) { + if (facing == Direction.NORTH || facing == Direction.SOUTH) { rangeX = range; } else { rangeZ = range; @@ -248,7 +248,7 @@ public class MethodHandler implements IMethodHandler { @Override public boolean invokeReconstructor(IAtomicReconstructor tile) { if (tile.getEnergy() >= TileEntityAtomicReconstructor.ENERGY_USE) { - EnumFacing sideToManipulate = tile.getOrientation(); + Direction sideToManipulate = tile.getOrientation(); Lens currentLens = tile.getLens(); if (currentLens.canInvoke(tile, sideToManipulate, TileEntityAtomicReconstructor.ENERGY_USE)) { tile.extractEnergy(TileEntityAtomicReconstructor.ENERGY_USE); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/DefaultFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/DefaultFarmerBehavior.java index ae68b631d..4383adcee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/DefaultFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/DefaultFarmerBehavior.java @@ -32,7 +32,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -170,7 +170,7 @@ public class DefaultFarmerBehavior implements IFarmerBehavior { ItemStack itemstack = getHoeStack(); - if (!player.canPlayerEdit(pos.offset(EnumFacing.UP), EnumFacing.UP, itemstack)) { + if (!player.canPlayerEdit(pos.offset(Direction.UP), Direction.UP, itemstack)) { return EnumActionResult.FAIL; } else { int hook = net.minecraftforge.event.ForgeEventFactory.onHoeUse(itemstack, player, world, pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/NetherWartFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/NetherWartFarmerBehavior.java index 40e3bd8f0..8310d1f32 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/NetherWartFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/NetherWartFarmerBehavior.java @@ -19,7 +19,7 @@ import net.minecraft.block.state.BlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -32,7 +32,7 @@ public class NetherWartFarmerBehavior implements IFarmerBehavior { int use = 500; if (farmer.getEnergy() >= use) { if (seed.getItem() == Items.NETHER_WART) { - if (world.getBlockState(pos.down()).getBlock().canSustainPlant(world.getBlockState(pos.down()), world, pos.down(), EnumFacing.UP, (IPlantable) Items.NETHER_WART)) { + if (world.getBlockState(pos.down()).getBlock().canSustainPlant(world.getBlockState(pos.down()), world, pos.down(), Direction.UP, (IPlantable) Items.NETHER_WART)) { world.setBlockState(pos, Blocks.NETHER_WART.getDefaultState(), 2); farmer.extractEnergy(use); return FarmerResult.SUCCESS; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ActuallyTiles.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ActuallyTiles.java new file mode 100644 index 000000000..e00d93e55 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ActuallyTiles.java @@ -0,0 +1,70 @@ +package de.ellpeck.actuallyadditions.mod.tile; + +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; +import net.minecraft.tileentity.TileEntityType; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; + +public class ActuallyTiles { + public static final DeferredRegister> TILES = DeferredRegister.create(ForgeRegistries.TILE_ENTITIES, ActuallyAdditions.MODID); + + public static final RegistryObject> COMPOST_TILE = TILES.register("compost", () -> TileEntityType.Builder.create(TileEntityCompost::new, InitBlocks.blockCompost.get()).build(null)); + public static final RegistryObject> FEEDER_TILE = TILES.register("feeder", () -> TileEntityType.Builder.create(TileEntityFeeder::new, InitBlocks.blockFeeder.get()).build(null)); + // public static final RegistryObject> GIANTCHEST_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityGiantChest::new, ).build(null)); + // public static final RegistryObject> GIANTCHESTMEDIUM_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityGiantChestMedium::new, ).build(null)); + // public static final RegistryObject> GIANTCHESTLARGE_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityGiantChestLarge::new, ).build(null)); + public static final RegistryObject> GRINDER_TILE = TILES.register("grinder", () -> TileEntityType.Builder.create(TileEntityGrinder::new, InitBlocks.blockGrinder.get()).build(null)); + public static final RegistryObject> FURNACE_DOUBLE_TILE = TILES.register("furnaceDouble", () -> TileEntityType.Builder.create(TileEntityFurnaceDouble::new, InitBlocks.blockFurnaceDouble.get()).build(null)); + public static final RegistryObject> INPUTTER_TILE = TILES.register("inputter", () -> TileEntityType.Builder.create(TileEntityInputter::new, InitBlocks.blockInputter.get()).build(null)); + public static final RegistryObject> FISHINGNET_TILE = TILES.register("fishingNet", () -> TileEntityType.Builder.create(TileEntityFishingNet::new, InitBlocks.blockFishingNet.get()).build(null)); + public static final RegistryObject> FURNACESOLAR_TILE = TILES.register("solarPanel", () -> TileEntityType.Builder.create(TileEntityFurnaceSolar::new, InitBlocks.blockFurnaceSolar.get()).build(null)); + public static final RegistryObject> HEATCOLLECTOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityHeatCollector::new, InitBlocks.blockHeatCollector.get()).build(null)); + public static final RegistryObject> ITEMREPAIRER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityItemRepairer::new, InitBlocks.blockItemRepairer.get()).build(null)); + public static final RegistryObject> BREAKER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityBreaker::new, InitBlocks.blockBreaker.get()).build(null)); + public static final RegistryObject> DROPPER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityDropper::new, InitBlocks.blockDropper.get()).build(null)); + public static final RegistryObject> INPUTTERADVANCED_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityInputterAdvanced::new, InitBlocks.blockInputterAdvanced.get()).build(null)); + public static final RegistryObject> PLACER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityPlacer::new, InitBlocks.blockPlacer.get()).build(null)); + public static final RegistryObject> GRINDER_DOUBLE_TILE = TILES.register("grinderDouble", () -> TileEntityType.Builder.create(TileEntityGrinderDouble::new, InitBlocks.blockGrinderDouble.get()).build(null)); + public static final RegistryObject> CANOLAPRESS_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityCanolaPress::new, InitBlocks.blockCanolaPress.get()).build(null)); + public static final RegistryObject> FERMENTINGBARREL_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityFermentingBarrel::new, InitBlocks.blockFermentingBarrel.get()).build(null)); + public static final RegistryObject> OILGENERATOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityOilGenerator::new, InitBlocks.blockOilGenerator.get()).build(null)); + public static final RegistryObject> COALGENERATOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityCoalGenerator::new, InitBlocks.blockCoalGenerator.get()).build(null)); + public static final RegistryObject> PHANTOMITEMFACE_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityPhantomItemface::new, InitBlocks.blockPhantomface.get()).build(null)); + public static final RegistryObject> PHANTOMLIQUIFACE_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityPhantomLiquiface::new, InitBlocks.blockPhantomLiquiface.get()).build(null)); + public static final RegistryObject> PHANTOMENERGYFACE_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityPhantomEnergyface::new, InitBlocks.blockPhantomEnergyface.get()).build(null)); + public static final RegistryObject> PLAYERINTERFACE_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityPlayerInterface::new, InitBlocks.blockPlayerInterface.get()).build(null)); + public static final RegistryObject> PHANTOMPLACER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityPhantomPlacer::new, InitBlocks.blockPhantomPlacer.get()).build(null)); + public static final RegistryObject> PHANTOMBREAKER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityPhantomBreaker::new, InitBlocks.blockPhantomBreaker.get()).build(null)); + public static final RegistryObject> FLUIDCOLLECTOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityFluidCollector::new, InitBlocks.blockFluidCollector.get()).build(null)); + public static final RegistryObject> FLUIDPLACER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityFluidPlacer::new, InitBlocks.blockFluidPlacer.get()).build(null)); + public static final RegistryObject> LAVAFACTORYCONTROLLER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityLavaFactoryController::new, InitBlocks.blockLavaFactoryController.get()).build(null)); + public static final RegistryObject> COFFEEMACHINE_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityCoffeeMachine::new, InitBlocks.blockCoffeeMachine.get()).build(null)); + public static final RegistryObject> PHANTOMBOOSTER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityPhantomBooster::new, InitBlocks.blockPhantomBooster.get()).build(null)); + public static final RegistryObject> ENERGIZER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityEnergizer::new, InitBlocks.blockEnergizer.get()).build(null)); + public static final RegistryObject> ENERVATOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityEnervator::new, InitBlocks.blockEnervator.get()).build(null)); + public static final RegistryObject> XPSOLIDIFIER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityXPSolidifier::new, InitBlocks.blockXPSolidifier.get()).build(null)); + public static final RegistryObject> SMILEYCLOUD_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntitySmileyCloud::new, InitBlocks.blockSmileyCloud.get()).build(null)); + public static final RegistryObject> LEAFGENERATOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityLeafGenerator::new, InitBlocks.blockLeafGenerator.get()).build(null)); + public static final RegistryObject> DIRECTIONALBREAKER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityDirectionalBreaker::new, InitBlocks.blockDirectionalBreaker.get()).build(null)); + public static final RegistryObject> RANGEDCOLLECTOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityRangedCollector::new, InitBlocks.blockRangedCollector.get()).build(null)); + public static final RegistryObject> ATOMICRECONSTRUCTOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityAtomicReconstructor::new, InitBlocks.blockAtomicReconstructor.get()).build(null)); + public static final RegistryObject> MINER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityMiner::new, InitBlocks.blockMiner.get()).build(null)); + public static final RegistryObject> FIREWORKBOX_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityFireworkBox::new, InitBlocks.blockFireworkBox.get()).build(null)); + public static final RegistryObject> PHANTOMREDSTONEFACE_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityPhantomRedstoneface::new, InitBlocks.blockPhantomRedstoneface.get()).build(null)); + public static final RegistryObject> LASERRELAYITEM_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityLaserRelayItem::new, InitBlocks.blockLaserRelayItem.get()).build(null)); + public static final RegistryObject> LASERRELAYENERGY_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityLaserRelayEnergy::new, InitBlocks.blockLaserRelay.get()).build(null)); + public static final RegistryObject> LASERRELAYENERGYADVANCED_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityLaserRelayEnergyAdvanced::new, InitBlocks.blockLaserRelayAdvanced.get()).build(null)); + public static final RegistryObject> LASERRELAYENERGYEXTREME_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityLaserRelayEnergyExtreme::new, InitBlocks.blockLaserRelayExtreme.get()).build(null)); + public static final RegistryObject> LASERRELAYITEMWHITELIST_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityLaserRelayItemWhitelist::new, InitBlocks.blockLaserRelayItemWhitelist.get()).build(null)); + public static final RegistryObject> ITEMVIEWER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityItemViewer::new, InitBlocks.blockItemViewer.get()).build(null)); + public static final RegistryObject> DISPLAYSTAND_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityDisplayStand::new, InitBlocks.blockDisplayStand.get()).build(null)); + public static final RegistryObject> SHOCKSUPPRESSOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityShockSuppressor::new, InitBlocks.blockShockSuppressor.get()).build(null)); + public static final RegistryObject> EMPOWERER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityEmpowerer::new, InitBlocks.blockEmpowerer.get()).build(null)); + public static final RegistryObject> LASERRELAYFLUIDS_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityLaserRelayFluids::new, InitBlocks.blockLaserRelayFluids.get()).build(null)); + public static final RegistryObject> BIOREACTOR_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityBioReactor::new, InitBlocks.blockBioReactor.get()).build(null)); + public static final RegistryObject> FARMER_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityFarmer::new, InitBlocks.blockFarmer.get()).build(null)); + public static final RegistryObject> ITEMVIEWERHOPPING_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityItemViewerHopping::new, InitBlocks.blockItemViewer.get()).build(null)); + public static final RegistryObject> BATTERYBOX_TILE = TILES.register("", () -> TileEntityType.Builder.create(TileEntityBatteryBox::new, InitBlocks.blockBatteryBox.get()).build(null)); +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingEnergyProvider.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingEnergyProvider.java index a5d3c39f1..663afc30b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingEnergyProvider.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingEnergyProvider.java @@ -11,7 +11,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; public interface ISharingEnergyProvider { @@ -19,7 +19,7 @@ public interface ISharingEnergyProvider { boolean doesShareEnergy(); - EnumFacing[] getEnergyShareSides(); + Direction[] getEnergyShareSides(); boolean canShareTo(TileEntity tile); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingFluidHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingFluidHandler.java index 0a05d1c70..363772946 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingFluidHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/ISharingFluidHandler.java @@ -10,7 +10,7 @@ package de.ellpeck.actuallyadditions.mod.tile; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; public interface ISharingFluidHandler { @@ -18,6 +18,6 @@ public interface ISharingFluidHandler { boolean doesShareFluid(); - EnumFacing[] getFluidShareSides(); + Direction[] getFluidShareSides(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java index 968ff507b..bf081e41f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java @@ -21,10 +21,10 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.item.Item; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -111,7 +111,7 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple } @Override - public EnumFacing getOrientation() { + public Direction getOrientation() { BlockState state = this.world.getBlockState(this.pos); return WorldUtil.getDirectionByPistonRotation(state); } @@ -177,7 +177,7 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index 15dfd870d..ccb12e85a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -14,31 +14,30 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.util.VanillaPacketDispatcher; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; +import net.minecraft.client.renderer.texture.ITickable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.network.play.server.SUpdateTileEntityPacket; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; -import net.minecraft.util.ResourceLocation; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + public abstract class TileEntityBase extends TileEntity implements ITickable { - public final String name; public boolean isRedstonePowered; public boolean isPulseMode; public boolean stopFromDropping; @@ -46,102 +45,59 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { protected TileEntity[] tilesAround = new TileEntity[6]; protected boolean hasSavedDataOnChangeOrWorldStart; - public TileEntityBase(String name) { - this.name = name; + public TileEntityBase(TileEntityType type) { + super(type); } public static void init() { ActuallyAdditions.LOGGER.info("Registering TileEntities..."); - - register(TileEntityCompost.class); - register(TileEntityFeeder.class); - register(TileEntityGiantChest.class); - register(TileEntityGiantChestMedium.class); - register(TileEntityGiantChestLarge.class); - register(TileEntityGrinder.class); - register(TileEntityFurnaceDouble.class); - register(TileEntityInputter.class); - register(TileEntityFishingNet.class); - register(TileEntityFurnaceSolar.class); - register(TileEntityHeatCollector.class); - register(TileEntityItemRepairer.class); - register(TileEntityBreaker.class); - register(TileEntityDropper.class); - register(TileEntityInputterAdvanced.class); - register(TileEntityPlacer.class); - register(TileEntityGrinderDouble.class); - register(TileEntityCanolaPress.class); - register(TileEntityFermentingBarrel.class); - register(TileEntityOilGenerator.class); - register(TileEntityCoalGenerator.class); - register(TileEntityPhantomItemface.class); - register(TileEntityPhantomLiquiface.class); - register(TileEntityPhantomEnergyface.class); - register(TileEntityPlayerInterface.class); - register(TileEntityPhantomPlacer.class); - register(TileEntityPhantomBreaker.class); - register(TileEntityFluidCollector.class); - register(TileEntityFluidPlacer.class); - register(TileEntityLavaFactoryController.class); - register(TileEntityCoffeeMachine.class); - register(TileEntityPhantomBooster.class); - register(TileEntityEnergizer.class); - register(TileEntityEnervator.class); - register(TileEntityXPSolidifier.class); - register(TileEntitySmileyCloud.class); - register(TileEntityLeafGenerator.class); - register(TileEntityDirectionalBreaker.class); - register(TileEntityRangedCollector.class); - register(TileEntityAtomicReconstructor.class); - register(TileEntityMiner.class); - register(TileEntityFireworkBox.class); - register(TileEntityPhantomRedstoneface.class); - register(TileEntityLaserRelayItem.class); - register(TileEntityLaserRelayEnergy.class); - register(TileEntityLaserRelayEnergyAdvanced.class); - register(TileEntityLaserRelayEnergyExtreme.class); - register(TileEntityLaserRelayItemWhitelist.class); - register(TileEntityItemViewer.class); - register(TileEntityDisplayStand.class); - register(TileEntityShockSuppressor.class); - register(TileEntityEmpowerer.class); - register(TileEntityLaserRelayFluids.class); - register(TileEntityBioReactor.class); - register(TileEntityFarmer.class); - register(TileEntityItemViewerHopping.class); - register(TileEntityBatteryBox.class); } private static void register(Class tileClass) { - try { - //This is hacky and dirty but it works so whatever - ResourceLocation name = new ResourceLocation(ActuallyAdditions.MODID, tileClass.newInstance().name); - GameRegistry.registerTileEntity(tileClass, name); - } catch (Exception e) { - ActuallyAdditions.LOGGER.fatal("Registering a TileEntity failed!", e); - } + // TODO: [port] migrate to register system. + // try { + // //This is hacky and dirty but it works so whatever + // ResourceLocation name = new ResourceLocation(ActuallyAdditions.MODID, tileClass.newInstance().name); + // GameRegistry.registerTileEntity(tileClass, name); + // } catch (Exception e) { + // ActuallyAdditions.LOGGER.fatal("Registering a TileEntity failed!", e); + // } } @Override - public final CompoundNBT writeToNBT(CompoundNBT compound) { + public CompoundNBT write(CompoundNBT compound) { this.writeSyncableNBT(compound, NBTType.SAVE_TILE); return compound; } + // TODO: [port] remove if the above is correct + // @Override + // public final CompoundNBT writeToNBT(CompoundNBT compound) { + // this.writeSyncableNBT(compound, NBTType.SAVE_TILE); + // return compound; + // } + @Override - public final void readFromNBT(CompoundNBT compound) { + public void read(BlockState state, CompoundNBT compound) { this.readSyncableNBT(compound, NBTType.SAVE_TILE); } + // TODO: [port] remove if the above is correct + // @Override + // public final void readFromNBT(CompoundNBT compound) { + // this.readSyncableNBT(compound, NBTType.SAVE_TILE); + // } + + @Nullable @Override - public final SPacketUpdateTileEntity getUpdatePacket() { + public SUpdateTileEntityPacket getUpdatePacket() { CompoundNBT compound = new CompoundNBT(); this.writeSyncableNBT(compound, NBTType.SYNC); - return new SPacketUpdateTileEntity(this.pos, -1, compound); + return new SUpdateTileEntityPacket(this.pos, -1, compound); } @Override - public final void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { + public void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) { this.readSyncableNBT(pkt.getNbtCompound(), NBTType.SYNC); } @@ -153,8 +109,8 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { } @Override - public final void handleUpdateTag(CompoundNBT compound) { - this.readSyncableNBT(compound, NBTType.SYNC); + public void handleUpdateTag(BlockState state, CompoundNBT tag) { + this.readSyncableNBT(tag, NBTType.SYNC); } public final void sendUpdate() { @@ -177,30 +133,30 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { public void writeSyncableNBT(CompoundNBT compound, NBTType type) { if (type != NBTType.SAVE_BLOCK) { - super.writeToNBT(compound); + super.write(compound); } if (type == NBTType.SAVE_TILE) { - compound.setBoolean("Redstone", this.isRedstonePowered); - compound.setInteger("TicksElapsed", this.ticksElapsed); - compound.setBoolean("StopDrop", this.stopFromDropping); + compound.putBoolean("Redstone", this.isRedstonePowered); + compound.putInt("TicksElapsed", this.ticksElapsed); + compound.putBoolean("StopDrop", this.stopFromDropping); } else if (type == NBTType.SYNC && this.stopFromDropping) { - compound.setBoolean("StopDrop", this.stopFromDropping); + compound.putBoolean("StopDrop", this.stopFromDropping); } if (this.isRedstoneToggle() && (type != NBTType.SAVE_BLOCK || this.isPulseMode)) { - compound.setBoolean("IsPulseMode", this.isPulseMode); + compound.putBoolean("IsPulseMode", this.isPulseMode); } } public void readSyncableNBT(CompoundNBT compound, NBTType type) { if (type != NBTType.SAVE_BLOCK) { - super.readFromNBT(compound); + super.read(null, compound); // FIXME: [port] flag as possible crash source } if (type == NBTType.SAVE_TILE) { this.isRedstonePowered = compound.getBoolean("Redstone"); - this.ticksElapsed = compound.getInteger("TicksElapsed"); + this.ticksElapsed = compound.getInt("TicksElapsed"); this.stopFromDropping = compound.getBoolean("StopDrop"); } else if (type == NBTType.SYNC) { this.stopFromDropping = compound.getBoolean("StopDrop"); @@ -211,22 +167,24 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { } } - @Override - public boolean shouldRefresh(World world, BlockPos pos, BlockState oldState, BlockState newState) { - return !oldState.getBlock().isAssociatedBlock(newState.getBlock()); - } + // TODO: [port] eval if still required in some way + // @Override + // public boolean shouldRefresh(World world, BlockPos pos, BlockState oldState, BlockState newState) { + // return !oldState.getBlock().isAssociatedBlock(newState.getBlock()); + // } public String getNameForTranslation() { - return "container." + ActuallyAdditions.MODID + "." + this.name + ".name"; + return "removeme";// "container." + ActuallyAdditions.MODID + "." + this.name + ".name"; } - @Override - public ITextComponent getDisplayName() { - return new TextComponentTranslation(this.getNameForTranslation()); - } + // @Override + // public ITextComponent getDisplayName() { + // return new TextComponentTranslation(this.getNameForTranslation()); + // } + @Override - public final void update() { + public void tick() { this.updateEntity(); } @@ -246,14 +204,14 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { if (provider.doesShareEnergy()) { int total = provider.getEnergyToSplitShare(); if (total > 0) { - EnumFacing[] sides = provider.getEnergyShareSides(); + Direction[] sides = provider.getEnergyShareSides(); int amount = total / sides.length; if (amount <= 0) { amount = total; } - for (EnumFacing side : sides) { + for (Direction side : sides) { TileEntity tile = this.tilesAround[side.ordinal()]; if (tile != null && provider.canShareTo(tile)) { WorldUtil.doEnergyInteraction(this, tile, side, amount); @@ -268,14 +226,14 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { if (handler.doesShareFluid()) { int total = handler.getMaxFluidAmountToSplitShare(); if (total > 0) { - EnumFacing[] sides = handler.getFluidShareSides(); + Direction[] sides = handler.getFluidShareSides(); int amount = total / sides.length; if (amount <= 0) { amount = total; } - for (EnumFacing side : sides) { + for (Direction side : sides) { TileEntity tile = this.tilesAround[side.ordinal()]; if (tile != null) { WorldUtil.doFluidInteraction(this, tile, side, amount); @@ -296,7 +254,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { } public void saveDataOnChangeOrWorldStart() { - for (EnumFacing side : EnumFacing.values()) { + for (Direction side : Direction.values()) { BlockPos pos = this.pos.offset(side); if (this.world.isBlockLoaded(pos)) { this.tilesAround[side.ordinal()] = this.world.getTileEntity(pos); @@ -314,7 +272,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { } public boolean canPlayerUse(PlayerEntity player) { - return player.getDistanceSq(this.getPos().getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D) <= 64 && !this.isInvalid() && this.world.getTileEntity(this.pos) == this; + return player.getDistanceSq(this.getPos().getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D) <= 64 && !this.isRemoved() && this.world.getTileEntity(this.pos) == this; } protected boolean sendUpdateWithInterval() { @@ -326,43 +284,29 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { } } + @Nonnull @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - return this.getCapability(capability, facing) != null; - } - - @SuppressWarnings("unchecked") - @Override - public T getCapability(Capability capability, EnumFacing facing) { + public LazyOptional getCapability(@Nonnull Capability capability, @Nullable Direction side) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - IItemHandler handler = this.getItemHandler(facing); - if (handler != null) { - return (T) handler; - } + return this.getItemHandler(side).cast(); } else if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { - IFluidHandler tank = this.getFluidHandler(facing); - if (tank != null) { - return (T) tank; - } + return this.getFluidHandler(side).cast(); } else if (capability == CapabilityEnergy.ENERGY) { - IEnergyStorage storage = this.getEnergyStorage(facing); - if (storage != null) { - return (T) storage; - } + return this.getEnergyStorage(side).cast(); } - return super.getCapability(capability, facing); + return LazyOptional.empty(); } - public IFluidHandler getFluidHandler(EnumFacing facing) { - return null; + public LazyOptional getFluidHandler(Direction facing) { + return LazyOptional.empty(); } - public IEnergyStorage getEnergyStorage(EnumFacing facing) { - return null; + public LazyOptional getEnergyStorage(Direction facing) { + return LazyOptional.empty(); } - public IItemHandler getItemHandler(EnumFacing facing) { - return null; + public LazyOptional getItemHandler(Direction facing) { + return LazyOptional.empty(); } public boolean isRedstoneToggle() { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java index 5666d55e8..2d5394fc4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java @@ -19,7 +19,7 @@ import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; @@ -33,7 +33,7 @@ public class TileEntityBatteryBox extends TileEntityInventoryBase implements ISh } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { ItemStack stack = this.inv.getStackInSlot(0); if (StackUtil.isValid(stack) && stack.getItem() instanceof ItemBattery) { if (stack.hasCapability(CapabilityEnergy.ENERGY, null)) { return stack.getCapability(CapabilityEnergy.ENERGY, null); } @@ -165,8 +165,8 @@ public class TileEntityBatteryBox extends TileEntityInventoryBase implements ISh } @Override - public EnumFacing[] getEnergyShareSides() { - return EnumFacing.values(); + public Direction[] getEnergyShareSides() { + return Direction.values(); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java index 0f17cfb9e..bf4d488d5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java @@ -21,7 +21,7 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.common.IPlantable; import net.minecraftforge.energy.IEnergyStorage; @@ -148,8 +148,8 @@ public class TileEntityBioReactor extends TileEntityInventoryBase implements ISh } @Override - public EnumFacing[] getEnergyShareSides() { - return EnumFacing.values(); + public Direction[] getEnergyShareSides() { + return Direction.values(); } @Override @@ -158,7 +158,7 @@ public class TileEntityBioReactor extends TileEntityInventoryBase implements ISh } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java index 2ec53e093..1ed30294e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java @@ -19,7 +19,7 @@ import net.minecraft.block.state.BlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.IFluidBlock; @@ -42,7 +42,7 @@ public class TileEntityBreaker extends TileEntityInventoryBase { public void writeSyncableNBT(CompoundNBT compound, NBTType type) { super.writeSyncableNBT(compound, type); if (type != NBTType.SAVE_BLOCK) { - compound.setInteger("CurrentTime", this.currentTime); + compound.putInt("CurrentTime", this.currentTime); } } @@ -50,7 +50,7 @@ public class TileEntityBreaker extends TileEntityInventoryBase { public void readSyncableNBT(CompoundNBT compound, NBTType type) { super.readSyncableNBT(compound, type); if (type != NBTType.SAVE_BLOCK) { - this.currentTime = compound.getInteger("CurrentTime"); + this.currentTime = compound.getInt("CurrentTime"); } } @@ -77,7 +77,7 @@ public class TileEntityBreaker extends TileEntityInventoryBase { } private void doWork() { - EnumFacing side = WorldUtil.getDirectionByPistonRotation(this.world.getBlockState(this.pos)); + Direction side = WorldUtil.getDirectionByPistonRotation(this.world.getBlockState(this.pos)); BlockPos breakCoords = this.pos.offset(side); BlockState stateToBreak = this.world.getBlockState(breakCoords); Block blockToBreak = stateToBreak.getBlock(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java index 395229c67..244d0ac34 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java @@ -19,7 +19,7 @@ import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -125,7 +125,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IS } @Override - public FluidTank getFluidHandler(EnumFacing facing) { + public FluidTank getFluidHandler(Direction facing) { return this.tank; } @@ -140,12 +140,12 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IS } @Override - public EnumFacing[] getFluidShareSides() { - return EnumFacing.values(); + public Direction[] getFluidShareSides() { + return Direction.values(); } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java index 7ddaa3590..f8e461257 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.OnlyIn; @@ -142,8 +142,8 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements } @Override - public EnumFacing[] getEnergyShareSides() { - return EnumFacing.values(); + public Direction[] getEnergyShareSides() { + return Direction.values(); } @Override @@ -152,7 +152,7 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java index a887bc976..0384c7d10 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java @@ -23,7 +23,7 @@ import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.FluidRegistry; @@ -191,7 +191,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements } @Override - public FluidTank getFluidHandler(EnumFacing facing) { + public FluidTank getFluidHandler(Direction facing) { return this.tank; } @@ -206,12 +206,12 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements } @Override - public EnumFacing[] getFluidShareSides() { + public Direction[] getFluidShareSides() { return null; } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java index cb7d387d5..07dca099a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java @@ -16,7 +16,7 @@ import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -29,7 +29,7 @@ public class TileEntityCompost extends TileEntityInventoryBase { protected CompostRecipe recipe; public TileEntityCompost() { - super(1, "compost"); + super(ActuallyTiles.COMPOST_TILE.get(), 1); } public static CompostRecipe getRecipeForInput(ItemStack input) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java index ffed11a17..2ccea8e3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java @@ -14,10 +14,10 @@ import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraftforge.energy.IEnergyStorage; @@ -76,7 +76,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase { private void doWork() { if (this.storage.getEnergyStored() >= ENERGY_USE * RANGE) { BlockState state = this.world.getBlockState(this.pos); - EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(state); + Direction sideToManipulate = WorldUtil.getDirectionByPistonRotation(state); for (int i = 0; i < RANGE; i++) { BlockPos coordsBlock = this.pos.offset(sideToManipulate, i + 1); @@ -121,7 +121,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase { } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java index ab08001c9..9d592df9f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java @@ -17,7 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.energy.IEnergyStorage; public class TileEntityDisplayStand extends TileEntityInventoryBase implements IEnergyDisplay { @@ -97,7 +97,7 @@ public class TileEntityDisplayStand extends TileEntityInventoryBase implements I } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java index 92dbde3e7..881d137a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java @@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java index 7a42683d3..f6f914def 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java @@ -18,7 +18,7 @@ import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; @@ -132,8 +132,8 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase { private TileEntityDisplayStand[] getNearbyStands() { TileEntityDisplayStand[] stands = new TileEntityDisplayStand[4]; - for (int i = 0; i < EnumFacing.HORIZONTALS.length; i++) { - EnumFacing facing = EnumFacing.HORIZONTALS[i]; + for (int i = 0; i < Direction.HORIZONTALS.length; i++) { + Direction facing = Direction.HORIZONTALS[i]; BlockPos offset = this.pos.offset(facing, 3); TileEntity tile = this.world.getTileEntity(offset); if (tile instanceof TileEntityDisplayStand) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java index 94c2fb0a1..55d834456 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java @@ -15,7 +15,7 @@ import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; @@ -88,7 +88,7 @@ public class TileEntityEnergizer extends TileEntityInventoryBase { } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java index 9fc552746..786fe67e5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java @@ -15,7 +15,7 @@ import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; @@ -99,8 +99,8 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements ISha } @Override - public EnumFacing[] getEnergyShareSides() { - return EnumFacing.values(); + public Direction[] getEnergyShareSides() { + return Direction.values(); } @Override @@ -109,7 +109,7 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements ISha } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java index 81a54998a..184bcf432 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java @@ -19,11 +19,10 @@ import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.energy.IEnergyStorage; @@ -161,12 +160,12 @@ public class TileEntityFarmer extends TileEntityInventoryBase implements IFarmer } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } @Override - public EnumFacing getOrientation() { + public Direction getOrientation() { BlockState state = this.world.getBlockState(this.pos); return WorldUtil.getDirectionByPistonRotation(state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java index c8bc05059..3eb94d0cc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java @@ -34,7 +34,7 @@ public class TileEntityFeeder extends TileEntityInventoryBase { private int lastTimer; public TileEntityFeeder() { - super(1, "feeder"); + super(ActuallyTiles.FEEDER_TILE.get(), 1); } public int getCurrentTimerToScale(int i) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java index 187dd9c46..ca86dbfb3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java @@ -13,7 +13,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.capability.IFluidHandler; @@ -131,7 +131,7 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari } @Override - public IFluidHandler getFluidHandler(EnumFacing facing) { + public IFluidHandler getFluidHandler(Direction facing) { return this.handlerMap; } @@ -146,7 +146,7 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari } @Override - public EnumFacing[] getFluidShareSides() { - return EnumFacing.values(); + public Direction[] getFluidShareSides() { + return Direction.values(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java index 2e73a1042..255b9923a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.WeightedRandom; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -270,7 +270,7 @@ public class TileEntityFireworkBox extends TileEntityBase implements IEnergyDisp } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java index 831d6bec7..160cfac67 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java @@ -12,16 +12,16 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.block.material.Material; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootParameterSets; +import net.minecraft.loot.LootTables; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.WorldServer; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootTableList; +import net.minecraft.util.Direction; +import net.minecraft.world.server.ServerWorld; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import java.util.List; @@ -30,14 +30,14 @@ public class TileEntityFishingNet extends TileEntityBase { public int timeUntilNextDrop; public TileEntityFishingNet() { - super("fishingNet"); + super(ActuallyTiles.FISHINGNET_TILE.get()); } @Override public void writeSyncableNBT(CompoundNBT compound, NBTType type) { super.writeSyncableNBT(compound, type); if (type != NBTType.SAVE_BLOCK) { - compound.setInteger("TimeUntilNextDrop", this.timeUntilNextDrop); + compound.putInt("TimeUntilNextDrop", this.timeUntilNextDrop); } } @@ -45,27 +45,29 @@ public class TileEntityFishingNet extends TileEntityBase { public void readSyncableNBT(CompoundNBT compound, NBTType type) { super.readSyncableNBT(compound, type); if (type != NBTType.SAVE_BLOCK) { - this.timeUntilNextDrop = compound.getInteger("TimeUntilNextDrop"); + this.timeUntilNextDrop = compound.getInt("TimeUntilNextDrop"); } } @Override public void updateEntity() { super.updateEntity(); + if (!this.world.isRemote) { if (!this.isRedstonePowered) { if (this.world.getBlockState(this.pos.down()).getMaterial() == Material.WATER) { if (this.timeUntilNextDrop > 0) { this.timeUntilNextDrop--; if (this.timeUntilNextDrop <= 0) { - LootContext.Builder builder = new LootContext.Builder((WorldServer) this.world); - List fishables = this.world.getLootTableManager().getLootTableFromLocation(LootTableList.GAMEPLAY_FISHING).generateLootForPools(this.world.rand, builder.build()); + // TODO: [port] come back to this as the loot table may be wrong + LootContext.Builder builder = new LootContext.Builder((ServerWorld) this.world); + List fishables = this.world.getServer().getLootTableManager().getLootTableFromLocation(LootTables.GAMEPLAY_FISHING).generate(builder.build(LootParameterSets.FISHING)); for (ItemStack fishable : fishables) { ItemStack leftover = this.storeInContainer(fishable); if (StackUtil.isValid(leftover)) { - EntityItem item = new EntityItem(this.world, this.pos.getX() + 0.5, this.pos.getY() + 0.5, this.pos.getZ() + 0.5, leftover.copy()); + ItemEntity item = new ItemEntity(this.world, this.pos.getX() + 0.5, this.pos.getY() + 0.5, this.pos.getZ() + 0.5, leftover.copy()); item.lifespan = 2000; - this.world.spawnEntity(item); + this.world.addEntity(item); } } } @@ -79,21 +81,22 @@ public class TileEntityFishingNet extends TileEntityBase { } private ItemStack storeInContainer(ItemStack stack) { - for (EnumFacing side : EnumFacing.values()) { + for (Direction side : Direction.values()) { TileEntity tile = this.tilesAround[side.ordinal()]; if (tile != null) { - if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side.getOpposite())) { - IItemHandler cap = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side.getOpposite()); - if (cap != null) { - for (int i = 0; i < cap.getSlots(); i++) { - stack = cap.insertItem(i, stack, false); + // TODO: [port] come back and make sure this works + ItemStack copyStack = stack.copy(); + stack = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side.getOpposite()).map(cap -> { + ItemStack localStack = ItemStack.EMPTY; + for (int i = 0; i < cap.getSlots(); i++) { + localStack = cap.insertItem(i, copyStack, false); - if (!StackUtil.isValid(stack)) { - return StackUtil.getEmpty(); - } + if (!StackUtil.isValid(localStack)) { + return ItemStack.EMPTY; } } - } + return localStack; + }).orElse(ItemStack.EMPTY); } } return stack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java index 9e5a4ab17..75fed9db8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java @@ -14,11 +14,11 @@ import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -68,7 +68,7 @@ public class TileEntityFluidCollector extends TileEntityBase implements ISharing private void doWork() { BlockState state = this.world.getBlockState(this.pos); - EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(state); + Direction sideToManipulate = WorldUtil.getDirectionByPistonRotation(state); BlockPos coordsBlock = this.pos.offset(sideToManipulate); BlockState stateToBreak = this.world.getBlockState(coordsBlock); @@ -124,7 +124,7 @@ public class TileEntityFluidCollector extends TileEntityBase implements ISharing } @Override - public IFluidHandler getFluidHandler(EnumFacing facing) { + public IFluidHandler getFluidHandler(Direction facing) { return this.tank; } @@ -184,7 +184,7 @@ public class TileEntityFluidCollector extends TileEntityBase implements ISharing } @Override - public EnumFacing[] getFluidShareSides() { - return EnumFacing.values(); + public Direction[] getFluidShareSides() { + return Direction.values(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java index 27b77c035..079a5af7f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java @@ -17,12 +17,14 @@ import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.FurnaceRecipe; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; +import net.minecraft.util.datafix.fixes.FurnaceRecipes; +import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.energy.IEnergyStorage; public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements IButtonReactor { @@ -34,6 +36,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements public static final int ENERGY_USE = 25; private static final int SMELT_TIME = 80; public final CustomEnergyStorage storage = new CustomEnergyStorage(30000, 150, 0); + public final LazyOptional lazyEnergy = LazyOptional.of(() -> this.storage); public int firstSmeltTime; public int secondSmeltTime; public boolean isAutoSplit; @@ -44,7 +47,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements private boolean lastSmelted; public TileEntityFurnaceDouble() { - super(4, "furnaceDouble"); + super(ActuallyTiles.FURNACE_DOUBLE_TILE.get(), 4); } public static void autoSplit(ItemStackHandlerAA inv, int slot1, int slot2) { @@ -68,7 +71,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements if (StackUtil.isValid(toSplit)) { ItemStack splitFirst = toSplit.copy(); - ItemStack secondSplit = splitFirst.splitStack(splitFirst.getCount() / 2); + ItemStack secondSplit = splitFirst.split(splitFirst.getCount() / 2); inv.setStackInSlot(slot1, splitFirst); inv.setStackInSlot(slot2, secondSplit); } @@ -79,9 +82,9 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements public void writeSyncableNBT(CompoundNBT compound, NBTType type) { super.writeSyncableNBT(compound, type); if (type != NBTType.SAVE_BLOCK) { - compound.setInteger("FirstSmeltTime", this.firstSmeltTime); - compound.setInteger("SecondSmeltTime", this.secondSmeltTime); - compound.setBoolean("IsAutoSplit", this.isAutoSplit); + compound.putInt("FirstSmeltTime", this.firstSmeltTime); + compound.putInt("SecondSmeltTime", this.secondSmeltTime); + compound.putBoolean("IsAutoSplit", this.isAutoSplit); } this.storage.writeToNBT(compound); } @@ -90,8 +93,8 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements public void readSyncableNBT(CompoundNBT compound, NBTType type) { super.readSyncableNBT(compound, type); if (type != NBTType.SAVE_BLOCK) { - this.firstSmeltTime = compound.getInteger("FirstSmeltTime"); - this.secondSmeltTime = compound.getInteger("SecondSmeltTime"); + this.firstSmeltTime = compound.getInt("FirstSmeltTime"); + this.secondSmeltTime = compound.getInt("SecondSmeltTime"); this.isAutoSplit = compound.getBoolean("IsAutoSplit"); } this.storage.readFromNBT(compound); @@ -139,7 +142,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements } BlockState currState = this.world.getBlockState(this.pos); - boolean current = currState.getValue(BlockFurnaceDouble.IS_ON); + boolean current = currState.get(BlockFurnaceDouble.IS_ON); boolean changeTo = current; if (this.lastSmelted != smelted) { changeTo = smelted; @@ -152,7 +155,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements } if (changeTo != current) { - this.world.setBlockState(this.pos, currState.withProperty(BlockFurnaceDouble.IS_ON, changeTo)); + this.world.setBlockState(this.pos, currState.with(BlockFurnaceDouble.IS_ON, changeTo)); } this.lastSmelted = smelted; @@ -190,7 +193,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements } public void finishBurning(int theInput, int theOutput) { - ItemStack output = FurnaceRecipes.instance().getSmeltingResult(this.inv.getStackInSlot(theInput)); + ItemStack output = FurnaceRecipe.instance().getSmeltingResult(this.inv.getStackInSlot(theInput)); if (!StackUtil.isValid(this.inv.getStackInSlot(theOutput))) { this.inv.setStackInSlot(theOutput, output.copy()); } else if (this.inv.getStackInSlot(theOutput).getItem() == output.getItem()) { @@ -217,7 +220,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { - return this.storage; + public LazyOptional getEnergyStorage(Direction facing) { + return this.lazyEnergy; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java index 10af532f9..2f57c49b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java @@ -10,10 +10,10 @@ package de.ellpeck.actuallyadditions.mod.tile; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.energy.IEnergyStorage; @@ -97,8 +97,8 @@ public class TileEntityFurnaceSolar extends TileEntityBase implements ISharingEn } @Override - public EnumFacing[] getEnergyShareSides() { - return EnumFacing.values(); + public Direction[] getEnergyShareSides() { + return Direction.values(); } @Override @@ -107,7 +107,7 @@ public class TileEntityFurnaceSolar extends TileEntityBase implements ISharingEn } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java index a61a688cd..9ded5420c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java @@ -19,12 +19,14 @@ import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.Util; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; +import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.energy.IEnergyStorage; public class TileEntityGrinder extends TileEntityInventoryBase implements IButtonReactor { @@ -37,6 +39,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IButto public static final int SLOT_OUTPUT_2_2 = 5; public static final int ENERGY_USE = 40; public final CustomEnergyStorage storage = new CustomEnergyStorage(60000, 100, 0); + public final LazyOptional lazyEnergy = LazyOptional.of(() -> this.storage); public int firstCrushTime; public int secondCrushTime; public boolean isDouble; @@ -47,21 +50,21 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IButto private boolean lastAutoSplit; private boolean lastCrushed; - public TileEntityGrinder(int slots, String name) { - super(slots, name); + public TileEntityGrinder(TileEntityType type, int slots) { + super(type, slots); } public TileEntityGrinder() { - super(3, "grinder"); + super(ActuallyTiles.GRINDER_TILE.get(), 3); this.isDouble = false; } @Override public void writeSyncableNBT(CompoundNBT compound, NBTType type) { if (type != NBTType.SAVE_BLOCK) { - compound.setInteger("FirstCrushTime", this.firstCrushTime); - compound.setInteger("SecondCrushTime", this.secondCrushTime); - compound.setBoolean("IsAutoSplit", this.isAutoSplit); + compound.putInt("FirstCrushTime", this.firstCrushTime); + compound.putInt("SecondCrushTime", this.secondCrushTime); + compound.putBoolean("IsAutoSplit", this.isAutoSplit); } this.storage.writeToNBT(compound); super.writeSyncableNBT(compound, type); @@ -70,8 +73,8 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IButto @Override public void readSyncableNBT(CompoundNBT compound, NBTType type) { if (type != NBTType.SAVE_BLOCK) { - this.firstCrushTime = compound.getInteger("FirstCrushTime"); - this.secondCrushTime = compound.getInteger("SecondCrushTime"); + this.firstCrushTime = compound.getInt("FirstCrushTime"); + this.secondCrushTime = compound.getInt("SecondCrushTime"); this.isAutoSplit = compound.getBoolean("IsAutoSplit"); } this.storage.readFromNBT(compound); @@ -133,7 +136,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IButto } BlockState currState = this.world.getBlockState(this.pos); - boolean current = currState.getValue(BlockFurnaceDouble.IS_ON); + boolean current = currState.get(BlockFurnaceDouble.IS_ON); boolean changeTo = current; if (this.lastCrushed != crushed) { changeTo = crushed; @@ -146,7 +149,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IButto } if (changeTo != current) { - this.world.setBlockState(this.pos, currState.withProperty(BlockFurnaceDouble.IS_ON, changeTo)); + this.world.setBlockState(this.pos, currState.with(BlockFurnaceDouble.IS_ON, changeTo)); } this.lastCrushed = crushed; @@ -183,11 +186,11 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IButto ItemStack outputOne = recipe.getOutputOne(); ItemStack outputTwo = recipe.getOutputTwo(); if (StackUtil.isValid(outputOne)) { - if (outputOne.getItemDamage() == Util.WILDCARD) { - outputOne.setItemDamage(0); + if (outputOne.getDamage() == Util.WILDCARD) { + outputOne.setDamage(0); } - if (StackUtil.isValid(outputTwo) && outputTwo.getItemDamage() == Util.WILDCARD) { - outputTwo.setItemDamage(0); + if (StackUtil.isValid(outputTwo) && outputTwo.getDamage() == Util.WILDCARD) { + outputTwo.setDamage(0); } if ((!StackUtil.isValid(this.inv.getStackInSlot(theFirstOutput)) || this.inv.getStackInSlot(theFirstOutput).isItemEqual(outputOne) && this.inv.getStackInSlot(theFirstOutput).getCount() <= this.inv.getStackInSlot(theFirstOutput).getMaxStackSize() - outputOne.getCount()) && (!StackUtil.isValid(outputTwo) || !StackUtil.isValid(this.inv.getStackInSlot(theSecondOutput)) || this.inv.getStackInSlot(theSecondOutput).isItemEqual(outputTwo) && this.inv.getStackInSlot(theSecondOutput).getCount() <= this.inv.getStackInSlot(theSecondOutput).getMaxStackSize() - outputTwo.getCount())) { return true; @@ -210,8 +213,8 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IButto } ItemStack outputOne = recipe.getOutputOne(); if (StackUtil.isValid(outputOne)) { - if (outputOne.getItemDamage() == Util.WILDCARD) { - outputOne.setItemDamage(0); + if (outputOne.getDamage() == Util.WILDCARD) { + outputOne.setDamage(0); } if (!StackUtil.isValid(this.inv.getStackInSlot(theFirstOutput))) { this.inv.setStackInSlot(theFirstOutput, outputOne.copy()); @@ -222,8 +225,8 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IButto ItemStack outputTwo = recipe.getOutputTwo(); if (StackUtil.isValid(outputTwo)) { - if (outputTwo.getItemDamage() == Util.WILDCARD) { - outputTwo.setItemDamage(0); + if (outputTwo.getDamage() == Util.WILDCARD) { + outputTwo.setDamage(0); } int rand = this.world.rand.nextInt(100) + 1; if (rand <= recipe.getSecondChance()) { @@ -259,7 +262,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IButto } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { - return this.storage; + public LazyOptional getEnergyStorage(Direction facing) { + return this.lazyEnergy; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java index f44310209..b4cba13e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java @@ -13,7 +13,7 @@ package de.ellpeck.actuallyadditions.mod.tile; public class TileEntityGrinderDouble extends TileEntityGrinder { public TileEntityGrinderDouble() { - super(6, "grinderDouble"); + super(ActuallyTiles.GRINDER_DOUBLE_TILE.get(), 6); this.isDouble = true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java index 565e27dc2..caf49781d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java @@ -13,11 +13,11 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockMagma; +import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.energy.IEnergyStorage; @@ -113,8 +113,8 @@ public class TileEntityHeatCollector extends TileEntityBase implements ISharingE } @Override - public EnumFacing[] getEnergyShareSides() { - return EnumFacing.values(); + public Direction[] getEnergyShareSides() { + return Direction.values(); } @Override @@ -123,7 +123,7 @@ public class TileEntityHeatCollector extends TileEntityBase implements ISharingE } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java index 7655740e4..a53c0f5d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -38,11 +38,11 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt public int sideToPut = -1; public int slotToPutStart; public int slotToPutEnd; - public Map placeToPut = new ConcurrentHashMap<>(); + public Map placeToPut = new ConcurrentHashMap<>(); public int sideToPull = -1; public int slotToPullStart; public int slotToPullEnd; - public Map placeToPull = new ConcurrentHashMap<>(); + public Map placeToPull = new ConcurrentHashMap<>(); public boolean isAdvanced; public FilterSettings leftFilter = new FilterSettings(12, true, true, false, false, 0, -1000); public FilterSettings rightFilter = new FilterSettings(12, true, true, false, false, 0, -2000); @@ -58,7 +58,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt } public TileEntityInputter() { - super(1, "inputter"); + super(ActuallyTiles.INPUTTER_TILE.get(), 1); this.isAdvanced = false; } @@ -85,7 +85,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt } private boolean newPulling() { - for (EnumFacing side : this.placeToPull.keySet()) { + for (Direction side : this.placeToPull.keySet()) { WorldUtil.doItemInteraction(this.placeToPull.get(side), this.wrapper, Integer.MAX_VALUE, this.slotToPullStart, this.slotToPullEnd, 0, 1, !this.isAdvanced ? null : this.leftFilter); @@ -99,7 +99,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt private boolean newPutting() { if (!this.isAdvanced || this.rightFilter.check(this.inv.getStackInSlot(0))) { - for (EnumFacing side : this.placeToPut.keySet()) { + for (Direction side : this.placeToPut.keySet()) { WorldUtil.doItemInteraction(this.wrapper, this.placeToPut.get(side), Integer.MAX_VALUE, 0, 1, this.slotToPutStart, this.slotToPutEnd, null); if (this.placeToPut instanceof TileEntityItemViewer) { @@ -124,14 +124,14 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt this.placeToPut.clear(); if (this.sideToPull != -1) { - EnumFacing side = WorldUtil.getDirectionBySidesInOrder(this.sideToPull); + Direction side = WorldUtil.getDirectionBySidesInOrder(this.sideToPull); BlockPos offset = this.pos.offset(side); if (this.world.isBlockLoaded(offset)) { TileEntity tile = this.world.getTileEntity(offset); if (tile != null) { - for (EnumFacing facing : EnumFacing.values()) { + for (Direction facing : Direction.values()) { IItemHandler normal = null; if (tile.getClass() == TileEntityFurnace.class) { normal = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); @@ -162,14 +162,14 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt } if (this.sideToPut != -1) { - EnumFacing side = WorldUtil.getDirectionBySidesInOrder(this.sideToPut); + Direction side = WorldUtil.getDirectionBySidesInOrder(this.sideToPut); BlockPos offset = this.pos.offset(side); if (this.world.isBlockLoaded(offset)) { TileEntity tile = this.world.getTileEntity(offset); if (tile != null) { - for (EnumFacing facing : EnumFacing.values()) { + for (Direction facing : Direction.values()) { IItemHandler normal = null; if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing)) { normal = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java index 9395b50c0..98fc64e79 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java @@ -17,7 +17,9 @@ import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.Direction; +import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; @@ -25,10 +27,12 @@ import net.minecraftforge.items.ItemHandlerHelper; public abstract class TileEntityInventoryBase extends TileEntityBase { public final ItemStackHandlerAA inv; + public final LazyOptional lazyInv; - public TileEntityInventoryBase(int slots, String name) { - super(name); + public TileEntityInventoryBase(TileEntityType type, int slots) { + super(type); this.inv = new TileStackHandler(slots); + this.lazyInv = LazyOptional.of(() -> this.inv); } public static void saveSlots(IItemHandler slots, CompoundNBT compound) { @@ -38,11 +42,11 @@ public abstract class TileEntityInventoryBase extends TileEntityBase { ItemStack slot = slots.getStackInSlot(i); CompoundNBT tagCompound = new CompoundNBT(); if (StackUtil.isValid(slot)) { - slot.writeToNBT(tagCompound); + slot.write(tagCompound); } - tagList.appendTag(tagCompound); + tagList.add(tagCompound); } - compound.setTag("Items", tagList); + compound.put("Items", tagList); } } @@ -51,8 +55,8 @@ public abstract class TileEntityInventoryBase extends TileEntityBase { ListNBT tagList = compound.getList("Items", 10); for (int i = 0; i < slots.getSlots(); i++) { CompoundNBT tagCompound = tagList.getCompound(i); - slots.setStackInSlot(i, tagCompound != null && tagCompound.hasKey("id") - ? new ItemStack(tagCompound) + slots.setStackInSlot(i, tagCompound.contains("id") + ? ItemStack.read(tagCompound) : StackUtil.getEmpty()); } } @@ -67,8 +71,8 @@ public abstract class TileEntityInventoryBase extends TileEntityBase { } @Override - public IItemHandler getItemHandler(EnumFacing facing) { - return this.inv; + public LazyOptional getItemHandler(Direction facing) { + return this.lazyInv; } public IAcceptor getAcceptor() { @@ -136,6 +140,4 @@ public abstract class TileEntityInventoryBase extends TileEntityBase { TileEntityInventoryBase.this.markDirty(); } } - - ; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java index 4b9318fbc..5eb65a8a0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java @@ -18,7 +18,7 @@ import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.common.registry.ForgeRegistries; @@ -131,7 +131,7 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase { } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java index f333bbe02..8deb6fbd8 100755 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java @@ -23,7 +23,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.IItemHandler; @@ -115,13 +115,13 @@ public class TileEntityItemViewer extends TileEntityBase { } @Override - public IItemHandler getItemHandler(EnumFacing facing) { + public IItemHandler getItemHandler(Direction facing) { return this.itemHandler.getNormalHandler(); } @SuppressWarnings("unchecked") @Override - public T getCapability(Capability capability, EnumFacing facing) { + public T getCapability(Capability capability, Direction facing) { if (ActuallyAdditions.commonCapsLoaded) { if (capability == SlotlessItemHandlerConfig.CAPABILITY) { Object handler = this.itemHandler.getSlotlessHandler(); @@ -234,7 +234,7 @@ public class TileEntityItemViewer extends TileEntityBase { TileEntityLaserRelayItem tileFound = null; if (this.world != null) { //Why is that even possible..? for (int i = 0; i <= 5; i++) { - EnumFacing side = WorldUtil.getDirectionBySidesInOrder(i); + Direction side = WorldUtil.getDirectionBySidesInOrder(i); BlockPos pos = this.getPos().offset(side); if (this.world.isBlockLoaded(pos)) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java index c14c88514..d12885094 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewerHopping.java @@ -24,7 +24,7 @@ import net.minecraft.block.state.BlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.items.CapabilityItemHandler; @@ -96,17 +96,17 @@ public class TileEntityItemViewerHopping extends TileEntityItemViewer { this.handlerToPullFrom = null; this.handlerToPushTo = null; - TileEntity from = this.world.getTileEntity(this.pos.offset(EnumFacing.UP)); + TileEntity from = this.world.getTileEntity(this.pos.offset(Direction.UP)); if (from != null && !(from instanceof TileEntityItemViewer)) { IItemHandler normal = null; - if (from.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { - normal = from.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN); + if (from.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN)) { + normal = from.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN); } Object slotless = null; if (ActuallyAdditions.commonCapsLoaded) { - if (from.hasCapability(SlotlessItemHandlerConfig.CAPABILITY, EnumFacing.DOWN)) { - slotless = from.getCapability(SlotlessItemHandlerConfig.CAPABILITY, EnumFacing.DOWN); + if (from.hasCapability(SlotlessItemHandlerConfig.CAPABILITY, Direction.DOWN)) { + slotless = from.getCapability(SlotlessItemHandlerConfig.CAPABILITY, Direction.DOWN); } } @@ -114,7 +114,7 @@ public class TileEntityItemViewerHopping extends TileEntityItemViewer { } BlockState state = this.world.getBlockState(this.pos); - EnumFacing facing = state.getValue(BlockHopper.FACING); + Direction facing = state.getValue(BlockHopper.FACING); BlockPos toPos = this.pos.offset(facing); if (this.world.isBlockLoaded(toPos)) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java index 44bc63426..61e7495e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.relauncher.OnlyIn; import net.minecraftforge.items.IItemHandler; @@ -159,7 +159,7 @@ public abstract class TileEntityLaserRelay extends TileEntityInventoryBase { } @Override - public IItemHandler getItemHandler(EnumFacing facing) { + public IItemHandler getItemHandler(Direction facing) { return null; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java index e57434a36..df69bda17 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java @@ -20,7 +20,7 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; @@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap; public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { public static final int CAP = 1000; - public final ConcurrentHashMap receiversAround = new ConcurrentHashMap<>(); + public final ConcurrentHashMap receiversAround = new ConcurrentHashMap<>(); private final IEnergyStorage[] energyStorages = new IEnergyStorage[6]; private Mode mode = Mode.BOTH; @@ -44,7 +44,7 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { super(name, LaserType.ENERGY); for (int i = 0; i < this.energyStorages.length; i++) { - EnumFacing facing = EnumFacing.values()[i]; + Direction facing = Direction.values()[i]; this.energyStorages[i] = new IEnergyStorage() { @Override @@ -84,7 +84,7 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { this("laserRelay"); } - private int transmitEnergy(EnumFacing from, int maxTransmit, boolean simulate) { + private int transmitEnergy(Direction from, int maxTransmit, boolean simulate) { int transmitted = 0; if (maxTransmit > 0 && this.mode != Mode.OUTPUT_ONLY) { Network network = this.getNetwork(); @@ -96,7 +96,7 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.energyStorages[facing == null ? 0 : facing.ordinal()]; @@ -109,11 +109,11 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { @Override public void saveDataOnChangeOrWorldStart() { - Map old = new HashMap<>(this.receiversAround); + Map old = new HashMap<>(this.receiversAround); boolean change = false; this.receiversAround.clear(); - for (EnumFacing side : EnumFacing.values()) { + for (Direction side : Direction.values()) { BlockPos pos = this.getPos().offset(side); if (this.world.isBlockLoaded(pos)) { TileEntity tile = this.world.getTileEntity(pos); @@ -138,7 +138,7 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { } } - private int transferEnergyToReceiverInNeed(EnumFacing from, Network network, int maxTransfer, boolean simulate) { + private int transferEnergyToReceiverInNeed(Direction from, Network network, int maxTransfer, boolean simulate) { int transmitted = 0; //Keeps track of all the Laser Relays and Energy Acceptors that have been checked already to make nothing run multiple times Set alreadyChecked = new ObjectOpenHashSet<>(); @@ -156,11 +156,11 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { if (theRelay.mode != Mode.INPUT_ONLY) { boolean workedOnce = false; - for (EnumFacing facing : theRelay.receiversAround.keySet()) { + for (Direction facing : theRelay.receiversAround.keySet()) { if (theRelay != this || facing != from) { TileEntity tile = theRelay.receiversAround.get(facing); - EnumFacing opp = facing.getOpposite(); + Direction opp = facing.getOpposite(); if (tile != null) { if (tile.hasCapability(CapabilityEnergy.ENERGY, opp)) { IEnergyStorage cap = tile.getCapability(CapabilityEnergy.ENERGY, opp); @@ -191,10 +191,10 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay { for (TileEntityLaserRelayEnergy theRelay : relaysThatWork) { double highestLoss = Math.max(theRelay.getLossPercentage(), this.getLossPercentage()); int lowestCap = Math.min(theRelay.getEnergyCap(), this.getEnergyCap()); - for (Map.Entry receiver : theRelay.receiversAround.entrySet()) { + for (Map.Entry receiver : theRelay.receiversAround.entrySet()) { if (receiver != null) { - EnumFacing side = receiver.getKey(); - EnumFacing opp = side.getOpposite(); + Direction side = receiver.getKey(); + Direction opp = side.getOpposite(); TileEntity tile = receiver.getValue(); if (!alreadyChecked.contains(tile.getPos())) { alreadyChecked.add(tile.getPos()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java index acd200106..a6c171ba8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java @@ -20,7 +20,7 @@ import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fluids.FluidStack; @@ -37,7 +37,7 @@ import java.util.concurrent.ConcurrentHashMap; public class TileEntityLaserRelayFluids extends TileEntityLaserRelay { - public final ConcurrentHashMap handlersAround = new ConcurrentHashMap<>(); + public final ConcurrentHashMap handlersAround = new ConcurrentHashMap<>(); private final IFluidHandler[] fluidHandlers = new IFluidHandler[6]; private Mode mode = Mode.BOTH; @@ -45,7 +45,7 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay { super("laserRelayFluids", LaserType.FLUID); for (int i = 0; i < this.fluidHandlers.length; i++) { - EnumFacing facing = EnumFacing.values()[i]; + Direction facing = Direction.values()[i]; this.fluidHandlers[i] = new IFluidHandler() { @Override public IFluidTankProperties[] getTankProperties() { @@ -76,7 +76,7 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay { if (!this.world.isRemote) { if (this.mode == Mode.INPUT_ONLY) { - for (EnumFacing side : this.handlersAround.keySet()) { + for (Direction side : this.handlersAround.keySet()) { WorldUtil.doFluidInteraction(this.handlersAround.get(side), this, side.getOpposite(), Integer.MAX_VALUE); } } @@ -90,11 +90,11 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay { @Override public void saveDataOnChangeOrWorldStart() { - Map old = new HashMap<>(this.handlersAround); + Map old = new HashMap<>(this.handlersAround); boolean change = false; this.handlersAround.clear(); - for (EnumFacing side : EnumFacing.values()) { + for (Direction side : Direction.values()) { BlockPos pos = this.getPos().offset(side); if (this.world.isBlockLoaded(pos)) { TileEntity tile = this.world.getTileEntity(pos); @@ -120,13 +120,13 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay { } @Override - public IFluidHandler getFluidHandler(EnumFacing facing) { + public IFluidHandler getFluidHandler(Direction facing) { return this.fluidHandlers[facing == null ? 0 : facing.ordinal()]; } - private int transmitFluid(EnumFacing from, FluidStack stack, boolean doFill) { + private int transmitFluid(Direction from, FluidStack stack, boolean doFill) { int transmitted = 0; if (stack != null && this.mode != Mode.OUTPUT_ONLY) { Network network = this.getNetwork(); @@ -137,7 +137,7 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay { return transmitted; } - private int transferFluidToReceiverInNeed(EnumFacing from, Network network, FluidStack stack, boolean doFill) { + private int transferFluidToReceiverInNeed(Direction from, Network network, FluidStack stack, boolean doFill) { int transmitted = 0; //Keeps track of all the Laser Relays and Energy Acceptors that have been checked already to make nothing run multiple times Set alreadyChecked = new HashSet<>(); @@ -155,11 +155,11 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay { if (theRelay.mode != Mode.INPUT_ONLY) { boolean workedOnce = false; - for (EnumFacing facing : theRelay.handlersAround.keySet()) { + for (Direction facing : theRelay.handlersAround.keySet()) { if (theRelay != this || facing != from) { TileEntity tile = theRelay.handlersAround.get(facing); - EnumFacing opp = facing.getOpposite(); + Direction opp = facing.getOpposite(); if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, opp)) { IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, opp); if (cap != null && cap.fill(stack, false) > 0) { @@ -186,10 +186,10 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay { } for (TileEntityLaserRelayFluids theRelay : relaysThatWork) { - for (Map.Entry receiver : theRelay.handlersAround.entrySet()) { + for (Map.Entry receiver : theRelay.handlersAround.entrySet()) { if (receiver != null) { - EnumFacing side = receiver.getKey(); - EnumFacing opp = side.getOpposite(); + Direction side = receiver.getKey(); + Direction opp = side.getOpposite(); TileEntity tile = receiver.getValue(); if (!alreadyChecked.contains(tile.getPos())) { alreadyChecked.add(tile.getPos()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java index 71a697a85..7a85f5d0a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.OnlyIn; @@ -66,7 +66,7 @@ public class TileEntityLaserRelayItem extends TileEntityLaserRelay { this.handlersAround.clear(); for (int i = 0; i <= 5; i++) { - EnumFacing side = WorldUtil.getDirectionBySidesInOrder(i); + Direction side = WorldUtil.getDirectionBySidesInOrder(i); BlockPos pos = this.getPos().offset(side); if (this.world.isBlockLoaded(pos)) { TileEntity tile = this.world.getTileEntity(pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java index 33736ae72..3a18aaa73 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java @@ -14,10 +14,10 @@ import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.init.Blocks; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.energy.IEnergyStorage; @@ -103,7 +103,7 @@ public class TileEntityLavaFactoryController extends TileEntityBase implements I } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java index d323c3e24..2ecfbdba9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java @@ -15,7 +15,7 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.block.Block; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.energy.IEnergyStorage; @@ -116,8 +116,8 @@ public class TileEntityLeafGenerator extends TileEntityBase implements ISharingE } @Override - public EnumFacing[] getEnergyShareSides() { - return EnumFacing.values(); + public Direction[] getEnergyShareSides() { + return Direction.values(); } @Override @@ -126,7 +126,7 @@ public class TileEntityLeafGenerator extends TileEntityBase implements ISharingE } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java index 1a29a7511..cea07fff8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java @@ -19,11 +19,11 @@ import de.ellpeck.actuallyadditions.mod.util.StackUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -128,7 +128,7 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IButtonR BlockState state = this.world.getBlockState(pos); Block block = state.getBlock(); - ItemStack stack = block.getPickBlock(state, new RayTraceResult(Type.BLOCK, new Vec3d(0, 0, 0), EnumFacing.DOWN, pos), this.world, pos, FakePlayerFactory.getMinecraft((WorldServer) this.world)); + ItemStack stack = block.getPickBlock(state, new RayTraceResult(Type.BLOCK, new Vec3d(0, 0, 0), Direction.DOWN, pos), this.world, pos, FakePlayerFactory.getMinecraft((WorldServer) this.world)); if (!block.isAir(this.world.getBlockState(pos), this.world, pos)) { if (block.getHarvestLevel(this.world.getBlockState(pos)) <= ItemDrill.HARVEST_LEVEL && state.getBlockHardness(this.world, pos) >= 0F && !(block instanceof BlockLiquid) && !(block instanceof IFluidBlock) && this.isMinable(block, stack)) { NonNullList drops = NonNullList.create(); @@ -231,7 +231,7 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IButtonR } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java index a2117dff9..3af6997ab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java @@ -16,7 +16,7 @@ import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntListValues; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -158,7 +158,7 @@ public class TileEntityOilGenerator extends TileEntityBase implements ISharingEn } @Override - public IFluidHandler getFluidHandler(EnumFacing facing) { + public IFluidHandler getFluidHandler(Direction facing) { return this.tank; } @@ -173,7 +173,7 @@ public class TileEntityOilGenerator extends TileEntityBase implements ISharingEn } @Override - public EnumFacing[] getFluidShareSides() { + public Direction[] getFluidShareSides() { return null; } @@ -188,8 +188,8 @@ public class TileEntityOilGenerator extends TileEntityBase implements ISharingEn } @Override - public EnumFacing[] getEnergyShareSides() { - return EnumFacing.values(); + public Direction[] getEnergyShareSides() { + return Direction.values(); } @Override @@ -198,7 +198,7 @@ public class TileEntityOilGenerator extends TileEntityBase implements ISharingEn } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java index 951a4cd68..2fa2f2dc1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java @@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.CapabilityEnergy; @@ -28,7 +28,7 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement if (super.isBoundThingInRange()) { TileEntity tile = this.world.getTileEntity(this.boundPosition); if (tile != null && !(tile instanceof TileEntityLaserRelayEnergy)) { - for (EnumFacing facing : EnumFacing.values()) { + for (Direction facing : Direction.values()) { if (tile.hasCapability(CapabilityEnergy.ENERGY, facing)) { return true; } } } @@ -52,8 +52,8 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement } @Override - public EnumFacing[] getEnergyShareSides() { - return EnumFacing.values(); + public Direction[] getEnergyShareSides() { + return Direction.values(); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java index 5357d5763..3dd620976 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java @@ -14,7 +14,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor; import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IRemover; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; @@ -35,7 +35,7 @@ public class TileEntityPhantomItemface extends TileEntityPhantomface { if (super.isBoundThingInRange()) { TileEntity tile = this.world.getTileEntity(this.getBoundPosition()); if (tile != null) { - for (EnumFacing facing : EnumFacing.values()) { + for (Direction facing : Direction.values()) { if (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing)) { return true; } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java index 013efe8ed..98ecd37cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java @@ -12,7 +12,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -28,7 +28,7 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements if (super.isBoundThingInRange()) { TileEntity tile = this.world.getTileEntity(this.boundPosition); if (tile != null && !(tile instanceof TileEntityLaserRelayFluids)) { - for (EnumFacing facing : EnumFacing.values()) { + for (Direction facing : Direction.values()) { if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing)) { return true; } } } @@ -52,7 +52,7 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements } @Override - public EnumFacing[] getFluidShareSides() { - return EnumFacing.values(); + public Direction[] getFluidShareSides() { + return Direction.values(); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java index f8bd2d8dd..54d801710 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java @@ -22,7 +22,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; @@ -213,7 +213,7 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements @Override public void onButtonPressed(int buttonID, PlayerEntity player) { - if (this.side + 1 >= EnumFacing.values().length) { + if (this.side + 1 >= Direction.values().length) { this.side = 0; } else { this.side++; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java index 532bfe23b..4f66d1b45 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java @@ -14,13 +14,13 @@ import java.util.Arrays; import net.minecraft.block.Block; import net.minecraft.block.state.BlockState; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; public class TileEntityPhantomRedstoneface extends TileEntityPhantomface { - public final int[] providesStrong = new int[EnumFacing.values().length]; - public final int[] providesWeak = new int[EnumFacing.values().length]; + public final int[] providesStrong = new int[Direction.values().length]; + public final int[] providesWeak = new int[Direction.values().length]; private final int[] lastProvidesStrong = new int[this.providesStrong.length]; private final int[] lastProvidesWeak = new int[this.providesWeak.length]; @@ -37,8 +37,8 @@ public class TileEntityPhantomRedstoneface extends TileEntityPhantomface { if (boundState != null) { Block boundBlock = boundState.getBlock(); if (boundBlock != null) { - for (int i = 0; i < EnumFacing.values().length; i++) { - EnumFacing facing = EnumFacing.values()[i]; + for (int i = 0; i < Direction.values().length; i++) { + Direction facing = Direction.values()[i]; this.providesWeak[i] = boundState.getWeakPower(this.world, this.boundPosition, facing); this.providesStrong[i] = boundState.getStrongPower(this.world, this.boundPosition, facing); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java index d13d2e1d4..1f85a0da8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java @@ -14,10 +14,10 @@ import de.ellpeck.actuallyadditions.api.tile.IPhantomTile; import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import net.minecraft.block.Block; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -181,7 +181,7 @@ public abstract class TileEntityPhantomface extends TileEntityInventoryBase impl protected abstract boolean isCapabilitySupported(Capability capability); @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { + public boolean hasCapability(Capability capability, Direction facing) { if (this.isBoundThingInRange() && this.isCapabilitySupported(capability)) { TileEntity tile = this.world.getTileEntity(this.getBoundPosition()); if (tile != null) { @@ -192,7 +192,7 @@ public abstract class TileEntityPhantomface extends TileEntityInventoryBase impl } @Override - public T getCapability(Capability capability, EnumFacing facing) { + public T getCapability(Capability capability, Direction facing) { if (this.isBoundThingInRange() && this.isCapabilitySupported(capability)) { TileEntity tile = this.world.getTileEntity(this.getBoundPosition()); if (tile != null) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java index 78904143d..0dcad14d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java @@ -14,7 +14,7 @@ import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.items.IItemHandler; @@ -50,7 +50,7 @@ public class TileEntityPlayerInterface extends TileEntityBase implements IEnergy } @Override - public IItemHandler getItemHandler(EnumFacing facing) { + public IItemHandler getItemHandler(Direction facing) { PlayerEntity player = this.getPlayer(); if (this.oldPlayer != player) { @@ -141,7 +141,7 @@ public class TileEntityPlayerInterface extends TileEntityBase implements IEnergy } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java index cadaad41a..00a710a50 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java @@ -11,7 +11,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraftforge.energy.IEnergyStorage; import java.util.ArrayList; @@ -87,7 +87,7 @@ public class TileEntityShockSuppressor extends TileEntityBase implements IEnergy } @Override - public IEnergyStorage getEnergyStorage(EnumFacing facing) { + public IEnergyStorage getEnergyStorage(Direction facing) { return this.storage; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java index d39584ddb..b2b66f2a7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -25,7 +25,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.SPacketBlockChange; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; @@ -117,9 +117,9 @@ public final class WorldUtil { return extracted; } - public static void doEnergyInteraction(TileEntity tileFrom, TileEntity tileTo, EnumFacing sideTo, int maxTransfer) { + public static void doEnergyInteraction(TileEntity tileFrom, TileEntity tileTo, Direction sideTo, int maxTransfer) { if (maxTransfer > 0) { - EnumFacing opp = sideTo == null + Direction opp = sideTo == null ? null : sideTo.getOpposite(); IEnergyStorage handlerFrom = tileFrom.getCapability(CapabilityEnergy.ENERGY, sideTo); @@ -135,7 +135,7 @@ public final class WorldUtil { } } - public static void doFluidInteraction(TileEntity tileFrom, TileEntity tileTo, EnumFacing sideTo, int maxTransfer) { + public static void doFluidInteraction(TileEntity tileFrom, TileEntity tileTo, Direction sideTo, int maxTransfer) { if (maxTransfer > 0) { if (tileFrom.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo) && tileTo.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo.getOpposite())) { IFluidHandler handlerFrom = tileFrom.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo); @@ -169,7 +169,7 @@ public final class WorldUtil { return true; } - public static ItemStack useItemAtSide(EnumFacing side, World world, BlockPos pos, ItemStack stack) { + public static ItemStack useItemAtSide(Direction side, World world, BlockPos pos, ItemStack stack) { if (world instanceof WorldServer && StackUtil.isValid(stack) && pos != null) { BlockPos offsetPos = pos.offset(side); BlockState state = world.getBlockState(offsetPos); @@ -210,7 +210,7 @@ public final class WorldUtil { return stack; } - public static boolean dropItemAtSide(EnumFacing side, World world, BlockPos pos, ItemStack stack) { + public static boolean dropItemAtSide(Direction side, World world, BlockPos pos, ItemStack stack) { BlockPos coords = pos.offset(side); if (world.isBlockLoaded(coords)) { EntityItem item = new EntityItem(world, coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, stack); @@ -223,33 +223,33 @@ public final class WorldUtil { return false; } - public static EnumFacing getDirectionBySidesInOrder(int side) { + public static Direction getDirectionBySidesInOrder(int side) { switch (side) { case 0: - return EnumFacing.UP; + return Direction.UP; case 1: - return EnumFacing.DOWN; + return Direction.DOWN; case 2: - return EnumFacing.NORTH; + return Direction.NORTH; case 3: - return EnumFacing.EAST; + return Direction.EAST; case 4: - return EnumFacing.SOUTH; + return Direction.SOUTH; default: - return EnumFacing.WEST; + return Direction.WEST; } } - public static EnumFacing getDirectionByPistonRotation(BlockState state) { + public static Direction getDirectionByPistonRotation(BlockState state) { return state.getValue(BlockDirectional.FACING); } public static ArrayList getMaterialsAround(World world, BlockPos pos) { ArrayList blocks = new ArrayList<>(); - blocks.add(world.getBlockState(pos.offset(EnumFacing.NORTH)).getMaterial()); - blocks.add(world.getBlockState(pos.offset(EnumFacing.EAST)).getMaterial()); - blocks.add(world.getBlockState(pos.offset(EnumFacing.SOUTH)).getMaterial()); - blocks.add(world.getBlockState(pos.offset(EnumFacing.WEST)).getMaterial()); + blocks.add(world.getBlockState(pos.offset(Direction.NORTH)).getMaterial()); + blocks.add(world.getBlockState(pos.offset(Direction.EAST)).getMaterial()); + blocks.add(world.getBlockState(pos.offset(Direction.SOUTH)).getMaterial()); + blocks.add(world.getBlockState(pos.offset(Direction.WEST)).getMaterial()); return blocks; }