tggamesyt/szar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

merl and TOS

Browse Source
This commit is contained in:
TGGamesYT
2026-02-14 15:37:27 +01:00
parent 148aa740b6
commit c5deef7b75
15 changed files with 537 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/assets/szar/lang/en_us.json
View File

@@ -66,5 +66,7 @@
"item.szar.baiter": "Music Disc",
"item.szar.baiter.desc": "HaVexy - Hyperabaiter Disstrack",
"death.attack.radiation": "%1$s radiated away",
"death.attack.radiation.player": "%1$s was lethally irradiated by %2$s"
"death.attack.radiation.player": "%1$s was lethally irradiated by %2$s",
"entity.szar.merl": "Merl",
"item.szar.merl_spawn_egg": "Merl Spawn Egg"
}

183
src/main/resources/assets/szar/models/item/atom.json
View File

@@ -1,179 +1,6 @@
{
"format_version": "1.21.11",
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "szar:item/nuke"
},
"elements": [
{
"from": [6, 17, 6],
"to": [10, 19, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]},
"faces": {
"north": {"uv": [9, 4.75, 10, 5.25], "texture": "#0"},
"east": {"uv": [8, 4.75, 9, 5.25], "texture": "#0"},
"south": {"uv": [11, 4.75, 12, 5.25], "texture": "#0"},
"west": {"uv": [10, 4.75, 11, 5.25], "texture": "#0"},
"up": {"uv": [10, 4.75, 9, 3.75], "texture": "#0"},
"down": {"uv": [11, 3.75, 10, 4.75], "texture": "#0"}
}
},
{
"from": [5, 15, 5],
"to": [11, 17, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
"faces": {
"north": {"uv": [1.5, 9, 3, 9.5], "texture": "#0"},
"east": {"uv": [0, 9, 1.5, 9.5], "texture": "#0"},
"south": {"uv": [4.5, 9, 6, 9.5], "texture": "#0"},
"west": {"uv": [3, 9, 4.5, 9.5], "texture": "#0"},
"up": {"uv": [3, 9, 1.5, 7.5], "texture": "#0"},
"down": {"uv": [4.5, 7.5, 3, 9], "texture": "#0"}
}
},
{
"from": [4, 9, 4],
"to": [12, 16, 12],
"rotation": {"x": 0, "y": 0, "z": -180, "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [2, 5.75, 4, 7.5], "texture": "#0"},
"east": {"uv": [0, 5.75, 2, 7.5], "texture": "#0"},
"south": {"uv": [6, 5.75, 8, 7.5], "texture": "#0"},
"west": {"uv": [4, 5.75, 6, 7.5], "texture": "#0"},
"up": {"uv": [4, 5.75, 2, 3.75], "texture": "#0"},
"down": {"uv": [6, 3.75, 4, 5.75], "texture": "#0"}
}
},
{
"from": [7, 19, 7],
"to": [9, 20, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 8]},
"faces": {
"north": {"uv": [9.5, 10.75, 10, 11], "texture": "#0"},
"east": {"uv": [9, 10.75, 9.5, 11], "texture": "#0"},
"south": {"uv": [10.5, 10.75, 11, 11], "texture": "#0"},
"west": {"uv": [10, 10.75, 10.5, 11], "texture": "#0"},
"up": {"uv": [10, 10.75, 9.5, 10.25], "texture": "#0"},
"down": {"uv": [10.5, 10.25, 10, 10.75], "texture": "#0"}
}
},
{
"from": [5, 7, 5],
"to": [11, 9, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [7.5, 9, 9, 9.5], "texture": "#0"},
"east": {"uv": [6, 9, 7.5, 9.5], "texture": "#0"},
"south": {"uv": [10.5, 9, 12, 9.5], "texture": "#0"},
"west": {"uv": [9, 9, 10.5, 9.5], "texture": "#0"},
"up": {"uv": [9, 9, 7.5, 7.5], "texture": "#0"},
"down": {"uv": [10.5, 7.5, 9, 9], "texture": "#0"}
}
},
{
"from": [6, 5, 6],
"to": [10, 7, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]},
"faces": {
"north": {"uv": [9, 6.25, 10, 6.75], "texture": "#0"},
"east": {"uv": [8, 6.25, 9, 6.75], "texture": "#0"},
"south": {"uv": [11, 6.25, 12, 6.75], "texture": "#0"},
"west": {"uv": [10, 6.25, 11, 6.75], "texture": "#0"},
"up": {"uv": [10, 6.25, 9, 5.25], "texture": "#0"},
"down": {"uv": [11, 5.25, 10, 6.25], "texture": "#0"}
}
},
{
"from": [7, 4, 7],
"to": [9, 5, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [11, 7.25, 11.5, 7.5], "texture": "#0"},
"east": {"uv": [10.5, 7.25, 11, 7.5], "texture": "#0"},
"south": {"uv": [12, 7.25, 12.5, 7.5], "texture": "#0"},
"west": {"uv": [11.5, 7.25, 12, 7.5], "texture": "#0"},
"up": {"uv": [11.5, 7.25, 11, 6.75], "texture": "#0"},
"down": {"uv": [12, 6.75, 11.5, 7.25], "texture": "#0"}
}
},
{
"from": [5, 3, 5],
"to": [6, 7, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 3, 6]},
"faces": {
"north": {"uv": [0.25, 11, 0.5, 12], "texture": "#0"},
"east": {"uv": [0, 11, 0.25, 12], "texture": "#0"},
"south": {"uv": [0.75, 11, 1, 12], "texture": "#0"},
"west": {"uv": [0.5, 11, 0.75, 12], "texture": "#0"},
"up": {"uv": [0.5, 11, 0.25, 10.75], "texture": "#0"},
"down": {"uv": [0.75, 10.75, 0.5, 11], "texture": "#0"}
}
},
{
"from": [10, 3, 10],
"to": [11, 7, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [10, 3, 11]},
"faces": {
"north": {"uv": [2.25, 11, 2.5, 12], "texture": "#0"},
"east": {"uv": [2, 11, 2.25, 12], "texture": "#0"},
"south": {"uv": [2.75, 11, 3, 12], "texture": "#0"},
"west": {"uv": [2.5, 11, 2.75, 12], "texture": "#0"},
"up": {"uv": [2.5, 11, 2.25, 10.75], "texture": "#0"},
"down": {"uv": [2.75, 10.75, 2.5, 11], "texture": "#0"}
}
},
{
"from": [10, 3, 5],
"to": [11, 7, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [10, 3, 6]},
"faces": {
"north": {"uv": [1.25, 11, 1.5, 12], "texture": "#0"},
"east": {"uv": [1, 11, 1.25, 12], "texture": "#0"},
"south": {"uv": [1.75, 11, 2, 12], "texture": "#0"},
"west": {"uv": [1.5, 11, 1.75, 12], "texture": "#0"},
"up": {"uv": [1.5, 11, 1.25, 10.75], "texture": "#0"},
"down": {"uv": [1.75, 10.75, 1.5, 11], "texture": "#0"}
}
},
{
"from": [5, 3, 10],
"to": [6, 7, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 3, 11]},
"faces": {
"north": {"uv": [3.25, 11, 3.5, 12], "texture": "#0"},
"east": {"uv": [3, 11, 3.25, 12], "texture": "#0"},
"south": {"uv": [3.75, 11, 4, 12], "texture": "#0"},
"west": {"uv": [3.5, 11, 3.75, 12], "texture": "#0"},
"up": {"uv": [3.5, 11, 3.25, 10.75], "texture": "#0"},
"down": {"uv": [3.75, 10.75, 3.5, 11], "texture": "#0"}
}
},
{
"from": [2, 0, 2],
"to": [14, 3, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]},
"faces": {
"north": {"uv": [3, 3, 6, 3.75], "texture": "#0"},
"east": {"uv": [0, 3, 3, 3.75], "texture": "#0"},
"south": {"uv": [9, 3, 12, 3.75], "texture": "#0"},
"west": {"uv": [6, 3, 9, 3.75], "texture": "#0"},
"up": {"uv": [6, 3, 3, 0], "texture": "#0"},
"down": {"uv": [9, 0, 6, 3], "texture": "#0"}
}
},
{
"from": [6, 3, 6],
"to": [10, 4, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]},
"faces": {
"north": {"uv": [1, 10.5, 2, 10.75], "texture": "#0"},
"east": {"uv": [0, 10.5, 1, 10.75], "texture": "#0"},
"south": {"uv": [3, 10.5, 4, 10.75], "texture": "#0"},
"west": {"uv": [2, 10.5, 3, 10.75], "texture": "#0"},
"up": {"uv": [2, 10.5, 1, 9.5], "texture": "#0"},
"down": {"uv": [3, 9.5, 2, 10.5], "texture": "#0"}
}
}
]
}
"parent": "minecraft:item/generated",
"textures": {
"layer0": "szar:item/atom"
}
}

3
src/main/resources/assets/szar/models/item/merl_spawn_egg.json Normal file
View File

@@ -0,0 +1,3 @@
{
"parent": "minecraft:item/template_spawn_egg"
}

8
src/main/resources/assets/szar/sounds.json
View File

@@ -50,5 +50,13 @@
"stream": true
}
]
},
"merl": {
"sounds": [
{
"name": "szar:merl",
"stream": true
}
]
}
}

BIN
src/main/resources/assets/szar/sounds/merl.ogg Normal file
View File

Binary file not shown.

BIN
src/main/resources/assets/szar/textures/entity/merl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
src/main/resources/assets/szar/textures/item/atom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/assets/szar/textures/item/nuke.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB