Skip to content

Commit

Permalink
More Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
WenXin20 committed Sep 2, 2024
1 parent 9778860 commit b192e40
Show file tree
Hide file tree
Showing 81 changed files with 146 additions and 146 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"tag": "marioverse:marioverse"
"tag": "marioverse:warp_pipes"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"tag": "marioverse:marioverse"
"tag": "marioverse:warp_pipes"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"tag": "marioverse:marioverse"
"tag": "marioverse:warp_pipes"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
},
{
"type": "minecraft:tag",
"name": "marioverse:marioverse",
"name": "marioverse:warp_pipes",
"expand": true,
"weight": 10,
"functions": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "neoforge:add_features",
"biomes": "#c:is_mushroom",
"features": ["marioverse:patch_mushroom_brown_marioverse", "marioverse:patch_mushroom_red_marioverse", "marioverse:patch_mushroom_white_marioverse"],
"features": [ "marioverse:patch_mushroom_brown_warp_pipes", "marioverse:patch_mushroom_red_warp_pipes", "marioverse:patch_mushroom_white_warp_pipes" ],
"step": "underground_decoration"
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"type": "neoforge:add_features",
"biomes": "#minecraft:is_overworld",
"features": ["marioverse:patch_clear_marioverse", "marioverse:patch_black_marioverse", "marioverse:patch_blue_marioverse",
"marioverse:patch_brown_marioverse", "marioverse:patch_cyan_marioverse", "marioverse:patch_gray_marioverse",
"marioverse:patch_green_marioverse", "marioverse:patch_light_blue_marioverse", "marioverse:patch_light_gray_marioverse",
"marioverse:patch_lime_marioverse", "marioverse:patch_magenta_marioverse", "marioverse:patch_orange_marioverse",
"marioverse:patch_pink_marioverse", "marioverse:patch_purple_marioverse", "marioverse:patch_red_marioverse",
"marioverse:patch_white_marioverse", "marioverse:patch_yellow_marioverse" ],
"features": [ "marioverse:patch_clear_warp_pipes", "marioverse:patch_black_warp_pipes", "marioverse:patch_blue_warp_pipes",
"marioverse:patch_brown_warp_pipes", "marioverse:patch_cyan_warp_pipes", "marioverse:patch_gray_warp_pipes",
"marioverse:patch_green_warp_pipes", "marioverse:patch_light_blue_warp_pipes", "marioverse:patch_light_gray_warp_pipes",
"marioverse:patch_lime_warp_pipes", "marioverse:patch_magenta_warp_pipes", "marioverse:patch_orange_warp_pipes",
"marioverse:patch_pink_warp_pipes", "marioverse:patch_purple_warp_pipes", "marioverse:patch_red_warp_pipes",
"marioverse:patch_white_warp_pipes", "marioverse:patch_yellow_warp_pipes" ],
"step": "underground_decoration"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/black"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/blue"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/brown"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "clear_marioverse",
"group": "marioverse:clear_warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "clear_marioverse",
"group": "marioverse:clear_warp_pipes",
"ingredients": [
{
"tag": "marioverse:dyeable_marioverse"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/cyan"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/gray"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/green"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/light_blue"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/light_gray"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/lime"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/magenta"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/orange"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/pink"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/data/marioverse/recipe/pipe_wrench.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "pipe_wrench",
"group": "marioverse:pipe_wrench",
"key": {
"C": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/purple"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/red"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/white"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "marioverse",
"group": "marioverse:warp_pipes",
"key": {
"I": {
"tag": "c:ingots/copper"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"group": "marioverse_from_dye",
"group": "marioverse:warp_pipes_from_dye",
"ingredients": [
{
"tag": "c:dyes/yellow"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
0,
0
],
"tag": "marioverse:marioverse"
"tag": "marioverse:warp_pipes"
},
{
"type": "minecraft:matching_block_tag",
Expand All @@ -127,7 +127,7 @@
0,
0
],
"tag": "marioverse:marioverse"
"tag": "marioverse:warp_pipes"
},
{
"type": "minecraft:matching_block_tag",
Expand All @@ -136,7 +136,7 @@
0,
1
],
"tag": "marioverse:marioverse"
"tag": "marioverse:warp_pipes"
},
{
"type": "minecraft:matching_block_tag",
Expand All @@ -145,7 +145,7 @@
0,
-1
],
"tag": "marioverse:marioverse"
"tag": "marioverse:warp_pipes"
}
]
}
Expand Down
Loading

0 comments on commit b192e40

Please sign in to comment.