Updated mappings
This commit is contained in:
parent
b864d551dd
commit
647b126c98
8 changed files with 18 additions and 24 deletions
|
@ -65,7 +65,7 @@ if (ENV.BUILD_NUMBER) {
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
mappings channel: 'snapshot', version: '20180921-1.13'
|
mappings channel: 'snapshot', version: '20190222-1.13.1'
|
||||||
|
|
||||||
runs {
|
runs {
|
||||||
client {
|
client {
|
||||||
|
|
|
@ -72,20 +72,20 @@ public class BlockIronFurnace extends BlockMachineBase {
|
||||||
|
|
||||||
switch (enumfacing) {
|
switch (enumfacing) {
|
||||||
case WEST:
|
case WEST:
|
||||||
worldIn.spawnParticle(Particles.SMOKE, 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.spawnParticle(Particles.FLAME, 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;
|
break;
|
||||||
case EAST:
|
case EAST:
|
||||||
worldIn.spawnParticle(Particles.SMOKE, 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.spawnParticle(Particles.FLAME, 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;
|
break;
|
||||||
case NORTH:
|
case NORTH:
|
||||||
worldIn.spawnParticle(Particles.SMOKE, 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.spawnParticle(Particles.FLAME, 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;
|
break;
|
||||||
case SOUTH:
|
case SOUTH:
|
||||||
worldIn.spawnParticle(Particles.SMOKE, 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.spawnParticle(Particles.FLAME, 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ package techreborn.entities;
|
||||||
import net.minecraft.entity.EntityLivingBase;
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.entity.MoverType;
|
import net.minecraft.entity.MoverType;
|
||||||
import net.minecraft.entity.item.EntityTNTPrimed;
|
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.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import reborncore.common.explosion.RebornExplosion;
|
import reborncore.common.explosion.RebornExplosion;
|
||||||
|
@ -84,13 +84,13 @@ public class EntityNukePrimed extends EntityTNTPrimed {
|
||||||
setFuse(getFuse() - 1);
|
setFuse(getFuse() - 1);
|
||||||
|
|
||||||
if (getFuse() <= 0) {
|
if (getFuse() <= 0) {
|
||||||
this.setDead();
|
this.remove();
|
||||||
if (!this.world.isRemote) {
|
if (!this.world.isRemote) {
|
||||||
explodeNuke();
|
explodeNuke();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.handleWaterMovement();
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@ public class StackToolTipEvent {
|
||||||
&& block.getRegistryName().getNamespace().contains("techreborn")) {
|
&& block.getRegistryName().getNamespace().contains("techreborn")) {
|
||||||
TileEntity tile = block.createTileEntity(block.getDefaultState(), Minecraft.getInstance().world);
|
TileEntity tile = block.createTileEntity(block.getDefaultState(), Minecraft.getInstance().world);
|
||||||
boolean hasData = false;
|
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");
|
NBTTagCompound tileData = event.getItemStack().getTag().getCompound("tile_data");
|
||||||
tile.read(tileData);
|
tile.read(tileData);
|
||||||
hasData = true;
|
hasData = true;
|
||||||
|
|
|
@ -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 + "X: " + TextFormatting.GOLD + x));
|
||||||
tooltip.add(new TextComponentString(TextFormatting.GRAY + "Y: " + TextFormatting.GOLD + y));
|
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.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 {
|
} else {
|
||||||
tooltip.add(new TextComponentString(TextFormatting.GRAY + I18n.format("techreborn.message.noCoordsSet")));
|
tooltip.add(new TextComponentString(TextFormatting.GRAY + I18n.format("techreborn.message.noCoordsSet")));
|
||||||
|
|
|
@ -30,8 +30,6 @@ import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.EnumFacing;
|
import net.minecraft.util.EnumFacing;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
||||||
import reborncore.api.IToolHandler;
|
import reborncore.api.IToolHandler;
|
||||||
import techreborn.TechReborn;
|
import techreborn.TechReborn;
|
||||||
|
|
||||||
|
@ -44,12 +42,6 @@ public class ItemWrench extends Item implements IToolHandler {
|
||||||
super(new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1));
|
super(new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
public boolean isFull3D() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleTool(ItemStack stack, BlockPos pos, World world, EntityPlayer player, EnumFacing side, boolean damage) {
|
public boolean handleTool(ItemStack stack, BlockPos pos, World world, EntityPlayer player, EnumFacing side, boolean damage) {
|
||||||
if (damage) {
|
if (damage) {
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
package techreborn.tiles.machine.multiblock;
|
package techreborn.tiles.machine.multiblock;
|
||||||
|
|
||||||
|
import net.minecraft.block.BlockFlowingFluid;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
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 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 boolean blade = multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0));
|
||||||
final IBlockState centerBlock = multiblockChecker.getBlock(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.getBlock() instanceof IFluidBlock)
|
||||||
&& centerBlock.getMaterial() == Material.WATER);
|
&& centerBlock.getMaterial() == Material.WATER);
|
||||||
return down && center && blade && up;
|
return down && center && blade && up;
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
package techreborn.tiles.machine.multiblock;
|
package techreborn.tiles.machine.multiblock;
|
||||||
|
|
||||||
|
import net.minecraft.block.BlockFlowingFluid;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
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 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 boolean blade = multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0));
|
||||||
final IBlockState centerBlock = multiblockChecker.getBlock(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.getBlock() instanceof IFluidBlock)
|
||||||
&& centerBlock.getMaterial() == Material.WATER);
|
&& centerBlock.getMaterial() == Material.WATER);
|
||||||
return down && center && blade && up;
|
return down && center && blade && up;
|
||||||
|
|
Loading…
Add table
Reference in a new issue