Some changes

Author: Spectrall368

src/main/resources/forge-1.16.5/templates/javamodel.java.ftl

@@ -32,43 +32,9 @@
 package ${package}.client.model;
 
 @OnlyIn(Dist.CLIENT)
-${model.toString()
-    .replace("public static class", "public class")
-    .replace("private final ModelRenderer", "public final ModelRenderer")
-    .replace("Entity entity", "T e")
-    .replace("Entity e", "T e")
-    .replace("T entity", "T e")
-    .replace("extends ModelBase", "extends EntityModel<Entity>")
-    .replace("extends EntityModel ", "extends EntityModel<Entity>")
-    .replace(" extends EntityModel<Entity>", "<T extends Entity> extends EntityModel<T>")
-    .replace("RendererModel ", "ModelRenderer ")
-    .replace("RendererModel(", "ModelRenderer(")
-    .replace("GlStateManager.translate", "GlStateManager.translated")
-    .replace("GlStateManager.scale", "GlStateManager.scaled")
-    .replaceAll("(.*?)\\.cubeList\\.add\\(new\\sModelBox\\(", "addBoxHelper(")
-    .replaceAll(",[\n\r\t\\s]+true\\)\\);", ", true);")
-    .replaceAll(",[\n\r\t\\s]+false\\)\\);", ", false);")
-    .replace("render(f5", "render(ms, vb, i1, i2, f1, f2, f3, f4")
-    .replace("setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, T e", "setRotationAngles(T e, float f, float f1, float f2, float f3, float f4")
-    .replace("setRotationAngles(f, f1, f2, f3, f4, f5, e", "setRotationAngles(e, f, f1, f2, f3, f4")
-    .replace("setRotationAngles(T e, float f, float f1, float f2, float f3, float f4, float f5", "setRotationAngles(T e, float f, float f1, float f2, float f3, float f4")
-    .replace("setRotationAngles(e, f, f1, f2, f3, f4, f5", "setRotationAngles(e, f, f1, f2, f3, f4")
-    .replace("render(T e, float f, float f1, float f2, float f3, float f4, float f5", "render(MatrixStack ms, IVertexBuilder vb, int i1, int i2, float f1, float f2, float f3, float f4")
-    .replace("super.setRotationAngles(e, f, f1, f2, f3, f4);", "")?keep_before_last("}")}
-
-    <#if model.contains(".cubeList.add(new")> <#-- if the model is pre 1.15.2 -->
-    @OnlyIn(Dist.CLIENT) public static void addBoxHelper(ModelRenderer renderer, int texU, int texV, float x, float y, float z, int dx, int dy, int dz, float delta) {
-    	addBoxHelper(renderer, texU, texV, x, y, z, dx, dy, dz, delta, renderer.mirror);
-    }
-
-    @OnlyIn(Dist.CLIENT) public static void addBoxHelper(ModelRenderer renderer, int texU, int texV, float x, float y, float z, int dx, int dy, int dz, float delta, boolean mirror) {
-    	renderer.mirror = mirror;
-    	renderer.addBox("", x, y, z, dx, dy, dz, delta, texU, texV);
-    }
-    </#if>
-
-    <#if !model.contains("setRotationAngles")>
-    @Override public void setRotationAngles(T e, float f, float f1, float f2, float f3, float f4) {}
-    </#if>
+${model
+    ?replace("private final ModelRenderer", "public final ModelRenderer")
+    ?replace("new ResourceLocation\\(\"modid\", \"(.*?)\"\\)", "new ResourceLocation(\"" + modid + "\", \"" + modelregistryname + "\")", "r")
+    ?replace("void setupAnim(Entity ", "void setupAnim(T ")
 }
-<#-- @formatter:on -->
+<#-- @formatter:on -->

src/main/resources/forge-1.16.5/templates/json/block_loot_table.json.ftl

@@ -1,10 +1,27 @@
 <#include "../mcitems.ftl">
 <#assign defaultSlabDrops = data.getModElement().getTypeString() == "block" && data.blockBase?has_content && data.blockBase == "Slab" && !(data.customDrop?? && !data.customDrop.isEmpty())/>
+<#assign isFlowerPot = data.getModElement().getTypeString() == "block" && data.blockBase! == "FlowerPot">
 {
   "type": "minecraft:block",
-  "random_sequence": "${modid}:blocks/${registryname}"
-  <#if data.hasDrops()>,
+  <#if data.hasDrops() || isFlowerPot>,
   "pools": [
+    <#if isFlowerPot>
+    {
+      "rolls": 1.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ]
+    }<#if data.hasDrops()>,</#if>
+    </#if>
+    <#if data.hasDrops()>
     {
       "rolls": 1.0,
       <#if data.dropAmount == 1 && !defaultSlabDrops>
@@ -17,7 +34,9 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": <#if data.customDrop?? && !data.customDrop.isEmpty()>"${mappedMCItemToRegistryName(data.customDrop)}"<#else>"${modid}:${registryname}"</#if>
+          "name": <#if data.customDrop?? && !data.customDrop.isEmpty()>"${mappedMCItemToRegistryName(data.customDrop)}"
+            <#elseif isFlowerPot>"${mappedMCItemToRegistryName(data.pottedPlant)}"
+            <#else>"${modid}:${registryname}"</#if>
           <#if data.isDoubleBlock()>,
           "conditions": [
             {
@@ -62,6 +81,7 @@
         }
       ]
     }
+    </#if>
   ]
   </#if>
 }

src/main/resources/forge-1.16.5/templates/json/block_model_tb.json.ftl

@@ -0,0 +1,8 @@
+{
+    "parent": "block/${var_model}",
+    "textures": {
+      <#if data.particleTexture?has_content>"particle": "${data.particleTexture.format("%s:block/%s")}",</#if>
+      "${var_txname}": "${data.texture.format("%s:block/%s")}",
+      "${var_txname_top}": "${data.textureTop().format("%s:block/%s")}"
+    }
+}

src/main/resources/forge-1.16.5/templates/json/spawn_egg.json.ftl

@@ -1,3 +1,12 @@
+<#if data.spawnEggTexture?has_content>
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "${data.spawnEggTexture.format("%s:item/%s")}"
+  }
+}
+<#else>
 {
     "parent": "item/template_spawn_egg"
-}
+}
+</#if>