Ported to 1.16.4.

build.gradle

@@ -65,8 +65,8 @@ minecraft {
 
 dependencies {
   minecraft "net.minecraftforge:forge:${version_forge_minecraft}"
-  compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api")
-  runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}")
+  // compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api")
+  // runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}")
 }
 
 processResources {

gradle.properties

@@ -1,8 +1,8 @@
 # @file gradle.properties
 org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx8G
-version_minecraft=1.16.3
-version_forge_minecraft=1.16.3-34.1.0
-version_fml_mappings=20200723-1.16.1
+version_minecraft=1.16.4
+version_forge_minecraft=1.16.4-35.0.2
+version_fml_mappings=20201028-1.16.3
 version_jei=1.16.3:7.3.2.36
 version_engineersdecor=1.1.4-b1

meta/update.json

@@ -1,6 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
-  "1.16.3": {
+  "1.16.4": {
+    "1.1.4-b1": "[U] Ported to 1.16.4.",
     "1.1.3": "[R] Release build v1.1.3.",
     "1.1.3-b3": "[A] Metal Sliding Door added (double door wing style).\n[A] Doors implicitly open/close adjacent wings of double doors.\n[A] Disabled injected buttons from other mods in container GUIs.\n[A] Mob spawning on Rebar/Gas Concrete inhibited (IE Concrete Compliancy).\n[M] Small Tree Cutter chopping improved (loosened tree volume search restrictions).",
     "1.1.3-b2": "[A] Crafting table shift/ctrl click item move actions tweaked to new metal slot design.\n[A] Factory Dropper and Block Placer now also support quick-move-all (shift-ctrl-click).\n[F] Fixed Small Lab Furnace speed boost factor (with IE Heater in aux slot).",
@@ -16,7 +17,7 @@
     "1.1.2-b1": "[U] Ported to MC1.16.2."
   },
   "promos": {
-    "1.16.3-recommended": "1.1.3",
-    "1.16.3-latest": "1.1.3"
+    "1.16.4-recommended": "1.1.3",
+    "1.16.4-latest": "1.1.4-b1"
   }
 }

readme.md

@@ -1,7 +1,7 @@
 
-## Engineer's Decor (MC1.16.3)
+## Engineer's Decor (MC1.16.x)
 
-Mod sources for Minecraft version 1.16.3.
+Mod sources for Minecraft version 1.16.x.
 
 - Description, credits, and features: Please see the readme in the repository root.
 
@@ -11,7 +11,7 @@ Mod sources for Minecraft version 1.16.3.
 
 ## Version history
 
-    ~ v1.1.4-b1  [A]
+    - v1.1.4-b1  [U] Ported to 1.16.4.
 
     - v1.1.3     [R] Release build v1.1.3.
 

src/main/java/wile/engineersdecor/ModContent.java

@@ -864,14 +864,14 @@ public class ModContent
   )).setRegistryName(new ResourceLocation(MODID, "steel_mesh_fence_gate"));
 
   public static final EdRailingBlock STEEL_RAILING = (EdRailingBlock)(new EdRailingBlock(
-    DecorBlock.CFG_CUTOUT,
+    DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL,
     Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(1f, 20f).sound(SoundType.METAL).notSolid(),
     Auxiliaries.getPixeledAABB(0,0,0,  0, 0,0),
     Auxiliaries.getPixeledAABB(0,0,0, 16,15.9,1)
   )).setRegistryName(new ResourceLocation(MODID, "steel_railing"));
 
   public static final EdCatwalkBlock STEEL_CATWALK = (EdCatwalkBlock)(new EdCatwalkBlock(
-    DecorBlock.CFG_CUTOUT,
+    DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL,
     Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 20f).sound(SoundType.METAL).notSolid(),
     Auxiliaries.getPixeledAABB(0,0,0, 16, 2,16),
     Auxiliaries.getPixeledAABB(0,0,0, 16,15.9, 1),

src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java

@@ -1092,7 +1092,7 @@ public class EdCraftingTable
         String[] translation_keys = { "next", "prev", "clear", "nextcollisionrecipe", "fromstorage", "tostorage", "fromplayer", "toplayer" };
         for(int i=0; (i<buttons.size()) && (i<translation_keys.length); ++i) {
           Button bt = buttons.get(i);
-          tooltips.add(new TipRange(bt.x,bt.y, bt.getWidth(), bt.getWidth_CLASH/*getHeight*/(), Auxiliaries.localizable(prefix+translation_keys[i])));
+          tooltips.add(new TipRange(bt.x,bt.y, bt.getWidth(), bt.getHeightRealms(), Auxiliaries.localizable(prefix+translation_keys[i])));
         }
         tooltip.init(tooltips);
       }
