26.1 Update

Minecraft is now Unobfuscated and requires Java 25
Lots of changes/code cleanup.
See https://github.com/MinecraftForge/MinecraftForge-Experimental/tree/26.1-dev for non-squashed commits.

Co-authored-by: Paint_Ninja <[email protected]>
This commit is contained in:
LexManosandPaint_Ninja committed 2026-03-24 14:07:41 -07:00
1 parent 5ac2675f87
commit 047e5fe252
1558 files changed
+11117 -16291

No files matched your search

@@ -1,9 +1,5 @@
{
"values": [
"#c:barrels/wooden",
{
"id": "#forge:barrels",
"required": false
}
"#c:barrels/wooden"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:barrel",
{
"id": "#forge:barrels/wooden",
"required": false
}
"minecraft:barrel"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:bookshelf",
{
"id": "#forge:bookshelves",
"required": false
}
"minecraft:bookshelf"
]
}
@@ -1,11 +1,8 @@
{
"values": [
"#forge:chests/ender",
"#forge:chests/trapped",
"#c:chests/wooden",
{
"id": "#forge:chests",
"required": false
}
"minecraft:copper_chest",
"#c:chests/ender",
"#c:chests/trapped",
"#c:chests/wooden"
]
}
@@ -1,10 +1,6 @@
{
"values": [
"minecraft:chest",
"minecraft:trapped_chest",
{
"id": "#forge:chests/wooden",
"required": false
}
"minecraft:trapped_chest"
]
}
@@ -1,12 +1,8 @@
{
"values": [
"#forge:cobblestone/normal",
"#forge:cobblestone/infested",
"#forge:cobblestone/mossy",
"#forge:cobblestone/deepslate",
{
"id": "#forge:cobblestone",
"required": false
}
"#c:cobblestones/normal",
"#c:cobblestones/infested",
"#c:cobblestones/mossy",
"#c:cobblestones/deepslate"
]
}
@@ -0,0 +1,5 @@
{
"values": [
"#c:fence_gates/wooden"
]
}
@@ -0,0 +1,6 @@
{
"values": [
"#c:fences/nether_brick",
"#c:fences/wooden"
]
}
@@ -15,10 +15,6 @@
"minecraft:wither_rose",
"minecraft:torchflower",
"minecraft:open_eyeblossom",
"minecraft:closed_eyeblossom",
{
"id": "#minecraft:small_flowers",
"required": false
}
"minecraft:closed_eyeblossom"
]
}
@@ -6,7 +6,7 @@
"minecraft:rose_bush",
"minecraft:pitcher_plant",
{
"id": "#minecraft:tall_flowers",
"id": "minecraft:tall_flowers",
"required": false
}
]
@@ -2,10 +2,6 @@
"values": [
"#c:glass_blocks/colorless",
"#c:glass_blocks/cheap",
"#c:glass_blocks/tinted",
{
"id": "#forge:glass",
"required": false
}
"#c:glass_blocks/tinted"
]
}
@@ -16,10 +16,6 @@
"minecraft:brown_stained_glass",
"minecraft:green_stained_glass",
"minecraft:red_stained_glass",
"minecraft:black_stained_glass",
{
"id": "#forge:glass/silica",
"required": false
}
"minecraft:black_stained_glass"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:glass",
{
"id": "#forge:glass/colorless",
"required": false
}
"minecraft:glass"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:tinted_glass",
{
"id": "#forge:glass/tinted",
"required": false
}
"minecraft:tinted_glass"
]
}
@@ -16,10 +16,6 @@
"minecraft:brown_stained_glass_pane",
"minecraft:green_stained_glass_pane",
"minecraft:red_stained_glass_pane",
"minecraft:black_stained_glass_pane",
{
"id": "#forge:glass_panes",
"required": false
}
"minecraft:black_stained_glass_pane"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:glass_pane",
{
"id": "#forge:glass_panes/colorless",
"required": false
}
"minecraft:glass_pane"
]
}
@@ -0,0 +1,6 @@
{
"values": [
"#c:natural_logs/nether",
"#c:natural_logs/overworld"
]
}
@@ -0,0 +1,6 @@
{
"values": [
"minecraft:crimson_stem",
"minecraft:warped_stem"
]
}
@@ -0,0 +1,13 @@
{
"values": [
"minecraft:acacia_log",
"minecraft:birch_log",
"minecraft:cherry_log",
"minecraft:dark_oak_log",
"minecraft:jungle_log",
"minecraft:mangrove_log",
"minecraft:oak_log",
"minecraft:pale_oak_log",
"minecraft:spruce_log"
]
}
@@ -0,0 +1,15 @@
{
"values": [
"minecraft:acacia_wood",
"minecraft:birch_wood",
"minecraft:cherry_wood",
"minecraft:crimson_hyphae",
"minecraft:dark_oak_wood",
"minecraft:jungle_wood",
"minecraft:mangrove_wood",
"minecraft:oak_wood",
"minecraft:pale_oak_wood",
"minecraft:spruce_wood",
"minecraft:warped_hyphae"
]
}
@@ -1,10 +1,6 @@
{
"values": [
"#c:obsidians/normal",
"#c:obsidians/crying",
{
"id": "#forge:obsidian",
"required": false
}
"#c:obsidians/crying"
]
}
+9 -13
View File
@@ -1,18 +1,14 @@
{
"values": [
"#forge:ores/coal",
"#forge:ores/copper",
"#forge:ores/diamond",
"#forge:ores/emerald",
"#forge:ores/gold",
"#forge:ores/iron",
"#forge:ores/lapis",
"#c:ores/coal",
"#c:ores/copper",
"#c:ores/diamond",
"#c:ores/emerald",
"#c:ores/gold",
"#c:ores/iron",
"#c:ores/lapis",
"#c:ores/netherite_scrap",
"#forge:ores/redstone",
"#c:ores/quartz",
{
"id": "#forge:ores",
"required": false
}
"#c:ores/redstone",
"#c:ores/quartz"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:ancient_debris",
{
"id": "#forge:ores/netherite_scrap",
"required": false
}
"minecraft:ancient_debris"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:nether_quartz_ore",
{
"id": "#forge:ores/quartz",
"required": false
}
"minecraft:nether_quartz_ore"
]
}
@@ -0,0 +1,6 @@
{
"values": [
"#c:sands/colorless",
"#c:sands/red"
]
}
@@ -1,10 +1,6 @@
{
"values": [
"#c:sandstone/red_blocks",
"#c:sandstone/uncolored_blocks",
{
"id": "#forge:sandstone",
"required": false
}
"#c:sandstone/uncolored_blocks"
]
}
@@ -16,53 +16,6 @@
"#c:storage_blocks/redstone",
"#c:storage_blocks/slime",
"#c:storage_blocks/wheat",
{
"id": "#forge:storage_blocks/coal",
"required": false
},
{
"id": "#forge:storage_blocks/copper",
"required": false
},
{
"id": "#forge:storage_blocks/diamond",
"required": false
},
{
"id": "#forge:storage_blocks/emerald",
"required": false
},
{
"id": "#forge:storage_blocks/gold",
"required": false
},
{
"id": "#forge:storage_blocks/iron",
"required": false
},
{
"id": "#forge:storage_blocks/lapis",
"required": false
},
{
"id": "#forge:storage_blocks/netherite",
"required": false
},
{
"id": "#forge:storage_blocks/raw_copper",
"required": false
},
{
"id": "#forge:storage_blocks/raw_gold",
"required": false
},
{
"id": "#forge:storage_blocks/raw_iron",
"required": false
},
{
"id": "#forge:storage_blocks/redstone",
"required": false
}
"#c:storage_blocks/resin"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:coal_block",
{
"id": "#forge:storage_blocks/coal",
"required": false
}
"minecraft:coal_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:copper_block",
{
"id": "#forge:storage_blocks/copper",
"required": false
}
"minecraft:copper_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:diamond_block",
{
"id": "#forge:storage_blocks/diamond",
"required": false
}
"minecraft:diamond_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:emerald_block",
{
"id": "#forge:storage_blocks/emerald",
"required": false
}
"minecraft:emerald_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:gold_block",
{
"id": "#forge:storage_blocks/gold",
"required": false
}
"minecraft:gold_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:iron_block",
{
"id": "#forge:storage_blocks/iron",
"required": false
}
"minecraft:iron_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:lapis_block",
{
"id": "#forge:storage_blocks/lapis",
"required": false
}
"minecraft:lapis_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:netherite_block",
{
"id": "#forge:storage_blocks/netherite",
"required": false
}
"minecraft:netherite_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:raw_copper_block",
{
"id": "#forge:storage_blocks/raw_copper",
"required": false
}
"minecraft:raw_copper_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:raw_gold_block",
{
"id": "#forge:storage_blocks/raw_gold",
"required": false
}
"minecraft:raw_gold_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:raw_iron_block",
{
"id": "#forge:storage_blocks/raw_iron",
"required": false
}
"minecraft:raw_iron_block"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:redstone_block",
{
"id": "#forge:storage_blocks/redstone",
"required": false
}
"minecraft:redstone_block"
]
}
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:resin_block"
]
}
@@ -4,10 +4,13 @@
"minecraft:stripped_bamboo_block",
"minecraft:stripped_birch_log",
"minecraft:stripped_cherry_log",
"minecraft:stripped_crimson_stem",
"minecraft:stripped_dark_oak_log",
"minecraft:stripped_jungle_log",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_oak_log",
"minecraft:stripped_spruce_log"
"minecraft:stripped_pale_oak_log",
"minecraft:stripped_spruce_log",
"minecraft:stripped_warped_stem"
]
}
@@ -3,10 +3,13 @@
"minecraft:stripped_acacia_wood",
"minecraft:stripped_birch_wood",
"minecraft:stripped_cherry_wood",
"minecraft:stripped_crimson_hyphae",
"minecraft:stripped_dark_oak_wood",
"minecraft:stripped_jungle_wood",
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_oak_wood",
"minecraft:stripped_spruce_wood"
"minecraft:stripped_pale_oak_wood",
"minecraft:stripped_spruce_wood",
"minecraft:stripped_warped_hyphae"
]
}
@@ -2,6 +2,8 @@
"values": [
"minecraft:acacia_boat",
"minecraft:acacia_chest_boat",
"minecraft:bamboo_chest_raft",
"minecraft:bamboo_raft",
"minecraft:birch_boat",
"minecraft:birch_chest_boat",
"minecraft:cherry_boat",
@@ -1,10 +1,6 @@
{
"values": [
"minecraft:ender_dragon",
"minecraft:wither",
{
"id": "#forge:bosses",
"required": false
}
"minecraft:wither"
]
}
@@ -0,0 +1,6 @@
{
"values": [
"minecraft:item_frame",
"minecraft:glow_item_frame"
]
}
@@ -4,9 +4,9 @@
"#minecraft:chest_armor",
"#minecraft:leg_armor",
"#minecraft:foot_armor",
{
"id": "#forge:armors",
"required": false
}
"#c:armors/horse",
"#c:armors/nautilus",
"#c:armors/wolf",
"#c:armors/humanoid"
]
}
@@ -0,0 +1,10 @@
{
"values": [
"minecraft:copper_horse_armor",
"minecraft:diamond_horse_armor",
"minecraft:golden_horse_armor",
"minecraft:iron_horse_armor",
"minecraft:leather_horse_armor",
"minecraft:netherite_horse_armor"
]
}
@@ -0,0 +1,33 @@
{
"values": [
"minecraft:chainmail_boots",
"minecraft:chainmail_chestplate",
"minecraft:chainmail_helmet",
"minecraft:chainmail_leggings",
"minecraft:copper_boots",
"minecraft:copper_chestplate",
"minecraft:copper_helmet",
"minecraft:copper_leggings",
"minecraft:diamond_boots",
"minecraft:diamond_chestplate",
"minecraft:diamond_helmet",
"minecraft:diamond_leggings",
"minecraft:golden_boots",
"minecraft:golden_chestplate",
"minecraft:golden_helmet",
"minecraft:golden_leggings",
"minecraft:iron_boots",
"minecraft:iron_chestplate",
"minecraft:iron_helmet",
"minecraft:iron_leggings",
"minecraft:leather_boots",
"minecraft:leather_chestplate",
"minecraft:leather_helmet",
"minecraft:leather_leggings",
"minecraft:netherite_boots",
"minecraft:netherite_chestplate",
"minecraft:netherite_helmet",
"minecraft:netherite_leggings",
"minecraft:turtle_helmet"
]
}
@@ -0,0 +1,9 @@
{
"values": [
"minecraft:copper_nautilus_armor",
"minecraft:diamond_nautilus_armor",
"minecraft:golden_nautilus_armor",
"minecraft:iron_nautilus_armor",
"minecraft:netherite_nautilus_armor"
]
}
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:wolf_armor"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"#c:barrels/wooden",
{
"id": "#forge:barrels",
"required": false
}
"#c:barrels/wooden"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:barrel",
{
"id": "#forge:barrels/wooden",
"required": false
}
"minecraft:barrel"
]
}
@@ -1,9 +1,5 @@
{
"values": [
"minecraft:bookshelf",
{
"id": "#forge:bookshelves",
"required": false
}
"minecraft:bookshelf"
]
}
@@ -1,6 +1,7 @@
{
"values": [
"#c:bricks/normal",
"#c:bricks/nether"
"#c:bricks/nether",
"#c:bricks/resin"
]
}
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:resin_brick"
]
}
@@ -1,11 +1,8 @@
{
"values": [
"#forge:chests/ender",
"#forge:chests/trapped",
"#c:chests/wooden",
{
"id": "#forge:chests",
"required": false
}
"minecraft:copper_chest",
"#c:chests/ender",
"#c:chests/trapped",
"#c:chests/wooden"
]
}
@@ -1,10 +1,6 @@
{
"values": [
"minecraft:chest",
"minecraft:trapped_chest",
{
"id": "#forge:chests/wooden",
"required": false
}
"minecraft:trapped_chest"
]
}
@@ -0,0 +1,5 @@
{
"values": [
"#c:clumps/resin"
]
}
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:resin_clump"
]
}
Loaded 100 of 1558 files, more files were not shown because too many files have changed in this diff. Show more