Initial 1.16 port.

Author: TBoshoven

.circleci/config.yml

@@ -16,7 +16,7 @@ jobs:
               TAG_VERSION="$(echo "$CIRCLE_TAG" | sed -E 's/[^0-9]+//')"
               sed -Ei 's/^(\s*version = ")([0-9]+\.){2}[0-9]+-DEV\.0+"$/\1'$TAG_VERSION'.'$CIRCLE_BUILD_NUM'"/' build.gradle
             else
-              [[ $CIRCLE_BRANCH = '1.15.2' ]] && LIB_VERSION=MASTER || LIB_VERSION=DEV
+              [[ $CIRCLE_BRANCH = '1.16.1' ]] && LIB_VERSION=MASTER || LIB_VERSION=DEV
               sed -Ei 's/^(\s*version = "([0-9]+\.){2}[0-9]+-)DEV\.0+"$/\1'$LIB_VERSION'.'$CIRCLE_BUILD_NUM'"/' build.gradle
             fi
       - restore_cache:
@@ -91,7 +91,7 @@ jobs:
             TAG_BUILD="$(echo "$CIRCLE_TAG" | sed -E 's/-[0-9.-]+$//' | sed -E 's/(^|-)([^-])/\U\2/g')"
             TAG_VERSION="$(echo "$CIRCLE_TAG" | sed -E 's/[^0-9]+//')"
             PROJECT_ID="$(jq -r .projectId $TAG_BUILD/curseforge.json)"
-            METADATA="$(jq -n '{"changelog": $ARGS.positional[0], "changelogType": "markdown", "displayName": $ARGS.positional[1], "gameVersions": [7722, 7498, 4458], "releaseType": "release"}' --args "$DESCRIPTION" "v$TAG_VERSION.$CIRCLE_BUILD_NUM")"
+            METADATA="$(jq -n '{"changelog": $ARGS.positional[0], "changelogType": "markdown", "displayName": $ARGS.positional[1], "gameVersions": [7892, 7498, 4458], "releaseType": "release"}' --args "$DESCRIPTION" "v$TAG_VERSION.$CIRCLE_BUILD_NUM")"
             FILE="$(ls /tmp/workspace/libs/*.jar | head -n 1)"
             curl -XPOST "https://minecraft.curseforge.com/api/projects/$PROJECT_ID/upload-file" -F "file=@$FILE" -F "metadata=$METADATA" -H "X-Api-Token: $CURSEFORGE_TOKEN"
 workflows:

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/Blocks.java

@@ -21,20 +21,19 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public final class Blocks {
-    private static final DeferredRegister<Block> BLOCKS = new DeferredRegister<>(ForgeRegistries.BLOCKS, MagicDoorknobMod.MOD_ID);
+    private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MagicDoorknobMod.MOD_ID);
 
     /**
      * The material the magic door and doorway are made of:
      * - Not liquid
      * - Solid
      * - Block movement
      * - Opaque
-     * - Requires no tool
      * - Not flammable
      * - Not replaceable
      * - Block pushes
      */
