Normally Updated All Mappings

Paneedah · Mar 8, 2023 · abe166d · abe166d
1 parent 831330c
commit abe166d
Show file tree

Hide file tree

Showing 102 changed files with 307 additions and 302 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ version project.mod_version
 
 minecraft {
     version = "1.12.2-14.23.5.2847"
-    mappings = "snapshot_20170624"
+    mappings = "stable_39"
 
     runDir = "run"
 

diff --git a/src/main/java/com/paneedah/mw/ModernWarfareMod.java b/src/main/java/com/paneedah/mw/ModernWarfareMod.java
@@ -41,14 +41,14 @@ public class ModernWarfareMod {
 
     public static final SimpleNetworkWrapper CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(MODID);
 
-    public static CreativeTabs ArmorTab = new ArmorTab(CreativeTabs.getNextID(), "ArmorTab");
-	public static CreativeTabs AssaultRiflesTab = new AssaultRiflesTab(CreativeTabs.getNextID(), "AssaultRifles_tab");
-	public static CreativeTabs AmmoTab = new AmmoTab(CreativeTabs.getNextID(), "AmmoTab");
-	public static CreativeTabs AttachmentsTab = new AttachmentsTab(CreativeTabs.getNextID(), "AttachmentsTab");
-	public static CreativeTabs GrenadesTab = new GrenadesTab(CreativeTabs.getNextID(), "GrenadesTab");
-	public static CreativeTabs GadgetsTab = new GadgetsTab(CreativeTabs.getNextID(), "GadgetsTab");
-	public static CreativeTabs PropsTab = new PropsTab(CreativeTabs.getNextID(), "props_tab");
-	public static CreativeTabs BlocksTab = new BlocksTab(CreativeTabs.getNextID(), "BlocksTab");
+    public static final CreativeTabs ArmorTab = new ArmorTab(CreativeTabs.getNextID(), "ArmorTab");
+	public static final CreativeTabs AssaultRiflesTab = new AssaultRiflesTab(CreativeTabs.getNextID(), "AssaultRifles_tab");
+	public static final CreativeTabs AmmoTab = new AmmoTab(CreativeTabs.getNextID(), "AmmoTab");
+	public static final CreativeTabs AttachmentsTab = new AttachmentsTab(CreativeTabs.getNextID(), "AttachmentsTab");
+	public static final CreativeTabs GrenadesTab = new GrenadesTab(CreativeTabs.getNextID(), "GrenadesTab");
+	public static final CreativeTabs GadgetsTab = new GadgetsTab(CreativeTabs.getNextID(), "GadgetsTab");
+	public static final CreativeTabs PropsTab = new PropsTab(CreativeTabs.getNextID(), "props_tab");
+	public static final CreativeTabs BlocksTab = new BlocksTab(CreativeTabs.getNextID(), "BlocksTab");
 
     @SidedProxy(serverSide = "com.paneedah.mw.proxies.CommonProxy", clientSide = "com.paneedah.mw.proxies.ClientProxy")
     public static CommonProxy proxy;

diff --git a/src/main/java/com/paneedah/mw/creativetab/AmmoTab.java b/src/main/java/com/paneedah/mw/creativetab/AmmoTab.java
@@ -14,7 +14,7 @@ public AmmoTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Bullets.Bullet556x45);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/ArmorTab.java b/src/main/java/com/paneedah/mw/creativetab/ArmorTab.java
@@ -14,7 +14,7 @@ public ArmorTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Armors.SpecOpshelmet);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/AssaultRiflesTab.java b/src/main/java/com/paneedah/mw/creativetab/AssaultRiflesTab.java
@@ -14,7 +14,7 @@ public AssaultRiflesTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Guns.M16A4);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/AttachmentsTab.java b/src/main/java/com/paneedah/mw/creativetab/AttachmentsTab.java
@@ -14,7 +14,7 @@ public AttachmentsTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Attachments.ACOG);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/BlocksTab.java b/src/main/java/com/paneedah/mw/creativetab/BlocksTab.java
@@ -14,7 +14,7 @@ public BlocksTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Ores.CopperOre);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/CombatServerTab.java b/src/main/java/com/paneedah/mw/creativetab/CombatServerTab.java
@@ -14,7 +14,7 @@ public CombatServerTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Guns.AsiimovM4A1);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/GadgetsTab.java b/src/main/java/com/paneedah/mw/creativetab/GadgetsTab.java
@@ -14,7 +14,7 @@ public GadgetsTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Electronics.Tablet);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/GrenadesTab.java b/src/main/java/com/paneedah/mw/creativetab/GrenadesTab.java
@@ -14,7 +14,7 @@ public GrenadesTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Grenades.FuseGrenade);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/GunsTab.java b/src/main/java/com/paneedah/mw/creativetab/GunsTab.java
@@ -13,7 +13,7 @@ public GunsTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Ores.CopperIngot);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/PistolsTab.java b/src/main/java/com/paneedah/mw/creativetab/PistolsTab.java
@@ -14,7 +14,7 @@ public PistolsTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Guns.P226);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/creativetab/PropsTab.java b/src/main/java/com/paneedah/mw/creativetab/PropsTab.java
@@ -13,7 +13,7 @@ public PropsTab(int par1, String par2Str) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
+	public ItemStack createIcon() {
 		return new ItemStack(Guns.M4A1);
 	}
 }
