From 5004b30a4837e72bb4a8280b4974549a74eda5bf Mon Sep 17 00:00:00 2001 From: Waterpicker Date: Mon, 7 Jan 2019 00:41:14 -0600 Subject: [PATCH] Updated mappings to stable_39 --- build.gradle | 2 +- src/main/java/org/dimdev/ddutils/TeleportUtils.java | 8 ++++---- src/main/java/org/dimdev/ddutils/schem/Schematic.java | 4 ++-- .../dimdoors/client/DimensionalPortalRenderer.java | 1 + .../client/TileEntityEntranceRiftRenderer.java | 2 +- .../java/org/dimdev/dimdoors/shared/ModRecipes.java | 4 ++-- .../dimdoors/shared/blocks/BlockDimensionalDoor.java | 9 ++++----- .../shared/blocks/BlockDimensionalDoorGold.java | 1 - .../shared/blocks/BlockDimensionalDoorIron.java | 1 - .../shared/blocks/BlockDimensionalDoorQuartz.java | 1 - .../shared/blocks/BlockDimensionalDoorWood.java | 1 - .../dimdoors/shared/blocks/BlockDimensionalPortal.java | 3 +-- .../shared/blocks/BlockDimensionalTrapdoor.java | 4 ++-- .../shared/blocks/BlockDimensionalTrapdoorWood.java | 1 - .../dimdev/dimdoors/shared/blocks/BlockDoorGold.java | 1 - .../dimdev/dimdoors/shared/blocks/BlockDoorQuartz.java | 1 - .../org/dimdev/dimdoors/shared/blocks/BlockFabric.java | 1 - .../dimdoors/shared/blocks/BlockFabricAncient.java | 1 - .../dimdoors/shared/blocks/BlockFabricEternal.java | 1 - .../dimdoors/shared/blocks/BlockFabricUnravelled.java | 1 - .../dimdoors/shared/blocks/BlockFloatingRift.java | 1 - .../dimdoors/shared/blocks/BlockMarkingPlate.java | 1 - .../dimdoors/shared/items/ItemDimensionalDoor.java | 4 ++-- .../dimdoors/shared/items/ItemDimensionalDoorGold.java | 1 - .../dimdoors/shared/items/ItemDimensionalDoorIron.java | 1 - .../shared/items/ItemDimensionalDoorQuartz.java | 1 - .../shared/items/ItemDimensionalDoorUnstable.java | 1 - .../dimdoors/shared/items/ItemDimensionalDoorWood.java | 1 - .../dimdoors/shared/items/ItemDimensionalTrapdoor.java | 4 ++-- .../shared/items/ItemDimensionalTrapdoorWood.java | 1 - .../org/dimdev/dimdoors/shared/items/ItemDoorGold.java | 1 - .../dimdev/dimdoors/shared/items/ItemDoorQuartz.java | 1 - .../dimdev/dimdoors/shared/items/ItemModRecord.java | 1 - .../dimdev/dimdoors/shared/items/ItemRiftBlade.java | 5 ++--- .../shared/items/ItemRiftConfigurationTool.java | 10 +++++++--- .../dimdev/dimdoors/shared/items/ItemRiftRemover.java | 9 ++++----- .../dimdoors/shared/items/ItemRiftSignature.java | 9 ++++----- .../dimdoors/shared/items/ItemRiftStabilizer.java | 7 +++---- .../shared/items/ItemStabilizedRiftSignature.java | 9 ++++----- .../shared/items/ItemWovenWorldThreadArmor.java | 1 - .../dimdev/dimdoors/shared/items/ModCreativeTabs.java | 2 +- .../org/dimdev/dimdoors/shared/items/ModItems.java | 4 ++-- .../shared/tileentities/TileEntityEntranceRift.java | 4 ++-- .../dimdoors/shared/tileentities/TileEntityRift.java | 3 ++- .../dimdoors/shared/world/gateways/GatewayLimbo.java | 2 +- 45 files changed, 54 insertions(+), 78 deletions(-) diff --git a/build.gradle b/build.gradle index 69b83106..01d3f1a0 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ dependencies { sourceCompatibility = targetCompatibility = "1.8" ext.mcversion = "1.12.2" ext.forgeversion = "14.23.4.2707" -String mcpversion = "snapshot_20180703" +String mcpversion = "stable_39" // Mod version version = "3.0.9" diff --git a/src/main/java/org/dimdev/ddutils/TeleportUtils.java b/src/main/java/org/dimdev/ddutils/TeleportUtils.java index bb643e85..f36d8113 100644 --- a/src/main/java/org/dimdev/ddutils/TeleportUtils.java +++ b/src/main/java/org/dimdev/ddutils/TeleportUtils.java @@ -188,7 +188,7 @@ public final class TeleportUtils { // Send respawn packets to the player player.dimension = newDimension; player.connection.sendPacket(new SPacketRespawn(player.dimension, newWorld.getDifficulty(), newWorld.getWorldInfo().getTerrainType(), player.interactionManager.getGameType())); - player.mcServer.getPlayerList().updatePermissionLevel(player); // Sends an SPacketEntityStatus + player.server.getPlayerList().updatePermissionLevel(player); // Sends an SPacketEntityStatus // Remove player entity from the old world oldWorld.removeEntityDangerously(player); @@ -213,14 +213,14 @@ public final class TeleportUtils { player.setWorld(newWorld); // Sync the player - player.mcServer.getPlayerList().preparePlayer(player, oldWorld); + player.server.getPlayerList().preparePlayer(player, oldWorld); player.connection.setPlayerLocation(player.posX, player.posY, player.posZ, player.rotationYaw, player.rotationPitch); // Fix for https://bugs.mojang.com/browse/MC-98153. See this comment: https://bugs.mojang.com/browse/MC-98153#comment-411524 captureCurrentPosition(player.connection); player.interactionManager.setWorld(newWorld); player.connection.sendPacket(new SPacketPlayerAbilities(player.capabilities)); - player.mcServer.getPlayerList().updateTimeAndWeatherForPlayer(player, newWorld); - player.mcServer.getPlayerList().syncPlayerInventory(player); + player.server.getPlayerList().updateTimeAndWeatherForPlayer(player, newWorld); + player.server.getPlayerList().syncPlayerInventory(player); for (PotionEffect potioneffect : player.getActivePotionEffects()) { player.connection.sendPacket(new SPacketEntityEffect(player.getEntityId(), potioneffect)); } diff --git a/src/main/java/org/dimdev/ddutils/schem/Schematic.java b/src/main/java/org/dimdev/ddutils/schem/Schematic.java index b1e9b18e..095f705d 100644 --- a/src/main/java/org/dimdev/ddutils/schem/Schematic.java +++ b/src/main/java/org/dimdev/ddutils/schem/Schematic.java @@ -296,7 +296,7 @@ public class Schematic { if (id.contains(":")) mods.add(id.split(":")[0]); schematic.setBlockState(x, y, z, state); - TileEntity tileEntity = world.getChunkFromBlockCoords(pos).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK); + TileEntity tileEntity = world.getChunk(pos).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK); if (tileEntity != null) { NBTTagCompound tileEntityNBT = tileEntity.serializeNBT(); tileEntityNBT.setInteger("x", tileEntityNBT.getInteger("x") - from.getX()); @@ -438,7 +438,7 @@ public class Schematic { for (int chunkZ = 0; chunkZ <= (length >> 4) + 1; chunkZ++) { long setStart = System.nanoTime(); // Get the chunk only once for efficiency - Chunk chunk = world.getChunkFromChunkCoords((xBase >> 4) + chunkX, (zBase >> 4) + chunkZ); + Chunk chunk = world.getChunk((xBase >> 4) + chunkX, (zBase >> 4) + chunkZ); ExtendedBlockStorage[] storageArray = chunk.getBlockStorageArray(); for (int storageY = 0; storageY <= (height >> 4) + 1; storageY++) { // Get the storage only once for eficiency diff --git a/src/main/java/org/dimdev/dimdoors/client/DimensionalPortalRenderer.java b/src/main/java/org/dimdev/dimdoors/client/DimensionalPortalRenderer.java index b0891c48..e364df6c 100644 --- a/src/main/java/org/dimdev/dimdoors/client/DimensionalPortalRenderer.java +++ b/src/main/java/org/dimdev/dimdoors/client/DimensionalPortalRenderer.java @@ -6,6 +6,7 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.inventory.Container; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import org.dimdev.ddutils.RGBA; diff --git a/src/main/java/org/dimdev/dimdoors/client/TileEntityEntranceRiftRenderer.java b/src/main/java/org/dimdev/dimdoors/client/TileEntityEntranceRiftRenderer.java index b32c3757..e46aa148 100644 --- a/src/main/java/org/dimdev/dimdoors/client/TileEntityEntranceRiftRenderer.java +++ b/src/main/java/org/dimdev/dimdoors/client/TileEntityEntranceRiftRenderer.java @@ -21,7 +21,7 @@ public class TileEntityEntranceRiftRenderer extends TileEntitySpecialRenderer tooltip, ITooltipFlag flag) { - if (I18n.hasKey(getUnlocalizedName() + ".info")) { - tooltip.add(I18n.format(getUnlocalizedName() + ".info")); + if (I18n.hasKey(getRegistryName() + ".info")) { + tooltip.add(I18n.format(getRegistryName() + ".info")); } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorGold.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorGold.java index 56616b27..d4f10232 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorGold.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorGold.java @@ -17,7 +17,6 @@ public class ItemDimensionalDoorGold extends ItemDimensionalDoor { public ItemDimensionalDoorGold() { super(ModBlocks.GOLD_DIMENSIONAL_DOOR); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(BlockDimensionalDoorGold.ID); setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalDoorGold.ID)); } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorIron.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorIron.java index e304705b..32a436d5 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorIron.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorIron.java @@ -12,7 +12,6 @@ public class ItemDimensionalDoorIron extends ItemDimensionalDoor { public ItemDimensionalDoorIron() { super(ModBlocks.IRON_DIMENSIONAL_DOOR); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(BlockDimensionalDoorIron.ID); setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalDoorIron.ID)); } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorQuartz.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorQuartz.java index f4cfe905..6c90c5e1 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorQuartz.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorQuartz.java @@ -14,7 +14,6 @@ public class ItemDimensionalDoorQuartz extends ItemDimensionalDoor { public ItemDimensionalDoorQuartz() { super(ModBlocks.PERSONAL_DIMENSIONAL_DOOR); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(BlockDimensionalDoorQuartz.ID); setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalDoorQuartz.ID)); } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorUnstable.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorUnstable.java index 258a3d4b..203e6ed0 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorUnstable.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorUnstable.java @@ -11,7 +11,6 @@ public class ItemDimensionalDoorUnstable extends ItemDimensionalDoor { public ItemDimensionalDoorUnstable() { super(ModBlocks.IRON_DIMENSIONAL_DOOR); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName("unstable_dimensional_door"); setRegistryName(new ResourceLocation(DimDoors.MODID, "unstable_dimensional_door")); } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorWood.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorWood.java index 7eb7b643..0982e1a3 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorWood.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorWood.java @@ -14,7 +14,6 @@ public class ItemDimensionalDoorWood extends ItemDimensionalDoor { public ItemDimensionalDoorWood() { super(ModBlocks.WARP_DIMENSIONAL_DOOR); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(BlockDimensionalDoorWood.ID); setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalDoorWood.ID)); } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoor.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoor.java index 33dcb6a4..c4dbf9f0 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoor.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoor.java @@ -54,8 +54,8 @@ public abstract class ItemDimensionalTrapdoor extends ItemBlock { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (I18n.hasKey(getUnlocalizedName() + ".info")) { - tooltip.add(I18n.format(getUnlocalizedName() + ".info")); + if (I18n.hasKey(getRegistryName() + ".info")) { + tooltip.add(I18n.format(getRegistryName() + ".info")); } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java index 4f7741c2..b9ce8ce8 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java @@ -12,7 +12,6 @@ public class ItemDimensionalTrapdoorWood extends ItemDimensionalTrapdoor { public ItemDimensionalTrapdoorWood() { super(ModBlocks.WOOD_DIMENSIONAL_TRAPDOOR); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(BlockDimensionalTrapdoorWood.ID); setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalTrapdoorWood.ID)); } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDoorGold.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDoorGold.java index 0aa49220..49bbcba2 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDoorGold.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDoorGold.java @@ -12,7 +12,6 @@ public class ItemDoorGold extends ItemDoor { super(ModBlocks.GOLD_DOOR); setMaxStackSize(16); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(BlockDoorGold.ID); setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDoorGold.ID)); } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDoorQuartz.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDoorQuartz.java index f1d42a43..fa6b6203 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDoorQuartz.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDoorQuartz.java @@ -11,7 +11,6 @@ public class ItemDoorQuartz extends ItemDoor { public ItemDoorQuartz() { super(ModBlocks.QUARTZ_DOOR); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(BlockDoorQuartz.ID); setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDoorQuartz.ID)); } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemModRecord.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemModRecord.java index ce8c734b..af7ddffb 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemModRecord.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemModRecord.java @@ -8,6 +8,5 @@ public class ItemModRecord extends ItemRecord { protected ItemModRecord(String recordName, SoundEvent soundIn) { super(recordName, soundIn); setRegistryName(DimDoors.MODID, "record_" + recordName); - setUnlocalizedName("record"); } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java index 61724873..fb5cca8b 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java @@ -30,7 +30,6 @@ public class ItemRiftBlade extends ItemSword { public ItemRiftBlade() { super(ToolMaterial.IRON); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(ID); setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @@ -57,7 +56,7 @@ public class ItemRiftBlade extends ItemSword { if (RayTraceHelper.isLivingEntity(hit) || RayTraceHelper.isRift(hit, world)) { return new ActionResult<>(EnumActionResult.SUCCESS, stack); } else { - player.sendStatusMessage(new TextComponentTranslation(getUnlocalizedName() + ".rift_miss"), true); + player.sendStatusMessage(new TextComponentTranslation(getRegistryName() + ".rift_miss"), true); TileEntityFloatingRiftRenderer.showRiftCoreUntil = System.currentTimeMillis() + ModConfig.graphics.highlightRiftCoreFor; return new ActionResult<>(EnumActionResult.FAIL, stack); } @@ -93,6 +92,6 @@ public class ItemRiftBlade extends ItemSword { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(I18n.format(getUnlocalizedName() + ".info")); + tooltip.add(I18n.format(getRegistryName() + ".info")); } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java index 685ab06b..69d6eda6 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java @@ -17,6 +17,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.dimdev.dimdoors.DimDoors; import org.dimdev.dimdoors.client.TileEntityFloatingRiftRenderer; import org.dimdev.dimdoors.shared.ModConfig; +import org.dimdev.dimdoors.shared.tileentities.TileEntityRift; import java.util.List; @@ -28,7 +29,6 @@ public class ItemRiftConfigurationTool extends Item { setMaxStackSize(1); setMaxDamage(16); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(ID); setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @@ -46,6 +46,10 @@ public class ItemRiftConfigurationTool extends Item { } if (RayTraceHelper.isRift(hit, world)) { + TileEntityRift rift = (TileEntityRift) world.getTileEntity(hit.getBlockPos()); + + System.out.println(rift); + //TODO: implement this tool's functionality return new ActionResult<>(EnumActionResult.SUCCESS, stack); } @@ -55,8 +59,8 @@ public class ItemRiftConfigurationTool extends Item { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (I18n.hasKey(getUnlocalizedName() + ".info")) { - tooltip.add(I18n.format(getUnlocalizedName() + ".info")); + if (I18n.hasKey(getRegistryName() + ".info")) { + tooltip.add(I18n.format(getRegistryName() + ".info")); } } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java index 5f774d0e..96c0205f 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java @@ -24,7 +24,6 @@ public class ItemRiftRemover extends Item { public ItemRiftRemover() { setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(ID); setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); setMaxStackSize(1); setMaxDamage(100); @@ -33,8 +32,8 @@ public class ItemRiftRemover extends Item { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - if (I18n.hasKey(getUnlocalizedName() + ".info")) { - tooltip.add(I18n.format(getUnlocalizedName() + ".info")); + if (I18n.hasKey(getRegistryName() + ".info")) { + tooltip.add(I18n.format(getRegistryName() + ".info")); } } @@ -57,10 +56,10 @@ public class ItemRiftRemover extends Item { rift.setClosing(true); world.playSound(null, player.getPosition(), ModSounds.RIFT_CLOSE, SoundCategory.BLOCKS, 0.6f, 1); stack.damageItem(10, player); - player.sendStatusMessage(new TextComponentTranslation(getUnlocalizedName() + ".closing"), true); + player.sendStatusMessage(new TextComponentTranslation(getRegistryName() + ".closing"), true); return new ActionResult<>(EnumActionResult.SUCCESS, stack); } else { - player.sendStatusMessage(new TextComponentTranslation(getUnlocalizedName() + ".already_closing"), true); + player.sendStatusMessage(new TextComponentTranslation(getRegistryName() + ".already_closing"), true); } } return new ActionResult<>(EnumActionResult.FAIL, stack); diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java index f35904be..17d37b73 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java @@ -29,7 +29,6 @@ public class ItemRiftSignature extends Item { setMaxStackSize(1); setMaxDamage(1); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(ID); setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @@ -58,7 +57,7 @@ public class ItemRiftSignature extends Item { if (target == null) { // The link signature has not been used. Store its current target as the first location. setSource(stack, new RotatedLocation(new Location(world, pos), player.rotationYaw, 0)); - player.sendStatusMessage(new TextComponentTranslation(getUnlocalizedName() + ".stored"), true); + player.sendStatusMessage(new TextComponentTranslation(getRegistryName() + ".stored"), true); world.playSound(null, player.getPosition(), ModSounds.RIFT_START, SoundCategory.BLOCKS, 0.6f, 1); } else { // Place a rift at the saved point @@ -86,7 +85,7 @@ public class ItemRiftSignature extends Item { stack.damageItem(1, player); // TODO: calculate damage based on position? clearSource(stack); - player.sendStatusMessage(new TextComponentTranslation(getUnlocalizedName() + ".created"), true); + player.sendStatusMessage(new TextComponentTranslation(getRegistryName() + ".created"), true); // null = send sound to the player too, we have to do this because this code is not run client-side world.playSound(null, player.getPosition(), ModSounds.RIFT_END, SoundCategory.BLOCKS, 0.6f, 1); } @@ -120,9 +119,9 @@ public class ItemRiftSignature extends Item { public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { RotatedLocation transform = getSource(stack); if (transform != null) { - tooltip.add(I18n.format(I18n.format(getUnlocalizedName() + ".bound.info", transform.getLocation().getX(), transform.getLocation().getY(), transform.getLocation().getZ(), transform.getLocation().dim))); + tooltip.add(I18n.format(I18n.format(getRegistryName() + ".bound.info", transform.getLocation().getX(), transform.getLocation().getY(), transform.getLocation().getZ(), transform.getLocation().dim))); } else { - tooltip.add(I18n.format(getUnlocalizedName() + ".unbound.info")); + tooltip.add(I18n.format(getRegistryName() + ".unbound.info")); } } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftStabilizer.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftStabilizer.java index 05d8b885..2d4a6eba 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftStabilizer.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftStabilizer.java @@ -26,7 +26,6 @@ public class ItemRiftStabilizer extends Item { setMaxStackSize(1); setMaxDamage(6); // TODO: Add more uses and make it reduce rift growth speed instead? setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(ID); setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @@ -52,10 +51,10 @@ public class ItemRiftStabilizer extends Item { rift.setStabilized(true); world.playSound(null, player.getPosition(), ModSounds.RIFT_CLOSE, SoundCategory.BLOCKS, 0.6f, 1); // TODO: different sound stack.damageItem(1, player); - player.sendStatusMessage(new TextComponentTranslation(getUnlocalizedName() + ".stabilized"), true); + player.sendStatusMessage(new TextComponentTranslation(getRegistryName() + ".stabilized"), true); return new ActionResult<>(EnumActionResult.SUCCESS, stack); } else { - player.sendStatusMessage(new TextComponentTranslation(getUnlocalizedName() + ".already_stabilized"), true); + player.sendStatusMessage(new TextComponentTranslation(getRegistryName() + ".already_stabilized"), true); } } return new ActionResult<>(EnumActionResult.FAIL, stack); @@ -64,6 +63,6 @@ public class ItemRiftStabilizer extends Item { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(I18n.format(I18n.format(getUnlocalizedName() + ".info"))); + tooltip.add(I18n.format(I18n.format(getRegistryName() + ".info"))); } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java index 9f86ec27..bfc17d2a 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java @@ -29,7 +29,6 @@ public class ItemStabilizedRiftSignature extends Item { // TODO: common supercla setMaxStackSize(1); setMaxDamage(20); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); - setUnlocalizedName(ID); setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); } @@ -57,7 +56,7 @@ public class ItemStabilizedRiftSignature extends Item { // TODO: common supercla if (target == null) { // The link signature has not been used. Store its current target as the first location. setSource(stack, new RotatedLocation(new Location(world, pos), player.rotationYaw, 0)); - player.sendStatusMessage(new TextComponentTranslation(getUnlocalizedName() + ".stored"), true); + player.sendStatusMessage(new TextComponentTranslation(getRegistryName() + ".stored"), true); world.playSound(null, player.getPosition(), ModSounds.RIFT_START, SoundCategory.BLOCKS, 0.6f, 1); } else { // Place a rift at the target point @@ -83,7 +82,7 @@ public class ItemStabilizedRiftSignature extends Item { // TODO: common supercla stack.damageItem(1, player); - player.sendStatusMessage(new TextComponentTranslation(getUnlocalizedName() + ".created"), true); + player.sendStatusMessage(new TextComponentTranslation(getRegistryName() + ".created"), true); world.playSound(null, player.getPosition(), ModSounds.RIFT_END, SoundCategory.BLOCKS, 0.6f, 1); } @@ -116,9 +115,9 @@ public class ItemStabilizedRiftSignature extends Item { // TODO: common supercla public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { RotatedLocation transform = getTarget(stack); if (transform != null) { - tooltip.add(I18n.format(getUnlocalizedName() + ".bound.info", transform.getLocation().getX(), transform.getLocation().getY(), transform.getLocation().getZ(), transform.getLocation().dim)); + tooltip.add(I18n.format(getRegistryName() + ".bound.info", transform.getLocation().getX(), transform.getLocation().getY(), transform.getLocation().getZ(), transform.getLocation().dim)); } else { - tooltip.add(I18n.format(getUnlocalizedName() + ".unbound.info")); + tooltip.add(I18n.format(getRegistryName() + ".unbound.info")); } } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemWovenWorldThreadArmor.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemWovenWorldThreadArmor.java index 5e2c3fb6..01f811ac 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemWovenWorldThreadArmor.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemWovenWorldThreadArmor.java @@ -20,7 +20,6 @@ public class ItemWovenWorldThreadArmor extends ItemArmor { public ItemWovenWorldThreadArmor(String name, int renderIndex, EntityEquipmentSlot equipmentSlot) { super(WOVEN_WORLD_THREAD, renderIndex, equipmentSlot); - setUnlocalizedName(name); setRegistryName(DimDoors.MODID, name); setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ModCreativeTabs.java b/src/main/java/org/dimdev/dimdoors/shared/items/ModCreativeTabs.java index 378587c8..8b1cbee4 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ModCreativeTabs.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ModCreativeTabs.java @@ -9,7 +9,7 @@ public final class ModCreativeTabs { public static final CreativeTabs DIMENSIONAL_DOORS_CREATIVE_TAB = new CreativeTabs("dimensional_doors_creative_tab") { @Override @SideOnly(Side.CLIENT) - public ItemStack getTabIconItem() { + public ItemStack createIcon() { return new ItemStack(ModItems.IRON_DIMENSIONAL_DOOR); } }; diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ModItems.java b/src/main/java/org/dimdev/dimdoors/shared/items/ModItems.java index 73c00ecf..24b72e5f 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ModItems.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ModItems.java @@ -29,8 +29,8 @@ public final class ModItems { // Crafting ingredients private static final String WORLD_THREAD_ID = "world_thread"; private static final String STABLE_FABRIC_ID = "stable_fabric"; - public static final Item WORLD_THREAD = new Item().setUnlocalizedName(WORLD_THREAD_ID).setFull3D().setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB).setRegistryName(new ResourceLocation(DimDoors.MODID, WORLD_THREAD_ID)); - public static final Item STABLE_FABRIC = new Item().setUnlocalizedName(STABLE_FABRIC_ID).setFull3D().setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB).setRegistryName(new ResourceLocation(DimDoors.MODID, STABLE_FABRIC_ID)); + public static final Item WORLD_THREAD = new Item().setRegistryName(DimDoors.MODID, WORLD_THREAD_ID).setFull3D().setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); + public static final Item STABLE_FABRIC = new Item().setRegistryName(DimDoors.MODID, STABLE_FABRIC_ID).setFull3D().setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB); // Tools public static final ItemRiftConfigurationTool RIFT_CONFIGURATION_TOOL = new ItemRiftConfigurationTool(); diff --git a/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityEntranceRift.java b/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityEntranceRift.java index 6f669a84..90af02d1 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityEntranceRift.java +++ b/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityEntranceRift.java @@ -77,7 +77,7 @@ import java.util.Random; @Override public boolean receiveEntity(Entity entity, float relativeYaw, float relativePitch) { // TODO: teleportOffset for all rifts instead? - Vec3d targetPos = new Vec3d(pos).addVector(0.5, 0, 0.5).add(new Vec3d(orientation.getDirectionVec()).scale(ModConfig.general.teleportOffset + 0.5)); + Vec3d targetPos = new Vec3d(pos).add(0.5, 0, 0.5).add(new Vec3d(orientation.getDirectionVec()).scale(ModConfig.general.teleportOffset + 0.5)); if (relativeRotation) { float yaw = getDestinationYaw(entity.rotationYaw) + entity.rotationYaw - relativeYaw; float pitch = entity instanceof EntityLiving ? entity.rotationPitch : getDestinationPitch(entity.rotationPitch) + entity.rotationPitch - relativePitch; @@ -137,7 +137,7 @@ import java.util.Random; @Override public float getSourcePitch(float entityPitch) { - return orientation.getOpposite().getFrontOffsetY() * 90; + return orientation.getOpposite().getYOffset() * 90; } @Override diff --git a/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityRift.java b/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityRift.java index c6575833..1d872a38 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityRift.java +++ b/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityRift.java @@ -1,6 +1,7 @@ package org.dimdev.dimdoors.shared.tileentities; import lombok.Getter; +import lombok.ToString; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -24,7 +25,7 @@ import org.dimdev.pocketlib.VirtualLocation; import javax.annotation.Nonnull; import org.dimdev.dimdoors.shared.pockets.PocketTemplate; -@NBTSerializable public abstract class TileEntityRift extends TileEntity implements ITarget, IEntityTarget { +@ToString @NBTSerializable public abstract class TileEntityRift extends TileEntity implements ITarget, IEntityTarget { /*@Saved*/ @Nonnull @Getter /*protected*/ VirtualTarget destination; // How the rift acts as a source @Saved @Getter protected LinkProperties properties; // How the rift acts as a target, and properties that affect how it can link to other rifts diff --git a/src/main/java/org/dimdev/dimdoors/shared/world/gateways/GatewayLimbo.java b/src/main/java/org/dimdev/dimdoors/shared/world/gateways/GatewayLimbo.java index 768f1cdc..ba61ad93 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/world/gateways/GatewayLimbo.java +++ b/src/main/java/org/dimdev/dimdoors/shared/world/gateways/GatewayLimbo.java @@ -23,7 +23,7 @@ public class GatewayLimbo extends BaseGateway { world.setBlockState(new BlockPos(x, y + 1, z - 1), unravelledFabric); world.setBlockState(new BlockPos(x, y + 1, z + 1), unravelledFabric); - ItemDoor.placeDoor(world, new BlockPos(x, y + 1, z), EnumFacing.getHorizontal(0), ModBlocks.DIMENSIONAL_PORTAL, false); + ItemDoor.placeDoor(world, new BlockPos(x, y + 1, z), EnumFacing.byHorizontalIndex(0), ModBlocks.DIMENSIONAL_PORTAL, false); } @Override