-
-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Unify tag namespace and conventions between NeoForge and Fabric for M…
…C 1.20.5 (#135)
- Loading branch information
1 parent
ef9c820
commit 9ce3276
Showing
893 changed files
with
7,198 additions
and
2,278 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
patches/net/minecraft/world/level/levelgen/feature/Feature.java.patch
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "values": [ | ||
| "#c:barrels/wooden", | ||
| { | ||
| "id": "#forge:barrels", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
9 changes: 9 additions & 0 deletions
9
src/generated/resources/data/c/tags/blocks/barrels/wooden.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:barrel", | ||
| { | ||
| "id": "#forge:barrels/wooden", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:bookshelf", | ||
| { | ||
| "id": "#forge:bookshelves", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/c/tags/blocks/budding_blocks.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:budding_amethyst" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:small_amethyst_bud", | ||
| "minecraft:medium_amethyst_bud", | ||
| "minecraft:large_amethyst_bud" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:chain" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "values": [ | ||
| "#c:chests/ender", | ||
| "#c:chests/trapped", | ||
| "#c:chests/wooden", | ||
| { | ||
| "id": "#forge:chests", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:ender_chest", | ||
| { | ||
| "id": "#forge:chests/ender", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
9 changes: 9 additions & 0 deletions
9
src/generated/resources/data/c/tags/blocks/chests/trapped.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:trapped_chest", | ||
| { | ||
| "id": "#forge:chests/trapped", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/generated/resources/data/c/tags/blocks/chests/wooden.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:chest", | ||
| "minecraft:trapped_chest", | ||
| { | ||
| "id": "#forge:chests/wooden", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:amethyst_cluster" | ||
| ] | ||
| } |
12 changes: 12 additions & 0 deletions
12
src/generated/resources/data/c/tags/blocks/cobblestones.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "values": [ | ||
| "#c:cobblestones/normal", | ||
| "#c:cobblestones/infested", | ||
| "#c:cobblestones/mossy", | ||
| "#c:cobblestones/deepslate", | ||
| { | ||
| "id": "#forge:cobblestone", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
9 changes: 9 additions & 0 deletions
9
src/generated/resources/data/c/tags/blocks/cobblestones/deepslate.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:cobbled_deepslate", | ||
| { | ||
| "id": "#forge:cobblestone/deepslate", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
9 changes: 9 additions & 0 deletions
9
src/generated/resources/data/c/tags/blocks/cobblestones/infested.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:infested_cobblestone", | ||
| { | ||
| "id": "#forge:cobblestone/infested", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
9 changes: 9 additions & 0 deletions
9
src/generated/resources/data/c/tags/blocks/cobblestones/mossy.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:mossy_cobblestone", | ||
| { | ||
| "id": "#forge:cobblestone/mossy", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
9 changes: 9 additions & 0 deletions
9
src/generated/resources/data/c/tags/blocks/cobblestones/normal.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:cobblestone", | ||
| { | ||
| "id": "#forge:cobblestone/normal", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "values": [ | ||
| "#c:dyed/white", | ||
| "#c:dyed/orange", | ||
| "#c:dyed/magenta", | ||
| "#c:dyed/light_blue", | ||
| "#c:dyed/yellow", | ||
| "#c:dyed/lime", | ||
| "#c:dyed/pink", | ||
| "#c:dyed/gray", | ||
| "#c:dyed/light_gray", | ||
| "#c:dyed/cyan", | ||
| "#c:dyed/purple", | ||
| "#c:dyed/blue", | ||
| "#c:dyed/brown", | ||
| "#c:dyed/green", | ||
| "#c:dyed/red", | ||
| "#c:dyed/black" | ||
| ] | ||
| } |
25 changes: 25 additions & 0 deletions
25
src/generated/resources/data/c/tags/blocks/dyed/black.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:black_banner", | ||
| "minecraft:black_bed", | ||
| "minecraft:black_candle", | ||
| "minecraft:black_carpet", | ||
| "minecraft:black_concrete", | ||
| "minecraft:black_concrete_powder", | ||
| "minecraft:black_glazed_terracotta", | ||
| "minecraft:black_shulker_box", | ||
| "minecraft:black_stained_glass", | ||
| "minecraft:black_stained_glass_pane", | ||
| "minecraft:black_terracotta", | ||
| "minecraft:black_wall_banner", | ||
| "minecraft:black_wool", | ||
| { | ||
| "id": "#forge:glass/black", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "#forge:stained_glass/black", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:blue_banner", | ||
| "minecraft:blue_bed", | ||
| "minecraft:blue_candle", | ||
| "minecraft:blue_carpet", | ||
| "minecraft:blue_concrete", | ||
| "minecraft:blue_concrete_powder", | ||
| "minecraft:blue_glazed_terracotta", | ||
| "minecraft:blue_shulker_box", | ||
| "minecraft:blue_stained_glass", | ||
| "minecraft:blue_stained_glass_pane", | ||
| "minecraft:blue_terracotta", | ||
| "minecraft:blue_wall_banner", | ||
| "minecraft:blue_wool", | ||
| { | ||
| "id": "#forge:glass/blue", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "#forge:stained_glass/blue", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
25 changes: 25 additions & 0 deletions
25
src/generated/resources/data/c/tags/blocks/dyed/brown.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:brown_banner", | ||
| "minecraft:brown_bed", | ||
| "minecraft:brown_candle", | ||
| "minecraft:brown_carpet", | ||
| "minecraft:brown_concrete", | ||
| "minecraft:brown_concrete_powder", | ||
| "minecraft:brown_glazed_terracotta", | ||
| "minecraft:brown_shulker_box", | ||
| "minecraft:brown_stained_glass", | ||
| "minecraft:brown_stained_glass_pane", | ||
| "minecraft:brown_terracotta", | ||
| "minecraft:brown_wall_banner", | ||
| "minecraft:brown_wool", | ||
| { | ||
| "id": "#forge:glass/brown", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "#forge:stained_glass/brown", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:cyan_banner", | ||
| "minecraft:cyan_bed", | ||
| "minecraft:cyan_candle", | ||
| "minecraft:cyan_carpet", | ||
| "minecraft:cyan_concrete", | ||
| "minecraft:cyan_concrete_powder", | ||
| "minecraft:cyan_glazed_terracotta", | ||
| "minecraft:cyan_shulker_box", | ||
| "minecraft:cyan_stained_glass", | ||
| "minecraft:cyan_stained_glass_pane", | ||
| "minecraft:cyan_terracotta", | ||
| "minecraft:cyan_wall_banner", | ||
| "minecraft:cyan_wool", | ||
| { | ||
| "id": "#forge:glass/cyan", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "#forge:stained_glass/cyan", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:gray_banner", | ||
| "minecraft:gray_bed", | ||
| "minecraft:gray_candle", | ||
| "minecraft:gray_carpet", | ||
| "minecraft:gray_concrete", | ||
| "minecraft:gray_concrete_powder", | ||
| "minecraft:gray_glazed_terracotta", | ||
| "minecraft:gray_shulker_box", | ||
| "minecraft:gray_stained_glass", | ||
| "minecraft:gray_stained_glass_pane", | ||
| "minecraft:gray_terracotta", | ||
| "minecraft:gray_wall_banner", | ||
| "minecraft:gray_wool", | ||
| { | ||
| "id": "#forge:glass/gray", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "#forge:stained_glass/gray", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
25 changes: 25 additions & 0 deletions
25
src/generated/resources/data/c/tags/blocks/dyed/green.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:green_banner", | ||
| "minecraft:green_bed", | ||
| "minecraft:green_candle", | ||
| "minecraft:green_carpet", | ||
| "minecraft:green_concrete", | ||
| "minecraft:green_concrete_powder", | ||
| "minecraft:green_glazed_terracotta", | ||
| "minecraft:green_shulker_box", | ||
| "minecraft:green_stained_glass", | ||
| "minecraft:green_stained_glass_pane", | ||
| "minecraft:green_terracotta", | ||
| "minecraft:green_wall_banner", | ||
| "minecraft:green_wool", | ||
| { | ||
| "id": "#forge:glass/green", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "#forge:stained_glass/green", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
25 changes: 25 additions & 0 deletions
25
src/generated/resources/data/c/tags/blocks/dyed/light_blue.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:light_blue_banner", | ||
| "minecraft:light_blue_bed", | ||
| "minecraft:light_blue_candle", | ||
| "minecraft:light_blue_carpet", | ||
| "minecraft:light_blue_concrete", | ||
| "minecraft:light_blue_concrete_powder", | ||
| "minecraft:light_blue_glazed_terracotta", | ||
| "minecraft:light_blue_shulker_box", | ||
| "minecraft:light_blue_stained_glass", | ||
| "minecraft:light_blue_stained_glass_pane", | ||
| "minecraft:light_blue_terracotta", | ||
| "minecraft:light_blue_wall_banner", | ||
| "minecraft:light_blue_wool", | ||
| { | ||
| "id": "#forge:glass/light_blue", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "#forge:stained_glass/light_blue", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.