last last skull

MosaicModding · Sep 1, 2024 · ae5a615 · ae5a615
1 parent 01ff7bd
commit ae5a615
Show file tree

Hide file tree

Showing 43 changed files with 245 additions and 27 deletions.
diff --git a/src/generated/resources/assets/sullysmod/blockstates/unicorn_ancient_skull.json b/src/generated/resources/assets/sullysmod/blockstates/unicorn_ancient_skull.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/skull"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/sullysmod/blockstates/unicorn_ancient_wall_skull.json b/src/generated/resources/assets/sullysmod/blockstates/unicorn_ancient_wall_skull.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minecraft:block/skull"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/sullysmod/lang/en_us.json b/src/generated/resources/assets/sullysmod/lang/en_us.json
@@ -83,6 +83,7 @@
   "block.sullysmod.stripped_petrified_wood": "Stripped Petrified Wood",
   "block.sullysmod.tiny_ancient_skull": "Tiny Ancient Skull",
   "block.sullysmod.tortoise_egg": "Tortoise Egg",
+  "block.sullysmod.unicorn_ancient_skull": "Unicorn Ancient Skull",
   "block.sullysmod.waxed_copper_button": "Waxed Copper Button",
   "block.sullysmod.waxed_exposed_copper_button": "Waxed Exposed Copper Button",
   "block.sullysmod.waxed_oxidized_copper_button": "Waxed Oxidized Copper Button",
@@ -208,7 +209,9 @@
   "subtitles.block.ancient_skull.gigantic": "Proper Sound soon...",
   "subtitles.block.ancient_skull.horned": "Proper Sound soon...",
   "subtitles.block.ancient_skull.long": "Proper Sound soon...",
+  "subtitles.block.ancient_skull.ribbed": "Proper Sound soon...",
   "subtitles.block.ancient_skull.tiny": "Proper Sound soon...",
+  "subtitles.block.ancient_skull.unicorn": "Proper Sound soon...",
   "subtitles.block.ancient_skull.wide": "Proper Sound soon...",
   "subtitles.block.flinger_totem.add_honey": "Honey applied",
   "subtitles.block.flinger_totem.input_honey": "Projectile absorbed",
@@ -291,6 +294,7 @@
   "sullysmod.artifact.tiny_ancient_skull.desc": "The head of a small chicken sized critter that lived long ago",
   "sullysmod.artifact.torn_cloth.desc": "A dirty torn off piece of clothing",
   "sullysmod.artifact.torn_manuscript.desc": "Part of a manuscript with an unknown language",
+  "sullysmod.artifact.unicorn_ancient_skull.desc": "A normal horse skull, but with a large horn protruding from it",
   "sullysmod.artifact.wide_ancient_skull.desc": "The head of an extinct animal with a strangely wide head and giant eye sockets",
   "sullysmod.item.modifiers.thrown": "When Thrown:",
   "sullysmod.item.throwing_knife.damage": " 2 Attack Damage",

diff --git a/src/generated/resources/assets/sullysmod/models/item/unicorn_ancient_skull.json b/src/generated/resources/assets/sullysmod/models/item/unicorn_ancient_skull.json
@@ -0,0 +1,66 @@
+{
+  "parent": "minecraft:builtin/entity",
+  "display": {
+    "fixed": {
+      "rotation": [
+        0,
+        180,
+        0
+      ],
+      "translation": [
+        0,
+        4,
+        0
+      ]
+    },
+    "ground": {
+      "scale": [
+        0.5,
+        0.5,
+        0.5
+      ],
+      "translation": [
+        0,
+        3,
+        0
+      ]
+    },
+    "gui": {
+      "rotation": [
+        30,
+        45,
+        0
+      ],
+      "scale": [
+        0.6,
+        0.6,
+        0.6
+      ],
+      "translation": [
+        0,
+        3,
+        0
+      ]
+    },
+    "thirdperson_righthand": {
+      "rotation": [
+        45,
+        45,
+        0
+      ],
+      "scale": [
+        0.5,
+        0.5,
+        0.5
+      ],
+      "translation": [
+        0,
+        3,
+        0
+      ]
+    }
+  },
+  "textures": {
+    "particle": "minecraft:block/soul_sand"
+  }
+}
diff --git a/src/generated/resources/assets/sullysmod/sounds.json b/src/generated/resources/assets/sullysmod/sounds.json
@@ -123,6 +123,15 @@
     ],
     "subtitle": "subtitles.block.ancient_skull.long"
   },