-    private static final Material DOORWAY_MATERIAL = new Material(MaterialColor.AIR, false, true, true, true, true, false, false, PushReaction.BLOCK);
+    private static final Material DOORWAY_MATERIAL = new Material(MaterialColor.AIR, false, true, true, true, false, false, PushReaction.BLOCK);
 
     /**
      * A magic doorway block. Generated by a magic doorknob.

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/MagicDoorwayPartBaseBlock.java

@@ -66,15 +66,14 @@ public int getOpacity(BlockState state, IBlockReader worldIn, BlockPos pos) {
         return super.getOpacity(state, worldIn, pos);
     }
 
-    @SuppressWarnings("deprecation")
     @Override
-    public float getBlockHardness(BlockState blockState, IBlockReader worldIn, BlockPos pos) {
-        // Use the base block's hardness.
-        TileEntity tileEntity = worldIn.getTileEntity(pos);
+    public float getSlipperiness(BlockState state, IWorldReader world, BlockPos pos, @Nullable Entity entity) {
+        // Use the base block's slipperiness.
+        TileEntity tileEntity = world.getTileEntity(pos);
         if (tileEntity instanceof MagicDoorwayPartBaseTileEntity) {
-            return ((MagicDoorwayPartBaseTileEntity) tileEntity).getBaseBlockState().getBlockHardness(worldIn, pos);
+            return ((MagicDoorwayPartBaseTileEntity) tileEntity).getBaseBlockState().getSlipperiness(world, pos, entity);
         }
-        return super.getBlockHardness(blockState, worldIn, pos);
+        return super.getSlipperiness(state, world, pos, entity);
     }
 
     @Override
@@ -115,7 +114,7 @@ public enum EnumPartType implements IStringSerializable {
         }
 
         @Override
-        public String getName() {
+        public String func_176610_l() {
             return name;
         }
 

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/colorhandlers/DoorwayBlockColorHandler.java

@@ -8,7 +8,7 @@
 import net.minecraft.client.renderer.color.IBlockColor;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.ILightReader;
+import net.minecraft.world.IBlockDisplayReader;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
@@ -23,7 +23,7 @@
 @MethodsReturnNonnullByDefault
 class DoorwayBlockColorHandler implements IBlockColor {
     @Override
-    public int getColor(BlockState state, @Nullable ILightReader worldIn, @Nullable BlockPos pos, int tintIndex) {
+    public int getColor(BlockState state, @Nullable IBlockDisplayReader worldIn, @Nullable BlockPos pos, int tintIndex) {
         if (worldIn != null && pos != null) {
             BlockColors blockColors = Minecraft.getInstance().getBlockColors();
 

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/tileentities/MagicDoorwayPartBaseTileEntity.java

@@ -1,6 +1,5 @@
 package com.tomboshoven.minecraft.magicdoorknob.blocks.tileentities;
 
-import com.mojang.datafixers.Dynamic;
 import com.tomboshoven.minecraft.magicdoorknob.items.Items;
 import com.tomboshoven.minecraft.magicdoorknob.items.MagicDoorknobItem;
 import com.tomboshoven.minecraft.magicdoorknob.modelloaders.textured.ModelTextureProperty;
@@ -9,12 +8,12 @@
 import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BlockModelShapes;
-import net.minecraft.client.renderer.model.Material;
+import net.minecraft.client.renderer.model.RenderMaterial;
 import net.minecraft.client.renderer.texture.MissingTextureSprite;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.inventory.container.PlayerContainer;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.nbt.NBTDynamicOps;
+import net.minecraft.nbt.NBTUtil;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.play.server.SUpdateTileEntityPacket;
 import net.minecraft.tileentity.TileEntity;
@@ -73,7 +72,7 @@ private CompoundNBT writeInternal(CompoundNBT compound) {
         CompoundNBT result = super.write(compound);
         ResourceLocation registryName = baseBlockState.getBlock().getRegistryName();
         if (registryName != null) {
-            compound.put("baseBlock", BlockState.serialize(NBTDynamicOps.INSTANCE, baseBlockState).getValue());
+            compound.put("baseBlock", NBTUtil.writeBlockState(baseBlockState));
         }
         if (doorknob != null) {
             result.putString("doorknobType", doorknob.getTypeName());
@@ -82,9 +81,13 @@ private CompoundNBT writeInternal(CompoundNBT compound) {
     }
 
     @Override
-    public void read(CompoundNBT compound) {
-        super.read(compound);
-        baseBlockState = BlockState.deserialize(new Dynamic<>(NBTDynamicOps.INSTANCE, compound.get("baseBlock")));
+    public void func_230337_a_(BlockState state, CompoundNBT compound) {
+        super.func_230337_a_(state, compound);
+        read(compound);
+    }
+
+    private void read(CompoundNBT compound) {
+        baseBlockState = NBTUtil.readBlockState(compound.getCompound("baseBlock"));
         String doorknobType = compound.getString("doorknobType");
         doorknob = Items.DOORKNOBS.get(doorknobType);
     }
@@ -116,17 +119,17 @@ public IModelData getModelData() {
         // Get the base block texture
         World world = getWorld();
         TextureAtlasSprite blockTexture = world == null ? null : blockModelShapes.getTexture(baseBlockState, world, getPos());
-        Material blockMaterial;
+        RenderMaterial blockMaterial;
         if (blockTexture == null || blockTexture instanceof MissingTextureSprite) {
             // If we can't find the texture, use a transparent one instead, to deal with things like air.
-            blockMaterial = new Material(PlayerContainer.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(MOD_ID, "block/empty"));
+            blockMaterial = new RenderMaterial(PlayerContainer.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(MOD_ID, "block/empty"));
         }
         else {
-            blockMaterial = new Material(blockTexture.getAtlasTexture().getTextureLocation(), blockTexture.getName());
+            blockMaterial = new RenderMaterial(blockTexture.getAtlasTexture().getTextureLocation(), blockTexture.getName());
         }
 
         // Get the highlight texture
-        Material doorknobMaterial;
+        RenderMaterial doorknobMaterial;
         if (doorknob != null) {
             doorknobMaterial = doorknob.getMainMaterial();
         } else {

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/tileentities/TileEntities.java

@@ -10,7 +10,7 @@
 
 @SuppressWarnings("ConstantConditions")
 public final class TileEntities {
-    private static final DeferredRegister<TileEntityType<?>> TILE_ENTITIES = new DeferredRegister<>(ForgeRegistries.TILE_ENTITIES, MagicDoorknobMod.MOD_ID);
+    private static final DeferredRegister<TileEntityType<?>> TILE_ENTITIES = DeferredRegister.create(ForgeRegistries.TILE_ENTITIES, MagicDoorknobMod.MOD_ID);
 
     static final RegistryObject<TileEntityType<MagicDoorTileEntity>> MAGIC_DOOR =
             TILE_ENTITIES.register("magic_door",

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/items/Items.java

@@ -7,8 +7,8 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemTier;
+import net.minecraft.tags.ITag.INamedTag;
 import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.Tag;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.event.RegistryEvent.Register;
@@ -45,7 +45,7 @@ private Items() {
      * @param mainTexture The main texture of the doorknob
      * @param recipeTag   The tag to use in recipes
      */
