Unification n Worldgen fixes

index.toml

@@ -1471,6 +1471,11 @@ file = "mods/kotlinforforge-5.11.0-all.pw.toml"
 hash = "451f3c8a632a8c76e827ee7239244417a9e2e78ef3e480286b9eacd6aeeadd1f"
 metafile = true
 
+[[files]]
+file = "mods/kubejs.pw.toml"
+hash = "99bea71046529d65463fc12acb505ab363c91133ebbcc1d976e49a5d33150702"
+metafile = true
+
 [[files]]
 file = "mods/lambdynamiclights-4.8.10+1.21.1.pw.toml"
 hash = "2dff78f3d2f29501486cfd20516ed9e8c3aa6b6fade70580b8139656078ee369"
@@ -1581,6 +1586,11 @@ file = "mods/reconnectible-chains.pw.toml"
 hash = "070e834d2b8eb749a0f547b29bbbeba9aa3b83041cef9b399e8e2e6c5c24e225"
 metafile = true
 
+[[files]]
+file = "mods/rhino.pw.toml"
+hash = "e55ca32b338a0e0540f4fec5170675d860566255ae0f45692a00cb4ebf2eb535"
+metafile = true
+
 [[files]]
 file = "mods/ritchiesprojectilelib-2.1.2+mc.1.21.1-neoforge.pw.toml"
 hash = "9107f7f41ea3847118f35001ec3ae60d0de7bcddfe0d4d7513277ddd43090536"

kubejs/README.txt

@@ -0,0 +1,15 @@
+Find out more info on the website: https://kubejs.com/
+
+Directory information:
+
+assets - Acts as a resource pack, you can put any client resources in here, like textures, models, etc. Example: assets/kubejs/textures/item/test_item.png
+data - Acts as a datapack, you can put any server resources in here, like loot tables, functions, etc. Example: data/kubejs/loot_tables/blocks/test_block.json
+
+startup_scripts - Scripts that get loaded once during game startup - Used for adding items and other things that can only happen while the game is loading (Can be reloaded with /kubejs reload_startup_scripts, but it may not work!)
+server_scripts - Scripts that get loaded every time server resources reload - Used for modifying recipes, tags, loot tables, and handling server events (Can be reloaded with /reload)
+client_scripts - Scripts that get loaded every time client resources reload - Used for JEI events, tooltips and other client side things (Can be reloaded with F3+T)
+
+config - KubeJS config storage. This is also the only directory that scripts can access other than world directory
+exported - Data dumps like texture atlases end up here
+
+You can find type-specific logs in logs/kubejs/ directory

kubejs/assets/tfmg/models/block/oil_deposit.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "tfmg:block/oil_deposit"
+  },
+  "render_type": "minecraft:translucent"
+}

kubejs/client_scripts/main.js

@@ -0,0 +1,10 @@
+// Visit the wiki for more info - https://kubejs.com/
+console.info('Hello, World! (Loaded client example script)')
+
+RecipeViewerEvents.removeEntries('item', event => {
+  event.remove('#kubejs:removed')
+})
+
+RecipeViewerEvents.removeEntries('fluid', event => {
+  event.remove('#kubejs:removed')
+})

kubejs/config/client.json

@@ -0,0 +1,8 @@
+{
+  "window_title": "",
+  "disable_recipe_book": false,
+  "export_atlases": false,
+  "blur_scaled_pack_icon": true,
+  "custom_stack_size_text": true,
+  "shrink_stack_size_text": true
+}

kubejs/config/common.json

@@ -0,0 +1,16 @@
+{
+  "hide_server_script_errors": false,
+  "server_only": false,
+  "announce_reload": true,
+  "packmode": "",
+  "save_dev_properties_in_config": false,
+  "allow_async_streams": true,
+  "match_json_recipes": true,
+  "ignore_custom_unique_recipe_ids": false,
+  "startup_error_gui": true,
+  "startup_error_report_url": "",
+  "remove_slot_limit": false,
+  "default_max_stack_size": 0,
+  "creative_mode_tab_icon": {},
+  "creative_mode_tab_name": null
+}

kubejs/config/web_server.json

@@ -0,0 +1,6 @@
+{
+  "enabled": true,
+  "port": 61423,
+  "public_address": "",
+  "auth": "1WWU-67eIhvy7nyggMwX6SClPYma3Y0KEDDGFgCpf1j8"
+}

kubejs/data/createnuclear/worldgen/configured_feature/lead_ore.json

@@ -0,0 +1,4 @@
+{
+    "type": "minecraft:no_op",
+    "config": {}
+}

