Skip to content

Commit

Permalink
Update neoforge
Browse files Browse the repository at this point in the history
  • Loading branch information
Mgazul committed Dec 7, 2024
1 parent 39f7813 commit c323654
Show file tree
Hide file tree
Showing 169 changed files with 3,492 additions and 2,782 deletions.
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
Progress
------

- [x] Rectify NeoForge([**dd989e5cff**](https://github.com/neoforged/NeoForge/commit/dd989e5cff))
- [x] Rectify NeoForge([**00f3f80ef9**](https://github.com/neoforged/NeoForge/commit/00f3f80ef9))
- [ ] Start patch
* [x] Bukkit([**8ec77750**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/8ec77750))
* [ ] CraftBukkit([**d50f50585**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/d50f50585))
Expand Down
1 change: 0 additions & 1 deletion src/generated/resources/assets/c/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@
"tag.item.c.seeds.wheat": "Wheat Seeds",
"tag.item.c.shulker_boxes": "Shulker Boxes",
"tag.item.c.slime_balls": "Slimeballs",
"tag.item.c.slimeballs": "Slimeballs",
"tag.item.c.stones": "Stones",
"tag.item.c.storage_blocks": "Storage Blocks",
"tag.item.c.storage_blocks.bone_meal": "Bone Meal Storage Blocks",
Expand Down
4 changes: 0 additions & 4 deletions src/generated/resources/data/c/tags/item/slime_balls.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"values": [
"minecraft:slime_ball",
{
"id": "#c:slimeballs",
"required": false
},
{
"id": "#forge:slime_balls",
"required": false
Expand Down
5 changes: 0 additions & 5 deletions src/generated/resources/data/c/tags/item/slimeballs.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:any_of",
"terms": [
{
"ability": "shears_dig",
"condition": "neoforge:can_item_perform_ability"
},
{
"condition": "minecraft:match_tool",
"predicate": {
"predicates": {
"minecraft:enchantments": [
{
"enchantments": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
}
]
}
],
"name": "minecraft:pale_oak_leaves"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
},
{
"chances": [
0.05,
0.0625,
0.083333336,
0.1
],
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune"
}
],
"name": "minecraft:pale_oak_sapling"
}
]
}
],
"rolls": 1.0
},
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:any_of",
"terms": [
{
"ability": "shears_dig",
"condition": "neoforge:can_item_perform_ability"
},
{
"condition": "minecraft:match_tool",
"predicate": {
"predicates": {
"minecraft:enchantments": [
{
"enchantments": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
}
]
}
}
],
"entries": [
{
"type": "minecraft:item",
"conditions": [
{
"chances": [
0.02,
0.022222223,
0.025,
0.033333335,
0.1
],
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune"
}
],
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 2.0,
"min": 1.0
},
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
],
"rolls": 1.0
}
],
"random_sequence": "minecraft:blocks/pale_oak_leaves"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"group": "chest_boat",
"ingredients": [
{
"neoforge:ingredient_type": "neoforge:difference",
"base": "#c:chests/wooden",
"subtracted": "#c:chests/trapped"
},
"minecraft:pale_oak_boat"
],
"result": {
"count": 1,
"id": "minecraft:pale_oak_chest_boat"
}
}
17 changes: 17 additions & 0 deletions src/generated/resources/data/minecraft/recipe/pale_oak_fence.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"group": "wooden_fence",
"key": {
"#": "#c:rods/wooden",
"W": "minecraft:pale_oak_planks"
},
"pattern": [
"W#W",
"W#W"
],
"result": {
"count": 3,
"id": "minecraft:pale_oak_fence"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"category": "redstone",
"group": "wooden_fence_gate",
"key": {
"#": "#c:rods/wooden",
"W": "minecraft:pale_oak_planks"
},
"pattern": [
"#W#",
"#W#"
],
"result": {
"count": 1,
"id": "minecraft:pale_oak_fence_gate"
}
}
18 changes: 18 additions & 0 deletions src/generated/resources/data/minecraft/recipe/pale_oak_sign.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"group": "wooden_sign",
"key": {
"#": "minecraft:pale_oak_planks",
"X": "#c:rods/wooden"
},
"pattern": [
"###",
"###",
" X "
],
"result": {
"count": 3,
"id": "minecraft:pale_oak_sign"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#neoforge:needs_netherite_tool"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#neoforge:needs_netherite_tool"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#neoforge:needs_netherite_tool"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#neoforge:needs_netherite_tool"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#neoforge:needs_netherite_tool"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
"minecraft:creaking": {
"sound": "minecraft:entity.parrot.imitate.creaking"
},
"minecraft:creaking_transient": {
"sound": "minecraft:entity.parrot.imitate.creaking"
},
"minecraft:creeper": {
"sound": "minecraft:entity.parrot.imitate.creeper"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
"minecraft:cherry_sapling": {
"chance": 0.3
},
"minecraft:closed_eyeblossom": {
"chance": 0.65
},
"minecraft:cocoa_beans": {
"chance": 0.65
},
Expand Down Expand Up @@ -184,6 +187,9 @@
"minecraft:oak_sapling": {
"chance": 0.3
},
"minecraft:open_eyeblossom": {
"chance": 0.65
},
"minecraft:orange_tulip": {
"chance": 0.65
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
2 changes: 1 addition & 1 deletion src/generated/resources/pack.mcmeta
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": {
"translate": "pack.neoforge.description"
},
"pack_format": 57,
"pack_format": 61,
"supported_formats": [
0,
2147483647
Expand Down
Loading

0 comments on commit c323654

Please sign in to comment.