added translation key fix.

Waterpicker · Waterpicker · commit d613019752e3 · 2019-01-07T01:08:37.000-06:00
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorGold.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorGold.java
@@ -16,6 +16,7 @@ public class BlockDimensionalDoorGold extends BlockDimensionalDoor {
     public BlockDimensionalDoorGold() {
         super(Material.IRON);
         setHardness(1.0F);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorIron.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorIron.java
@@ -18,6 +18,7 @@ public BlockDimensionalDoorIron() {
         super(Material.IRON);
         setHardness(1.0F);
         setResistance(2000.0F);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorQuartz.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorQuartz.java
@@ -16,6 +16,7 @@ public class BlockDimensionalDoorQuartz extends BlockDimensionalDoor {
     public BlockDimensionalDoorQuartz() {
         super(Material.ROCK);
         setHardness(0.1F);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorWood.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorWood.java
@@ -17,6 +17,7 @@ public class BlockDimensionalDoorWood extends BlockDimensionalDoor { // TODO: al
     public BlockDimensionalDoorWood() {
         super(Material.WOOD);
         setHardness(1.0F);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalPortal.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalPortal.java
@@ -22,6 +22,7 @@ public BlockDimensionalPortal() {
         super(Material.PORTAL); // This is the only way to make it collide with water but not other entities, but still have a collision box.
         setHardness(1.0F);
         setLightLevel(0.5F);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
         setDefaultState(super.getDefaultState().withProperty(OPEN, true));
     }
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalTrapdoorWood.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalTrapdoorWood.java
@@ -18,6 +18,7 @@ public class BlockDimensionalTrapdoorWood extends BlockDimensionalTrapdoor { //
     public BlockDimensionalTrapdoorWood() {
         super(Material.WOOD);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
         setHardness(1.0F);
         setSoundType(SoundType.WOOD);
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDoorGold.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDoorGold.java
@@ -22,6 +22,7 @@ public class BlockDoorGold extends BlockDoor {
     public BlockDoorGold() {
         super(Material.IRON);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
         setHardness(0.1F);
     }
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDoorQuartz.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDoorQuartz.java
@@ -22,6 +22,7 @@ public class BlockDoorQuartz extends BlockDoor {
     public BlockDoorQuartz() {
         super(Material.ROCK);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
         setHardness(0.1F);
     }
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabric.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabric.java
@@ -30,6 +30,7 @@ public class BlockFabric extends BlockColored {
     public BlockFabric() {
         super(FABRIC);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
         setDefaultState(getDefaultState().withProperty(COLOR, EnumDyeColor.BLACK));
         setHardness(0.1F);
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabricAncient.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabricAncient.java
@@ -23,6 +23,7 @@ public BlockFabricAncient() {
         super(Material.ROCK);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setDefaultState(getDefaultState().withProperty(COLOR, EnumDyeColor.BLACK));
         setHardness(-1);
         setResistance(6000000.0F);
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabricEternal.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabricEternal.java
@@ -21,6 +21,7 @@ public class BlockFabricEternal extends BlockEmptyDrops { // TODO: make this a g
     public BlockFabricEternal() {
         super(ETERNAL_FABRIC);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
         setHardness(-1);
         setResistance(6000000.0F);
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabricUnravelled.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabricUnravelled.java
@@ -23,6 +23,7 @@ public class BlockFabricUnravelled extends BlockEmptyDrops {
     public BlockFabricUnravelled() {
         super(UNRAVELLED_FABRIC);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
         setHardness(0.1F);
         setSoundType(SoundType.STONE);
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFloatingRift.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFloatingRift.java
@@ -28,6 +28,7 @@ public class BlockFloatingRift extends BlockSpecialAir implements ITileEntityPro
 
     public BlockFloatingRift() {
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setTickRandomly(true);
         setResistance(6000000.0F); // Same as bedrock
         setLightLevel(0.5f);
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockMarkingPlate.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockMarkingPlate.java
@@ -21,6 +21,7 @@ public class BlockMarkingPlate extends Block {
     public BlockMarkingPlate() {
         super(FABRIC);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
         setHardness(0.1F);
         setSoundType(SoundType.STONE);
diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoor.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoor.java
@@ -109,8 +109,8 @@ public static boolean isRiftNear(World world, BlockPos pos) {
     @Override
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
-        if (I18n.hasKey(getRegistryName() + ".info")) {
-            tooltip.add(I18n.format(getRegistryName() + ".info"));
+        if (I18n.hasKey(getTranslationKey() + ".info")) {
+            tooltip.add(I18n.format(getTranslationKey() + ".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
@@ -17,6 +17,7 @@ public class ItemDimensionalDoorGold extends ItemDimensionalDoor {
     public ItemDimensionalDoorGold() {
         super(ModBlocks.GOLD_DIMENSIONAL_DOOR);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(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
@@ -12,6 +12,7 @@ public class ItemDimensionalDoorIron extends ItemDimensionalDoor {
     public ItemDimensionalDoorIron() {
         super(ModBlocks.IRON_DIMENSIONAL_DOOR);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(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
@@ -14,6 +14,7 @@ public class ItemDimensionalDoorQuartz extends ItemDimensionalDoor {
     public ItemDimensionalDoorQuartz() {
         super(ModBlocks.PERSONAL_DIMENSIONAL_DOOR);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(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
@@ -11,6 +11,7 @@ public class ItemDimensionalDoorUnstable extends ItemDimensionalDoor {
     public ItemDimensionalDoorUnstable() {
         super(ModBlocks.IRON_DIMENSIONAL_DOOR);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey("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
@@ -14,6 +14,7 @@ public class ItemDimensionalDoorWood extends ItemDimensionalDoor {
     public ItemDimensionalDoorWood() {
         super(ModBlocks.WARP_DIMENSIONAL_DOOR);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(BlockDimensionalDoorWood.ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalDoorWood.ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java
@@ -12,6 +12,7 @@ public class ItemDimensionalTrapdoorWood extends ItemDimensionalTrapdoor {
     public ItemDimensionalTrapdoorWood() {
         super(ModBlocks.WOOD_DIMENSIONAL_TRAPDOOR);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(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
@@ -12,6 +12,7 @@ public ItemDoorGold() {
         super(ModBlocks.GOLD_DOOR);
         setMaxStackSize(16);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(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
@@ -11,6 +11,7 @@ public class ItemDoorQuartz extends ItemDoor {
     public ItemDoorQuartz() {
         super(ModBlocks.QUARTZ_DOOR);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(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
@@ -7,6 +7,7 @@
 public class ItemModRecord extends ItemRecord {
     protected ItemModRecord(String recordName, SoundEvent soundIn) {
         super(recordName, soundIn);
+        setTranslationKey("record");
         setRegistryName(DimDoors.MODID, "record_" + recordName);
     }
 }
diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java
@@ -30,6 +30,7 @@ public class ItemRiftBlade extends ItemSword {
     public ItemRiftBlade() {
         super(ToolMaterial.IRON);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java
@@ -29,6 +29,7 @@ public class ItemRiftConfigurationTool extends Item {
         setMaxStackSize(1);
         setMaxDamage(16);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java
@@ -25,6 +25,7 @@ public class ItemRiftRemover extends Item {
     public ItemRiftRemover() {
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
+        setTranslationKey(ID);
         setMaxStackSize(1);
         setMaxDamage(100);
     }
diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java
@@ -29,6 +29,7 @@ public ItemRiftSignature() {
         setMaxStackSize(1);
         setMaxDamage(1);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftStabilizer.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftStabilizer.java
@@ -26,6 +26,7 @@ public ItemRiftStabilizer() {
         setMaxStackSize(1);
         setMaxDamage(6); // TODO: Add more uses and make it reduce rift growth speed instead?
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java
@@ -29,6 +29,7 @@ public ItemStabilizedRiftSignature() {
         setMaxStackSize(1);
         setMaxDamage(20);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
+        setTranslationKey(ID);
         setRegistryName(new ResourceLocation(DimDoors.MODID, ID));
     }
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemWovenWorldThreadArmor.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemWovenWorldThreadArmor.java
@@ -21,6 +21,7 @@ public class ItemWovenWorldThreadArmor extends ItemArmor {
     public ItemWovenWorldThreadArmor(String name, int renderIndex, EntityEquipmentSlot equipmentSlot) {
         super(WOVEN_WORLD_THREAD, renderIndex, equipmentSlot);
         setRegistryName(DimDoors.MODID, name);
+        setTranslationKey(name);
         setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public class BlockDimensionalDoorGold extends BlockDimensionalDoor {`
`16`	`16`	`public BlockDimensionalDoorGold() {`
`17`	`17`	`super(Material.IRON);`
`18`	`18`	`setHardness(1.0F);`
	`19`	`+ setTranslationKey(ID);`
`19`	`20`	`setRegistryName(new ResourceLocation(DimDoors.MODID, ID));`
`20`	`21`	`}`
`21`	`22`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public BlockDimensionalDoorIron() {`
`18`	`18`	`super(Material.IRON);`
`19`	`19`	`setHardness(1.0F);`
`20`	`20`	`setResistance(2000.0F);`
	`21`	`+ setTranslationKey(ID);`
`21`	`22`	`setRegistryName(new ResourceLocation(DimDoors.MODID, ID));`
`22`	`23`	`}`
`23`	`24`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public class BlockDimensionalDoorWood extends BlockDimensionalDoor { // TODO: al`
`17`	`17`	`public BlockDimensionalDoorWood() {`
`18`	`18`	`super(Material.WOOD);`
`19`	`19`	`setHardness(1.0F);`
	`20`	`+ setTranslationKey(ID);`
`20`	`21`	`setRegistryName(new ResourceLocation(DimDoors.MODID, ID));`
`21`	`22`	`}`
`22`	`23`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public BlockDimensionalPortal() {`
`22`	`22`	`super(Material.PORTAL); // This is the only way to make it collide with water but not other entities, but still have a collision box.`
`23`	`23`	`setHardness(1.0F);`
`24`	`24`	`setLightLevel(0.5F);`
	`25`	`+ setTranslationKey(ID);`
`25`	`26`	`setRegistryName(new ResourceLocation(DimDoors.MODID, ID));`
`26`	`27`	`setDefaultState(super.getDefaultState().withProperty(OPEN, true));`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public class BlockDoorGold extends BlockDoor {`
`22`	`22`	`public BlockDoorGold() {`
`23`	`23`	`super(Material.IRON);`
`24`	`24`	`setRegistryName(new ResourceLocation(DimDoors.MODID, ID));`
	`25`	`+ setTranslationKey(ID);`
`25`	`26`	`setCreativeTab(ModCreativeTabs.DIMENSIONAL_DOORS_CREATIVE_TAB);`
`26`	`27`	`setHardness(0.1F);`
`27`	`28`	`}`