diff --git a/src/main/java/com/paneedah/mw/misc/ItemCarbonComposite.java b/src/main/java/com/paneedah/mw/misc/ItemCarbonComposite.java
@@ -8,7 +8,7 @@ public class ItemCarbonComposite extends Item {
 
     public ItemCarbonComposite() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "CarbonComposite");
+        setTranslationKey(ModReference.MWC_ID + "_" + "CarbonComposite");
         //setTextureName(ModReference.MWC_ID + ":" + "carboncomposite");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemCarbonFiber.java b/src/main/java/com/paneedah/mw/misc/ItemCarbonFiber.java
@@ -8,7 +8,7 @@ public class ItemCarbonFiber extends Item {
 
     public ItemCarbonFiber() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "CarbonFiber");
+        setTranslationKey(ModReference.MWC_ID + "_" + "CarbonFiber");
 //        setTextureName(ModReference.MWC_ID + ":" + "carbonfiber");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemCopperIngot.java b/src/main/java/com/paneedah/mw/misc/ItemCopperIngot.java
@@ -8,7 +8,7 @@ public class ItemCopperIngot extends Item {
 
     public ItemCopperIngot() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "CopperIngot");
+        setTranslationKey(ModReference.MWC_ID + "_" + "CopperIngot");
 //        setTextureName(ModReference.MWC_ID + ":" + "copperingot");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemGraphiteChunk.java b/src/main/java/com/paneedah/mw/misc/ItemGraphiteChunk.java
@@ -8,7 +8,7 @@ public class ItemGraphiteChunk extends Item {
 
     public ItemGraphiteChunk() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "GraphiteChunk");
+        setTranslationKey(ModReference.MWC_ID + "_" + "GraphiteChunk");
 //        setTextureName(ModReference.MWC_ID + ":" + "graphitechunk");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemGunmetalComposite.java b/src/main/java/com/paneedah/mw/misc/ItemGunmetalComposite.java
@@ -8,7 +8,7 @@ public class ItemGunmetalComposite extends Item {
 
     public ItemGunmetalComposite() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "GunmetalComposite");
+        setTranslationKey(ModReference.MWC_ID + "_" + "GunmetalComposite");
 //        setTextureName(ModReference.MWC_ID + ":" + "gunmetalcomposite");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemGunmetalIngot.java b/src/main/java/com/paneedah/mw/misc/ItemGunmetalIngot.java
