diff --git a/build.gradle b/build.gradle index 93a4e29c8..a01169d74 100644 --- a/build.gradle +++ b/build.gradle @@ -195,8 +195,8 @@ minecraft { username = developmentEnvironmentUserName.toString() useDependencyAccessTransformers = true - setMcpMappingChannel("snapshot") - setMcpMappingVersion("20171003") + setMcpMappingChannel("stable") + setMcpMappingVersion("39") // Automatic token injection with RetroFuturaGradle if (gradleTokenModId) { diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 15f9f22d9..3ee922885 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -307,13 +307,13 @@ public abstract class AEBaseBlock extends Block { return dir; } - final int west_x = forward.getFrontOffsetY() * up.getFrontOffsetZ() - forward.getFrontOffsetZ() * up.getFrontOffsetY(); - final int west_y = forward.getFrontOffsetZ() * up.getFrontOffsetX() - forward.getFrontOffsetX() * up.getFrontOffsetZ(); - final int west_z = forward.getFrontOffsetX() * up.getFrontOffsetY() - forward.getFrontOffsetY() * up.getFrontOffsetX(); + final int west_x = forward.getYOffset() * up.getZOffset() - forward.getZOffset() * up.getYOffset(); + final int west_y = forward.getZOffset() * up.getYOffset() - forward.getXOffset() * up.getZOffset(); + final int west_z = forward.getXOffset() * up.getYOffset() - forward.getYOffset() * up.getXOffset(); EnumFacing west = null; for (final EnumFacing dx : EnumFacing.VALUES) { - if (dx.getFrontOffsetX() == west_x && dx.getFrontOffsetY() == west_y && dx.getFrontOffsetZ() == west_z) { + if (dx.getXOffset() == west_x && dx.getYOffset() == west_y && dx.getZOffset() == west_z) { west = dx; } } @@ -348,12 +348,12 @@ public abstract class AEBaseBlock extends Block { @Override public String toString() { - String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered"; + String regName = this.getRegistryName() != null ? this.getRegistryName().getPath() : "unregistered"; return this.getClass().getSimpleName() + "[" + regName + "]"; } - protected String getUnlocalizedName(final ItemStack is) { - return this.getUnlocalizedName(); + protected String getTranslationKey(final ItemStack is) { + return this.getTranslationKey(); } protected boolean hasCustomRotation() { diff --git a/src/main/java/appeng/block/AEBaseItemBlock.java b/src/main/java/appeng/block/AEBaseItemBlock.java index 65161a79c..c697ddaa5 100644 --- a/src/main/java/appeng/block/AEBaseItemBlock.java +++ b/src/main/java/appeng/block/AEBaseItemBlock.java @@ -38,6 +38,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -77,8 +78,9 @@ public class AEBaseItemBlock extends ItemBlock { } @Override - public String getUnlocalizedName(final ItemStack is) { - return this.blockType.getUnlocalizedName(is); + @NotNull + public String getTranslationKey(final ItemStack is) { + return this.blockType.getTranslationKey(is); } @Override @@ -137,7 +139,7 @@ public class AEBaseItemBlock extends ItemBlock { ori = ((IOrientableBlock) this.blockType).getOrientable(w, pos); up = side; forward = EnumFacing.SOUTH; - if (up.getFrontOffsetY() == 0) { + if (up.getYOffset() == 0) { forward = EnumFacing.UP; } } diff --git a/src/main/java/appeng/block/AEBaseStairBlock.java b/src/main/java/appeng/block/AEBaseStairBlock.java index 929fe6055..3fbe2f494 100644 --- a/src/main/java/appeng/block/AEBaseStairBlock.java +++ b/src/main/java/appeng/block/AEBaseStairBlock.java @@ -36,16 +36,18 @@ public abstract class AEBaseStairBlock extends BlockStairs { super(block.getDefaultState()); Preconditions.checkNotNull(block); - Preconditions.checkNotNull(block.getUnlocalizedName()); - Preconditions.checkArgument(block.getUnlocalizedName().length() > 0); + Preconditions.checkNotNull(block.getTranslationKey()); + Preconditions.checkArgument(block.getTranslationKey().length() > 0); - this.setUnlocalizedName("stair." + type); + + this.setTranslationKey("stair." + type); + this.getLocalizedName(); this.setLightOpacity(0); } @Override public String toString() { - String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered"; + String regName = this.getRegistryName() != null ? this.getRegistryName().getPath() : "unregistered"; return this.getClass().getSimpleName() + "[" + regName + "]"; } diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 477dace7e..92060234e 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -288,7 +288,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity return false; } - final String name = this.getUnlocalizedName(); + final String name = this.getTranslationKey(); if (player.isSneaking()) { final NBTTagCompound data = tileEntity.downloadSettings(SettingsFrom.MEMORY_CARD); @@ -300,7 +300,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity final String savedName = memoryCard.getSettingsName(heldItem); final NBTTagCompound data = memoryCard.getData(heldItem); - if (this.getUnlocalizedName().equals(savedName)) { + if (this.getTranslationKey().equals(savedName)) { tileEntity.uploadSettings(SettingsFrom.MEMORY_CARD, data, player); memoryCard.notifyUser(player, MemoryCardMessages.SETTINGS_LOADED); } else { diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index 78648f39e..643f5639c 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -43,6 +43,7 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import javax.annotation.Nonnull; import java.util.EnumSet; @@ -111,7 +112,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java index 95a00f028..24c1e846d 100644 --- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java +++ b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java @@ -38,6 +38,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class BlockMolecularAssembler extends AEBaseTileBlock { @@ -72,7 +74,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock { */ @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index 79cad240a..5179a5e78 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -121,15 +121,15 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision { final EnumFacing forward = tile.getForward(); final AEAxisAlignedBB bb = new AEAxisAlignedBB(twoPixels, twoPixels, twoPixels, 1.0 - twoPixels, 1.0 - twoPixels, 1.0 - twoPixels); - if (up.getFrontOffsetX() != 0) { + if (up.getXOffset() != 0) { bb.minX = 0; bb.maxX = 1; } - if (up.getFrontOffsetY() != 0) { + if (up.getYOffset() != 0) { bb.minY = 0; bb.maxY = 1; } - if (up.getFrontOffsetZ() != 0) { + if (up.getZOffset() != 0) { bb.minZ = 0; bb.maxZ = 1; } diff --git a/src/main/java/appeng/block/misc/BlockInscriber.java b/src/main/java/appeng/block/misc/BlockInscriber.java index 5b702df33..47b5a292d 100644 --- a/src/main/java/appeng/block/misc/BlockInscriber.java +++ b/src/main/java/appeng/block/misc/BlockInscriber.java @@ -68,7 +68,7 @@ public class BlockInscriber extends AEBaseTileBlock { } @Override - public String getUnlocalizedName(final ItemStack is) { - return super.getUnlocalizedName(is); + public String getTranslationKey(final ItemStack is) { + return super.getTranslationKey(is); } } diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java index a82e6aca1..d042ff1f3 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/BlockLightDetector.java @@ -41,6 +41,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; import java.util.Random; @@ -115,9 +116,9 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl @Override public Iterable getSelectedBoundingBoxesFromPool(final World w, final BlockPos pos, final Entity thePlayer, final boolean b) { final EnumFacing up = this.getOrientable(w, pos).getUp(); - final double xOff = -0.3 * up.getFrontOffsetX(); - final double yOff = -0.3 * up.getFrontOffsetY(); - final double zOff = -0.3 * up.getFrontOffsetZ(); + final double xOff = -0.3 * up.getXOffset(); + final double yOff = -0.3 * up.getYOffset(); + final double zOff = -0.3 * up.getZOffset(); return Collections.singletonList(new AxisAlignedBB(xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7)); } @@ -167,7 +168,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl @Override @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/misc/BlockQuartzFixture.java b/src/main/java/appeng/block/misc/BlockQuartzFixture.java index 39b968a25..d0d72eb18 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzFixture.java +++ b/src/main/java/appeng/block/misc/BlockQuartzFixture.java @@ -44,6 +44,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; import java.util.Random; @@ -107,9 +108,9 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, @Override public Iterable getSelectedBoundingBoxesFromPool(final World w, final BlockPos pos, final Entity e, final boolean isVisual) { final EnumFacing up = this.getOrientable(w, pos).getUp(); - final double xOff = -0.3 * up.getFrontOffsetX(); - final double yOff = -0.3 * up.getFrontOffsetY(); - final double zOff = -0.3 * up.getFrontOffsetZ(); + final double xOff = -0.3 * up.getXOffset(); + final double yOff = -0.3 * up.getYOffset(); + final double zOff = -0.3 * up.getZOffset(); return Collections.singletonList(new AxisAlignedBB(xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7)); } @@ -134,9 +135,9 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, } final EnumFacing up = this.getOrientable(w, pos).getUp(); - final double xOff = -0.3 * up.getFrontOffsetX(); - final double yOff = -0.3 * up.getFrontOffsetY(); - final double zOff = -0.3 * up.getFrontOffsetZ(); + final double xOff = -0.3 * up.getXOffset(); + final double yOff = -0.3 * up.getYOffset(); + final double zOff = -0.3 * up.getZOffset(); for (int bolts = 0; bolts < 3; bolts++) { if (AppEng.proxy.shouldAddParticles(r)) { final LightningFX fx = new LightningFX(w, xOff + 0.5 + pos.getX(), yOff + 0.5 + pos.getY(), zOff + 0.5 + pos.getZ(), 0.0D, 0.0D, 0.0D); @@ -192,7 +193,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, @Override @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index 83a63d2d6..69113e84a 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -87,9 +87,9 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr double ry = 0.5 + pos.getY(); double rz = 0.5 + pos.getZ(); - rx += up.getFrontOffsetX() * d0; - ry += up.getFrontOffsetY() * d0; - rz += up.getFrontOffsetZ() * d0; + rx += up.getXOffset() * d0; + ry += up.getYOffset() * d0; + rz += up.getZOffset() * d0; final int x = pos.getX(); final int y = pos.getY(); @@ -103,25 +103,25 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr case 0: dx = 0.6; dz = d1; - pt = new BlockPos(x + west.getFrontOffsetX(), y + west.getFrontOffsetY(), z + west.getFrontOffsetZ()); + pt = new BlockPos(x + west.getXOffset(), y + west.getYOffset(), z + west.getZOffset()); break; case 1: dx = d1; dz += 0.6; - pt = new BlockPos(x + forward.getFrontOffsetX(), y + forward.getFrontOffsetY(), z + forward.getFrontOffsetZ()); + pt = new BlockPos(x + forward.getXOffset(), y + forward.getYOffset(), z + forward.getZOffset()); break; case 2: dx = d1; dz = -0.6; - pt = new BlockPos(x - forward.getFrontOffsetX(), y - forward.getFrontOffsetY(), z - forward.getFrontOffsetZ()); + pt = new BlockPos(x - forward.getXOffset(), y - forward.getYOffset(), z - forward.getZOffset()); break; case 3: dx = -0.6; dz = d1; - pt = new BlockPos(x - west.getFrontOffsetX(), y - west.getFrontOffsetY(), z - west.getFrontOffsetZ()); + pt = new BlockPos(x - west.getXOffset(), y - west.getYOffset(), z - west.getZOffset()); break; } @@ -130,13 +130,13 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr return; } - rx += dx * west.getFrontOffsetX(); - ry += dx * west.getFrontOffsetY(); - rz += dx * west.getFrontOffsetZ(); + rx += dx * west.getXOffset(); + ry += dx * west.getYOffset(); + rz += dx * west.getZOffset(); - rx += dz * forward.getFrontOffsetX(); - ry += dz * forward.getFrontOffsetY(); - rz += dz * forward.getFrontOffsetZ(); + rx += dz * forward.getXOffset(); + ry += dz * forward.getYOffset(); + rz += dz * forward.getZOffset(); final LightningFX fx = new LightningFX(w, rx, ry, rz, 0.0D, 0.0D, 0.0D); Minecraft.getMinecraft().effectRenderer.addEffect(fx); diff --git a/src/main/java/appeng/block/misc/BlockSecurityStation.java b/src/main/java/appeng/block/misc/BlockSecurityStation.java index 1d6845906..0c6867d1f 100644 --- a/src/main/java/appeng/block/misc/BlockSecurityStation.java +++ b/src/main/java/appeng/block/misc/BlockSecurityStation.java @@ -37,6 +37,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -56,7 +57,7 @@ public class BlockSecurityStation extends AEBaseTileBlock { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index d6011a152..f961c61f2 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -89,7 +89,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision { @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) { - if (world.isBlockIndirectlyGettingPowered(pos) > 0) { + if (world.getRedstonePowerFromNeighbors(pos) > 0) { this.startFuse(world, pos, null); world.setBlockToAir(pos); } @@ -99,7 +99,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision { public void onBlockAdded(final World w, final BlockPos pos, final IBlockState state) { super.onBlockAdded(w, pos, state); - if (w.isBlockIndirectlyGettingPowered(pos) > 0) { + if (w.getRedstonePowerFromNeighbors(pos) > 0) { this.startFuse(w, pos, null); w.setBlockToAir(pos); } diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index f4706b091..ca62e8b20 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -102,20 +102,20 @@ public final class BlockVibrationChamber extends AEBaseTileBlock { final EnumFacing forward = tc.getForward(); final EnumFacing up = tc.getUp(); - final int west_x = forward.getFrontOffsetY() * up.getFrontOffsetZ() - forward.getFrontOffsetZ() * up.getFrontOffsetY(); - final int west_y = forward.getFrontOffsetZ() * up.getFrontOffsetX() - forward.getFrontOffsetX() * up.getFrontOffsetZ(); - final int west_z = forward.getFrontOffsetX() * up.getFrontOffsetY() - forward.getFrontOffsetY() * up.getFrontOffsetX(); + final int west_x = forward.getYOffset() * up.getZOffset() - forward.getZOffset() * up.getYOffset(); + final int west_y = forward.getZOffset() * up.getXOffset() - forward.getXOffset() * up.getZOffset(); + final int west_z = forward.getXOffset() * up.getYOffset() - forward.getYOffset() * up.getXOffset(); - f1 += forward.getFrontOffsetX() * 0.6; - f2 += forward.getFrontOffsetY() * 0.6; - f3 += forward.getFrontOffsetZ() * 0.6; + f1 += forward.getXOffset() * 0.6; + f2 += forward.getYOffset() * 0.6; + f3 += forward.getZOffset() * 0.6; final float ox = r.nextFloat(); final float oy = r.nextFloat() * 0.2f; - f1 += up.getFrontOffsetX() * (-0.3 + oy); - f2 += up.getFrontOffsetY() * (-0.3 + oy); - f3 += up.getFrontOffsetZ() * (-0.3 + oy); + f1 += up.getXOffset() * (-0.3 + oy); + f2 += up.getYOffset() * (-0.3 + oy); + f3 += up.getZOffset() * (-0.3 + oy); f1 += west_x * (0.3 * ox - 0.15); f2 += west_y * (0.3 * ox - 0.15); diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index c7f8b9c59..9e6850e39 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -152,7 +152,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade { } @Override - public void onEntityCollidedWithBlock(final World w, final BlockPos pos, final IBlockState state, final Entity entityIn) { + public void onEntityCollision(final World w, final BlockPos pos, final IBlockState state, final Entity entityIn) { this.cb(w, pos).onEntityCollision(entityIn); } diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java index be5015236..17c42a44b 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/BlockController.java @@ -33,6 +33,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BlockController extends AEBaseTileBlock { @@ -144,7 +146,7 @@ public class BlockController extends AEBaseTileBlock { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index 7f500730c..0947fcbdb 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -40,6 +40,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; @@ -68,7 +69,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/paint/BlockPaint.java b/src/main/java/appeng/block/paint/BlockPaint.java index 9670f7889..b4a8b0b6c 100644 --- a/src/main/java/appeng/block/paint/BlockPaint.java +++ b/src/main/java/appeng/block/paint/BlockPaint.java @@ -44,6 +44,7 @@ import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.Collection; import java.util.Collections; import java.util.Random; @@ -81,7 +82,7 @@ public class BlockPaint extends AEBaseTileBlock { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/qnb/BlockQuantumBase.java b/src/main/java/appeng/block/qnb/BlockQuantumBase.java index 745b7cdcb..9f5e045b5 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumBase.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumBase.java @@ -37,6 +37,8 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import javax.annotation.Nonnull; + public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICustomCollision { @@ -86,7 +88,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index fe4156a04..5b54ec9f8 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -105,9 +105,9 @@ class QnbFormedBakedModel implements IBakedModel { for (EnumFacing facing : EnumFacing.values()) { // Offset the face by a slight amount so that it is drawn over the already drawn ring texture // (avoids z-fighting) - float xOffset = Math.abs(facing.getFrontOffsetX() * 0.01f); - float yOffset = Math.abs(facing.getFrontOffsetY() * 0.01f); - float zOffset = Math.abs(facing.getFrontOffsetZ() * 0.01f); + float xOffset = Math.abs(facing.getXOffset() * 0.01f); + float yOffset = Math.abs(facing.getYOffset() * 0.01f); + float zOffset = Math.abs(facing.getZOffset() * 0.01f); builder.setDrawFaces(EnumSet.of(facing)); builder.addCube( @@ -130,9 +130,9 @@ class QnbFormedBakedModel implements IBakedModel { for (EnumFacing facing : EnumFacing.values()) { // Offset the face by a slight amount so that it is drawn over the already drawn ring texture // (avoids z-fighting) - float xOffset = Math.abs(facing.getFrontOffsetX() * 0.01f); - float yOffset = Math.abs(facing.getFrontOffsetY() * 0.01f); - float zOffset = Math.abs(facing.getFrontOffsetZ() * 0.01f); + float xOffset = Math.abs(facing.getXOffset() * 0.01f); + float yOffset = Math.abs(facing.getYOffset() * 0.01f); + float zOffset = Math.abs(facing.getZOffset() * 0.01f); builder.setDrawFaces(EnumSet.of(facing)); builder.addCube( diff --git a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java index 367f1ec2b..5095e68ea 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java @@ -34,6 +34,8 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import javax.annotation.Nonnull; + public class BlockSpatialPylon extends AEBaseTileBlock { @@ -83,7 +85,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/storage/BlockChest.java b/src/main/java/appeng/block/storage/BlockChest.java index ecacb9257..79c62c340 100644 --- a/src/main/java/appeng/block/storage/BlockChest.java +++ b/src/main/java/appeng/block/storage/BlockChest.java @@ -38,6 +38,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -56,7 +57,7 @@ public class BlockChest extends AEBaseTileBlock { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/BlockDrive.java index 27014f2fc..137e49705 100644 --- a/src/main/java/appeng/block/storage/BlockDrive.java +++ b/src/main/java/appeng/block/storage/BlockDrive.java @@ -40,6 +40,7 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -52,7 +53,7 @@ public class BlockDrive extends AEBaseTileBlock { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java index 8e0c9c81f..411597e59 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/BlockSkyChest.java @@ -99,18 +99,18 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision { o = sk.getUp(); } - final double offsetX = o.getFrontOffsetX() == 0 ? AABB_OFFSET_SIDES : 0.0; - final double offsetY = o.getFrontOffsetY() == 0 ? AABB_OFFSET_SIDES : 0.0; - final double offsetZ = o.getFrontOffsetZ() == 0 ? AABB_OFFSET_SIDES : 0.0; + final double offsetX = o.getXOffset() == 0 ? AABB_OFFSET_SIDES : 0.0; + final double offsetY = o.getYOffset() == 0 ? AABB_OFFSET_SIDES : 0.0; + final double offsetZ = o.getZOffset() == 0 ? AABB_OFFSET_SIDES : 0.0; // for x/z top and bottom is swapped - final double minX = Math.max(0.0, offsetX + (o.getFrontOffsetX() < 0 ? AABB_OFFSET_BOTTOM : (o.getFrontOffsetX() * AABB_OFFSET_TOP))); - final double minY = Math.max(0.0, offsetY + (o.getFrontOffsetY() < 0 ? AABB_OFFSET_TOP : (o.getFrontOffsetY() * AABB_OFFSET_BOTTOM))); - final double minZ = Math.max(0.0, offsetZ + (o.getFrontOffsetZ() < 0 ? AABB_OFFSET_BOTTOM : (o.getFrontOffsetZ() * AABB_OFFSET_TOP))); + final double minX = Math.max(0.0, offsetX + (o.getXOffset() < 0 ? AABB_OFFSET_BOTTOM : (o.getXOffset() * AABB_OFFSET_TOP))); + final double minY = Math.max(0.0, offsetY + (o.getYOffset() < 0 ? AABB_OFFSET_TOP : (o.getYOffset() * AABB_OFFSET_BOTTOM))); + final double minZ = Math.max(0.0, offsetZ + (o.getZOffset() < 0 ? AABB_OFFSET_BOTTOM : (o.getZOffset() * AABB_OFFSET_TOP))); - final double maxX = Math.min(1.0, 1.0 - offsetX - (o.getFrontOffsetX() < 0 ? AABB_OFFSET_TOP : (o.getFrontOffsetX() * AABB_OFFSET_BOTTOM))); - final double maxY = Math.min(1.0, 1.0 - offsetY - (o.getFrontOffsetY() < 0 ? AABB_OFFSET_BOTTOM : (o.getFrontOffsetY() * AABB_OFFSET_TOP))); - final double maxZ = Math.min(1.0, 1.0 - offsetZ - (o.getFrontOffsetZ() < 0 ? AABB_OFFSET_TOP : (o.getFrontOffsetZ() * AABB_OFFSET_BOTTOM))); + final double maxX = Math.min(1.0, 1.0 - offsetX - (o.getXOffset() < 0 ? AABB_OFFSET_TOP : (o.getXOffset() * AABB_OFFSET_BOTTOM))); + final double maxY = Math.min(1.0, 1.0 - offsetY - (o.getYOffset() < 0 ? AABB_OFFSET_BOTTOM : (o.getYOffset() * AABB_OFFSET_TOP))); + final double maxZ = Math.min(1.0, 1.0 - offsetZ - (o.getZOffset() < 0 ? AABB_OFFSET_TOP : (o.getZOffset() * AABB_OFFSET_BOTTOM))); return new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ); } diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java index bfc96e3c1..c6bfc1ace 100644 --- a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java @@ -164,7 +164,7 @@ class BlockDefinitionBuilder implements IBlockBuilder { // Create block and matching item, and set factory name of both Block block = this.blockSupplier.get(); block.setRegistryName(AppEng.MOD_ID, this.registryName); - block.setUnlocalizedName("appliedenergistics2." + this.registryName); + block.setTranslationKey("appliedenergistics2." + this.registryName); ItemBlock item = this.constructItemFromBlock(block); if (item != null) { diff --git a/src/main/java/appeng/bootstrap/BlockRendering.java b/src/main/java/appeng/bootstrap/BlockRendering.java index 519694ba4..c419b8231 100644 --- a/src/main/java/appeng/bootstrap/BlockRendering.java +++ b/src/main/java/appeng/bootstrap/BlockRendering.java @@ -116,11 +116,11 @@ class BlockRendering implements IBlockRendering, ISelectiveResourceReloadListene } if (this.modelCustomizer != null) { - factory.addModelOverride(block.getRegistryName().getResourcePath(), this.modelCustomizer); + factory.addModelOverride(block.getRegistryName().getPath(), this.modelCustomizer); } else if (block instanceof AEBaseTileBlock) { // This is a default rotating model if the base-block uses an AE tile entity which exposes UP/FRONT as // extended props - factory.addModelOverride(block.getRegistryName().getResourcePath(), (l, m) -> { + factory.addModelOverride(block.getRegistryName().getPath(), (l, m) -> { AutoRotatingModel model = new AutoRotatingModel(m); BlockRendering.this.reloads.add(model); return model; diff --git a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java index 4e0c9c33a..1b644847b 100644 --- a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java @@ -126,7 +126,7 @@ class ItemDefinitionBuilder implements IItemBuilder { ItemDefinition definition = new ItemDefinition(this.registryName, item); - item.setUnlocalizedName("appliedenergistics2." + this.registryName); + item.setTranslationKey("appliedenergistics2." + this.registryName); item.setCreativeTab(this.creativeTab); // Register all extra handlers diff --git a/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java b/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java index febf6dcbd..91febdc1b 100644 --- a/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java +++ b/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java @@ -61,7 +61,7 @@ public class ModelOverrideComponent implements IPreInitComponent { IModel missingModel = ModelLoaderRegistry.getMissingModel(); for (ModelResourceLocation location : keys) { - if (!location.getResourceDomain().equals(AppEng.MOD_ID)) { + if (!location.getNamespace().equals(AppEng.MOD_ID)) { continue; } @@ -72,7 +72,7 @@ public class ModelOverrideComponent implements IPreInitComponent { continue; } - BiFunction customizer = this.customizer.get(location.getResourcePath()); + BiFunction customizer = this.customizer.get(location.getPath()); if (customizer != null) { IBakedModel newModel = customizer.apply(location, orgModel); diff --git a/src/main/java/appeng/client/render/TesrRenderHelper.java b/src/main/java/appeng/client/render/TesrRenderHelper.java index e14303639..6120bf417 100644 --- a/src/main/java/appeng/client/render/TesrRenderHelper.java +++ b/src/main/java/appeng/client/render/TesrRenderHelper.java @@ -47,7 +47,7 @@ public class TesrRenderHelper { * at the center of a block. */ public static void moveToFace(EnumFacing face) { - GlStateManager.translate(face.getFrontOffsetX() * 0.50, face.getFrontOffsetY() * 0.50, face.getFrontOffsetZ() * 0.50); + GlStateManager.translate(face.getXOffset() * 0.50, face.getYOffset() * 0.50, face.getZOffset() * 0.50); } /** diff --git a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java index 89e74a3ac..7c288acd9 100644 --- a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java @@ -398,7 +398,7 @@ public class CubeBuilder { builder.put(i, x, y, z); break; case NORMAL: - builder.put(i, face.getFrontOffsetX(), face.getFrontOffsetY(), face.getFrontOffsetZ()); + builder.put(i, face.getXOffset(), face.getYOffset(), face.getZOffset()); break; case COLOR: // Color format is RGBA diff --git a/src/main/java/appeng/client/render/cablebus/QuadRotator.java b/src/main/java/appeng/client/render/cablebus/QuadRotator.java index cc441bb08..d7c790846 100644 --- a/src/main/java/appeng/client/render/cablebus/QuadRotator.java +++ b/src/main/java/appeng/client/render/cablebus/QuadRotator.java @@ -72,7 +72,7 @@ public class QuadRotator { // Figure out where the position is in the array VertexFormat format = quad.getFormat(); int posIdx = this.findPositionOffset(format) / 4; - int stride = format.getNextOffset() / 4; + int stride = format.getSize() / 4; int normalIdx = format.getNormalOffset(); VertexFormatElement.EnumType normalType = null; // Figure out the type of the normals diff --git a/src/main/java/appeng/client/render/model/BuiltInModelLoader.java b/src/main/java/appeng/client/render/model/BuiltInModelLoader.java index e547d53ca..fbdd796f7 100644 --- a/src/main/java/appeng/client/render/model/BuiltInModelLoader.java +++ b/src/main/java/appeng/client/render/model/BuiltInModelLoader.java @@ -43,16 +43,16 @@ public class BuiltInModelLoader implements ICustomModelLoader { @Override public boolean accepts(ResourceLocation modelLocation) { - if (!modelLocation.getResourceDomain().equals(AppEng.MOD_ID)) { + if (!modelLocation.getNamespace().equals(AppEng.MOD_ID)) { return false; } - return this.builtInModels.containsKey(modelLocation.getResourcePath()); + return this.builtInModels.containsKey(modelLocation.getPath()); } @Override public IModel loadModel(ResourceLocation modelLocation) throws Exception { - return this.builtInModels.get(modelLocation.getResourcePath()); + return this.builtInModels.get(modelLocation.getPath()); } @Override diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index 7873fc500..6bac0309e 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -137,14 +137,14 @@ public enum UVLModelLoader implements ICustomModelLoader { @Override public boolean accepts(ResourceLocation modelLocation) { - String modelPath = modelLocation.getResourcePath(); - if (modelLocation.getResourcePath().startsWith("models/")) { + String modelPath = modelLocation.getPath(); + if (modelLocation.getPath().startsWith("models/")) { modelPath = modelPath.substring("models/".length()); } try (InputStreamReader io = new InputStreamReader(Minecraft.getMinecraft() .getResourceManager() - .getResource(new ResourceLocation(modelLocation.getResourceDomain(), "models/" + modelPath + ".json")) + .getResource(new ResourceLocation(modelLocation.getNamespace(), "models/" + modelPath + ".json")) .getInputStream())) { return gson.fromJson(io, UVLMarker.class).ae2_uvl_marker; } catch (Exception e) { @@ -174,11 +174,11 @@ public enum UVLModelLoader implements ICustomModelLoader { private final IModel parent; public UVLModelWrapper(ResourceLocation modelLocation) { - String modelPath = modelLocation.getResourcePath(); - if (modelLocation.getResourcePath().startsWith("models/")) { + String modelPath = modelLocation.getPath(); + if (modelLocation.getPath().startsWith("models/")) { modelPath = modelPath.substring("models/".length()); } - ResourceLocation armatureLocation = new ResourceLocation(modelLocation.getResourceDomain(), "armatures/" + modelPath + ".json"); + ResourceLocation armatureLocation = new ResourceLocation(modelLocation.getNamespace(), "armatures/" + modelPath + ".json"); ModelBlockAnimation animation = ModelBlockAnimation.loadVanillaAnimation(UVLModelLoader.this.resourceManager, armatureLocation); ModelBlock model; { @@ -187,12 +187,12 @@ public enum UVLModelLoader implements ICustomModelLoader { ModelBlock lvt_5_1_ = null; try { - String s = modelLocation.getResourcePath(); + String s = modelLocation.getPath(); iresource = Minecraft.getMinecraft() .getResourceManager() .getResource( - new ResourceLocation(modelLocation.getResourceDomain(), "models/" + modelPath + ".json")); + new ResourceLocation(modelLocation.getNamespace(), "models/" + modelPath + ".json")); reader = new InputStreamReader(iresource.getInputStream(), Charsets.UTF_8); lvt_5_1_ = JsonUtils.gsonDeserialize(this.UVLSERIALIZER, reader, ModelBlock.class, false); diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java index 153040b46..01d4f47ce 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java @@ -41,7 +41,7 @@ public class SpatialPylonRendering extends BlockRenderingCustomizer { @Override @SideOnly(Side.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { - rendering.builtInModel(MODEL_ID.getResourcePath(), new SpatialPylonModel()); + rendering.builtInModel(MODEL_ID.getPath(), new SpatialPylonModel()); rendering.stateMapper(this::mapState); } diff --git a/src/main/java/appeng/container/implementations/ContainerFluidInterfaceConfigurationTerminal.java b/src/main/java/appeng/container/implementations/ContainerFluidInterfaceConfigurationTerminal.java index 971f5cb62..0086bdb0d 100644 --- a/src/main/java/appeng/container/implementations/ContainerFluidInterfaceConfigurationTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerFluidInterfaceConfigurationTerminal.java @@ -163,7 +163,7 @@ public final class ContainerFluidInterfaceConfigurationTerminal extends AEBaseCo } } - if (!this.data.hasNoTags()) { + if (!this.data.isEmpty()) { try { NetworkHandler.instance().sendTo(new PacketCompressedNBT(this.data), (EntityPlayerMP) this.getPlayerInv().player); } catch (final IOException e) { @@ -251,7 +251,7 @@ public final class ContainerFluidInterfaceConfigurationTerminal extends AEBaseCo final String name = '=' + Long.toString(inv.which, Character.MAX_RADIX); final NBTTagCompound tag = data.getCompoundTag(name); - if (tag.hasNoTags()) { + if (tag.isEmpty()) { tag.setLong("sortBy", inv.sortBy); tag.setString("un", inv.unlocalizedName); tag.setTag("pos", NBTUtil.createPosTag(inv.pos)); diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceConfigurationTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceConfigurationTerminal.java index 7f64348cd..bf340f168 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceConfigurationTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceConfigurationTerminal.java @@ -153,7 +153,7 @@ public final class ContainerInterfaceConfigurationTerminal extends AEBaseContain } } - if (!this.data.hasNoTags()) { + if (!this.data.isEmpty()) { try { NetworkHandler.instance().sendTo(new PacketCompressedNBT(this.data), (EntityPlayerMP) this.getPlayerInv().player); } catch (final IOException e) { @@ -296,7 +296,7 @@ public final class ContainerInterfaceConfigurationTerminal extends AEBaseContain final String name = '=' + Long.toString(inv.which, Character.MAX_RADIX); final NBTTagCompound tag = data.getCompoundTag(name); - if (tag.hasNoTags()) { + if (tag.isEmpty()) { tag.setLong("sortBy", inv.sortBy); tag.setString("un", inv.unlocalizedName); tag.setTag("pos", NBTUtil.createPosTag(inv.pos)); diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index 8948592b9..9cb3a3823 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -160,7 +160,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { } } - if (!this.data.hasNoTags()) { + if (!this.data.isEmpty()) { try { NetworkHandler.instance().sendTo(new PacketCompressedNBT(this.data), (EntityPlayerMP) this.getPlayerInv().player); } catch (final IOException e) { @@ -330,7 +330,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { final String name = '=' + Long.toString(inv.which, Character.MAX_RADIX); final NBTTagCompound tag = data.getCompoundTag(name); - if (tag.hasNoTags()) { + if (tag.isEmpty()) { tag.setLong("sortBy", inv.sortBy); tag.setString("un", inv.unlocalizedName); tag.setTag("pos", NBTUtil.createPosTag(inv.pos)); diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java index f3cc61ca8..c94da0e76 100644 --- a/src/main/java/appeng/core/CreativeTab.java +++ b/src/main/java/appeng/core/CreativeTab.java @@ -40,12 +40,12 @@ public final class CreativeTab extends CreativeTabs { } @Override - public ItemStack getTabIconItem() { - return this.getIconItemStack(); + public ItemStack getIcon() { + return this.createIcon(); } @Override - public ItemStack getIconItemStack() { + public ItemStack createIcon() { final IDefinitions definitions = AEApi.instance().definitions(); final IBlocks blocks = definitions.blocks(); final IItems items = definitions.items(); diff --git a/src/main/java/appeng/core/CreativeTabFacade.java b/src/main/java/appeng/core/CreativeTabFacade.java index 44f8933ae..e59d457e6 100644 --- a/src/main/java/appeng/core/CreativeTabFacade.java +++ b/src/main/java/appeng/core/CreativeTabFacade.java @@ -42,12 +42,12 @@ public final class CreativeTabFacade extends CreativeTabs { } @Override - public ItemStack getTabIconItem() { - return this.getIconItemStack(); + public ItemStack getIcon() { + return this.createIcon(); } @Override - public ItemStack getIconItemStack() { + public ItemStack createIcon() { final Optional maybeFacade = AEApi.instance().definitions().items().facade().maybeItem(); if (maybeFacade.isPresent()) { return ((ItemFacade) maybeFacade.get()).getCreativeTabIcon(); diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index 55a9e1fdd..4a3ee0c91 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -252,7 +252,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { // Use the mod id as last option. for (final Entry entry : this.modIdTunnels.entrySet()) { - if (trigger.getItem().getRegistryName() != null && trigger.getItem().getRegistryName().getResourceDomain().equals(entry.getKey())) { + if (trigger.getItem().getRegistryName() != null && trigger.getItem().getRegistryName().getNamespace().equals(entry.getKey())) { return entry.getValue(); } } diff --git a/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java b/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java index 91f834025..2812614b0 100644 --- a/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java +++ b/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java @@ -122,7 +122,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene return null; } - this.log("Recipe for '%1$s' found '%2$s'", input.getUnlocalizedName(), Platform.getItemDisplayName(recipe.getOutput())); + this.log("Recipe for '%1$s' found '%2$s'", input.getTranslationKey(), Platform.getItemDisplayName(recipe.getOutput())); return recipe; } diff --git a/src/main/java/appeng/crafting/CraftBranchFailure.java b/src/main/java/appeng/crafting/CraftBranchFailure.java index 724d778b7..6d7837127 100644 --- a/src/main/java/appeng/crafting/CraftBranchFailure.java +++ b/src/main/java/appeng/crafting/CraftBranchFailure.java @@ -29,7 +29,7 @@ public class CraftBranchFailure extends Exception { private final IAEItemStack missing; public CraftBranchFailure(final IAEItemStack what, final long howMany) { - super("Failed: " + what.getItem().getUnlocalizedName() + " x " + howMany); + super("Failed: " + what.getItem().getTranslationKey() + " x " + howMany); this.missing = what.copy(); this.missing.setStackSize(howMany); } diff --git a/src/main/java/appeng/debug/ToolReplicatorCard.java b/src/main/java/appeng/debug/ToolReplicatorCard.java index d7559a392..d7352248e 100644 --- a/src/main/java/appeng/debug/ToolReplicatorCard.java +++ b/src/main/java/appeng/debug/ToolReplicatorCard.java @@ -89,9 +89,9 @@ public class ToolReplicatorCard extends AEBaseItem { final DimensionalCoord min = sc.getMin(); final DimensionalCoord max = sc.getMax(); - x += currentSideOff.getFrontOffsetX(); - y += currentSideOff.getFrontOffsetY(); - z += currentSideOff.getFrontOffsetZ(); + x += currentSideOff.getXOffset(); + y += currentSideOff.getYOffset(); + z += currentSideOff.getZOffset(); final int min_x = min.x; final int min_y = min.y; diff --git a/src/main/java/appeng/decorative/slab/BlockSlabCommon.java b/src/main/java/appeng/decorative/slab/BlockSlabCommon.java index 8eb0652b6..674c04eab 100644 --- a/src/main/java/appeng/decorative/slab/BlockSlabCommon.java +++ b/src/main/java/appeng/decorative/slab/BlockSlabCommon.java @@ -86,8 +86,8 @@ public abstract class BlockSlabCommon extends BlockSlab { } @Override - public String getUnlocalizedName(int meta) { - return this.getUnlocalizedName(); + public String getTranslationKey(int meta) { + return this.getTranslationKey(); } @Override diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java index 3783e2e1d..7a4ba6670 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java @@ -33,6 +33,7 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import javax.annotation.Nonnull; import java.util.EnumSet; @@ -77,7 +78,7 @@ public class BlockQuartzGlass extends AEBaseBlock { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzOre.java b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java index ac76ed655..24b1baa31 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzOre.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java @@ -31,6 +31,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.Random; @@ -42,7 +43,7 @@ public class BlockQuartzOre extends AEBaseBlock { } @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java index b4e4c98d5..73a3422b3 100644 --- a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java +++ b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java @@ -275,8 +275,8 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable try { Vec3d from = new Vec3d(hostTile.getPos().getX() + 0.5, hostTile.getPos().getY() + 0.5, hostTile.getPos().getZ() + 0.5); - from = from.addVector(direction.getFrontOffsetX() * 0.501, direction.getFrontOffsetY() * 0.501, direction.getFrontOffsetZ() * 0.501); - final Vec3d to = from.addVector(direction.getFrontOffsetX(), direction.getFrontOffsetY(), direction.getFrontOffsetZ()); + from = from.add(direction.getXOffset() * 0.501, direction.getYOffset() * 0.501, direction.getZOffset() * 0.501); + final Vec3d to = from.add(direction.getXOffset(), direction.getYOffset(), direction.getZOffset()); final RayTraceResult mop = hostWorld.rayTraceBlocks(from, to, true); if (mop != null && !BAD_BLOCKS.contains(directedBlock)) { if (mop.getBlockPos().equals(directedTile.getPos())) { @@ -296,7 +296,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable final Item item = Item.getItemFromBlock(directedBlock); if (item == Items.AIR) { - return directedBlock.getUnlocalizedName(); + return directedBlock.getTranslationKey(); } } } diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 373e4d595..4d679b1a7 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -256,7 +256,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn final NBTTagCompound c = w.getCompoundTagAt(x); if (c != null) { final ItemStack is = stackFromNBT(c); - this.addToSendListFacing(is, EnumFacing.getFront(s.getIndex())); + this.addToSendListFacing(is, EnumFacing.byIndex(s.getIndex())); } } } @@ -1025,14 +1025,14 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn phantomTE = ((IPhantomTile) te); if (phantomTE.hasBoundPosition()) { TileEntity phantom = w.getTileEntity(phantomTE.getBoundPosition()); - if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(phantomTE.getBoundPosition()).getBlock().getRegistryName().getResourceDomain())) { + if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(phantomTE.getBoundPosition()).getBlock().getRegistryName().getNamespace())) { if (isCustomInvBlocking(phantom, s)) { visitedFaces.remove(s); continue; } } } - } else if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(tile.getPos().offset(s)).getBlock().getRegistryName().getResourceDomain())) { + } else if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(tile.getPos().offset(s)).getBlock().getRegistryName().getNamespace())) { if (isCustomInvBlocking(te, s)) { visitedFaces.remove(s); continue; @@ -1113,14 +1113,14 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn IPhantomTile phantomTE = ((IPhantomTile) te); if (phantomTE.hasBoundPosition()) { TileEntity phantom = w.getTileEntity(phantomTE.getBoundPosition()); - if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(phantomTE.getBoundPosition()).getBlock().getRegistryName().getResourceDomain())) { + if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(phantomTE.getBoundPosition()).getBlock().getRegistryName().getNamespace())) { if (!isCustomInvBlocking(phantom, s)) { allAreBusy = false; break; } } } - } else if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(tile.getPos().offset(s)).getBlock().getRegistryName().getResourceDomain())) { + } else if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(tile.getPos().offset(s)).getBlock().getRegistryName().getNamespace())) { if (!isCustomInvBlocking(te, s)) { allAreBusy = false; break; @@ -1300,8 +1300,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn try { Vec3d from = new Vec3d(hostTile.getPos().getX() + 0.5, hostTile.getPos().getY() + 0.5, hostTile.getPos().getZ() + 0.5); - from = from.addVector(direction.getFrontOffsetX() * 0.501, direction.getFrontOffsetY() * 0.501, direction.getFrontOffsetZ() * 0.501); - final Vec3d to = from.addVector(direction.getFrontOffsetX(), direction.getFrontOffsetY(), direction.getFrontOffsetZ()); + from = from.add(direction.getXOffset() * 0.501, direction.getYOffset() * 0.501, direction.getZOffset() * 0.501); + final Vec3d to = from.add(direction.getXOffset(), direction.getYOffset(), direction.getZOffset()); final RayTraceResult mop = hostWorld.rayTraceBlocks(from, to, true); if (mop != null && !BAD_BLOCKS.contains(directedBlock)) { if (mop.getBlockPos().equals(directedTile.getPos())) { @@ -1321,7 +1321,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn final Item item = Item.getItemFromBlock(directedBlock); if (item == Items.AIR) { - return directedBlock.getUnlocalizedName(); + return directedBlock.getTranslationKey(); } } } diff --git a/src/main/java/appeng/helpers/InvalidPatternHelper.java b/src/main/java/appeng/helpers/InvalidPatternHelper.java index 15c3c97bd..aea1b2ea8 100644 --- a/src/main/java/appeng/helpers/InvalidPatternHelper.java +++ b/src/main/java/appeng/helpers/InvalidPatternHelper.java @@ -59,7 +59,7 @@ public class InvalidPatternHelper { NBTTagCompound in = inTag.getCompoundTagAt(i); // skip empty slots in the crafting grid - if (in.hasNoTags()) { + if (in.isEmpty()) { continue; } diff --git a/src/main/java/appeng/helpers/LocationRotation.java b/src/main/java/appeng/helpers/LocationRotation.java index 5cbf32d37..d670cd2e4 100644 --- a/src/main/java/appeng/helpers/LocationRotation.java +++ b/src/main/java/appeng/helpers/LocationRotation.java @@ -45,7 +45,7 @@ public class LocationRotation implements IOrientable { @Override public EnumFacing getForward() { - if (this.getUp().getFrontOffsetY() == 0) { + if (this.getUp().getYOffset() == 0) { return EnumFacing.UP; } return EnumFacing.SOUTH; diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index dcea32f53..c6bb5d23a 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -49,7 +49,7 @@ public class MetaRotation implements IOrientable { @Override public EnumFacing getForward() { - if (this.getUp().getFrontOffsetY() == 0) { + if (this.getUp().getYOffset() == 0) { return EnumFacing.UP; } return EnumFacing.SOUTH; diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index 516dcef73..647721063 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -54,7 +54,7 @@ public class MultiCraftingTracker { for (int x = 0; x < this.size; x++) { final NBTTagCompound link = extra.getCompoundTag("links-" + x); - if (link != null && !link.hasNoTags()) { + if (link != null && !link.isEmpty()) { this.setLink(x, AEApi.instance().storage().loadCraftingLink(link, this.owner)); } } diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index 888195676..377e53616 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -95,7 +95,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable getMaybePart(final TileEntity te, final IProbeHitData data) { if (te instanceof IPartHost) { BlockPos pos = data.getPos(); - final Vec3d position = data.getHitVec().addVector(-pos.getX(), -pos.getY(), -pos.getZ()); + final Vec3d position = data.getHitVec().add(-pos.getX(), -pos.getY(), -pos.getZ()); final IPartHost host = (IPartHost) te; final SelectedPart sp = host.selectPart(position); diff --git a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java index b9935e828..05720aa6e 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java @@ -51,7 +51,7 @@ public final class PartAccessor { public Optional getMaybePart(final TileEntity te, final RayTraceResult mop) { if (te instanceof IPartHost) { BlockPos pos = mop.getBlockPos(); - final Vec3d position = mop.hitVec.addVector(-pos.getX(), -pos.getY(), -pos.getZ()); + final Vec3d position = mop.hitVec.add(-pos.getX(), -pos.getY(), -pos.getZ()); final IPartHost host = (IPartHost) te; final SelectedPart sp = host.selectPart(position); diff --git a/src/main/java/appeng/integration/modules/waila/part/Tracer.java b/src/main/java/appeng/integration/modules/waila/part/Tracer.java index 0bb456a02..21d39b7d5 100644 --- a/src/main/java/appeng/integration/modules/waila/part/Tracer.java +++ b/src/main/java/appeng/integration/modules/waila/part/Tracer.java @@ -51,7 +51,7 @@ public final class Tracer { final Vec3d headVec = this.getCorrectedHeadVec(player); final Vec3d lookVec = player.getLook(1.0F); final double reach = this.getBlockReachDistance_server(player); - final Vec3d endVec = headVec.addVector(lookVec.x * reach, lookVec.y * reach, lookVec.z * reach); + final Vec3d endVec = headVec.add(lookVec.x * reach, lookVec.y * reach, lookVec.z * reach); return blockState.collisionRayTrace(world, pos, headVec, endVec); } diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 7d5c547d5..dc9ef83c3 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -39,7 +39,7 @@ public abstract class AEBaseItem extends Item { @Override public String toString() { - String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered"; + String regName = this.getRegistryName() != null ? this.getRegistryName().getPath() : "unregistered"; return this.getClass().getSimpleName() + "[" + regName + "]"; } diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java index 1352b0a65..505d6c7f8 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMaterial.java @@ -63,6 +63,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nonnull; import java.util.*; import java.util.Map.Entry; import java.util.regex.Matcher; @@ -209,7 +210,8 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, } @Override - public String getUnlocalizedName(final ItemStack is) { + @Nonnull + public String getTranslationKey(final ItemStack is) { return "item.appliedenergistics2.material." + this.nameOf(is).toLowerCase(); } diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 00e9459cf..0f8dfca76 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -39,6 +39,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; import java.util.Optional; @@ -70,7 +71,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal { { crystalSeedStack.setItemDamage(certus2); crystalSeedStack = newStyle(crystalSeedStack); - String itemName = crystalSeedStack.getItem().getRegistryName().getResourcePath(); + String itemName = crystalSeedStack.getItem().getRegistryName().getPath(); return new ResolverResult(itemName, crystalSeedStack.getItemDamage(), crystalSeedStack.getTagCompound()); }) .orElse(null); @@ -154,22 +155,23 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal { } @Override - public String getUnlocalizedName(final ItemStack is) { + @Nonnull + public String getTranslationKey(final ItemStack is) { final int damage = getProgress(is); if (damage < CERTUS + SINGLE_OFFSET) { - return this.getUnlocalizedName() + ".certus"; + return this.getTranslationKey() + ".certus"; } if (damage < NETHER + SINGLE_OFFSET) { - return this.getUnlocalizedName() + ".nether"; + return this.getTranslationKey() + ".nether"; } if (damage < FLUIX + SINGLE_OFFSET) { - return this.getUnlocalizedName() + ".fluix"; + return this.getTranslationKey() + ".fluix"; } - return this.getUnlocalizedName(); + return this.getTranslationKey(); } @Override diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 43e705f80..747882023 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -94,7 +94,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte } final NonNullList tmpList = NonNullList.create(); - b.getSubBlocks(b.getCreativeTabToDisplayOn(), tmpList); + b.getSubBlocks(b.getCreativeTab(), tmpList); for (final ItemStack l : tmpList) { final ItemStack facade = this.createFacadeForItem(l, false); if (!facade.isEmpty()) { diff --git a/src/main/java/appeng/items/parts/ItemPart.java b/src/main/java/appeng/items/parts/ItemPart.java index 6a9ea4974..ebf9864cc 100644 --- a/src/main/java/appeng/items/parts/ItemPart.java +++ b/src/main/java/appeng/items/parts/ItemPart.java @@ -141,7 +141,8 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup } @Override - public String getUnlocalizedName(final ItemStack is) { + @Nonnull + public String getTranslationKey(final ItemStack is) { Preconditions.checkNotNull(is); return "item.appliedenergistics2.multi_part." + this.getTypeByStack(is).getUnlocalizedName().toLowerCase(); } diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 9ecb0c04d..2b6dd198d 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -80,7 +80,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe static { for (final AEColor color : AEColor.VALID_COLORS) { - final String dyeName = color.dye.getUnlocalizedName(); + final String dyeName = color.dye.getTranslationKey(); final String oreDictName = "dye" + WordUtils.capitalize(dyeName); final int oreDictId = OreDictionary.getOreID(oreDictName); diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 40a9b3283..76a7b975a 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -162,7 +162,7 @@ public class QuantumCluster implements ILocatable, IAECluster { if (qc != null) { final World theWorld = qc.center.getWorld(); if (!qc.isDestroyed) { - final Chunk c = theWorld.getChunkFromBlockCoords(qc.center.getPos()); + final Chunk c = theWorld.getChunk(qc.center.getPos()); if (c.isLoaded()) { final int id = theWorld.provider.getDimension(); final World cur = DimensionManager.getWorld(id); diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 79008af57..b7a69df38 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -392,7 +392,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } } - return output.hasNoTags() ? null : output; + return output.isEmpty() ? null : output; } public boolean useStandardMemoryCard() { @@ -416,7 +416,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } } - final String name = is.getUnlocalizedName(); + final String name = is.getTranslationKey(); if (player.isSneaking()) { final NBTTagCompound data = this.downloadSettings(SettingsFrom.MEMORY_CARD); diff --git a/src/main/java/appeng/parts/BusCollisionHelper.java b/src/main/java/appeng/parts/BusCollisionHelper.java index 58c1d3d98..3bb4b5734 100644 --- a/src/main/java/appeng/parts/BusCollisionHelper.java +++ b/src/main/java/appeng/parts/BusCollisionHelper.java @@ -109,25 +109,25 @@ public class BusCollisionHelper implements IPartCollisionHelper { maxY /= 16.0; maxZ /= 16.0; - double aX = minX * this.x.getFrontOffsetX() + minY * this.y.getFrontOffsetX() + minZ * this.z.getFrontOffsetX(); - double aY = minX * this.x.getFrontOffsetY() + minY * this.y.getFrontOffsetY() + minZ * this.z.getFrontOffsetY(); - double aZ = minX * this.x.getFrontOffsetZ() + minY * this.y.getFrontOffsetZ() + minZ * this.z.getFrontOffsetZ(); + double aX = minX * this.x.getXOffset() + minY * this.y.getXOffset() + minZ * this.z.getXOffset(); + double aY = minX * this.x.getYOffset() + minY * this.y.getYOffset() + minZ * this.z.getYOffset(); + double aZ = minX * this.x.getZOffset() + minY * this.y.getZOffset() + minZ * this.z.getZOffset(); - double bX = maxX * this.x.getFrontOffsetX() + maxY * this.y.getFrontOffsetX() + maxZ * this.z.getFrontOffsetX(); - double bY = maxX * this.x.getFrontOffsetY() + maxY * this.y.getFrontOffsetY() + maxZ * this.z.getFrontOffsetY(); - double bZ = maxX * this.x.getFrontOffsetZ() + maxY * this.y.getFrontOffsetZ() + maxZ * this.z.getFrontOffsetZ(); + double bX = maxX * this.x.getXOffset() + maxY * this.y.getXOffset() + maxZ * this.z.getXOffset(); + double bY = maxX * this.x.getYOffset() + maxY * this.y.getYOffset() + maxZ * this.z.getYOffset(); + double bZ = maxX * this.x.getZOffset() + maxY * this.y.getZOffset() + maxZ * this.z.getZOffset(); - if (this.x.getFrontOffsetX() + this.y.getFrontOffsetX() + this.z.getFrontOffsetX() < 0) { + if (this.x.getXOffset() + this.y.getXOffset() + this.z.getXOffset() < 0) { aX += 1; bX += 1; } - if (this.x.getFrontOffsetY() + this.y.getFrontOffsetY() + this.z.getFrontOffsetY() < 0) { + if (this.x.getYOffset() + this.y.getYOffset() + this.z.getYOffset() < 0) { aY += 1; bY += 1; } - if (this.x.getFrontOffsetZ() + this.y.getFrontOffsetZ() + this.z.getFrontOffsetZ() < 0) { + if (this.x.getZOffset() + this.y.getZOffset() + this.z.getZOffset() < 0) { aZ += 1; bZ += 1; } diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 1b4932377..29366dd95 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -446,7 +446,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I private void updateRedstone() { final TileEntity te = this.getTile(); - this.hasRedstone = te.getWorld().isBlockIndirectlyGettingPowered(te.getPos()) != 0 ? YesNo.YES : YesNo.NO; + this.hasRedstone = te.getWorld().getRedstonePowerFromNeighbors(te.getPos()) != 0 ? YesNo.YES : YesNo.NO; } private void updateDynamicRender() { diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 4d7373e42..f23c7fb38 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -91,7 +91,7 @@ public class PartPlacement { if (mop != null) { final List is = new ArrayList<>(); final SelectedPart sp = selectPart(player, host, - mop.hitVec.addVector(-mop.getBlockPos().getX(), -mop.getBlockPos().getY(), -mop.getBlockPos().getZ())); + mop.hitVec.add(-mop.getBlockPos().getX(), -mop.getBlockPos().getY(), -mop.getBlockPos().getZ())); if (sp.part != null) { is.add(sp.part.getItemStack(PartItemStack.WRENCH)); @@ -170,7 +170,7 @@ public class PartPlacement { final RayTraceResult mop = block.collisionRayTrace(world.getBlockState(pos), world, pos, dir.getA(), dir.getB()); if (mop != null) { - mop.hitVec = mop.hitVec.addVector(-mop.getBlockPos().getX(), -mop.getBlockPos().getY(), -mop.getBlockPos().getZ()); + mop.hitVec = mop.hitVec.add(-mop.getBlockPos().getX(), -mop.getBlockPos().getY(), -mop.getBlockPos().getZ()); final SelectedPart sPart = selectPart(player, host, mop.hitVec); if (sPart != null && sPart.part != null) { if (sPart.part.onShiftActivate(player, hand, mop.hitVec)) { @@ -263,7 +263,7 @@ public class PartPlacement { if (mop != null) { final SelectedPart sp = selectPart(player, host, - mop.hitVec.addVector(-mop.getBlockPos().getX(), -mop.getBlockPos().getY(), -mop.getBlockPos().getZ())); + mop.hitVec.add(-mop.getBlockPos().getX(), -mop.getBlockPos().getY(), -mop.getBlockPos().getZ())); if (sp.part != null) { if (!player.isSneaking() && sp.part.onActivate(player, hand, mop.hitVec)) { diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index 53e0241b3..4bfc72f79 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -399,7 +399,7 @@ public abstract class PartP2PTunnel extends PartBasicSt this.onTunnelConfigChange(); final ItemStack p2pItem = this.getItemStack(PartItemStack.WRENCH); - final String type = p2pItem.getUnlocalizedName(); + final String type = p2pItem.getTranslationKey(); p2pItem.writeToNBT(data); if (needsNewFrequency) { diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 2f4f91bb5..f106320d7 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -115,7 +115,7 @@ public final class CompassService { final int hi_y = low_y + 32; // lower level... - final Chunk c = w.getChunkFromChunkCoords(cx, cz); + final Chunk c = w.getChunk(cx, cz); Optional maybeBlock = AEApi.instance().definitions().blocks().skyStoneBlock().maybeBlock(); if (maybeBlock.isPresent()) { diff --git a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java index 4c3d28a38..8f7660def 100644 --- a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java +++ b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java @@ -147,7 +147,7 @@ final class MinecraftItemCSVExporter implements Exporter { if (this.mode == ExportMode.VERBOSE) { final Item item = input.getItem(); - final String unlocalizedItem = input.getUnlocalizedName(); + final String unlocalizedItem = input.getTranslationKey(); final Block block = Block.getBlockFromItem(item); final boolean isBlock = block != Blocks.AIR && !block.equals(Blocks.AIR); final Class stackClass = input.getClass(); @@ -199,7 +199,7 @@ final class MinecraftItemCSVExporter implements Exporter { return null; } else { - AELog.debug(EXPORTING_SUBTYPES_MESSAGE, input.getUnlocalizedName(), input.getHasSubtypes()); + AELog.debug(EXPORTING_SUBTYPES_MESSAGE, input.getTranslationKey(), input.getHasSubtypes()); } final String itemName = ForgeRegistries.ITEMS.getKey(input).toString(); @@ -212,7 +212,7 @@ final class MinecraftItemCSVExporter implements Exporter { try { input.getSubItems(creativeTab, stacks); } catch (final Exception ignored) { - AELog.warn(EXPORTING_SUBTYPES_FAILED_MESSAGE, input.getUnlocalizedName()); + AELog.warn(EXPORTING_SUBTYPES_FAILED_MESSAGE, input.getTranslationKey()); AELog.debug(ignored); // ignore if mods do bullshit in their code @@ -232,7 +232,7 @@ final class MinecraftItemCSVExporter implements Exporter { } final List joinedBlockAttributes = Lists.newArrayListWithCapacity(5); - final String unlocalizedItem = input.getUnlocalizedName(); + final String unlocalizedItem = input.getTranslationKey(); final String localization = I18n.translateToLocal(unlocalizedItem + LOCALIZATION_NAME_EXTENSION); joinedBlockAttributes.add(itemName); diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index ca0fd3068..04ac64281 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -102,7 +102,7 @@ public class CachedPlane { for (int x = 0; x < this.x_size; x++) { for (int z = 0; z < this.z_size; z++) { - this.myColumns[x][z] = new Column(w.getChunkFromChunkCoords((minX + x) >> 4, + this.myColumns[x][z] = new Column(w.getChunk((minX + x) >> 4, (minZ + z) >> 4), (minX + x) & 0xF, (minZ + z) & 0xF, minCY, cy_size); } } @@ -114,7 +114,7 @@ public class CachedPlane { final List> rawTiles = new ArrayList<>(); final List deadTiles = new ArrayList<>(); - final Chunk c = w.getChunkFromChunkCoords(minCX + cx, minCZ + cz); + final Chunk c = w.getChunk(minCX + cx, minCZ + cz); this.myChunks[cx][cz] = c; rawTiles.addAll(c.getTileEntityMap().entrySet()); diff --git a/src/main/java/appeng/spatial/DefaultSpatialHandler.java b/src/main/java/appeng/spatial/DefaultSpatialHandler.java index c9d8607de..d9f353a4e 100644 --- a/src/main/java/appeng/spatial/DefaultSpatialHandler.java +++ b/src/main/java/appeng/spatial/DefaultSpatialHandler.java @@ -45,7 +45,7 @@ public class DefaultSpatialHandler implements IMovableHandler { te.setWorld(w); te.setPos(newPosition); - final Chunk c = w.getChunkFromBlockCoords(newPosition); + final Chunk c = w.getChunk(newPosition); c.addTileEntity(newPosition, te); if (c.isLoaded()) { diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java index 1c6e2eae8..f6f2b295c 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java @@ -274,7 +274,7 @@ public class Quad implements IVertexProducer, ISmartVertexConsumer { * @return The BakedQuad. */ public BakedQuad bake() { - int[] packedData = new int[this.format.format.getNextOffset()]; + int[] packedData = new int[this.format.format.getSize()]; for (int v = 0; v < 4; v++) { for (int e = 0; e < this.format.elementCount; e++) { LightUtil.pack(this.vertices[v].raw[e], packedData, this.format.format, v, e); diff --git a/src/main/java/appeng/tile/AEBaseInvTile.java b/src/main/java/appeng/tile/AEBaseInvTile.java index 43a673b38..7db81b881 100644 --- a/src/main/java/appeng/tile/AEBaseInvTile.java +++ b/src/main/java/appeng/tile/AEBaseInvTile.java @@ -100,7 +100,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements IAEAppEngInven if (this.hasCustomInventoryName()) { return new TextComponentString(this.getCustomInventoryName()); } - return new TextComponentTranslation(this.getBlockType().getUnlocalizedName()); + return new TextComponentTranslation(this.getBlockType().getTranslationKey()); } protected @Nonnull diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 16f03a9cf..4e79bcb19 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -406,7 +406,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } } - return output.hasNoTags() ? null : output; + return output.isEmpty()? null : output; } @Override diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/TileCrank.java index 1b13cc24b..21335d110 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/TileCrank.java @@ -134,17 +134,17 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable @Override public Iterable getSelectedBoundingBoxesFromPool(final World w, final BlockPos pos, final Entity thePlayer, final boolean b) { - final double xOff = -0.15 * this.getUp().getFrontOffsetX(); - final double yOff = -0.15 * this.getUp().getFrontOffsetY(); - final double zOff = -0.15 * this.getUp().getFrontOffsetZ(); + final double xOff = -0.15 * this.getUp().getXOffset(); + final double yOff = -0.15 * this.getUp().getYOffset(); + final double zOff = -0.15 * this.getUp().getZOffset(); return Collections.singletonList(new AxisAlignedBB(xOff + 0.15, yOff + 0.15, zOff + 0.15, xOff + 0.85, yOff + 0.85, zOff + 0.85)); } @Override public void addCollidingBlockToList(final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e) { - final double xOff = -0.15 * this.getUp().getFrontOffsetX(); - final double yOff = -0.15 * this.getUp().getFrontOffsetY(); - final double zOff = -0.15 * this.getUp().getFrontOffsetZ(); + final double xOff = -0.15 * this.getUp().getXOffset(); + final double yOff = -0.15 * this.getUp().getYOffset(); + final double zOff = -0.15 * this.getUp().getZOffset(); out.add(new AxisAlignedBB(xOff + 0.15, yOff + 0.15, zOff + 0.15, // ahh xOff + 0.85, yOff + 0.85, zOff + 0.85)); } diff --git a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java index a902c42b9..f2ce3f971 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java @@ -85,7 +85,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl } public void updateRedstoneState() { - final YesNo currentState = this.world.isBlockIndirectlyGettingPowered(this.pos) != 0 ? YesNo.YES : YesNo.NO; + final YesNo currentState = this.world.getRedstonePowerFromNeighbors(this.pos) != 0 ? YesNo.YES : YesNo.NO; if (this.lastRedstoneState != currentState) { this.lastRedstoneState = currentState; if (this.lastRedstoneState == YesNo.YES) { diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index 6d0987a92..b2a70de2b 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -142,7 +142,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC } public void updateRedstoneState() { - final YesNo currentState = this.world.isBlockIndirectlyGettingPowered(this.pos) != 0 ? YesNo.YES : YesNo.NO; + final YesNo currentState = this.world.getRedstonePowerFromNeighbors(this.pos) != 0 ? YesNo.YES : YesNo.NO; if (this.lastRedstoneState != currentState) { this.lastRedstoneState = currentState; this.updateTask(); diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index c08959aa2..396154c24 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -220,9 +220,9 @@ public class Platform { } public static EnumFacing crossProduct(final EnumFacing forward, final EnumFacing up) { - final int west_x = forward.getFrontOffsetY() * up.getFrontOffsetZ() - forward.getFrontOffsetZ() * up.getFrontOffsetY(); - final int west_y = forward.getFrontOffsetZ() * up.getFrontOffsetX() - forward.getFrontOffsetX() * up.getFrontOffsetZ(); - final int west_z = forward.getFrontOffsetX() * up.getFrontOffsetY() - forward.getFrontOffsetY() * up.getFrontOffsetX(); + final int west_x = forward.getYOffset() * up.getZOffset() - forward.getZOffset() * up.getYOffset(); + final int west_y = forward.getZOffset() * up.getXOffset() - forward.getXOffset() * up.getZOffset(); + final int west_z = forward.getXOffset() * up.getYOffset() - forward.getYOffset() * up.getXOffset(); switch (west_x + west_y * 2 + west_z * 3) { case 1: @@ -571,12 +571,12 @@ public class Platform { try { String name = itemStack.getDisplayName(); if (name == null || name.isEmpty()) { - name = itemStack.getItem().getUnlocalizedName(itemStack); + name = itemStack.getItem().getTranslationKey(itemStack); } return name == null ? "** Null" : name; } catch (final Exception errA) { try { - final String n = itemStack.getUnlocalizedName(); + final String n = itemStack.getTranslationKey(); return n == null ? "** Null" : n; } catch (final Exception errB) { return "** Exception"; @@ -939,7 +939,7 @@ public class Platform { } final Vec3d from = new Vec3d(x, y, z); - final Vec3d to = from.addVector(eyeRayX * reachDistance, eyeRayY * reachDistance, eyeRayZ * reachDistance); + final Vec3d to = from.add(eyeRayX * reachDistance, eyeRayY * reachDistance, eyeRayZ * reachDistance); return new LookDirection(from, to); } @@ -962,7 +962,7 @@ public class Platform { final float f8 = f3 * f5; final double d3 = 32.0D; - final Vec3d vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3); + final Vec3d vec31 = vec3.add(f7 * d3, f6 * d3, f8 * d3); final AxisAlignedBB bb = new AxisAlignedBB(Math.min(vec3.x, vec31.x), Math.min(vec3.y, vec31.y), Math.min(vec3.z, vec31.z), Math.max(vec3.x, vec31.x), Math.max(vec3.y, vec31.y), Math.max(vec3.z, vec31.z)).grow(16, 16, 16); diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java index e6094f202..d2204f91c 100644 --- a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java +++ b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java @@ -118,8 +118,8 @@ public class ItemComparisonHelper { return true; } - final boolean isLeftEmpty = left == null || left.hasNoTags(); - final boolean isRightEmpty = right == null || right.hasNoTags(); + final boolean isLeftEmpty = left == null || left.isEmpty(); + final boolean isRightEmpty = right == null || right.isEmpty(); if (isLeftEmpty && isRightEmpty) { return true; diff --git a/src/main/java/appeng/util/inv/BlockingInventoryAdaptor.java b/src/main/java/appeng/util/inv/BlockingInventoryAdaptor.java index aaa2e1701..092e3a625 100644 --- a/src/main/java/appeng/util/inv/BlockingInventoryAdaptor.java +++ b/src/main/java/appeng/util/inv/BlockingInventoryAdaptor.java @@ -12,7 +12,7 @@ public abstract class BlockingInventoryAdaptor implements Iterable { // Attempt getting an IItemHandler for the given side via caps IItemHandler itemHandler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d); if (itemHandler != null) { - return new BlockingItemHandler(itemHandler, te.getBlockType().getRegistryName().getResourceDomain()); + return new BlockingItemHandler(itemHandler, te.getBlockType().getRegistryName().getNamespace()); } } return null; diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index f07f3b6c9..a9cc80407 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -286,7 +286,7 @@ public class AEItemStack extends AEStack implements IAEItemStack { @SideOnly(Side.CLIENT) public String getModID() { - return this.getDefinition().getItem().getRegistryName().getResourceDomain(); + return this.getDefinition().getItem().getRegistryName().getNamespace(); } public Optional getOre() { diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 38be14474..71d527271 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -186,7 +186,7 @@ public class OreHelper { @Override public String toString() { - return "ItemRef [ref=" + this.ref.getUnlocalizedName() + ", damage=" + this.damage + ", hash=" + this.hash + ']'; + return "ItemRef [ref=" + this.ref.getTranslationKey() + ", damage=" + this.damage + ", hash=" + this.hash + ']'; } } } \ No newline at end of file diff --git a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java index f3777a444..2dd8e1e15 100644 --- a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java +++ b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java @@ -36,7 +36,7 @@ public class ChunkOnly extends StandardWorld { public ChunkOnly(final World w, final int cx, final int cz) { super(w); - this.target = w.getChunkFromChunkCoords(cx, cz); + this.target = w.getChunk(cx, cz); this.cx = cx; this.cz = cz; } diff --git a/src/test/java/appeng/client/render/UVLightmapJsonTest.java b/src/test/java/appeng/client/render/UVLightmapJsonTest.java index f8e5a2597..cdd7c4783 100644 --- a/src/test/java/appeng/client/render/UVLightmapJsonTest.java +++ b/src/test/java/appeng/client/render/UVLightmapJsonTest.java @@ -77,7 +77,7 @@ public class UVLightmapJsonTest } @Override - public BlockRenderLayer getBlockLayer() + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; }