Skip to content

Commit

Permalink
Small fixes that use 1.21.60 features
Browse files Browse the repository at this point in the history
  • Loading branch information
mammerla committed Feb 11, 2025
1 parent 445d10f commit 1940420
Show file tree
Hide file tree
Showing 15 changed files with 97 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "1.21.50",
"format_version": "1.21.60",
"minecraft:block": {
"description": {
"identifier": "mikeamm_gwve:fabricator",
Expand Down Expand Up @@ -31,10 +31,28 @@
"catch_chance_modifier": 5
},
"minecraft:geometry": "geometry.mikeamm_gwve_fabricator",
"minecraft:liquid_detection": {
"detection_rules": [
{
"liquid_type": "water",
"on_liquid_touches": "broken"
}
]
},
"minecraft:item_visual": {
"geometry": "geometry.mikeamm_gwve_fabricator_in_hand",
"material_instances": {
"*": {
"texture": "mikeamm_gwve_fabricator_in_hand",
"render_method": "alpha_test"
}
}
},
"minecraft:material_instances": {
"*": {
"texture": "mikeamm_gwve_fabricator",
"render_method": "alpha_test"
"render_method": "alpha_test",
"ambient_occlusion": 1
}
},
"minecraft:light_emission": 7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": {
"identifier": "mikeamm_gwve:axe_turret_kit",
"menu_category": {
"category": "items"
"category": "equipment"
}
},
"components": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": {
"identifier": "mikeamm_gwve:bow_turret_kit",
"menu_category": {
"category": "items"
"category": "equipment"
}
},
"components": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": {
"identifier": "mikeamm_gwve:crossbow_turret_kit",
"menu_category": {
"category": "items"
"category": "equipment"
}
},
"components": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": {
"identifier": "mikeamm_gwve:depleted_gray_shard",
"menu_category": {
"category": "items"
"category": "equipment"
}
},
"components": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": {
"identifier": "mikeamm_gwve:gray_wave_generator_kit",
"menu_category": {
"category": "items"
"category": "equipment"
}
},
"components": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": {
"identifier": "mikeamm_gwve:shbullet_turret_kit",
"menu_category": {
"category": "items"
"category": "equipment"
}
},
"components": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": {
"identifier": "mikeamm_gwve:smfireball_turret_kit",
"menu_category": {
"category": "items"
"category": "equipment"
}
},
"components": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"format_version": "1.19.0",
"minecraft:geometry": [
{
"description": {
"identifier": "geometry.mikeamm_gwve_fabricator_in_hand",
"texture_width": 64,
"texture_height": 64,
"visible_bounds_width": 4,
"visible_bounds_height": 2.5,
"visible_bounds_offset": [0, 0.75, 0]
},
"bones": [
{
"name": "bone",
"pivot": [8, 0, -8],
"cubes": [
{
"origin": [-8, 0, -8],
"size": [16, 2, 16],
"uv": {
"north": {"uv": [0, 32], "uv_size": [16, 2]},
"east": {"uv": [0, 34], "uv_size": [16, 2]},
"south": {"uv": [0, 36], "uv_size": [16, 2]},
"west": {"uv": [0, 38], "uv_size": [16, 2]},
"up": {"uv": [0, 0], "uv_size": [16, 16]},
"down": {"uv": [0, 32], "uv_size": [16, -16]}
}
},
{"origin": [5, 2, -7], "size": [2, 13, 2], "uv": [0, 0]},
{"origin": [-7, 2, -7], "size": [2, 13, 2], "uv": [0, 0]},
{"origin": [-7, 2, 5], "size": [2, 13, 2], "uv": [0, 0]},
{"origin": [5, 2, 5], "size": [2, 13, 2], "uv": [2, 9]},
{
"origin": [-8, 15, -8],
"size": [16, 2, 16],
"uv": {
"north": {"uv": [0, 32], "uv_size": [16, 2]},
"east": {"uv": [0, 34], "uv_size": [16, 2]},
"south": {"uv": [0, 36], "uv_size": [16, 2]},
"west": {"uv": [0, 38], "uv_size": [16, 2]},
"up": {"uv": [0, 0], "uv_size": [16, 16]},
"down": {"uv": [0, 32], "uv_size": [16, -16]}
}
}
]
}
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"mikeamm_gwve_fabricator": {
"textures": "textures/mikeamm/gray_wave/blocks/fabricator.png"
},
"mikeamm_gwve_fabricator_in_hand": {
"textures": "textures/mikeamm/gray_wave/blocks/fabricator_in_hand.png"
},
"mikeamm_gwve_gray_ore": {
"textures": "textures/mikeamm/gray_wave/blocks/gray_ore.png"
}
Expand Down
11 changes: 5 additions & 6 deletions custom_blocks/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"version": "0.2.0",
"version": "0.3.0",
"configurations": [
{
"type": "minecraft-js",
"request": "attach",
"name": "Debug with Minecraft",
"port": 19144,
"mode": "listen",
"preLaunchTask": "build",
"name": "Debug with Minecraft",
"preLaunchTask": "buildandeploy",
"sourceMapRoot": "${workspaceFolder}/dist/debug/",
"generatedSourceRoot": "${workspaceFolder}/dist/scripts/",
"port": 19144
"generatedSourceRoot": "${workspaceFolder}/dist/scripts/"
}
]
}
16 changes: 8 additions & 8 deletions custom_blocks/.vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"dependsOrder": "sequence",
"dependsOn": [
"gulp: default"
]
"tasks": [
{
"type": "npm",
"label": "buildandeploy",
"group": "build",
"script": "local-deploy",
"dependsOrder": "sequence"
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@
"*": {
"texture": "bubble_fish_blue",
"render_method": "blend",
"face_dimming": true
"face_dimming": true,
"ambient_occlusion": 1
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion custom_blocks/resource_packs/custom_blocks/blocks.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"carried_textures": "die_red",
"isotropic": true,
"brightness_gamma": 1,
"ambient_occlusion_exponent": 1,
"sound": "stone"
},
"demo:tuna_roll": {
Expand Down

0 comments on commit 1940420

Please sign in to comment.