-    private static void addDoorknob(IForgeRegistry<? super Item> registry, String typeName, IItemTier tier, ResourceLocation mainTexture, Tag<Item> recipeTag) {
+    private static void addDoorknob(IForgeRegistry<? super Item> registry, String typeName, IItemTier tier, ResourceLocation mainTexture, INamedTag<Item> recipeTag) {
         MagicDoorknobItem i = new MagicDoorknobItem(new Item.Properties().group(ItemGroup.TOOLS), typeName, tier, mainTexture, recipeTag);
         i.setRegistryName(MagicDoorknobMod.MOD_ID, String.format("magic_doorknob_%s", typeName));
         registry.register(i);
@@ -61,7 +61,7 @@ private static void addDoorknob(IForgeRegistry<? super Item> registry, String ty
      * @param blockName The name of the block that provides the texture of the doorknob
      * @param recipeTag The tag to use in recipes
      */
-    private static void addDoorknob(IForgeRegistry<? super Item> registry, String typeName, IItemTier tier, String blockName, Tag<Item> recipeTag) {
+    private static void addDoorknob(IForgeRegistry<? super Item> registry, String typeName, IItemTier tier, String blockName, INamedTag<Item> recipeTag) {
         addDoorknob(registry, typeName, tier, new ResourceLocation("minecraft", String.format("block/%s", blockName)), recipeTag);
     }
 

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/items/MagicDoorknobItem.java

@@ -9,13 +9,13 @@
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.model.Material;
+import net.minecraft.client.renderer.model.RenderMaterial;
 import net.minecraft.inventory.container.PlayerContainer;
 import net.minecraft.item.BlockItemUseContext;
 import net.minecraft.item.IItemTier;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemUseContext;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.ITag.INamedTag;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Direction;
@@ -43,7 +43,7 @@ public class MagicDoorknobItem extends Item {
     // The item material, used for determining doorway generation properties
     private final IItemTier tier;
     // The item tag to use in recipes
-    private final Tag<Item> recipeTag;
+    private final INamedTag<Item> recipeTag;
 
     /**
      * @param properties          The item properties
@@ -52,7 +52,7 @@ public class MagicDoorknobItem extends Item {
      * @param mainTextureLocation The main material for rendering the block
      * @param recipeTag           The item tag to use in recipes
      */
-    MagicDoorknobItem(Item.Properties properties, String typeName, IItemTier tier, ResourceLocation mainTextureLocation, Tag<Item> recipeTag) {
+    MagicDoorknobItem(Item.Properties properties, String typeName, IItemTier tier, ResourceLocation mainTextureLocation, INamedTag<Item> recipeTag) {
         super(properties);
 
         this.typeName = typeName;
@@ -225,8 +225,8 @@ private boolean isReplaceable(IBlockReader world, BlockPos pos) {
      * @return The location of the main texture of the doorknob
      */
     @OnlyIn(Dist.CLIENT)
-    public Material getMainMaterial() {
-        return new Material(PlayerContainer.LOCATION_BLOCKS_TEXTURE, mainTextureLocation);
+    public RenderMaterial getMainMaterial() {
+        return new RenderMaterial(PlayerContainer.LOCATION_BLOCKS_TEXTURE, mainTextureLocation);
     }
 
     /**
@@ -246,7 +246,7 @@ public IItemTier getTier() {
     /**
      * @return The item tag for use in recipes
      */
-    public Tag<Item> getRecipeTag() {
+    public INamedTag<Item> getRecipeTag() {
         return recipeTag;
     }
 }

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/ModelLoaders.java

@@ -4,7 +4,7 @@
 import com.tomboshoven.minecraft.magicdoorknob.modelloaders.textured.TexturedModelLoader;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.RenderTypeLookup;
-import net.minecraft.client.renderer.model.Material;
+import net.minecraft.client.renderer.model.RenderMaterial;
 import net.minecraft.inventory.container.PlayerContainer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
@@ -30,7 +30,7 @@ public static void register(IEventBus eventBus) {
    private static void registerModelLoaders(ModelRegistryEvent event) {
         // Initialize textured model loader
         TexturedModelLoader modelLoader = new TexturedModelLoader();
-        modelLoader.registerTexture(new Material(PlayerContainer.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(MOD_ID, "block/empty")));
+        modelLoader.registerTexture(new RenderMaterial(PlayerContainer.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(MOD_ID, "block/empty")));
         ModelLoaderRegistry.registerLoader(new ResourceLocation(MOD_ID, "textured"), modelLoader);
 
         // Translucent has the best results across block types

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ITextureMapper.java

@@ -2,7 +2,7 @@
 
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.model.Material;
+import net.minecraft.client.renderer.model.RenderMaterial;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.model.data.IModelData;
@@ -23,5 +23,5 @@ public interface ITextureMapper {
      * @param extraData   Extra model data if available
      * @return The appropriate material
      */
-    Material mapSprite(PropertySprite spriteToMap, @Nullable BlockState blockState, @Nullable IModelData extraData);
+    RenderMaterial mapSprite(PropertySprite spriteToMap, @Nullable BlockState blockState, @Nullable IModelData extraData);
 }

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelDataTextureMapper.java

@@ -2,7 +2,7 @@
 
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.model.Material;
+import net.minecraft.client.renderer.model.RenderMaterial;
 import net.minecraft.client.renderer.texture.MissingTextureSprite;
 import net.minecraft.inventory.container.PlayerContainer;
 import net.minecraft.util.ResourceLocation;
@@ -22,15 +22,15 @@
 @OnlyIn(Dist.CLIENT)
 class ModelDataTextureMapper implements ITextureMapper {
     @Override
-    public Material mapSprite(PropertySprite spriteToMap, @Nullable BlockState blockState, @Nullable IModelData extraData) {
+    public RenderMaterial mapSprite(PropertySprite spriteToMap, @Nullable BlockState blockState, @Nullable IModelData extraData) {
         if (extraData != null) {
             ResourceLocation name = spriteToMap.getName();
-            ModelProperty<Material> modelProperty = ModelTextureProperty.get(name);
-            Material material = extraData.getData(modelProperty);
+            ModelProperty<RenderMaterial> modelProperty = ModelTextureProperty.get(name);
+            RenderMaterial material = extraData.getData(modelProperty);
             if (material != null) {
                 return material;
             }
         }
-        return new Material(PlayerContainer.LOCATION_BLOCKS_TEXTURE, MissingTextureSprite.getLocation());
+        return new RenderMaterial(PlayerContainer.LOCATION_BLOCKS_TEXTURE, MissingTextureSprite.getLocation());
     }
 }

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelTextureProperty.java

@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Maps;
 import mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.client.renderer.model.Material;
+import net.minecraft.client.renderer.model.RenderMaterial;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.data.ModelProperty;
 
@@ -15,7 +15,7 @@
  */
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-public final class ModelTextureProperty extends ModelProperty<Material> {
+public final class ModelTextureProperty extends ModelProperty<RenderMaterial> {
     // Lazily filled map of model texture properties.
     // Can't just use equality as they are used in an IdentityHashMap.
     private static final Map<ResourceLocation, ModelTextureProperty> PROPERTIES = Maps.newHashMap();