Moved to official mappings

build.gradle

@@ -51,7 +51,7 @@ group= "com.teammetallurgy.atum"
 archivesBaseName = "Atum"
 
 minecraft {
-    mappings channel: 'snapshot', version: project.mappings
+    mappings channel: 'official', version: '1.16.5'
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
     runs {

src/main/java/com/teammetallurgy/atum/Atum.java

@@ -14,12 +14,12 @@
 import com.teammetallurgy.atum.world.SandstormHandler;
 import com.teammetallurgy.atum.world.biome.AtumBiomeProvider;
 import com.teammetallurgy.atum.world.gen.AtumChunkGenerator;
-import net.minecraft.block.WoodType;
-import net.minecraft.item.ItemGroup;
-import net.minecraft.util.RegistryKey;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.World;
+import net.minecraft.world.level.block.state.properties.WoodType;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.Level;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -42,10 +42,10 @@
 public class Atum {
     public static final String MOD_ID = "atum";
     public static final Logger LOG = LogManager.getLogger(StringUtils.capitalize(MOD_ID));
-    public static final ItemGroup GROUP = new AtumItemGroup();
-    public static final RegistryKey<World> ATUM = RegistryKey.getOrCreateKey(Registry.WORLD_KEY, new ResourceLocation(MOD_ID, "atum"));
-    public static final Codec<AtumBiomeProvider> ATUM_LAYERD = Registry.register(Registry.BIOME_PROVIDER_CODEC, new ResourceLocation(MOD_ID, "atum_layered"), AtumBiomeProvider.CODEC);
-    public static final Codec<AtumChunkGenerator> ATUM_NOISE = Registry.register(Registry.CHUNK_GENERATOR_CODEC, new ResourceLocation(MOD_ID, "noise"), AtumChunkGenerator.CODEC);
+    public static final CreativeModeTab GROUP = new AtumItemGroup();
+    public static final ResourceKey<Level> ATUM = ResourceKey.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(MOD_ID, "atum"));
+    public static final Codec<AtumBiomeProvider> ATUM_LAYERD = Registry.register(Registry.BIOME_SOURCE, new ResourceLocation(MOD_ID, "atum_layered"), AtumBiomeProvider.CODEC);
+    public static final Codec<AtumChunkGenerator> ATUM_NOISE = Registry.register(Registry.CHUNK_GENERATOR, new ResourceLocation(MOD_ID, "noise"), AtumChunkGenerator.CODEC);
     public static final WoodType PALM = WoodType.create("atum_palm");
     public static final WoodType DEADWOOD = WoodType.create("atum_deadwood");
 

src/main/java/com/teammetallurgy/atum/api/AtumAPI.java

@@ -1,11 +1,11 @@
 package com.teammetallurgy.atum.api;
 
 import com.teammetallurgy.atum.Atum;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.item.Item;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.Tags.IOptionalNamedTag;
 
 public class AtumAPI {

src/main/java/com/teammetallurgy/atum/api/AtumMats.java

@@ -2,48 +2,48 @@
 
 import com.teammetallurgy.atum.init.AtumBlocks;
 import com.teammetallurgy.atum.init.AtumItems;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.material.MaterialColor;
-import net.minecraft.inventory.EquipmentSlotType;
-import net.minecraft.item.IArmorMaterial;
-import net.minecraft.item.IItemTier;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.util.SoundEvents;
+import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.item.ArmorMaterial;
+import net.minecraft.world.item.Tier;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents;
 
 import javax.annotation.Nonnull;
 
 public class AtumMats {
-    public static final IArmorMaterial MUMMY_ARMOR = new IArmorMaterial() {
+    public static final ArmorMaterial MUMMY_ARMOR = new ArmorMaterial() {
         private final int[] MAX_DAMAGE_ARRAY = new int[]{11, 12, 13, 10};
         private final int MAX_DAMAGE_FACTOR = 4;
 
         @Override
-        public int getDurability(@Nonnull EquipmentSlotType slotType) {
+        public int getDurabilityForSlot(@Nonnull EquipmentSlot slotType) {
             return MAX_DAMAGE_ARRAY[slotType.getIndex()] * MAX_DAMAGE_FACTOR;
         }
 
         @Override
-        public int getDamageReductionAmount(@Nonnull EquipmentSlotType slotType) {
+        public int getDefenseForSlot(@Nonnull EquipmentSlot slotType) {
             int[] damageReduction = new int[]{1, 2, 2, 1};
             return damageReduction[slotType.getIndex()];
         }
 
         @Override
-        public int getEnchantability() {
+        public int getEnchantmentValue() {
             return 12;
         }
 
         @Override
         @Nonnull
-        public SoundEvent getSoundEvent() {
-            return SoundEvents.ITEM_ARMOR_EQUIP_LEATHER;
+        public SoundEvent getEquipSound() {
+            return SoundEvents.ARMOR_EQUIP_LEATHER;
         }
 
         @Override
         @Nonnull
-        public Ingredient getRepairMaterial() {
-            return Ingredient.fromItems(AtumItems.SCRAP);
+        public Ingredient getRepairIngredient() {
+            return Ingredient.of(AtumItems.SCRAP);
         }
 
         @Override
@@ -62,37 +62,37 @@ public float getKnockbackResistance() {
             return 0.0F;
         }
     };
-    public static final IArmorMaterial WANDERER_ARMOR = new IArmorMaterial() {
+    public static final ArmorMaterial WANDERER_ARMOR = new ArmorMaterial() {
         private final int[] MAX_DAMAGE_ARRAY = new int[]{14, 15, 16, 7};
         private final int MAX_DAMAGE_FACTOR = 10;
 
 
         @Override
-        public int getDurability(@Nonnull EquipmentSlotType slotType) {
+        public int getDurabilityForSlot(@Nonnull EquipmentSlot slotType) {
             return MAX_DAMAGE_ARRAY[slotType.getIndex()] * MAX_DAMAGE_FACTOR;
         }
 
         @Override
-        public int getDamageReductionAmount(@Nonnull EquipmentSlotType slotType) {
+        public int getDefenseForSlot(@Nonnull EquipmentSlot slotType) {
             int[] damageReduction = new int[]{1, 2, 3, 1};
             return damageReduction[slotType.getIndex()];
         }
 
         @Override
-        public int getEnchantability() {
+        public int getEnchantmentValue() {
             return 14;
         }
 
         @Override
         @Nonnull
-        public SoundEvent getSoundEvent() {
-            return SoundEvents.ITEM_ARMOR_EQUIP_LEATHER;
+        public SoundEvent getEquipSound() {
+            return SoundEvents.ARMOR_EQUIP_LEATHER;
         }
 
         @Override
         @Nonnull
-        public Ingredient getRepairMaterial() {
-            return Ingredient.fromItems(AtumItems.LINEN_CLOTH);
+        public Ingredient getRepairIngredient() {
+            return Ingredient.of(AtumItems.LINEN_CLOTH);
         }
 
         @Override
@@ -111,132 +111,132 @@ public float getKnockbackResistance() {
             return 0.0F;
         }
     };
-    public static final IItemTier KHNUMITE = new IItemTier() {
+    public static final Tier KHNUMITE = new Tier() {
         @Override
-        public int getMaxUses() {
+        public int getUses() {
             return 160;
         }
 
         @Override
-        public float getEfficiency() {
+        public float getSpeed() {
             return 3.6F;
         }
 
         @Override
-        public float getAttackDamage() {
+        public float getAttackDamageBonus() {
             return 1.1F;
         }
 
         @Override
-        public int getHarvestLevel() {
+        public int getLevel() {
             return 1;
         }
 
         @Override
-        public int getEnchantability() {
+        public int getEnchantmentValue() {
             return 10;
         }
 
         @Override
         @Nonnull
-        public Ingredient getRepairMaterial() {
-            return Ingredient.fromItems(AtumItems.KHNUMITE);
+        public Ingredient getRepairIngredient() {
+            return Ingredient.of(AtumItems.KHNUMITE);
         }
     };
-    public static final IItemTier LIMESTONE = new IItemTier() {
+    public static final Tier LIMESTONE = new Tier() {
         @Override
-        public int getMaxUses() {
+        public int getUses() {
             return 131;
         }
 
         @Override
-        public float getEfficiency() {
+        public float getSpeed() {
             return 4.0F;
         }
 
         @Override
-        public float getAttackDamage() {
+        public float getAttackDamageBonus() {
             return 1.0F;
         }
 
         @Override
-        public int getHarvestLevel() {
+        public int getLevel() {
             return 1;
         }
 
         @Override
-        public int getEnchantability() {
+        public int getEnchantmentValue() {
             return 6;
         }
 
         @Override
         @Nonnull
-        public Ingredient getRepairMaterial() {
-            return Ingredient.fromItems(AtumBlocks.LIMESTONE_CRACKED);
+        public Ingredient getRepairIngredient() {
+            return Ingredient.of(AtumBlocks.LIMESTONE_CRACKED);
         }
     };
-    public static final IItemTier NEBU = new IItemTier() {
+    public static final Tier NEBU = new Tier() {
         @Override
-        public int getMaxUses() {
+        public int getUses() {
             return 2250;
         }
 
         @Override
-        public float getEfficiency() {
+        public float getSpeed() {
             return 9.0F;
         }
 
         @Override
-        public float getAttackDamage() {
+        public float getAttackDamageBonus() {
             return 4.0F;
         }
 
         @Override
-        public int getHarvestLevel() {
+        public int getLevel() {
             return 4;
         }
 
         @Override
-        public int getEnchantability() {
+        public int getEnchantmentValue() {
             return 22;
         }
 
         @Override
         @Nonnull
-        public Ingredient getRepairMaterial() {
-            return Ingredient.fromItems(AtumItems.NEBU_INGOT);
+        public Ingredient getRepairIngredient() {
+            return Ingredient.of(AtumItems.NEBU_INGOT);
         }
     };
-    public static final IArmorMaterial NEBU_ARMOR = new IArmorMaterial() {
+    public static final ArmorMaterial NEBU_ARMOR = new ArmorMaterial() {
         private final int[] MAX_DAMAGE_ARRAY = new int[]{13, 15, 16, 11};
         private final int MAX_DAMAGE_FACTOR = 37;
 
         @Override
-        public int getDurability(@Nonnull EquipmentSlotType slotType) {
+        public int getDurabilityForSlot(@Nonnull EquipmentSlot slotType) {
             return MAX_DAMAGE_ARRAY[slotType.getIndex()] * MAX_DAMAGE_FACTOR;
         }
 
         @Override
-        public int getDamageReductionAmount(@Nonnull EquipmentSlotType slotType) {
+        public int getDefenseForSlot(@Nonnull EquipmentSlot slotType) {
             int[] damageReduction = new int[]{3, 6, 8, 3};
             return damageReduction[slotType.getIndex()];
         }
 
         @Override
-        public int getEnchantability() {
+        public int getEnchantmentValue() {
             return 25;
         }
 
         @Override
         @Nonnull
-        public SoundEvent getSoundEvent() {
-            return SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND;
+        public SoundEvent getEquipSound() {
+            return SoundEvents.ARMOR_EQUIP_DIAMOND;
         }
 
         @Override
         @Nonnull
-        public Ingredient getRepairMaterial() {
-            return Ingredient.fromItems(AtumItems.NEBU_INGOT);
+        public Ingredient getRepairIngredient() {
+            return Ingredient.of(AtumItems.NEBU_INGOT);
         }
 
         @Override
@@ -256,5 +256,5 @@ public float getKnockbackResistance() {
         }
     };
 
-    public static final Material HEART_OF_RA = new Material.Builder(MaterialColor.GOLD).notOpaque().notSolid().build();
+    public static final Material HEART_OF_RA = new Material.Builder(MaterialColor.GOLD).notSolidBlocking().nonSolid().build();
 }

src/main/java/com/teammetallurgy/atum/api/God.java

@@ -1,14 +1,14 @@
 package com.teammetallurgy.atum.api;
 
 import com.google.common.collect.Maps;
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.text.Color;
-import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraft.util.StringRepresentable;
+import net.minecraft.network.chat.TextColor;
+import net.minecraft.network.chat.TranslatableComponent;
 
 import javax.annotation.Nonnull;
 import java.util.HashMap;
 
-public enum God implements IStringSerializable {
+public enum God implements StringRepresentable {
     ANPUT("anput", "#46403F"),
     ANUBIS("anubis", "#780162"),
     ATEM("atem", "#229F89"),
@@ -28,30 +28,30 @@ public enum God implements IStringSerializable {
     static HashMap<String, God> GOD_BY_NAME;
     static HashMap<Integer, God> MAP;
     private final String name;
-    private final Color color;
+    private final TextColor color;
     private final String hex;
 
     God(String name, String hex) {
         this.name = name;
         this.hex = hex;
-        this.color = Color.fromHex(hex);
+        this.color = TextColor.parseColor(hex);
     }
 
     @Override
     @Nonnull
-    public String getString() {
+    public String getSerializedName() {
         return this.getName();
     }
 
     public String getName() {
         return this.name;
     }
 
-    public TranslationTextComponent getDisplayName() {
-        return new TranslationTextComponent("atum.god." + this.name);
+    public TranslatableComponent getDisplayName() {
+        return new TranslatableComponent("atum.god." + this.name);
     }
 
-    public Color getColor() {
+    public TextColor getColor() {
         return this.color;
     }