@@ -8,7 +8,7 @@ public class ItemGunmetalIngot extends Item {
 
 	public ItemGunmetalIngot() {
 		setMaxStackSize(64);
-		setUnlocalizedName(ModReference.MWC_ID + "_" + "GunmetalIngot");
+		setTranslationKey(ModReference.MWC_ID + "_" + "GunmetalIngot");
 //		setTextureName(ModReference.MWC_ID + ":" + "gunmetalingot");
 		setCreativeTab(ModernWarfareMod.BlocksTab);
 	}

diff --git a/src/main/java/com/paneedah/mw/misc/ItemGunmetalPlate.java b/src/main/java/com/paneedah/mw/misc/ItemGunmetalPlate.java
@@ -8,7 +8,7 @@ public class ItemGunmetalPlate extends Item {
 
     public ItemGunmetalPlate() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "GunmetalPlate");
+        setTranslationKey(ModReference.MWC_ID + "_" + "GunmetalPlate");
 //        setTextureName(ModReference.MWC_ID + ":" + "gunmetalplate");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemLeadIngot.java b/src/main/java/com/paneedah/mw/misc/ItemLeadIngot.java
@@ -8,7 +8,7 @@ public class ItemLeadIngot extends Item {
 
     public ItemLeadIngot() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "LeadIngot");
+        setTranslationKey(ModReference.MWC_ID + "_" + "LeadIngot");
 //        setTextureName(ModReference.MWC_ID + ":" + "leadingot");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemPlasticPlate.java b/src/main/java/com/paneedah/mw/misc/ItemPlasticPlate.java
@@ -8,7 +8,7 @@ public class ItemPlasticPlate extends Item {
 
     public ItemPlasticPlate() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "PlasticPlate");
+        setTranslationKey(ModReference.MWC_ID + "_" + "PlasticPlate");
 //        setTextureName(ModReference.MWC_ID + ":" + "plasticplate");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemSteelDust.java b/src/main/java/com/paneedah/mw/misc/ItemSteelDust.java
@@ -8,7 +8,7 @@ public class ItemSteelDust extends Item {
 
 	public ItemSteelDust() {
 		setMaxStackSize(64);
-		setUnlocalizedName(ModReference.MWC_ID + "_" + "SteelDust");
+		setTranslationKey(ModReference.MWC_ID + "_" + "SteelDust");
 //		setTextureName(ModReference.MWC_ID + ":" + "steeldust");
 		setCreativeTab(ModernWarfareMod.BlocksTab);
 	}

diff --git a/src/main/java/com/paneedah/mw/misc/ItemSteelIngot.java b/src/main/java/com/paneedah/mw/misc/ItemSteelIngot.java
@@ -8,7 +8,7 @@ public class ItemSteelIngot extends Item {
 
 	public ItemSteelIngot() {
 		setMaxStackSize(64);
-		setUnlocalizedName(ModReference.MWC_ID + "_" + "SteelIngot");
+		setTranslationKey(ModReference.MWC_ID + "_" + "SteelIngot");
 //		setTextureName(ModReference.MWC_ID + ":" + "steelingot");
 		setCreativeTab(ModernWarfareMod.BlocksTab);
 	}

diff --git a/src/main/java/com/paneedah/mw/misc/ItemSyntheticPlastic.java b/src/main/java/com/paneedah/mw/misc/ItemSyntheticPlastic.java
@@ -8,7 +8,7 @@ public class ItemSyntheticPlastic extends Item {
 
     public ItemSyntheticPlastic() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "SyntheticPlastic");
+        setTranslationKey(ModReference.MWC_ID + "_" + "SyntheticPlastic");
 //        setTextureName(ModReference.MWC_ID + ":" + "syntheticplastic");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemSyntheticPolymerComposite.java b/src/main/java/com/paneedah/mw/misc/ItemSyntheticPolymerComposite.java
@@ -8,7 +8,7 @@ public class ItemSyntheticPolymerComposite extends Item {
 
     public ItemSyntheticPolymerComposite() {
         setMaxStackSize(64);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "SyntheticPolymerComposite");
+        setTranslationKey(ModReference.MWC_ID + "_" + "SyntheticPolymerComposite");
 //        setTextureName(ModReference.MWC_ID + ":" + "syntheticpolymercomposite");
         setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/misc/ItemVestRender.java b/src/main/java/com/paneedah/mw/misc/ItemVestRender.java
@@ -7,7 +7,7 @@ public class ItemVestRender extends Item {
 
     public ItemVestRender() {
         setMaxStackSize(1);
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "vestrender");
+        setTranslationKey(ModReference.MWC_ID + "_" + "vestrender");
 //        setTextureName(ModReference.MWC_ID + ":" + "syntheticplastic");
 //        setCreativeTab(ModernWarfareMod.BlocksTab);
     }

diff --git a/src/main/java/com/paneedah/mw/ores/BlockCopperOre.java b/src/main/java/com/paneedah/mw/ores/BlockCopperOre.java
@@ -13,7 +13,7 @@ public class BlockCopperOre extends Block {
     public BlockCopperOre() {
         super(Material.ROCK);
 
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "CopperOre");
+        setTranslationKey(ModReference.MWC_ID + "_" + "CopperOre");
         //setBlockTextureName(ModReference.MWC_ID + ":" + "copperore");
         setHardness(6F);
         setResistance(15F);

diff --git a/src/main/java/com/paneedah/mw/ores/BlockGraphiteOre.java b/src/main/java/com/paneedah/mw/ores/BlockGraphiteOre.java
@@ -15,7 +15,7 @@ public class BlockGraphiteOre extends Block {
     public BlockGraphiteOre() {
         super(Material.ROCK);
 
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "GraphiteOre");
+        setTranslationKey(ModReference.MWC_ID + "_" + "GraphiteOre");
         //setBlockTextureName(ModReference.MWC_ID + ":" + "graphiteore");
         setHardness(6F);
         setResistance(15F);

diff --git a/src/main/java/com/paneedah/mw/ores/BlockLeadOre.java b/src/main/java/com/paneedah/mw/ores/BlockLeadOre.java
@@ -13,7 +13,7 @@ public class BlockLeadOre extends Block {
     public BlockLeadOre() {
         super(Material.ROCK);
 
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "LeadOre");
+        setTranslationKey(ModReference.MWC_ID + "_" + "LeadOre");
         //setBlockTextureName(ModReference.MWC_ID + ":" + "leadore");
         setHardness(6F);
         setResistance(15F);

diff --git a/src/main/java/com/paneedah/mw/ores/BlockSulfurOre.java b/src/main/java/com/paneedah/mw/ores/BlockSulfurOre.java
@@ -15,7 +15,7 @@ public class BlockSulfurOre extends Block {
     public BlockSulfurOre() {
         super(Material.ROCK);
 
-        setUnlocalizedName(ModReference.MWC_ID + "_" + "SulfurOre");
+        setTranslationKey(ModReference.MWC_ID + "_" + "SulfurOre");
         //setBlockTextureName(ModReference.MWC_ID + ":" + "sulfurore");
         setHardness(6F);
         setResistance(15F);

diff --git a/src/main/java/com/paneedah/mw/ores/BlockTinOre.java b/src/main/java/com/paneedah/mw/ores/BlockTinOre.java
@@ -14,7 +14,7 @@ public BlockTinOre() {
         super(Material.ROCK);
 
         //setBlockName(ModReference.MWC_ID + "_" + "TinOre");
-        setUnlocalizedName(ModReference.MWC_ID + ":" + "tinore");
+        setTranslationKey(ModReference.MWC_ID + ":" + "tinore");
         setHardness(6F);
         setResistance(15F);
         setSoundType(SoundType.STONE); 

diff --git a/src/main/java/com/paneedah/mw/resources/ItemSteelPlate.java b/src/main/java/com/paneedah/mw/resources/ItemSteelPlate.java
@@ -8,7 +8,7 @@ public class ItemSteelPlate extends Item {
 
 	public ItemSteelPlate() {
 		setMaxStackSize(64);
-		setUnlocalizedName(ModReference.MWC_ID + "_" + "SteelPlate");
+		setTranslationKey(ModReference.MWC_ID + "_" + "SteelPlate");
 		//setTextureName(ModReference.MWC_ID + ":" + "SteelPlate");
 		setCreativeTab(ModernWarfareMod.BlocksTab);
 	}

diff --git a/src/main/java/com/paneedah/mw/resources/ItemSulfurDust.java b/src/main/java/com/paneedah/mw/resources/ItemSulfurDust.java
@@ -8,7 +8,7 @@ public class ItemSulfurDust extends Item {
 
 	public ItemSulfurDust() {
 		setMaxStackSize(64);
-		setUnlocalizedName(ModReference.MWC_ID + "_" + "SulfurDust");
+		setTranslationKey(ModReference.MWC_ID + "_" + "SulfurDust");
 		//setTextureName(ModReference.MWC_ID + ":" + "SulfurDust");
 		setCreativeTab(ModernWarfareMod.BlocksTab);
 	}

diff --git a/src/main/java/com/paneedah/mw/resources/ItemTinIngot.java b/src/main/java/com/paneedah/mw/resources/ItemTinIngot.java
@@ -8,7 +8,7 @@ public class ItemTinIngot extends Item {
 
 	public ItemTinIngot() {
 		setMaxStackSize(64);
-		setUnlocalizedName(ModReference.MWC_ID + "_" + "TinIngot");
+		setTranslationKey(ModReference.MWC_ID + "_" + "TinIngot");
 		//setTextureName(ModReference.MWC_ID + ":" + "TinIngot");
 		setCreativeTab(ModernWarfareMod.BlocksTab);
 	}

diff --git a/src/main/java/com/paneedah/weaponlib/AttachmentBuilder.java b/src/main/java/com/paneedah/weaponlib/AttachmentBuilder.java
@@ -254,7 +254,7 @@ protected ItemAttachment<T> createAttachment(ModContext modContext) {
 	@SuppressWarnings("deprecation")
 	public ItemAttachment<T> build(ModContext modContext) {
 		ItemAttachment<T> attachment = createAttachment(modContext);
-		attachment.setUnlocalizedName(getModId() + "_" + name);
+		attachment.setTranslationKey(getModId() + "_" + name);
 		attachment.setCreativeTab(tab);
 		attachment.setPostRenderer(postRenderer);
 		attachment.setName(name);

diff --git a/src/main/java/com/paneedah/weaponlib/ClientEffectManager.java b/src/main/java/com/paneedah/weaponlib/ClientEffectManager.java
@@ -118,7 +118,7 @@ public void spawnFlashParticle(EntityLivingBase player, float flashIntensity, fl
 		double posY = player.posY + (look.getYCoord() * distance) + (compatibility.world(player).rand.nextFloat() * 2.0f - 1) * positionRandomizationFactor - yOffset;
 		double posZ = player.posZ + (look.getZCoord() * distance) + (compatibility.world(player).rand.nextFloat() * 2.0f - 1) * positionRandomizationFactor + (look.getXCoord() * xOffset);
 
-		Vec3d bruh = new Vec3d(-0.13, 0, 2.0).rotatePitch((float) Math.toRadians(-player.rotationPitch)).rotateYaw((float) Math.toRadians(-player.rotationYaw)).add(player.getPositionVector()).addVector(0, 1.5, 0);
+		Vec3d bruh = new Vec3d(-0.13, 0, 2.0).rotatePitch((float) Math.toRadians(-player.rotationPitch)).rotateYaw((float) Math.toRadians(-player.rotationYaw)).add(player.getPositionVector()).add(0, 1.5, 0);
 
 		//MuzzleFlash flash = new MuzzleFlash(bruh, player.rotationYaw, player.rotationPitch, 1.0);