+  "block.note_block.ancient_skull.ribbed": {
+    "sounds": [
+      {
+        "type": "event",
+        "name": "entity.skeleton.ambient"
+      }
+    ],
+    "subtitle": "subtitles.block.ancient_skull.ribbed"
+  },
   "block.note_block.ancient_skull.tiny": {
     "sounds": [
       {
@@ -132,6 +141,15 @@
     ],
     "subtitle": "subtitles.block.ancient_skull.tiny"
   },
+  "block.note_block.ancient_skull.unicorn": {
+    "sounds": [
+      {
+        "type": "event",
+        "name": "entity.skeleton.ambient"
+      }
+    ],
+    "subtitle": "subtitles.block.ancient_skull.unicorn"
+  },
   "block.note_block.ancient_skull.wide": {
     "sounds": [
       {

diff --git a/src/generated/resources/data/blueprint/tags/blocks/noteblock_top_instruments.json b/src/generated/resources/data/blueprint/tags/blocks/noteblock_top_instruments.json
@@ -8,6 +8,7 @@
     "sullysmod:long_ancient_skull",
     "sullysmod:tiny_ancient_skull",
     "sullysmod:wide_ancient_skull",
-    "sullysmod:ribbed_ancient_skull"
+    "sullysmod:ribbed_ancient_skull",
+    "sullysmod:unicorn_ancient_skull"
   ]
 }
diff --git a/src/generated/resources/data/forge/tags/items/heads.json b/src/generated/resources/data/forge/tags/items/heads.json
@@ -7,6 +7,7 @@
     "sullysmod:long_ancient_skull",
     "sullysmod:ribbed_ancient_skull",
     "sullysmod:gigantic_ancient_skull",
+    "sullysmod:unicorn_ancient_skull",
     "sullysmod:flatbilled_ancient_skull",
     "sullysmod:horned_ancient_skull"
   ]

diff --git a/src/generated/resources/data/minecraft/tags/items/noteblock_top_instruments.json b/src/generated/resources/data/minecraft/tags/items/noteblock_top_instruments.json
@@ -7,6 +7,7 @@
     "sullysmod:long_ancient_skull",
     "sullysmod:ribbed_ancient_skull",
     "sullysmod:gigantic_ancient_skull",
+    "sullysmod:unicorn_ancient_skull",
     "sullysmod:flatbilled_ancient_skull",
     "sullysmod:horned_ancient_skull"
   ]

