From e6b1a0351f02b1aae14924db2c928bacc06f2f29 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Sat, 18 Oct 2025 20:54:45 +0200 Subject: [PATCH 1/2] Add launch and task configuration files for CreateNuclearForge --- .vscode/launch.json | 65 +++++++++++++++++++++++++++++++++++++++++++++ .vscode/tasks.json | 37 ++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..9c99e0c7 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,65 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "runClient", + "request": "launch", + "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", + "projectName": "CreateNuclearForge", + "cwd": "${workspaceFolder}\\run", + "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\build\\classpath\\runClient_minecraftClasspath.txt\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge/build/createSrgToMcp/output.srg\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dforge.enableGameTest\u003dtrue -Dmixin.debug.verbose\u003dtrue -Dmixin.debug.export\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p \"C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.10\\51e6a22c6c716beb11e244bf5b8be480f51dd6b5\\securejarhandler-2.1.10.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.5\\19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0\\asm-commons-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.5\\64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe\\asm-util-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.5\\490bacc77de7cbc0be1a30bb3471072d705be4a4\\asm-analysis-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.5\\fd33c8b6373abaa675be407082fdfda35021254a\\asm-tree-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.5\\dc6ea1875f4d64fbc85e1691c95b96a3d8569c90\\asm-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar\" --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming -XX:HeapDumpPath\u003dMojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump", + "args": "--launchTarget forgeclientuserdev --version MOD_DEV --assetIndex 5 --assetsDir \"C:\\Users\\Jean Paul\\.gradle\\caches\\forge_gradle\\assets\" --gameDir . --fml.forgeVersion 47.2.6 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mixin.config createnuclear.forge.mixins.json", + "env": { + "MOD_CLASSES": "createnuclear%%${workspaceFolder}\\build\\resources\\main;createnuclear%%${workspaceFolder}\\build\\classes\\java\\main", + "MCP_MAPPINGS": "parchment_2023.09.03-1.20.1" + }, + "preLaunchTask": "prepareRunClientCompile" + }, + { + "type": "java", + "name": "runData", + "request": "launch", + "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", + "projectName": "CreateNuclearForge", + "cwd": "${workspaceFolder}\\run", + "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES,REGISTRYDUMP \"-DlegacyClassPath.file\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\build\\classpath\\runData_minecraftClasspath.txt\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge/build/createSrgToMcp/output.srg\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dmixin.debug.verbose\u003dtrue -Dmixin.debug.export\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p \"C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.10\\51e6a22c6c716beb11e244bf5b8be480f51dd6b5\\securejarhandler-2.1.10.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.5\\19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0\\asm-commons-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.5\\64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe\\asm-util-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.5\\490bacc77de7cbc0be1a30bb3471072d705be4a4\\asm-analysis-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.5\\fd33c8b6373abaa675be407082fdfda35021254a\\asm-tree-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.5\\dc6ea1875f4d64fbc85e1691c95b96a3d8569c90\\asm-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar\" --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", + "args": "--launchTarget forgedatauserdev --assetIndex 5 --assetsDir \"C:\\Users\\Jean Paul\\.gradle\\caches\\forge_gradle\\assets\" --gameDir . --fml.forgeVersion 47.2.6 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mod createnuclear --all --output \"C:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\src\\generated\\resources\" --existing \"C:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\src\\main\\resources\" --mixin.config createnuclear.forge.mixins.json", + "env": { + "MOD_CLASSES": "createnuclear%%${workspaceFolder}\\build\\resources\\main;createnuclear%%${workspaceFolder}\\build\\classes\\java\\main", + "MCP_MAPPINGS": "parchment_2023.09.03-1.20.1" + }, + "preLaunchTask": "prepareRunDataCompile" + }, + { + "type": "java", + "name": "runGameTestServer", + "request": "launch", + "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", + "projectName": "CreateNuclearForge", + "cwd": "${workspaceFolder}\\run\\gametest", + "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\build\\classpath\\runGameTestServer_minecraftClasspath.txt\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge/build/createSrgToMcp/output.srg\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dmixin.debug.verbose\u003dtrue -Dmixin.debug.export\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p \"C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.10\\51e6a22c6c716beb11e244bf5b8be480f51dd6b5\\securejarhandler-2.1.10.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.5\\19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0\\asm-commons-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.5\\64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe\\asm-util-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.5\\490bacc77de7cbc0be1a30bb3471072d705be4a4\\asm-analysis-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.5\\fd33c8b6373abaa675be407082fdfda35021254a\\asm-tree-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.5\\dc6ea1875f4d64fbc85e1691c95b96a3d8569c90\\asm-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar\" --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", + "args": "--launchTarget forgegametestserveruserdev --gameDir . --fml.forgeVersion 47.2.6 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mixin.config createnuclear.forge.mixins.json", + "env": { + "MOD_CLASSES": "createnuclear%%${workspaceFolder}\\build\\resources\\main;createnuclear%%${workspaceFolder}\\build\\classes\\java\\main", + "MCP_MAPPINGS": "parchment_2023.09.03-1.20.1" + }, + "preLaunchTask": "prepareRunGameTestServerCompile" + }, + { + "type": "java", + "name": "runServer", + "request": "launch", + "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", + "projectName": "CreateNuclearForge", + "cwd": "${workspaceFolder}\\run\\server", + "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\build\\classpath\\runServer_minecraftClasspath.txt\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge/build/createSrgToMcp/output.srg\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\Jean Paul\\Desktop\\mod_fabric\\CreateNuclearForge\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dforge.enableGameTest\u003dtrue -Dmixin.debug.verbose\u003dtrue -Dmixin.debug.export\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p \"C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.10\\51e6a22c6c716beb11e244bf5b8be480f51dd6b5\\securejarhandler-2.1.10.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.5\\19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0\\asm-commons-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.5\\64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe\\asm-util-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.5\\490bacc77de7cbc0be1a30bb3471072d705be4a4\\asm-analysis-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.5\\fd33c8b6373abaa675be407082fdfda35021254a\\asm-tree-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.5\\dc6ea1875f4d64fbc85e1691c95b96a3d8569c90\\asm-9.5.jar;C:\\Users\\Jean Paul\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar\" --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", + "args": "--launchTarget forgeserveruserdev --gameDir . --fml.forgeVersion 47.2.6 --fml.mcVersion 1.20.1 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230612.114412 --mixin.config createnuclear.forge.mixins.json", + "env": { + "MOD_CLASSES": "createnuclear%%${workspaceFolder}\\build\\resources\\main;createnuclear%%${workspaceFolder}\\build\\classes\\java\\main", + "MCP_MAPPINGS": "parchment_2023.09.03-1.20.1" + }, + "preLaunchTask": "prepareRunServerCompile" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..5423194b --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,37 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "prepareRunClientCompile", + "type": "shell", + "command": "./gradlew prepareRunClientCompile", + "options": { + "cwd": "${workspaceFolder}" + } + }, + { + "label": "prepareRunDataCompile", + "type": "shell", + "command": "./gradlew prepareRunDataCompile", + "options": { + "cwd": "${workspaceFolder}" + } + }, + { + "label": "prepareRunGameTestServerCompile", + "type": "shell", + "command": "./gradlew prepareRunGameTestServerCompile", + "options": { + "cwd": "${workspaceFolder}" + } + }, + { + "label": "prepareRunServerCompile", + "type": "shell", + "command": "./gradlew prepareRunServerCompile", + "options": { + "cwd": "${workspaceFolder}" + } + } + ] +} \ No newline at end of file From e29bb3bbf500e6780fdf1f56421f615faa4b4e82 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Sat, 18 Oct 2025 20:55:48 +0200 Subject: [PATCH 2/2] fix-Tags-#68: Updated Update item tags and localization for anti-radiation gear; refactor mixing recipes --- .../15812fa7bc190aa8f0a8644088c7ff563925e506 | 6 +-- .../3c9854c256b4d84dd9b4b92d1a03ceb45298124f | 19 +++---- .../assets/createnuclear/lang/en_ud.json | 9 ++-- .../assets/createnuclear/lang/en_us.json | 9 ++-- .../createnuclear/recipes/mixing/steel.json | 2 +- .../recipes/mixing/uranium_fluid.json | 2 +- .../data/forge/tags/items/armors.json | 53 ------------------- .../forge/tags/items/{ => armors}/boots.json | 0 .../tags/items/{ => armors}/chestplates.json | 0 .../tags/items/{ => armors}/helmets.json | 0 .../tags/items/{ => armors}/leggings.json | 0 .../data/forge/tags/items/dusts.json | 1 + .../data/forge/tags/items/dusts/coal.json | 5 ++ .../data/forge/tags/items/dusts/uranium.json | 5 ++ .../nuclearteam/createnuclear/CNItems.java | 21 ++++---- .../data/recipe/CNMixingRecipeGen.java | 4 +- .../foundation/mixin/BaseFireBlockMixin.java | 2 +- 17 files changed, 51 insertions(+), 87 deletions(-) delete mode 100644 src/generated/resources/data/forge/tags/items/armors.json rename src/generated/resources/data/forge/tags/items/{ => armors}/boots.json (100%) rename src/generated/resources/data/forge/tags/items/{ => armors}/chestplates.json (100%) rename src/generated/resources/data/forge/tags/items/{ => armors}/helmets.json (100%) rename src/generated/resources/data/forge/tags/items/{ => armors}/leggings.json (100%) create mode 100644 src/generated/resources/data/forge/tags/items/dusts/coal.json create mode 100644 src/generated/resources/data/forge/tags/items/dusts/uranium.json diff --git a/src/generated/resources/.cache/15812fa7bc190aa8f0a8644088c7ff563925e506 b/src/generated/resources/.cache/15812fa7bc190aa8f0a8644088c7ff563925e506 index 43cdb6b6..7c590142 100644 --- a/src/generated/resources/.cache/15812fa7bc190aa8f0a8644088c7ff563925e506 +++ b/src/generated/resources/.cache/15812fa7bc190aa8f0a8644088c7ff563925e506 @@ -1,4 +1,4 @@ -// 1.20.1 2025-05-27T20:12:08.2853318 CreateNuclear's Processing Recipes +// 1.20.1 2025-10-18T20:38:48.8956666 CreateNuclear's Processing Recipes d02fe65c0c4f06b58fa7565d7254902de5018e8b data/createnuclear/advancements/recipes/building_blocks/shapeless/cloth/black_cloth.json 9690e12858db1c546576ce70847e723c005f814e data/createnuclear/advancements/recipes/building_blocks/shapeless/cloth/blue_cloth.json 3bebcd85a99be0ddec8db66c5734232ac4bbd2ad data/createnuclear/advancements/recipes/building_blocks/shapeless/cloth/brown_cloth.json @@ -40,8 +40,8 @@ f2d3a2dbcb9135e31261cc8408f11cd07038a826 data/createnuclear/recipes/item_applica 8228bb2d850dfd474e2ce142ac9a0ff6ab707f07 data/createnuclear/recipes/mechanical_crafting/reactor_core.json 48db9006423a3762a24c7cae7a3534f124aa0e4c data/createnuclear/recipes/mechanical_crafting/reactor_frame.json 0a1d26105f14cb2a01b18b9f050c900412f917fb data/createnuclear/recipes/mechanical_crafting/uranium_rod.json -21619f6b573091dd880541f61af3c1b1b8d495e4 data/createnuclear/recipes/mixing/steel.json -a9895b29715ad4cce9d97c158677bfcf21eaff14 data/createnuclear/recipes/mixing/uranium_fluid.json +7fc7695cd03577131096e9695170193044f8bc1a data/createnuclear/recipes/mixing/steel.json +23e57de458330d04dfebff8070b44b3b1b2718eb data/createnuclear/recipes/mixing/uranium_fluid.json ee4d2bf63449ba88826be263cf98e4bba2927ced data/createnuclear/recipes/pressing/graphene.json 1713ce33da8ce2fd0145e9921cab615d31fa5e66 data/createnuclear/recipes/shapeless/cloth/black_cloth.json 0d0c71a2b494a34439cb2d7873b31083b07877b0 data/createnuclear/recipes/shapeless/cloth/blue_cloth.json diff --git a/src/generated/resources/.cache/3c9854c256b4d84dd9b4b92d1a03ceb45298124f b/src/generated/resources/.cache/3c9854c256b4d84dd9b4b92d1a03ceb45298124f index 1f148f4f..c76378ae 100644 --- a/src/generated/resources/.cache/3c9854c256b4d84dd9b4b92d1a03ceb45298124f +++ b/src/generated/resources/.cache/3c9854c256b4d84dd9b4b92d1a03ceb45298124f @@ -1,4 +1,4 @@ -// 1.20.1 2025-05-24T17:17:58.5625935 Registrate Provider for createnuclear [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.20.1 2025-10-18T20:49:25.4930742 Registrate Provider for createnuclear [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 0b2c76c9cff305eacfdfb57c4b703f94ca6dc903 assets/createnuclear/blockstates/autunite.json 5d06bc544bcbeb7443178d66955bb5101cf696da assets/createnuclear/blockstates/autunite_pillar.json 5b375444ac5057e63776f4991589c57824574b4a assets/createnuclear/blockstates/cut_autunite.json @@ -38,8 +38,8 @@ a2fc21fa320e677fe7690b260ee3f57ebdbd50b6 assets/createnuclear/blockstates/small_ 57c846a957e9250bc45f2f1091bf3f78b2a77344 assets/createnuclear/blockstates/steel_block.json de2884054a21315d8b167f64b206be331d388420 assets/createnuclear/blockstates/uranium.json 4557f548df100ae1d05e3b5711797225f6a39673 assets/createnuclear/blockstates/uranium_ore.json -a88689839af8cd0e82f47f4b8bef5ed383c11782 assets/createnuclear/lang/en_ud.json -b158b3d709a4465d8cebf293d764bca67db94078 assets/createnuclear/lang/en_us.json +81907ba20f0105785a5926b0e96afdd421cdbc6b assets/createnuclear/lang/en_ud.json +936ceecee4d1c0742ef305edd30559a55c1ebcb5 assets/createnuclear/lang/en_us.json a8495d2cd5e38213683becaf1c84b2852f8b06f5 assets/createnuclear/models/block/autunite_natural_0.json 29394a22ee8655dc22ea51563411505fbcfd2dab assets/createnuclear/models/block/autunite_natural_1.json 9e4f83de1ca7a9ab5363f43fc7c3f7f4ec6164d5 assets/createnuclear/models/block/autunite_natural_2.json @@ -359,18 +359,19 @@ a7258ae3454252e874b324fbd81b880ce52759c4 data/forge/tags/blocks/storage_blocks/l 0aafd338eaffcc3f48fb8dc9d18fc969318b06e0 data/forge/tags/blocks/storage_blocks/raw_uranium.json f8074cdbc6e2b560acb4e9da953b23f9825486a6 data/forge/tags/blocks/storage_blocks/steel.json a63487094743744be756ad497f483fcd4d11e9bc data/forge/tags/fluids/uranium.json -7422c4cd9d6dd716f91311faa1fb7e26aa9ac345 data/forge/tags/items/armors.json -fadb3957b979d82146790ef3550e38606760421e data/forge/tags/items/boots.json +fadb3957b979d82146790ef3550e38606760421e data/forge/tags/items/armors/boots.json +0845acff015f78c494df2cd6754c5cff10d77c05 data/forge/tags/items/armors/chestplates.json +b5d23f0bc26a4e3a72cde40f3c6d59c03c818b4d data/forge/tags/items/armors/helmets.json +bebad856ee0f047735060f28544eb6149d8c2b20 data/forge/tags/items/armors/leggings.json 9ac9f967f480bbbe186815331a7e1771c8feea57 data/forge/tags/items/buckets/uranium.json -0845acff015f78c494df2cd6754c5cff10d77c05 data/forge/tags/items/chestplates.json 25c93720c5221fac9aeb0ae47182ef59e0a0c2bb data/forge/tags/items/coal_dusts.json -25c93720c5221fac9aeb0ae47182ef59e0a0c2bb data/forge/tags/items/dusts.json +4c65712ad229579aed33c75220c37f9a70134cb2 data/forge/tags/items/dusts.json +25c93720c5221fac9aeb0ae47182ef59e0a0c2bb data/forge/tags/items/dusts/coal.json +69b53861489d10b3a836be9812af97c999833470 data/forge/tags/items/dusts/uranium.json 75f0600da4891d0f4a3329fb44cac6c4945a0b49 data/forge/tags/items/glass.json -b5d23f0bc26a4e3a72cde40f3c6d59c03c818b4d data/forge/tags/items/helmets.json 81d5270bd69ab7d6ffef70dc7867a498202eb4b4 data/forge/tags/items/ingots.json 30fa647448df4131c1d6460756f18583a493ee31 data/forge/tags/items/ingots/lead.json 24bc6e0cdae825d9e5d1500567ae81d83c15a88d data/forge/tags/items/ingots/steel.json -bebad856ee0f047735060f28544eb6149d8c2b20 data/forge/tags/items/leggings.json 3245aa72f5bb5f83632ab05f449e8a2d576ac386 data/forge/tags/items/nuggets.json 41ff866ec94383906342a0d1594554e3063b9d0f data/forge/tags/items/nuggets/lead.json 1ec402fda0c91947be220066973f79f3e522663f data/forge/tags/items/nuggets/steel.json diff --git a/src/generated/resources/assets/createnuclear/lang/en_ud.json b/src/generated/resources/assets/createnuclear/lang/en_ud.json index 809e491d..fdc2c9fb 100644 --- a/src/generated/resources/assets/createnuclear/lang/en_ud.json +++ b/src/generated/resources/assets/createnuclear/lang/en_ud.json @@ -107,8 +107,6 @@ "create.recipe.fan_enriched.fan": "ǝɹıℲ pǝɥɔıɹuƎ puıɥǝq uɐℲ", "createnuclear.enriched.fan.recipe": "buıɥɔıɹuƎ ʞןnᗺ", "createnuclear.generic.unit.heat": "Ὁ", - "createnuclear.gui.createnuclear.reactor_controller.title": "ɹǝןןoɹʇuoƆ ɹoʇɔɐǝᴚ", - "createnuclear.gui.createnuclear.reactor_input.title": "ǝbɐɹoʇS ʇnduI ɹoʇɔɐǝᴚ", "createnuclear.gui.reactor_controller.info_header.title": "ǝnןɐʌ ʇɐǝH", "createnuclear.ponder.reactor.header": "ɹoʇɔɐǝɹ ǝɥʇ ɟo uoıʇɔnɹʇsuoƆ", "createnuclear.ponder.reactor.text_1": "Ɩ ɹooןℲ", @@ -138,6 +136,8 @@ "entity.createnuclear.irradiated_chicken": "uǝʞɔıɥƆ pǝʇɐıpɐɹɹI", "entity.createnuclear.irradiated_wolf": "ɟןoM pǝʇɐıpɐɹɹI", "fluid.createnuclear.uranium": "ɯnıuɐɹ∩ pınbıꞀ", + "gui.createnuclear.reactor_controller.title": "ɹǝןןoɹʇuoƆ ɹoʇɔɐǝᴚ", + "gui.createnuclear.reactor_input.title": "ǝbɐɹoʇS ʇnduI ɹoʇɔɐǝᴚ", "item.createnuclear.anti_radiation_boots": "sʇooᗺ uoıʇɐıpɐᴚ ıʇuⱯ", "item.createnuclear.black_anti_radiation_chestplate": "ǝʇɐןdʇsǝɥƆ uoıʇɐıpɐᴚ ıʇuⱯ ʞɔɐןᗺ", "item.createnuclear.black_anti_radiation_helmet": "ʇǝɯןǝH uoıʇɐıpɐᴚ ıʇuⱯ ʞɔɐןᗺ", @@ -241,10 +241,11 @@ "item.minecraft.tipped_arrow.effect.potion_of_radiation_2": "uoıʇɐıpɐᴚ ɟo ʍoɹɹⱯ", "item.minecraft.tipped_arrow.effect.potion_of_radiation_augment_1": "uoıʇɐıpɐᴚ ɟo ʍoɹɹⱯ", "itemGroup.createnuclear.main": "ɹɐǝןɔnN ǝʇɐǝɹƆ", - "overlay.event_message": "ɹǝɯıʇ %s ⚠ buıuɹɐM ⚠", + "itemgroup.uranium": "dnoɹ⅁ ɯnıuɐɹ∩", + "overlay.event_message": "ɹǝɯıʇ %s  šâ buıuɹɐM  šâ", "reactor.info.assembled.creator": "pǝןqɯǝssɐ uǝǝq sɐɥ ɹoʇɔɐǝᴚ", "reactor.info.assembled.destroyer": "pǝןqɯǝssɐsıp uǝǝq sɐɥ ɹoʇɔɐǝᴚ", - "reactor.info.assembled.none": "pǝןqɯǝssɐ ʇou ʞɔoןqıʇןnW", + "reactor.info.assembled.none": "pǝןqɯǝssɐ ʇou sı ɹoʇɔɐǝᴚ", "reactor.info.is": "sı ɹǝןןoɹʇuoɔ", "reactor.item.gui.name": "uɹǝʇʇɐԀ bıɟuoƆ", "reactor.update.casing.input": "ʇnduı uı buısɐɔ ǝɥʇ ǝʇɐpd∩", diff --git a/src/generated/resources/assets/createnuclear/lang/en_us.json b/src/generated/resources/assets/createnuclear/lang/en_us.json index 68d32f19..bcedf177 100644 --- a/src/generated/resources/assets/createnuclear/lang/en_us.json +++ b/src/generated/resources/assets/createnuclear/lang/en_us.json @@ -107,8 +107,6 @@ "create.recipe.fan_enriched.fan": "Fan behind Enriched Fire", "createnuclear.enriched.fan.recipe": "Bulk Enriching", "createnuclear.generic.unit.heat": "Q", - "createnuclear.gui.createnuclear.reactor_controller.title": "Reactor Controller", - "createnuclear.gui.createnuclear.reactor_input.title": "Reactor Input Storage", "createnuclear.gui.reactor_controller.info_header.title": "Heat value", "createnuclear.ponder.reactor.header": "Construction of the reactor", "createnuclear.ponder.reactor.text_1": "Floor 1", @@ -138,6 +136,8 @@ "entity.createnuclear.irradiated_chicken": "Irradiated Chicken", "entity.createnuclear.irradiated_wolf": "Irradiated Wolf", "fluid.createnuclear.uranium": "Liquid Uranium", + "gui.createnuclear.reactor_controller.title": "Reactor Controller", + "gui.createnuclear.reactor_input.title": "Reactor Input Storage", "item.createnuclear.anti_radiation_boots": "Anti Radiation Boots", "item.createnuclear.black_anti_radiation_chestplate": "Black Anti Radiation Chestplate", "item.createnuclear.black_anti_radiation_helmet": "Black Anti Radiation Helmet", @@ -241,10 +241,11 @@ "item.minecraft.tipped_arrow.effect.potion_of_radiation_2": "Arrow of Radiation", "item.minecraft.tipped_arrow.effect.potion_of_radiation_augment_1": "Arrow of Radiation", "itemGroup.createnuclear.main": "Create Nuclear", - "overlay.event_message": "⚠ Warning ⚠ %s timer", + "itemgroup.uranium": "Uranium Group", + "overlay.event_message": "âš  Warning âš  %s timer", "reactor.info.assembled.creator": "Reactor has been assembled", "reactor.info.assembled.destroyer": "Reactor has been disassembled", - "reactor.info.assembled.none": "Multiblock not assembled", + "reactor.info.assembled.none": "Reactor is not assembled", "reactor.info.is": "controller is", "reactor.item.gui.name": "Config Pattern", "reactor.update.casing.input": "Update the casing in input", diff --git a/src/generated/resources/data/createnuclear/recipes/mixing/steel.json b/src/generated/resources/data/createnuclear/recipes/mixing/steel.json index e040a0c5..d0f34b44 100644 --- a/src/generated/resources/data/createnuclear/recipes/mixing/steel.json +++ b/src/generated/resources/data/createnuclear/recipes/mixing/steel.json @@ -2,7 +2,7 @@ "type": "create:mixing", "ingredients": [ { - "tag": "forge:coal_dusts" + "tag": "forge:dusts/coal" }, { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/createnuclear/recipes/mixing/uranium_fluid.json b/src/generated/resources/data/createnuclear/recipes/mixing/uranium_fluid.json index d9c05fc0..fd6222f3 100644 --- a/src/generated/resources/data/createnuclear/recipes/mixing/uranium_fluid.json +++ b/src/generated/resources/data/createnuclear/recipes/mixing/uranium_fluid.json @@ -2,7 +2,7 @@ "type": "create:mixing", "ingredients": [ { - "item": "createnuclear:uranium_powder" + "tag": "forge:dusts/uranium" } ], "results": [ diff --git a/src/generated/resources/data/forge/tags/items/armors.json b/src/generated/resources/data/forge/tags/items/armors.json deleted file mode 100644 index 4151900f..00000000 --- a/src/generated/resources/data/forge/tags/items/armors.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "values": [ - "createnuclear:white_anti_radiation_helmet", - "createnuclear:orange_anti_radiation_helmet", - "createnuclear:magenta_anti_radiation_helmet", - "createnuclear:light_blue_anti_radiation_helmet", - "createnuclear:yellow_anti_radiation_helmet", - "createnuclear:lime_anti_radiation_helmet", - "createnuclear:pink_anti_radiation_helmet", - "createnuclear:gray_anti_radiation_helmet", - "createnuclear:light_gray_anti_radiation_helmet", - "createnuclear:cyan_anti_radiation_helmet", - "createnuclear:purple_anti_radiation_helmet", - "createnuclear:blue_anti_radiation_helmet", - "createnuclear:brown_anti_radiation_helmet", - "createnuclear:green_anti_radiation_helmet", - "createnuclear:red_anti_radiation_helmet", - "createnuclear:black_anti_radiation_helmet", - "createnuclear:white_anti_radiation_chestplate", - "createnuclear:orange_anti_radiation_chestplate", - "createnuclear:magenta_anti_radiation_chestplate", - "createnuclear:light_blue_anti_radiation_chestplate", - "createnuclear:yellow_anti_radiation_chestplate", - "createnuclear:lime_anti_radiation_chestplate", - "createnuclear:pink_anti_radiation_chestplate", - "createnuclear:gray_anti_radiation_chestplate", - "createnuclear:light_gray_anti_radiation_chestplate", - "createnuclear:cyan_anti_radiation_chestplate", - "createnuclear:purple_anti_radiation_chestplate", - "createnuclear:blue_anti_radiation_chestplate", - "createnuclear:brown_anti_radiation_chestplate", - "createnuclear:green_anti_radiation_chestplate", - "createnuclear:red_anti_radiation_chestplate", - "createnuclear:black_anti_radiation_chestplate", - "createnuclear:white_anti_radiation_leggings", - "createnuclear:orange_anti_radiation_leggings", - "createnuclear:magenta_anti_radiation_leggings", - "createnuclear:light_blue_anti_radiation_leggings", - "createnuclear:yellow_anti_radiation_leggings", - "createnuclear:lime_anti_radiation_leggings", - "createnuclear:pink_anti_radiation_leggings", - "createnuclear:gray_anti_radiation_leggings", - "createnuclear:light_gray_anti_radiation_leggings", - "createnuclear:cyan_anti_radiation_leggings", - "createnuclear:purple_anti_radiation_leggings", - "createnuclear:blue_anti_radiation_leggings", - "createnuclear:brown_anti_radiation_leggings", - "createnuclear:green_anti_radiation_leggings", - "createnuclear:red_anti_radiation_leggings", - "createnuclear:black_anti_radiation_leggings", - "createnuclear:anti_radiation_boots" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/boots.json b/src/generated/resources/data/forge/tags/items/armors/boots.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/boots.json rename to src/generated/resources/data/forge/tags/items/armors/boots.json diff --git a/src/generated/resources/data/forge/tags/items/chestplates.json b/src/generated/resources/data/forge/tags/items/armors/chestplates.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/chestplates.json rename to src/generated/resources/data/forge/tags/items/armors/chestplates.json diff --git a/src/generated/resources/data/forge/tags/items/helmets.json b/src/generated/resources/data/forge/tags/items/armors/helmets.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/helmets.json rename to src/generated/resources/data/forge/tags/items/armors/helmets.json diff --git a/src/generated/resources/data/forge/tags/items/leggings.json b/src/generated/resources/data/forge/tags/items/armors/leggings.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/leggings.json rename to src/generated/resources/data/forge/tags/items/armors/leggings.json diff --git a/src/generated/resources/data/forge/tags/items/dusts.json b/src/generated/resources/data/forge/tags/items/dusts.json index 84c8f569..16ed2299 100644 --- a/src/generated/resources/data/forge/tags/items/dusts.json +++ b/src/generated/resources/data/forge/tags/items/dusts.json @@ -1,5 +1,6 @@ { "values": [ + "createnuclear:uranium_powder", "createnuclear:coal_dust" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/coal.json b/src/generated/resources/data/forge/tags/items/dusts/coal.json new file mode 100644 index 00000000..84c8f569 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/coal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "createnuclear:coal_dust" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/uranium.json b/src/generated/resources/data/forge/tags/items/dusts/uranium.json new file mode 100644 index 00000000..f96cdf12 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/uranium.json @@ -0,0 +1,5 @@ +{ + "values": [ + "createnuclear:uranium_powder" + ] +} \ No newline at end of file diff --git a/src/main/java/net/nuclearteam/createnuclear/CNItems.java b/src/main/java/net/nuclearteam/createnuclear/CNItems.java index 0fe889a8..7132ff29 100644 --- a/src/main/java/net/nuclearteam/createnuclear/CNItems.java +++ b/src/main/java/net/nuclearteam/createnuclear/CNItems.java @@ -26,7 +26,7 @@ import java.util.function.Supplier; -@SuppressWarnings({"unused", "deprecation"}) +@SuppressWarnings({"deprecation"}) public class CNItems { public static final ItemEntry @@ -53,6 +53,7 @@ public class CNItems { URANIUM_POWDER = CreateNuclear.REGISTRATE .item("uranium_powder", Item::new) + .tag(CNTags.forgeItemTag("dusts"), CNTags.forgeItemTag("dusts/uranium")) .register(), STEEL_INGOT = CreateNuclear.REGISTRATE @@ -62,7 +63,7 @@ public class CNItems { COAL_DUST = CreateNuclear.REGISTRATE .item("coal_dust", Item::new) - .tag(CNTags.forgeItemTag("dusts"), CNTags.forgeItemTag("coal_dusts")) + .tag(CNTags.forgeItemTag("dusts"), CNTags.forgeItemTag("coal_dusts"), CNTags.forgeItemTag("dusts/coal")) .register(), GRAPHITE_ROD = CreateNuclear.REGISTRATE @@ -103,8 +104,7 @@ public class CNItems { String colorName = color.getSerializedName(); return CreateNuclear.REGISTRATE.item(colorName + "_anti_radiation_helmet", p -> new Helmet(p, color)) .tag( - CNTags.forgeItemTag("helmets"), - CNTags.forgeItemTag("armors"), + CNTags.forgeItemTag("armors/helmets"), getHelmetTag(colorName), CNItemTags.ALL_ANTI_RADIATION_ARMORS.tag, CNItemTags.ANTI_RADIATION_HELMET_FULL_DYE.tag @@ -120,8 +120,7 @@ public class CNItems { return CreateNuclear.REGISTRATE.item(colorName + "_anti_radiation_chestplate", p -> new Chestplate(p, color)) .tag( - CNTags.forgeItemTag("chestplates"), - CNTags.forgeItemTag("armors"), + CNTags.forgeItemTag("armors/chestplates"), getChestplateTag(colorName), CNItemTags.ALL_ANTI_RADIATION_ARMORS.tag, CNItemTags.ANTI_RADIATION_CHESTPLATE_FULL_DYE.tag @@ -136,8 +135,7 @@ public class CNItems { String colorName = color.getSerializedName(); return CreateNuclear.REGISTRATE.item(colorName + "_anti_radiation_leggings", p -> new Leggings(p, color)) .tag( - CNTags.forgeItemTag("leggings"), - CNTags.forgeItemTag("armors"), + CNTags.forgeItemTag("armors/leggings"), getLeggingsTag(colorName), CNItemTags.ALL_ANTI_RADIATION_ARMORS.tag, CNItemTags.ANTI_RADIATION_LEGGINGS_FULL_DYE.tag @@ -150,7 +148,12 @@ public class CNItems { public static final ItemEntry ANTI_RADIATION_BOOTS = CreateNuclear.REGISTRATE.item("anti_radiation_boots", Boot::new) - .tag(CNTags.forgeItemTag("boots"), CNTags.forgeItemTag("armors"), CNItemTags.ANTI_RADIATION_BOOTS_DYE.tag, CNItemTags.ANTI_RADIATION_ARMOR.tag, CNItemTags.ALL_ANTI_RADIATION_ARMORS.tag) + .tag( + CNTags.forgeItemTag("armors/boots"), + CNItemTags.ANTI_RADIATION_BOOTS_DYE.tag, + CNItemTags.ANTI_RADIATION_ARMOR.tag, + CNItemTags.ALL_ANTI_RADIATION_ARMORS.tag + ) .lang("Anti Radiation Boots") .model((c, p) -> p.generated(c, CreateNuclear.asResource("item/armors/anti_radiation_boots"))) .register(); diff --git a/src/main/java/net/nuclearteam/createnuclear/foundation/data/recipe/CNMixingRecipeGen.java b/src/main/java/net/nuclearteam/createnuclear/foundation/data/recipe/CNMixingRecipeGen.java index a779de9a..6aa6f66c 100644 --- a/src/main/java/net/nuclearteam/createnuclear/foundation/data/recipe/CNMixingRecipeGen.java +++ b/src/main/java/net/nuclearteam/createnuclear/foundation/data/recipe/CNMixingRecipeGen.java @@ -19,13 +19,13 @@ public class CNMixingRecipeGen extends CNProcessingRecipeGen { GeneratedRecipe STEEL = create("steel", b -> b - .require(CNTags.forgeItemTag("coal_dusts")) + .require(CNTags.forgeItemTag("dusts/coal")) .require(Tags.Items.INGOTS_IRON) .output(CNItems.STEEL_INGOT) ), URANIUM_FLUID = create("uranium_fluid", b -> b - .require(CNItems.URANIUM_POWDER) + .require(CNTags.forgeItemTag("dusts/uranium")) .output(CNFluids.URANIUM.get(), 25) ) ; diff --git a/src/main/java/net/nuclearteam/createnuclear/foundation/mixin/BaseFireBlockMixin.java b/src/main/java/net/nuclearteam/createnuclear/foundation/mixin/BaseFireBlockMixin.java index 74d6fe6b..7c4b5940 100644 --- a/src/main/java/net/nuclearteam/createnuclear/foundation/mixin/BaseFireBlockMixin.java +++ b/src/main/java/net/nuclearteam/createnuclear/foundation/mixin/BaseFireBlockMixin.java @@ -13,7 +13,7 @@ @Mixin(BaseFireBlock.class) public abstract class BaseFireBlockMixin { - @Inject(at = @At("HEAD"), method = "m_49245_", cancellable = true) + @Inject(at = @At("HEAD"), method = "getState", cancellable = true) private static void CN$getState(BlockGetter reader, BlockPos pos, CallbackInfoReturnable cir) { BlockPos blockPos = pos.below(); BlockState blockState = reader.getBlockState(blockPos);