kubejs/data/tfmg/worldgen/configured_feature/oil_deposit.json

@@ -0,0 +1,27 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "targets": [
+      {
+        "target": {
+          "predicate_type": "minecraft:random_block_match",
+          "block": "minecraft:air",
+          "probability": 0.05
+        },
+        "state": {
+          "Name": "tfmg:oil_deposit"
+        }
+      },
+      {
+        "target": {
+          "predicate_type": "minecraft:always_true"
+        },
+        "state": {
+          "Name": "kubejs:cloud"
+        }
+      }
+    ],
+    "size": 64,
+    "discard_chance_on_air_exposure": 0.8
+  }
+}

kubejs/data/tfmg/worldgen/place_feature/oil_deposit.json

@@ -0,0 +1,27 @@
+{
+  "feature": "tfmg:oil_deposit",
+  "placement": [
+    {
+      "type": "minecraft:rarity_filter",
+      "chance": 16
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:uniform",
+        "max_inclusive": {
+          "absolute": -64
+        },
+        "min_inclusive": {
+          "absolute": -64
+        }
+      }
+    },
+    {
+      "type": "create:config_filter"
+    }
+  ]
+}

kubejs/server_scripts/main.js

@@ -0,0 +1,216 @@
+// Visit the wiki for more info - https://kubejs.com/
+console.info('Hello, World! (Loaded server example script)')
+
+// Listen to the block tag event
+ServerEvents.tags('block', event => {
+
+    event.remove('minecraft:infiniburn_overworld', 'tfmg:oil_deposit')
+    event.remove('minecraft:dragon_immune', 'tfmg:oil_deposit')
+    event.remove('minecraft:infiniburn_end', 'tfmg:oil_deposit')
+    event.remove('minecraft:infiniburn_nether', 'tfmg:oil_deposit')
+    event.remove('minecraft:lava_pool_stone_cannot_replace', 'tfmg:oil_deposit')
+    event.remove('minecraft:mineable/pickaxe', 'tfmg:oil_deposit')
+    event.remove('nova_structures:explosion_resistand', 'tfmg:oil_deposit')
+    event.remove('minecraft:wither_immune', 'tfmg:oil_deposit')
+    event.remove('minecraft:features_cannot_replace', 'tfmg:oil_deposit')
+
+    //event.add('simulated:non_movable', 'tfmg:oil_deposit')
+    event.add('create:non_movable', 'tfmg:oil_deposit')
+
+    //event.add('simulated:non_movable', 'kubejs:cloud')
+    event.add('create:non_movable', 'kubejs:cloud')
+
+
+    event.add('kubejs:oil_replaced', 'tfmg:fossilstone')
+    event.add('kubejs:oil_replaced', 'tfmg:crude_oil')
+})
+
+ServerEvents.tags('fluid', event => {
+
+    event.removeAllTagsFrom('createbigcannons:molten_steel')
+    event.add('kubejs:removed', 'createbigcannons:molten_steel')
+
+    event.add('kubejs:oil_replaced', 'tfmg:crude_oil')
+
+})
+
+ServerEvents.tags('item', event => {
+
+
+    // ------------------------- UNIFICATION -------------------------
+    // Steel
+
+    const other_steel = [
+        'createnuclear:steel_ingot', 'createbigcannons:steel_ingot', // ingots
+        'createnuclear:steel_nugget', 'createbigcannons:steel_scrap', // nuggets
+        'createnuclear:steel_block', 'createbigcannons:steel_block', // blocks
+        'createbigcannons:molten_steel_bucket'
+    ]
+
+    other_steel.forEach(i => {
+        event.removeAllTagsFrom(i)
+        event.add('kubejs:removed', i)
+    })
+
+    event.add('kubejs:steel_block', 'createnuclear:steel_block')
+    event.add('kubejs:steel_block', 'createbigcannons:steel_block')
+    event.add('kubejs:steel_block', 'tfmg:steel_block')
+
+
+    // Molten cast iron
+
+    const other_cast = [
+        'createbigcannons:cast_iron_ingot',
+        'createbigcannons:cast_iron_nugget',
+        'createbigcannons:cast_iron_block'
+    ]
+
+    other_cast.forEach(i => {
+        event.removeAllTagsFrom(i)
+        event.add('kubejs:removed', i)
+    })
+
+    event.add('kubejs:cast_iron_block', 'createbigcannons:cast_iron_block')
+    event.add('kubejs:cast_iron_block', 'tfmg:cast_iron_block')
+
+    // Lead
+
+    const other_lead = [
+        'createnuclear:lead_ingot',
+        'createnuclear:raw_lead',
+        'createnuclear:lead_ore',
+        'createnuclear:deepslate_lead_ore',
+        'createnuclear:lead_block',
+        'createnuclear:lead_nugget'
+    ]
+
+    other_lead.forEach(i => {
+        event.removeAllTagsFrom(i)
+        event.add('kubejs:removed', i)
+    })
+
+    event.add('kubejs:lead_block', 'createnuclear:lead_block')
+    event.add('kubejs:lead_block', 'tfmg:lead_block')
+
+
+    // Other
+
+    event.removeAllTagsFrom('tfmg:copper_wire')
+    event.add('kubejs:removed', 'tfmg:copper_wire')
+})
+
+// Listen for the "recipes" server event.
+ServerEvents.recipes(event => {
+    // ------------------------- UNIFICATION -------------------------
+    // Steel
+
+
+    const steel_to_remove = [
+        'createbigcannons:mixing/alloy_steel',
+        'createbigcannons:compacting/forge_steel_ingot',
+        'createbigcannons:compacting/forge_steel_block',
+        'createbigcannons:compacting/forge_steel_nugget',
+        'createbigcannons:steel_ingot_from_block',
+        'createbigcannons:steel_scrap',
+
+        'createnuclear:mixing/steel',
+        'createnuclear:crafting/crafting/steel_ingot_from_decompacting',
+        'createnuclear:crafting/steel_ingot_from_decompacting',
+        'createnuclear:crafting/crafting/steel_nuget_from_decompacting',
+        'createnuclear:crafting/steel_nuget_from_decompacting',
+
+    ]
+
+    steel_to_remove.forEach(r => {
+        event.remove({ id: r })
+    })
+
+    event.remove([{ output: 'createbigcannons:molten_steel' }, { input: 'createbigcannons:molten_steel' }])
+
+
+    event.stonecutting('createnuclear:steel_block', '#kubejs:steel_block')
+    event.stonecutting('createbigcannons:steel_block', '#kubejs:steel_block')
+    event.stonecutting('tfmg:steel_block', '#kubejs:steel_block')
+
+    // Molten cast iron
+
+    const iron_cast_to_remove = [
+
+        'createbigcannons:compacting/forge_cast_iron_ingot',
+        'createbigcannons:compacting/forge_cast_iron_block',
+        'createbigcannons:compacting/forge_cast_iron_nugget',
+
+        'createbigcannons:compacting/iron_to_cast_iron_ingot',
+
+        'createbigcannons:cast_iron_ingot_from_block',
+        'createbigcannons:cast_iron_nugget',
+    ]
+
+    iron_cast_to_remove.forEach(r => {
+        event.remove({ id: r })
+    })
+
+    event.stonecutting('createbigcannons:cast_iron_block', '#kubejs:cast_iron_block')
+    event.stonecutting('tfmg:cast_iron_block', '#kubejs:cast_iron_block')
+
+
+    // Lead
+
+    const lead_to_remove = [
+
+    ]
+
+    lead_to_remove.forEach(r => {
+        event.remove({ id: r })
+    })
+
+    event.stonecutting('createnuclear:lead_block', '#kubejs:lead_block')
+    event.stonecutting('tfmg:lead_block', '#kubejs:lead_block')
+
+    // Other
+
+    event.remove({ id: 'tfmg:copper_wire_from_ingots_copper_stonecutting' })
+
+
+    // ------------------------- CONFLICTS -------------------------
+
+    // Wire copper simple radio
+    event.remove({ id: 'simpleradio:copper_wire' })
+    event.shapeless(
+        Item.of('simpleradio:copper_wire', 1),
+        [
+            '2x #c:wires/copper'
+        ]
+    )
+
+
+    // Additions
+
+    event.custom({
+        "type": "tfmg:vat_machine_recipe",
+        "allowed_vat_types": [
+            "tfmg:cast_iron_vat",
+            "tfmg:steel_vat",
+            "tfmg:firebrick_lined_vat"
+        ],
+        "heat_level": 2,
+        "ingredients": [
+            {
+                "type": "neoforge:single",
+                "amount": 500,
+                "fluid": "tfmg:carbon_dioxide"
+            }
+        ],
+        "machines": [
+            "tfmg:mixing"
+        ],
+        "min_size": 1,
+        "results": [
+            {
+                "amount": 1,
+                "id": "kubejs:cloud"
+            }
+        ]
+    })
+
+})