@@ -1108,11 +1108,10 @@ public class EdCraftingTable
       }
       renderBackground(mx);
       super.render(mx, mouseX, mouseY, partialTicks);
-      if(!tooltip.render(mx,this, mouseX, mouseY)) func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY);
+      if(!tooltip.render(mx,this, mouseX, mouseY)) renderHoveredToolTip(mx, mouseX, mouseY);
     }
 
-    @Override
-    protected void func_230459_a_/*renderHoveredToolTip*/(MatrixStack mx, int mouseX, int mouseY)
+    protected void renderHoveredToolTip(MatrixStack mx, int mouseX, int mouseY)
     {
       if((!player.inventory.getItemStack().isEmpty()) || (getSlotUnderMouse() == null)) return;
       final Slot slot = getSlotUnderMouse();

src/main/java/wile/engineersdecor/blocks/EdDropper.java

@@ -918,7 +918,7 @@ public class EdDropper
     {
       renderBackground/*renderBackground*/(mx);
       super.render(mx, mouseX, mouseY, partialTicks);
-      if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
+      if(!tooltip_.render(mx, this, mouseX, mouseY)) renderHoveredTooltip(mx, mouseX, mouseY);
     }
 
     @Override

src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java

@@ -810,7 +810,7 @@ public class EdElectricalFurnace
     {
       renderBackground/*renderBackground*/(mx);
       super.render(mx, mouseX, mouseY, partialTicks);
-      if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
+      if(!tooltip_.render(mx, this, mouseX, mouseY)) renderHoveredTooltip(mx, mouseX, mouseY);
     }
 
     @Override

src/main/java/wile/engineersdecor/blocks/EdFurnace.java

@@ -996,7 +996,7 @@ public class EdFurnace
     {
       renderBackground/*renderBackground*/(mx);
       super.render(mx, mouseX, mouseY, partialTicks);
-      func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
+      renderHoveredTooltip(mx, mouseX, mouseY);
     }
 
     @Override

src/main/java/wile/engineersdecor/blocks/EdHopper.java

@@ -869,7 +869,7 @@ public class EdHopper
     {
       renderBackground(mx);
       super.render(mx, mouseX, mouseY, partialTicks);
-      if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
+      if(!tooltip_.render(mx, this, mouseX, mouseY)) renderHoveredTooltip(mx, mouseX, mouseY);
     }
 
     @Override

src/main/java/wile/engineersdecor/blocks/EdLabeledCrate.java

@@ -721,7 +721,7 @@ public class EdLabeledCrate
     {
       renderBackground/*renderBackground*/(mx);
       super.render(mx, mouseX, mouseY, partialTicks);
-      func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
+      renderHoveredTooltip(mx, mouseX, mouseY);
     }
 
     @Override

src/main/java/wile/engineersdecor/blocks/EdPlacer.java

@@ -766,7 +766,7 @@ public class EdPlacer
     {
       renderBackground/*renderBackground*/(mx);
       super.render(mx, mouseX, mouseY, partialTicks);
-      if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
+      if(!tooltip_.render(mx, this, mouseX, mouseY)) renderHoveredTooltip(mx, mouseX, mouseY);
     }
 
     @Override

src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java

@@ -704,7 +704,7 @@ public class EdWasteIncinerator
     {
       renderBackground/*renderBackground*/(mx);
       super.render(mx, mouseX, mouseY, partialTicks);
-      func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
+      renderHoveredTooltip(mx, mouseX, mouseY);
     }
 
     @Override

src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java

@@ -7,8 +7,8 @@
  * JEI plugin (see https://github.com/mezz/JustEnoughItems/wiki/Creating-Plugins)
  */
 package wile.engineersdecor.eapi.jei;
-//public class JEIPlugin {}
-
+public class JEIPlugin {}
+/*
 import wile.engineersdecor.ModEngineersDecor;
 import wile.engineersdecor.ModConfig;
 import wile.engineersdecor.ModContent;
@@ -74,3 +74,4 @@ public class JEIPlugin implements mezz.jei.api.IModPlugin
     }
   }
 }
+*/

src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java

@@ -233,7 +233,7 @@ public class Auxiliaries
   }
 
   public static @Nullable ITextComponent unserializeTextComponent(String serialized)
-  { return ITextComponent.Serializer.func_240643_a_(serialized); }
+  { return ITextComponent.Serializer.getComponentFromJson(serialized); }
 
   public static String serializeTextComponent(ITextComponent tc)
   { return (tc==null) ? ("") : (ITextComponent.Serializer.toJson(tc)); }

src/main/java/wile/engineersdecor/libmc/detail/OptionalRecipeCondition.java

@@ -11,7 +11,6 @@ package wile.engineersdecor.libmc.detail;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.tags.ITag;
-import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagCollectionManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.JSONUtils;
@@ -98,7 +97,7 @@ public class OptionalRecipeCondition implements ICondition
     if(without_recipes) return false;
     if((experimental) && (!with_experimental)) return false;
     final IForgeRegistry<Item> item_registry = ForgeRegistries.ITEMS;
-    final Map<ResourceLocation, ITag<Item>> item_tags = TagCollectionManager.func_242178_a().func_241836_b().func_241833_a(); // ItemTags.getCollection().getTagMap() not set yet
+    final Map<ResourceLocation, ITag<Item>> item_tags = TagCollectionManager.getManager().getItemTags().getIDTagMap();
     if(result != null) {
       boolean item_registered = item_registry.containsKey(result);
       if(!item_registered) return false; // required result not registered

src/main/resources/META-INF/mods.toml

@@ -19,13 +19,13 @@ logoFile="logo.png"
 [[dependencies.engineersdecor]]
   modId="forge"
   mandatory=true
-  versionRange="[34.1.0,)"
+  versionRange="[35.0.2,)"
   ordering="NONE"
   side="BOTH"
 
 [[dependencies.engineersdecor]]
   modId="minecraft"
   mandatory=true
-  versionRange="[1.16.3]"
+  versionRange="[1.16.4]"
   ordering="NONE"
   side="BOTH"

src/main/resources/assets/engineersdecor/lang/en_us.json

@@ -236,6 +236,7 @@
   "block.engineersdecor.small_tree_cutter.status": "SOC: %1$s%% of %2$sRF§r | progress: %3$s%% (%4$ss)",
   "block.engineersdecor.small_waste_incinerator": "Small Waste Incinerator",
   "block.engineersdecor.small_waste_incinerator.help": "Trash with internal fifo slots.\n Items can be inserted on all sides,\n and are kept until there is no\n space left in the fifo. After that\n the oldest stack will be incinerated.\n Apply electrical RF/FE power to\n increase the processing speed.\n Keeps its inventory when being\n relocated.",
+  "block.engineersdecor.steel_catwalk": "Steel Catwalk",
   "block.engineersdecor.steel_double_t_support": "Steel Double T Support",
   "block.engineersdecor.steel_double_t_support.help": "Horizontal ceiling support beam fragment.",
   "block.engineersdecor.steel_floor_grating": "Steel Floor Grating",
@@ -246,6 +247,7 @@
   "block.engineersdecor.steel_mesh_fence.help": "Industrial style fence.\n Does not connect do regular fences.\n Connects to full blocks if in line\n with another mesh fence.",
   "block.engineersdecor.steel_mesh_fence_gate": "Steel Mesh Fence Gate",
   "block.engineersdecor.steel_mesh_fence_gate.help": "Industrial style fence gate that\n fits well to the Steel Mesh Fence.\n Can be placed as single or double\n size gate.",
+  "block.engineersdecor.steel_railing": "Steel Railing",
   "block.engineersdecor.steel_table": "Steel Table",
   "block.engineersdecor.steel_table.help": "Robust four-legged steel table.",
   "block.engineersdecor.straight_pipe_valve": "Fluid Pipe Check Valve",
@@ -286,7 +288,5 @@
   "block.engineersdecor.treated_wood_window.help": "Wood framed triple glazed window.\n Well insulating. Does not connect\n to adjacent blocks like glass\n panes.",
   "block.engineersdecor.treated_wood_windowsill": "Treated Wood Window Sill",
   "block.engineersdecor.treated_wood_windowsill.help": "Simple window decoration.",
-  "block.engineersdecor.steel_catwalk": "Steel Catwalk",
-  "block.engineersdecor.steel_railing": "Steel Railing",
   "item.engineersdecor.metal_bar": "Metal Bar"
 }

src/main/resources/assets/engineersdecor/lang/ru_ru.json

@@ -236,6 +236,7 @@
   "block.engineersdecor.small_tree_cutter.status": "SOC: %1$s%% of %2$sRF§r | progress: %3$s%% (%4$ss)",
   "block.engineersdecor.small_waste_incinerator": "Компактный сжигатель отходов",
   "block.engineersdecor.small_waste_incinerator.help": "§6Отходы с слотами для очереди.§r Предметы могут помещаться с любой стороны, и храниться до тех пор, пока в очереди не останется свободного места. После этого самый старый стек будет сожжен. Подключите электричество (RF/FE) для увеличения скорости обработки. Сохраняет инвентарь при перемещении.",
+  "block.engineersdecor.steel_catwalk": "Steel Catwalk",
   "block.engineersdecor.steel_double_t_support": "Стальная двойная Т-образная опора",
   "block.engineersdecor.steel_double_t_support.help": "§6Фрагмент горизонтальной потолочной опорной балки.",
   "block.engineersdecor.steel_floor_grating": "Решётка стального пола",
@@ -246,6 +247,7 @@
   "block.engineersdecor.steel_mesh_fence.help": "§6Забор в индустриальном стиле.§r\nНе стыкуется с обычными заборами.",
   "block.engineersdecor.steel_mesh_fence_gate": "Steel Mesh Fence Gate",
   "block.engineersdecor.steel_mesh_fence_gate.help": "§6Industrial style fence gate that fits well to the Steel Mesh Fence.§r\nCan be placed as single or double size gate.",
+  "block.engineersdecor.steel_railing": "Steel Railing",
   "block.engineersdecor.steel_table": "Стальной стол",
   "block.engineersdecor.steel_table.help": "§6Прочный стол с четырьмя ножками.",
   "block.engineersdecor.straight_pipe_valve": "Одноканальный жидкостный клапан",

src/main/resources/assets/engineersdecor/lang/zh_cn.json

@@ -236,6 +236,7 @@
   "block.engineersdecor.small_tree_cutter.status": "SOC: %1$s%% of %2$sRF§r | progress: %3$s%% (%4$ss)",
   "block.engineersdecor.small_waste_incinerator": "小型垃圾焚烧炉",
   "block.engineersdecor.small_waste_incinerator.help": "§6有内部先进先出队列的垃圾桶。§r物品可以从任何一面插入，而且 直到队列满都会保留。一旦超过队列上限，最老的物品会被焚毁。 通入RF/FE会增加处理速度。破坏时保留内部未销毁的物品。",
+  "block.engineersdecor.steel_catwalk": "Steel Catwalk",
   "block.engineersdecor.steel_double_t_support": "钢制双T型支架",
   "block.engineersdecor.steel_double_t_support.help": "§6一段水平吊顶支撑梁。",
   "block.engineersdecor.steel_floor_grating": "钢地板格栅",
@@ -246,6 +247,7 @@
   "block.engineersdecor.steel_mesh_fence.help": "§6工业风格的栅栏。§r\n不与普通栅栏连接。",
   "block.engineersdecor.steel_mesh_fence_gate": "钢制网状栅栏门",
   "block.engineersdecor.steel_mesh_fence_gate.help": "§6工业风格的栅栏门，可以同钢丝栅栏完美搭配。§r\n放置时可以设置为单叶门或者双叶门。",
+  "block.engineersdecor.steel_railing": "Steel Railing",
   "block.engineersdecor.steel_table": "钢桌",
   "block.engineersdecor.steel_table.help": "§6结实的四脚钢桌。",
   "block.engineersdecor.straight_pipe_valve": "输液管止回阀",