Skip to content

Commit

Permalink
24w11a
Browse files Browse the repository at this point in the history
  • Loading branch information
bangetto committed Mar 26, 2024
1 parent 0d366bc commit 70b4e32
Show file tree
Hide file tree
Showing 51 changed files with 322 additions and 24 deletions.
44 changes: 44 additions & 0 deletions assets/minecraft/models/block/heavy_core.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 3, 0],
"scale":[ 1, 1, 1 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"scale":[ 0.5, 0.5, 0.5 ]
},
"fixed": {
"rotation": [ 0, 180, 0 ],
"translation": [ 0, 4, 0],
"scale":[ 1, 1, 1 ]
},
"thirdperson_righthand": {
"rotation": [ 45, 45, 0 ],
"translation": [ 0, 3, 0 ],
"scale": [ 0.5, 0.5, 0.5 ]
}
},
"texture_size": [16, 16],
"textures": {
"all": "block/heavy_core",
"particle": "block/heavy_core"
},
"elements": [
{
"name": "heavy_core",
"from": [4, 0, 4],
"to": [12, 8, 12],
"faces": {
"north": {"uv": [0, 8, 8, 16], "texture": "all"},
"east": {"uv": [0, 8, 8, 16], "texture": "all"},
"south": {"uv": [0, 8, 8, 16], "texture": "all"},
"west": {"uv": [0, 8, 8, 16], "texture": "all"},
"up": {"uv": [0, 0, 8, 8], "texture": "all"},
"down": {"uv": [8, 0, 16, 8], "texture": "all"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/bolt_armor_trim_smithing_template"
}
}
6 changes: 6 additions & 0 deletions assets/minecraft/models/item/breeze_rod.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/breeze_rod"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/flow_armor_trim_smithing_template"
}
}
6 changes: 6 additions & 0 deletions assets/minecraft/models/item/flow_banner_pattern.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/flow_banner_pattern"
}
}
6 changes: 6 additions & 0 deletions assets/minecraft/models/item/flow_pottery_sherd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/flow_pottery_sherd"
}
}
6 changes: 6 additions & 0 deletions assets/minecraft/models/item/guster_banner_pattern.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/guster_banner_pattern"
}
}
6 changes: 6 additions & 0 deletions assets/minecraft/models/item/guster_pottery_sherd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/guster_pottery_sherd"
}
}
25 changes: 25 additions & 0 deletions assets/minecraft/models/item/handheld_mace.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"parent": "item/handheld",
"display": {
"thirdperson_righthand": {
"rotation": [ 0, -90, 55 ],
"translation": [ 0, 4.0, 1 ],
"scale": [ 1, 1, 1 ]
},
"thirdperson_lefthand": {
"rotation": [ 0, 90, -55 ],
"translation": [ 0, 4.0, 1 ],
"scale": [ 1, 1, 1 ]
},
"firstperson_righthand": {
"rotation": [ 0, -90, 25 ],
"translation": [ 0, 3, 0.8 ],
"scale": [ 0.9, 0.9, 0.9 ]
},
"firstperson_lefthand": {
"rotation": [ 0, 90, -25 ],
"translation": [ 0, 3, 0.8 ],
"scale": [ 0.9, 0.9, 0.9 ]
}
}
}
3 changes: 3 additions & 0 deletions assets/minecraft/models/item/heavy_core.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:block/heavy_core"
}
6 changes: 6 additions & 0 deletions assets/minecraft/models/item/mace.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld_mace",
"textures": {
"layer0": "minecraft:item/mace"
}
}
6 changes: 6 additions & 0 deletions assets/minecraft/models/item/scrape_pottery_sherd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/scrape_pottery_sherd"
}
}
39 changes: 39 additions & 0 deletions assets/minecraft/models/item/template_banner.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"parent": "builtin/entity",
"gui_light": "front",
"textures": {
"particle": "block/oak_planks"
},
"display": {
"thirdperson_righthand": {
"rotation": [ 0, 90, 0 ],
"translation": [ 0, 2, 0.5],
"scale":[ 0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [ 0, 90, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.375, 0.375, 0.375]
},
"gui": {
"rotation": [ 30, 20, 0 ],
"translation": [ 0, -3.25, 0],
"scale":[ 0.5325, 0.5325, 0.5325]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 1, 0],
"scale":[ 0.25, 0.25, 0.25]
},
"head": {
"rotation": [ 0, 180, 0 ],
"translation": [ 0, 16, 7],
"scale":[ 1.5, 1.5, 1.5 ]
},
"fixed": {
"rotation": [ 0, 180, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.5, 0.5, 0.5]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=vex_armor_trim_smithing_template
model=item/flow_armor_trim_smithing_template
nbt.VB|Protocol1_20_3To1_20_5|id=1283
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=vex_armor_trim_smithing_template
model=item/guster_armor_trim_smithing_template
nbt.VB|Protocol1_20_3To1_20_5|id=1284
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=flower_banner_pattern
model=item/flow_banner_pattern
nbt.VB|Protocol1_20_3To1_20_5|id=1198
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=flower_banner_pattern
model=item/guster_banner_pattern
nbt.VB|Protocol1_20_3To1_20_5|id=1199
4 changes: 4 additions & 0 deletions assets/minecraft/optifine/cit/blaze_rod/breeze_rod.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=blaze_rod
model=item/breeze_rod
nbt.VB|Protocol1_20_3To1_20_5|id=1327
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type=item
matchItems=leather_horse_armor
model=item/wolf_armor
nbt.VB|Protocol1_20_3To1_20_5|id=796
nbt.VB|Protocol1_20_3To1_20_5|id=797
4 changes: 4 additions & 0 deletions assets/minecraft/optifine/cit/netherite/axe/mace.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=netherite_axe
model=item/mace
nbt.VB|Protocol1_20_3To1_20_5|id=1093
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=blade_pottery_shard
model=item/scrape_pottery_sherd
nbt.VB|Protocol1_20_3To1_20_5|id=1303
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=friend_pottery_sherd
model=item/flow_pottery_sherd
nbt.VB|Protocol1_20_3To1_20_5|id=1293
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=friend_pottery_sherd
model=item/guster_pottery_sherd
nbt.VB|Protocol1_20_3To1_20_5|id=1294
4 changes: 0 additions & 4 deletions assets/minecraft/optifine/cit/scute/turtle_scute.properties

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type=item
matchItems=snowball
model=item/wind_charge
nbt.VB|Protocol1_20_3To1_20_5|id=1088
nbt.VB|Protocol1_20_3To1_20_5|id=1090
2 changes: 1 addition & 1 deletion assets/minecraft/optifine/cit/spawner/vault.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type=item
matchItems=spawner
model=item/vault
nbt.VB|Protocol1_20_3To1_20_5|id=1315
nbt.VB|Protocol1_20_3To1_20_5|id=1326
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type=item
matchItems=wither_skeleton_head
model=item/heavy_core
nbt.VB|Protocol1_20_3To1_20_5|id=85
12 changes: 12 additions & 0 deletions assets/minecraft/overrides/item/blade_pottery_sherd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"overrides": [
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 1303
}
},
"model": "item/scrape_pottery_sherd"
}
]
}
12 changes: 12 additions & 0 deletions assets/minecraft/overrides/item/blaze_rod.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"overrides": [
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 1327
}
},
"model": "item/breeze_rod"
}
]
}
20 changes: 20 additions & 0 deletions assets/minecraft/overrides/item/flower_banner_pattern.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"overrides": [
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 1198
}
},
"model": "item/flow_banner_pattern"
},
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 1199
}
},
"model": "item/guster_banner_pattern"
}
]
}
20 changes: 20 additions & 0 deletions assets/minecraft/overrides/item/friend_pottery_sherd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"overrides": [
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 1293
}
},
"model": "item/flow_pottery_sherd"
},
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 1294
}
},
"model": "item/guster_pottery_sherd"
}
]
}
2 changes: 1 addition & 1 deletion assets/minecraft/overrides/item/leather_horse_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 796
"VB|Protocol1_20_3To1_20_5|id": 797
}
},
"model": "item/wolf_armor"
Expand Down
12 changes: 12 additions & 0 deletions assets/minecraft/overrides/item/netherite_axe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"overrides": [
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 1093
}
},
"model": "item/mace"
}
]
}
10 changes: 1 addition & 9 deletions assets/minecraft/overrides/item/scute.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
{
"overrides": [
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 794
}
},
"model": "item/turtle_scute"
},
{
"predicate": {
"nbt": {
"VB|Protocol1_20_3To1_20_5|id": 795
"VB|Protocol1_20_3To1_20_5|id": 796
}
},
"model": "item/armadillo_scute"
Expand Down
Loading

0 comments on commit 70b4e32

Please sign in to comment.