diff --git a/build.gradle b/build.gradle index 3b9c8c5cf..e3f8fb3c3 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,7 @@ if (ENV.BUILD_NUMBER) { } minecraft { - mappings channel: 'snapshot', version: '20180921-1.13' + mappings channel: 'snapshot', version: '20190222-1.13.1' runs { client { diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java index 80c8346c7..8c53f6893 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java @@ -72,20 +72,20 @@ public class BlockIronFurnace extends BlockMachineBase { switch (enumfacing) { case WEST: - worldIn.spawnParticle(Particles.SMOKE, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); - worldIn.spawnParticle(Particles.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldIn.addParticle(Particles.SMOKE, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldIn.addParticle(Particles.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); break; case EAST: - worldIn.spawnParticle(Particles.SMOKE, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); - worldIn.spawnParticle(Particles.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldIn.addParticle(Particles.SMOKE, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldIn.addParticle(Particles.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); break; case NORTH: - worldIn.spawnParticle(Particles.SMOKE, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); - worldIn.spawnParticle(Particles.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); + worldIn.addParticle(Particles.SMOKE, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); + worldIn.addParticle(Particles.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); break; case SOUTH: - worldIn.spawnParticle(Particles.SMOKE, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); - worldIn.spawnParticle(Particles.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); + worldIn.addParticle(Particles.SMOKE, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); + worldIn.addParticle(Particles.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); } } } diff --git a/src/main/java/techreborn/entities/EntityNukePrimed.java b/src/main/java/techreborn/entities/EntityNukePrimed.java index 228e08e4e..32cae3f34 100644 --- a/src/main/java/techreborn/entities/EntityNukePrimed.java +++ b/src/main/java/techreborn/entities/EntityNukePrimed.java @@ -27,7 +27,7 @@ package techreborn.entities; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.MoverType; import net.minecraft.entity.item.EntityTNTPrimed; -import net.minecraft.util.EnumParticleTypes; +import net.minecraft.init.Particles; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.common.explosion.RebornExplosion; @@ -84,13 +84,13 @@ public class EntityNukePrimed extends EntityTNTPrimed { setFuse(getFuse() - 1); if (getFuse() <= 0) { - this.setDead(); + this.remove(); if (!this.world.isRemote) { explodeNuke(); } } else { this.handleWaterMovement(); - this.world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, this.posX, this.posY + 0.5D, this.posZ, 0.0D, 0.0D, 0.0D); + this.world.addParticle(Particles.SMOKE, this.posX, this.posY + 0.5D, this.posZ, 0.0D, 0.0D, 0.0D); } } diff --git a/src/main/java/techreborn/events/StackToolTipEvent.java b/src/main/java/techreborn/events/StackToolTipEvent.java index fb09c5dd8..a483b3b17 100644 --- a/src/main/java/techreborn/events/StackToolTipEvent.java +++ b/src/main/java/techreborn/events/StackToolTipEvent.java @@ -92,7 +92,7 @@ public class StackToolTipEvent { && block.getRegistryName().getNamespace().contains("techreborn")) { TileEntity tile = block.createTileEntity(block.getDefaultState(), Minecraft.getInstance().world); boolean hasData = false; - if (event.getItemStack().hasTag() && event.getItemStack().getTag().hasKey("tile_data")) { + if (event.getItemStack().hasTag() && event.getItemStack().getTag().contains("tile_data")) { NBTTagCompound tileData = event.getItemStack().getTag().getCompound("tile_data"); tile.read(tileData); hasData = true; diff --git a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java index 8db608c39..22125db68 100644 --- a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java +++ b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java @@ -120,7 +120,7 @@ public class ItemFrequencyTransmitter extends Item { tooltip.add(new TextComponentString(TextFormatting.GRAY + "X: " + TextFormatting.GOLD + x)); tooltip.add(new TextComponentString(TextFormatting.GRAY + "Y: " + TextFormatting.GOLD + y)); tooltip.add(new TextComponentString(TextFormatting.GRAY + "Z: " + TextFormatting.GOLD + z)); - tooltip.add(new TextComponentString(TextFormatting.DARK_GRAY + DimensionManager.getProviderType(dim).getName()); + tooltip.add(new TextComponentString(TextFormatting.DARK_GRAY + DimensionManager.getProviderType(dim).getName())); } else { tooltip.add(new TextComponentString(TextFormatting.GRAY + I18n.format("techreborn.message.noCoordsSet"))); diff --git a/src/main/java/techreborn/items/tool/ItemWrench.java b/src/main/java/techreborn/items/tool/ItemWrench.java index 78809d507..d89edb511 100644 --- a/src/main/java/techreborn/items/tool/ItemWrench.java +++ b/src/main/java/techreborn/items/tool/ItemWrench.java @@ -30,8 +30,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import reborncore.api.IToolHandler; import techreborn.TechReborn; @@ -44,12 +42,6 @@ public class ItemWrench extends Item implements IToolHandler { super(new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1)); } - @Override - @OnlyIn(Dist.CLIENT) - public boolean isFull3D() { - return true; - } - @Override public boolean handleTool(ItemStack stack, BlockPos pos, World world, EntityPlayer player, EnumFacing side, boolean damage) { if (damage) { diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java index 1b62bfb0b..9a8bfe08c 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java @@ -24,6 +24,7 @@ package techreborn.tiles.machine.multiblock; +import net.minecraft.block.BlockFlowingFluid; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -84,7 +85,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, new BlockPos(0, 2, 0)); final boolean blade = multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); final IBlockState centerBlock = multiblockChecker.getBlock(0, 1, 0); - final boolean center = ((centerBlock.getBlock() instanceof BlockLiquid + final boolean center = ((centerBlock.getBlock() instanceof BlockFlowingFluid || centerBlock.getBlock() instanceof IFluidBlock) && centerBlock.getMaterial() == Material.WATER); return down && center && blade && up; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java index d16cd0099..1df0acd47 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java @@ -24,6 +24,7 @@ package techreborn.tiles.machine.multiblock; +import net.minecraft.block.BlockFlowingFluid; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -83,7 +84,7 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, new BlockPos(0, 2, 0)); final boolean blade = multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); final IBlockState centerBlock = multiblockChecker.getBlock(0, 1, 0); - final boolean center = ((centerBlock.getBlock() instanceof BlockLiquid + final boolean center = ((centerBlock.getBlock() instanceof BlockFlowingFluid || centerBlock.getBlock() instanceof IFluidBlock) && centerBlock.getMaterial() == Material.WATER); return down && center && blade && up;