Skip to content

Commit

Permalink
Add angel and devil hat, update emissives
Browse files Browse the repository at this point in the history
  • Loading branch information
@fonnymunkey
fonnymunkey committed May 16, 2024
1 parent 6857e5d commit ae144f0
Show file tree
Hide file tree
Showing 24 changed files with 347 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/main/java/fonnymunkey/simplehats/common/init/HatJson.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ public class HatJson {
new HatEntry("worms_mine", Rarity.UNCOMMON, 5, 0),

new HatEntry("alien_antennae", Rarity.COMMON, 5, 0, new HatEntry.HatDyeSettings(true, 5308240)),
new HatEntry("angel_and_devil", Rarity.EPIC, 5, 0),
new HatEntry("astronaut", Rarity.COMMON, 5, 0),
new HatEntry("axolotl_on_head", Rarity.EPIC, 5, 0, new HatEntry.HatParticleSettings(true, "minecraft:dolphin", 0.1F, HatEntry.HatParticleSettings.HatParticleMovement.TRAILING_HEAD)),
new HatEntry("baby_crewmate", Rarity.RARE, 5, 0, new HatEntry.HatDyeSettings(true, 16719360)),
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/simplehats/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@
"item.simplehats.worms_mine": "Worm's Mine",

"item.simplehats.alien_antennae": "Alien Antennae",
"item.simplehats.angel_and_devil": "Angel and Devil",
"item.simplehats.astronaut": "Astronaut",
"item.simplehats.axolotl_on_head": "Axolotl Friend",
"item.simplehats.baby_crewmate": "Baby Crewmate",
Expand Down
292 changes: 292 additions & 0 deletions src/main/resources/assets/simplehats/models/item/angel_and_devil.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,292 @@
{
"parent": "simplehats:item/hatparent2",
"texture_size": [64, 64],
"textures": {
"0": "simplehats:item/hats/angel_and_devil",
"particle": "simplehats:item/hats/angel_and_devil"
},
"elements": [
{
"from": [24.75, 7, 14],
"to": [26.75, 9, 16],
"rotation": {"angle": 45, "axis": "y", "origin": [14, 12.5, 8.5]},
"faces": {
"north": {"uv": [0.5, 6.75, 1, 7.25], "texture": "#0"},
"east": {"uv": [5.75, 6.5, 6.25, 7], "texture": "#0"},
"south": {"uv": [1, 6.75, 0.5, 7.25], "texture": "#0"},
"west": {"uv": [0.5, 6.75, 1, 7.25], "texture": "#0"},
"up": {"uv": [6.25, 8, 5.75, 7.5], "texture": "#0"},
"down": {"uv": [6.25, 7.5, 5.75, 8], "texture": "#0"}
}
},
{
"from": [21.66206, 7, 8.03033],
"to": [23.66206, 9, 10.03033],
"rotation": {"angle": -45, "axis": "y", "origin": [22.66206, 8, 9.03033]},
"faces": {
"north": {"uv": [0.5, 6.75, 1, 7.25], "texture": "#0"},
"east": {"uv": [0.5, 6.75, 1, 7.25], "texture": "#0"},
"south": {"uv": [5.75, 6.5, 6.25, 7], "texture": "#0"},
"west": {"uv": [1, 6.75, 0.5, 7.25], "texture": "#0"},
"up": {"uv": [6.25, 8, 5.75, 7.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [6.25, 7.5, 5.75, 8], "rotation": 270, "texture": "#0"}
}
},
{
"from": [23.75, 4.5, 13.5],
"to": [25.75, 6.5, 16.5],
"rotation": {"angle": 45, "axis": "y", "origin": [14, 12.5, 8.5]},
"faces": {
"north": {"uv": [4.75, 4.25, 5.25, 4.75], "texture": "#0"},
"east": {"uv": [3.5, 4, 4.25, 4.5], "texture": "#0"},
"south": {"uv": [4.75, 5.25, 5.25, 5.75], "texture": "#0"},
"west": {"uv": [3.5, 4, 4.25, 4.5], "texture": "#0"},
"up": {"uv": [6.25, 4.5, 5.75, 3.75], "texture": "#0"},
"down": {"uv": [6.25, 2.5, 5.75, 3.25], "texture": "#0"}
}
},
{
"from": [19.75, 3.5, 14.25],
"to": [21.75, 6.5, 16.25],
"rotation": {"angle": 45, "axis": "y", "origin": [14, 12.5, 8.5]},
"faces": {
"north": {"uv": [4.75, 3, 5.25, 3.75], "texture": "#0"},
"east": {"uv": [4.75, 1.75, 5.25, 2.5], "texture": "#0"},
"south": {"uv": [7.75, 0.5, 8.25, 1.25], "texture": "#0"},
"west": {"uv": [4.75, 1.75, 5.25, 2.5], "texture": "#0"},
"up": {"uv": [6.25, 2, 5.75, 1.5], "texture": "#0"},
"down": {"uv": [6.25, 0.5, 5.75, 1], "texture": "#0"}
}
},
{
"from": [26.43317, 6, 8.24634],
"to": [30.43317, 9, 8.27134],
"rotation": {"angle": -22.5, "axis": "y", "origin": [28.35817, 7.5, 9.00884]},
"faces": {
"north": {"uv": [5, 11.5, 6, 12.25], "texture": "#0"},
"south": {"uv": [6, 11.5, 5, 12.25], "texture": "#0"}
}
},
{
"from": [25.45197, 6, 7.59463],
"to": [25.47697, 9, 11.59463],
"rotation": {"angle": 22.5, "axis": "y", "origin": [28.71447, 7.5, 8.34463]},
"faces": {
"east": {"uv": [5, 11.5, 6, 12.25], "texture": "#0"},
"west": {"uv": [6, 11.5, 5, 12.25], "texture": "#0"}
}
},
{
"from": [20.75, 6, 13],
"to": [24.75, 9, 17],
"rotation": {"angle": 45, "axis": "y", "origin": [14, 12.5, 8.5]},
"faces": {
"north": {"uv": [0.5, 5.5, 1.5, 6.25], "texture": "#0"},
"east": {"uv": [0.5, 5.5, 1.5, 6.25], "texture": "#0"},
"south": {"uv": [0.5, 5.5, 1.5, 6.25], "texture": "#0"},
"west": {"uv": [0.5, 5.5, 1.5, 6.25], "texture": "#0"},
"up": {"uv": [1.5, 5, 0.5, 4], "texture": "#0"},
"down": {"uv": [1.5, 4, 0.5, 5], "texture": "#0"}
}
},
{
"from": [19.75, 9, 12],
"to": [25.75, 13, 18],
"rotation": {"angle": 45, "axis": "y", "origin": [14, 12.5, 8.5]},
"faces": {
"north": {"uv": [6.75, 3.5, 8.25, 4.5], "texture": "#0"},
"east": {"uv": [4.25, 2.5, 2.75, 3.5], "texture": "#0"},
"south": {"uv": [0.75, 2.5, 2.25, 3.5], "texture": "#0"},
"west": {"uv": [2.75, 2.5, 4.25, 3.5], "texture": "#0"},
"up": {"uv": [2.25, 2, 0.75, 0.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [4.25, 0.5, 2.75, 2], "texture": "#0"}
}
},
{
"from": [19.25, 8.75, 11.5],
"to": [26.25, 14.75, 18.5],
"rotation": {"angle": 45, "axis": "y", "origin": [14, 12.5, 8.5]},
"faces": {
"north": {"uv": [10.25, 12.25, 12, 13.75], "texture": "#0"},
"east": {"uv": [10.25, 10, 12, 11.5], "texture": "#0"},
"south": {"uv": [12.5, 12.25, 14.25, 13.75], "texture": "#0"},
"west": {"uv": [12.5, 10, 14.25, 11.5], "texture": "#0"},
"up": {"uv": [12, 9, 10.25, 7.25], "texture": "#0"}
}
},
{
"from": [23.75, 14.75, 14],
"to": [25.75, 16.75, 16],
"rotation": {"angle": 45, "axis": "y", "origin": [14, 12.5, 8.5]},
"faces": {
"north": {"uv": [6.75, 0.5, 7.25, 1], "texture": "#0"},
"east": {"uv": [7.25, 0.5, 6.75, 1], "texture": "#0"},
"south": {"uv": [7.25, 0.5, 6.75, 1], "texture": "#0"},
"west": {"uv": [6.75, 0.5, 7.25, 1], "texture": "#0"},
"up": {"uv": [7.25, 1, 6.75, 0.5], "rotation": 270, "texture": "#0"},
"down": {"uv": [7.25, 0.5, 6.75, 1], "texture": "#0"}
}
},
{
"from": [19.75, 14.75, 14],
"to": [21.75, 16.75, 16],
"rotation": {"angle": 45, "axis": "y", "origin": [14, 12.5, 8.5]},
"faces": {
"north": {"uv": [6.75, 0.5, 7.25, 1], "texture": "#0"},
"east": {"uv": [7.25, 0.5, 6.75, 1], "texture": "#0"},
"south": {"uv": [7.25, 0.5, 6.75, 1], "texture": "#0"},
"west": {"uv": [6.75, 0.5, 7.25, 1], "texture": "#0"},
"up": {"uv": [7.25, 1, 6.75, 0.5], "rotation": 270, "texture": "#0"},
"down": {"uv": [7.25, 0.5, 6.75, 1], "texture": "#0"}
}
},
{
"from": [-4.75, 7, 15.5],
"to": [-2.75, 9, 17.5],
"rotation": {"angle": -45, "axis": "y", "origin": [4, 12.75, 8.75]},
"faces": {
"north": {"uv": [8.75, 1.25, 9.25, 1.75], "texture": "#0"},
"east": {"uv": [8.75, 2.25, 9.25, 2.75], "texture": "#0"},
"south": {"uv": [9.25, 1.25, 8.75, 1.75], "texture": "#0"},
"west": {"uv": [5.75, 5.5, 6.25, 6], "texture": "#0"},
"up": {"uv": [5.25, 6.75, 4.75, 6.25], "texture": "#0"},
"down": {"uv": [6.25, 5.5, 5.75, 6], "texture": "#0"}
}
},
{
"from": [-12.2028, 7, 3.50736],
"to": [-10.2028, 9, 5.50736],
"rotation": {"angle": -45, "axis": "y", "origin": [-11.2028, 8, 4.50736]},
"faces": {
"north": {"uv": [9.25, 1.25, 8.75, 1.75], "texture": "#0"},
"east": {"uv": [5.75, 5.5, 6.25, 6], "texture": "#0"},
"south": {"uv": [8.75, 1.25, 9.25, 1.75], "texture": "#0"},
"west": {"uv": [8.75, 2.25, 9.25, 2.75], "texture": "#0"},
"up": {"uv": [5.25, 6.75, 4.75, 6.25], "rotation": 180, "texture": "#0"},
"down": {"uv": [6.25, 5.5, 5.75, 6], "rotation": 180, "texture": "#0"}
}
},
{
"from": [-6, 3.5, 15.5],
"to": [-4, 6.5, 17.5],
"rotation": {"angle": -45, "axis": "y", "origin": [4, 12.75, 8.75]},
"faces": {
"north": {"uv": [3.25, 6.5, 3.75, 7.25], "texture": "#0"},
"east": {"uv": [8.75, 4.5, 9.25, 5.25], "texture": "#0"},
"south": {"uv": [8.75, 4.5, 9.25, 5.25], "texture": "#0"},
"west": {"uv": [8.75, 4.5, 9.25, 5.25], "texture": "#0"},
"up": {"uv": [2, 7.25, 1.5, 6.75], "texture": "#0"},
"down": {"uv": [9.25, 3.5, 8.75, 4], "texture": "#0"}
}
},
{
"from": [-9.5, 4.5, 15.75],
"to": [-7.5, 6.5, 18.75],
"rotation": {"angle": -45, "axis": "y", "origin": [4, 12.75, 8.75]},
"faces": {
"north": {"uv": [1.5, 6.75, 2, 7.25], "texture": "#0"},
"east": {"uv": [4.25, 5, 3.5, 5.5], "texture": "#0"},
"south": {"uv": [8.75, 5.75, 9.25, 6.25], "texture": "#0"},
"west": {"uv": [3.5, 5, 4.25, 5.5], "texture": "#0"},
"up": {"uv": [5.25, 1.25, 4.75, 0.5], "texture": "#0"},
"down": {"uv": [5.25, 0.5, 4.75, 1.25], "texture": "#0"}
}
},
{
"from": [-8.75, 6, 14.5],
"to": [-4.75, 9, 18.5],
"rotation": {"angle": -45, "axis": "y", "origin": [4, 12.75, 8.75]},
"faces": {
"north": {"uv": [2, 5.5, 3, 6.25], "texture": "#0"},
"east": {"uv": [2, 5.5, 3, 6.25], "texture": "#0"},
"south": {"uv": [2, 5.5, 3, 6.25], "texture": "#0"},
"west": {"uv": [2, 5.5, 3, 6.25], "texture": "#0"},
"up": {"uv": [3, 5, 2, 4], "texture": "#0"},
"down": {"uv": [3, 4, 2, 5], "texture": "#0"}
}
},
{
"from": [-14.68317, 6, 7.99634],
"to": [-10.68317, 9, 8.02134],
"rotation": {"angle": 22.5, "axis": "y", "origin": [-12.60817, 7.5, 8.75884]},
"faces": {
"north": {"uv": [4, 8.25, 3, 9], "texture": "#0"},
"south": {"uv": [3, 8.25, 4, 9], "texture": "#0"}
}
},
{
"from": [-9.72697, 6, 7.34463],
"to": [-9.70197, 9, 11.34463],
"rotation": {"angle": -22.5, "axis": "y", "origin": [-12.96447, 7.5, 8.09463]},
"faces": {
"east": {"uv": [3, 8.25, 4, 9], "texture": "#0"},
"west": {"uv": [4, 8.25, 3, 9], "texture": "#0"}
}
},
{
"from": [-9.75, 9, 13.5],
"to": [-3.75, 13, 19.5],
"rotation": {"angle": -45, "axis": "y", "origin": [4, 12.75, 8.75]},
"faces": {
"north": {"uv": [6.75, 2, 8.25, 3], "texture": "#0"},
"east": {"uv": [4.25, 2.5, 2.75, 3.5], "texture": "#0"},
"south": {"uv": [0.75, 2.5, 2.25, 3.5], "texture": "#0"},
"west": {"uv": [2.75, 2.5, 4.25, 3.5], "texture": "#0"},
"up": {"uv": [2.25, 2, 0.75, 0.5], "texture": "#0"},
"down": {"uv": [4.25, 0.5, 2.75, 2], "texture": "#0"}
}
},
{
"from": [-10.25, 8.75, 13],
"to": [-3.25, 14.75, 20],
"rotation": {"angle": -45, "axis": "y", "origin": [4, 12.75, 8.75]},
"faces": {
"north": {"uv": [10.25, 4.75, 12, 6.25], "texture": "#0"},
"east": {"uv": [10.25, 2.75, 12, 4.25], "texture": "#0"},
"south": {"uv": [12.5, 4.75, 14.25, 6.25], "texture": "#0"},
"west": {"uv": [12.5, 2.75, 14.25, 4.25], "texture": "#0"},
"up": {"uv": [12, 2.25, 10.25, 0.5], "texture": "#0"}
}
},
{
"from": [-9.75, 16.25, 13.5],
"to": [-3.75, 17.25, 19.5],
"rotation": {"angle": -45, "axis": "y", "origin": [4, 12.75, 8.75]},
"faces": {
"north": {"uv": [6.75, 6.5, 8.25, 6.75], "texture": "#0"},
"east": {"uv": [6.75, 6.5, 8.25, 6.75], "texture": "#0"},
"south": {"uv": [6.75, 6.5, 8.25, 6.75], "texture": "#0"},
"west": {"uv": [6.75, 6.5, 8.25, 6.75], "texture": "#0"},
"up": {"uv": [8.25, 6.5, 6.75, 5], "texture": "#0"},
"down": {"uv": [8.25, 5, 6.75, 6.5], "texture": "#0"}
}
}
],
"display": {
"gui": {
"rotation": [35, -135, 0],
"translation": [-0.5, -0.5, 0],
"scale": [0.41, 0.41, 0.41]
},
"head": {
"scale": [0.8, 0.8, 0.8]
},
"fixed": {
"scale": [0.5, 0.5, 0.01]
}
},
"groups": [
{
"name": "group",
"origin": [0, 0, 0],
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
},
{
"name": "group",
"origin": [0, 0, 0],
"color": 0,
"children": [11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
}
]
}
Binary file added src/main/resources/assets/simplehats/textures/item/hats/angel_and_devil.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/simplehats/textures/item/hats/angel_and_devil_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/simplehats/textures/item/hats/druid_antlers_rare.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/simplehats/textures/item/hats/druid_antlers_rare_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/main/resources/assets/simplehats/textures/item/hats/druid_antlers_rare_e.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 3,
"interpolate": true
}
}
Binary file added src/main/resources/assets/simplehats/textures/item/hats/eyeholder_dark_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/main/resources/assets/simplehats/textures/item/hats/eyeholder_dark_e.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 2,
"frames": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3]
}
}
Binary file added src/main/resources/assets/simplehats/textures/item/hats/eyeholder_evil_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/main/resources/assets/simplehats/textures/item/hats/eyeholder_evil_e.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 2,
"frames": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3]
}
}
Binary file added src/main/resources/assets/simplehats/textures/item/hats/eyeholder_warm_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/main/resources/assets/simplehats/textures/item/hats/eyeholder_warm_e.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 2,
"frames": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3]
}
}
Binary file added src/main/resources/assets/simplehats/textures/item/hats/eyeholder_xanath_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/main/resources/assets/simplehats/textures/item/hats/eyeholder_xanath_e.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 2,
"frames": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 0, 1, 2, 3]
}
}
Binary file added src/main/resources/assets/simplehats/textures/item/hats/mimic_head_dark_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/main/resources/assets/simplehats/textures/item/hats/mimic_head_dark_e.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 2,
"frames": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 0, 1, 2, 3]
}
}
Binary file added src/main/resources/assets/simplehats/textures/item/hats/mimic_head_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/main/resources/assets/simplehats/textures/item/hats/mimic_head_e.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 2,
"frames": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 0, 1, 2, 3]
}
}
Binary file added src/main/resources/assets/simplehats/textures/item/hats/mimic_head_gold_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/main/resources/assets/simplehats/textures/item/hats/mimic_head_gold_e.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 2,
"frames": [0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 4, 5, 6, 7]
}
}
Binary file added src/main/resources/assets/simplehats/textures/item/hats/mindflayer_alhoon_e.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/main/resources/assets/simplehats/textures/item/hats/mindflayer_alhoon_e.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 3
}
}

0 comments on commit ae144f0

Please sign in to comment.