diff --git a/src/generated/resources/data/sullysmod/advancements/adventure/all_artifacts.json b/src/generated/resources/data/sullysmod/advancements/adventure/all_artifacts.json
@@ -577,6 +577,18 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "unicorn_ancient_skull": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "sullysmod:unicorn_ancient_skull"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "wide_ancient_skull": {
       "conditions": {
         "items": [
@@ -732,6 +744,9 @@
     [
       "broken_bottle"
     ],
+    [
+      "unicorn_ancient_skull"
+    ],
     [
       "rusty_tools"
     ],

diff --git a/src/generated/resources/data/sullysmod/advancements/adventure/all_skulls.json b/src/generated/resources/data/sullysmod/advancements/adventure/all_skulls.json
@@ -97,6 +97,18 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "unicorn_ancient_skull": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "sullysmod:unicorn_ancient_skull"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "wide_ancient_skull": {
       "conditions": {
         "items": [
@@ -152,6 +164,9 @@
     ],
     [
       "ribbed_ancient_skull"
+    ],
+    [
+      "unicorn_ancient_skull"
     ]
   ],
   "rewards": {

diff --git a/src/generated/resources/data/sullysmod/loot_tables/blocks/unicorn_ancient_skull.json b/src/generated/resources/data/sullysmod/loot_tables/blocks/unicorn_ancient_skull.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "sullysmod:unicorn_ancient_skull"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "sullysmod:blocks/unicorn_ancient_skull"
+}
diff --git a/src/generated/resources/data/sullysmod/tags/items/artifacts.json b/src/generated/resources/data/sullysmod/tags/items/artifacts.json
@@ -42,6 +42,7 @@
     "sullysmod:moon_tablet",
     "sullysmod:gigantic_ancient_skull",
     "sullysmod:broken_bottle",
+    "sullysmod:unicorn_ancient_skull",
     "sullysmod:rusty_tools",
     "sullysmod:fossilised_fish",
     "sullysmod:torn_manuscript",

diff --git a/src/generated/resources/data/sullysmod/tags/items/artifacts/ancient_skulls.json b/src/generated/resources/data/sullysmod/tags/items/artifacts/ancient_skulls.json
@@ -7,6 +7,7 @@
     "sullysmod:long_ancient_skull",
     "sullysmod:ribbed_ancient_skull",
     "sullysmod:gigantic_ancient_skull",
+    "sullysmod:unicorn_ancient_skull",
     "sullysmod:flatbilled_ancient_skull",
     "sullysmod:horned_ancient_skull"
   ]

diff --git a/...ancient_skulls/BaseAncientSkullModel.java → ...ent_skulls/AbstractAncientSkullModel.java b/...ancient_skulls/BaseAncientSkullModel.java → ...ent_skulls/AbstractAncientSkullModel.java
@@ -5,10 +5,10 @@
 import net.minecraft.client.model.SkullModelBase;
 import net.minecraft.client.model.geom.ModelPart;
 
-public abstract class BaseAncientSkullModel extends SkullModelBase {
+public abstract class AbstractAncientSkullModel extends SkullModelBase {
     private final ModelPart head;
 
-    public BaseAncientSkullModel(ModelPart root) {
+    public AbstractAncientSkullModel(ModelPart root) {
         this.head = root.getChild("head");
     }
 

diff --git a/...in/java/com/uraneptus/sullysmod/client/model/ancient_skulls/CrackedAncientSkullModel.java b/...in/java/com/uraneptus/sullysmod/client/model/ancient_skulls/CrackedAncientSkullModel.java
@@ -9,7 +9,7 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 @OnlyIn(Dist.CLIENT)
-public class CrackedAncientSkullModel extends BaseAncientSkullModel {
+public class CrackedAncientSkullModel extends AbstractAncientSkullModel {
 	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("cracked"), "main");
 
 	public CrackedAncientSkullModel(ModelPart root) {

diff --git a/...in/java/com/uraneptus/sullysmod/client/model/ancient_skulls/CrestedAncientSkullModel.java b/...in/java/com/uraneptus/sullysmod/client/model/ancient_skulls/CrestedAncientSkullModel.java
@@ -6,7 +6,7 @@
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
 
-public class CrestedAncientSkullModel extends BaseAncientSkullModel {
+public class CrestedAncientSkullModel extends AbstractAncientSkullModel {
 	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("crested"), "main");
 
 	public CrestedAncientSkullModel(ModelPart root) {

diff --git a/...java/com/uraneptus/sullysmod/client/model/ancient_skulls/FlatbilledAncientSkullModel.java b/...java/com/uraneptus/sullysmod/client/model/ancient_skulls/FlatbilledAncientSkullModel.java
@@ -6,7 +6,7 @@
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
 
-public class FlatbilledAncientSkullModel extends BaseAncientSkullModel {
+public class FlatbilledAncientSkullModel extends AbstractAncientSkullModel {
 	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("flatbilled"), "main");
 
 

diff --git a/...n/java/com/uraneptus/sullysmod/client/model/ancient_skulls/GiganticAncientSkullModel.java b/...n/java/com/uraneptus/sullysmod/client/model/ancient_skulls/GiganticAncientSkullModel.java
@@ -6,7 +6,7 @@
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
 
-public class GiganticAncientSkullModel extends BaseAncientSkullModel {
+public class GiganticAncientSkullModel extends AbstractAncientSkullModel {
 	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("gigantic"), "main");
 
 

diff --git a/...ain/java/com/uraneptus/sullysmod/client/model/ancient_skulls/HornedAncientSkullModel.java b/...ain/java/com/uraneptus/sullysmod/client/model/ancient_skulls/HornedAncientSkullModel.java
@@ -6,7 +6,7 @@
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
 
-public class HornedAncientSkullModel extends BaseAncientSkullModel {
+public class HornedAncientSkullModel extends AbstractAncientSkullModel {
 	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("horned"), "main");
 
 

diff --git a/src/main/java/com/uraneptus/sullysmod/client/model/ancient_skulls/LongAncientSkullModel.java b/src/main/java/com/uraneptus/sullysmod/client/model/ancient_skulls/LongAncientSkullModel.java
@@ -6,7 +6,7 @@
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
 
-public class LongAncientSkullModel extends BaseAncientSkullModel {
+public class LongAncientSkullModel extends AbstractAncientSkullModel {
 	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("long"), "main");
 
 

diff --git a/...ain/java/com/uraneptus/sullysmod/client/model/ancient_skulls/RibbedAncientSkullModel.java b/...ain/java/com/uraneptus/sullysmod/client/model/ancient_skulls/RibbedAncientSkullModel.java
@@ -6,7 +6,7 @@
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
 
-public class RibbedAncientSkullModel extends BaseAncientSkullModel {
+public class RibbedAncientSkullModel extends AbstractAncientSkullModel {
 	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("ribbed"), "main");
 
 	public RibbedAncientSkullModel(ModelPart root) {

diff --git a/src/main/java/com/uraneptus/sullysmod/client/model/ancient_skulls/TinyAncientSkullModel.java b/src/main/java/com/uraneptus/sullysmod/client/model/ancient_skulls/TinyAncientSkullModel.java
@@ -6,7 +6,7 @@
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
 
-public class TinyAncientSkullModel extends BaseAncientSkullModel {
+public class TinyAncientSkullModel extends AbstractAncientSkullModel {
 	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("tiny"), "main");
 
 	public TinyAncientSkullModel(ModelPart root) {

diff --git a/...in/java/com/uraneptus/sullysmod/client/model/ancient_skulls/UnicornAncientSkullModel.java b/...in/java/com/uraneptus/sullysmod/client/model/ancient_skulls/UnicornAncientSkullModel.java
@@ -0,0 +1,37 @@
+package com.uraneptus.sullysmod.client.model.ancient_skulls;
+
+import com.uraneptus.sullysmod.SullysMod;
+import net.minecraft.client.model.geom.ModelLayerLocation;
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.client.model.geom.PartPose;
+import net.minecraft.client.model.geom.builders.*;
+
+public class UnicornAncientSkullModel extends AbstractAncientSkullModel {
+    public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("unicorn"), "main");
+
+    public UnicornAncientSkullModel(ModelPart root) {
+        super(root);
+    }
+
+    public static LayerDefinition createBodyLayer() {
+        MeshDefinition meshdefinition = new MeshDefinition();
+
+        PartDefinition head = meshdefinition.getRoot().addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 0).addBox(-3.0F, -5.0F, -4.0F, 6.0F, 5.0F, 7.0F, new CubeDeformation(0.0F))
+                .texOffs(0, 12).addBox(-2.0F, -5.0F, -9.0F, 4.0F, 5.0F, 5.0F, new CubeDeformation(0.0F))
+                .texOffs(19, 0).addBox(-1.0F, -5.0F, 3.0F, 2.0F, 5.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -0.6F, 0.0F));
+
+        head.addOrReplaceChild("horn", CubeListBuilder.create().texOffs(18, 12).addBox(-1.0F, -10.0F, -1.0F, 2.0F, 10.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -4.5F, -1.75F, 0.4363F, 0.0F, 0.0F));
+
+        return LayerDefinition.create(meshdefinition, 32, 32);
+    }
+
+    @Override
+    public float headRenderScale() {
+        return 1.2F;
+    }
+
+    @Override
+    public float headRenderHeight() {
+        return 0;
+    }
+}
diff --git a/src/main/java/com/uraneptus/sullysmod/client/model/ancient_skulls/WideAncientSkullModel.java b/src/main/java/com/uraneptus/sullysmod/client/model/ancient_skulls/WideAncientSkullModel.java
@@ -6,7 +6,7 @@
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
 
-public class WideAncientSkullModel extends BaseAncientSkullModel {
+public class WideAncientSkullModel extends AbstractAncientSkullModel {
 	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(SullysMod.modPrefix("wide"), "main");