From b93f8234428851299e043e2895e4e109403beb0c Mon Sep 17 00:00:00 2001 From: SpeeeDCraft <52341158+SpeeeDCraft@users.noreply.github.com> Date: Sat, 21 Oct 2023 19:47:58 +0700 Subject: [PATCH] 2 new veins --- config/jade/plugins.json | 1 + config/xaerominimap_entities.json | 4 +- .../placed_feature/in_biome/veins.json | 2 +- .../vein/surface_bismuthinite.json | 216 ++++++++++++++++++ .../vein/surface_cassiterite.json | 75 ++++++ kubejs/startup_scripts/gregtech/materials.js | 6 + kubejs/startup_scripts/gregtech/stonetypes.js | 2 +- 7 files changed, 302 insertions(+), 4 deletions(-) create mode 100644 kubejs/data/tfc/worldgen/configured_feature/vein/surface_bismuthinite.json create mode 100644 kubejs/data/tfc/worldgen/configured_feature/vein/surface_cassiterite.json create mode 100644 kubejs/startup_scripts/gregtech/materials.js diff --git a/config/jade/plugins.json b/config/jade/plugins.json index 535a3cd6b..febe4ee44 100644 --- a/config/jade/plugins.json +++ b/config/jade/plugins.json @@ -37,6 +37,7 @@ "block_states": false, "lectern": true, "entity_armor": true, + "harvest_tool.creative": false, "horse_stats": true, "item_tooltip": true, "entity_health": true, diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index f7ab2ff22..46474f8c6 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -10,16 +10,16 @@ "name": "gui.xaero_entity_category_root", "protection": true, "settingOverrides": { - "displayed": true, "displayHeight": 0.0, + "displayed": true, "heightBasedFade": true, "renderOrder": 0.0, "color": 13.0, "displayNameWhenIconFails": true, "entityNumber": 1000.0, "alwaysDisplayNametags": false, - "startFadingAt": 0.0, "dotSize": 2.0, + "startFadingAt": 0.0, "renderOverMinimapFrame": 1.0, "icons": 1.0, "heightLimit": 20.0, diff --git a/kubejs/data/tfc/tags/worldgen/placed_feature/in_biome/veins.json b/kubejs/data/tfc/tags/worldgen/placed_feature/in_biome/veins.json index 599d0f27a..126f11a02 100644 --- a/kubejs/data/tfc/tags/worldgen/placed_feature/in_biome/veins.json +++ b/kubejs/data/tfc/tags/worldgen/placed_feature/in_biome/veins.json @@ -1,6 +1,6 @@ { "__comment__": "This file was automatically created by mcresources", - "replace": false, + "replace": true, "values": [ ] } \ No newline at end of file diff --git a/kubejs/data/tfc/worldgen/configured_feature/vein/surface_bismuthinite.json b/kubejs/data/tfc/worldgen/configured_feature/vein/surface_bismuthinite.json new file mode 100644 index 000000000..6970ca8b2 --- /dev/null +++ b/kubejs/data/tfc/worldgen/configured_feature/vein/surface_bismuthinite.json @@ -0,0 +1,216 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:cluster_vein", + "config": { + "rarity": 20, + "min_y": { + "absolute": 60 + }, + "max_y": { + "absolute": 210 + }, + "size": 15, + "density": 0.2, + "blocks": [ + { + "replace": [ + "tfc:rock/raw/granite" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_granite_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_granite_sulfur_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_granite_lead_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_diorite_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_diorite_sulfur_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_diorite_lead_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gabbro" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_gabbro_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_gabbro_sulfur_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_gabbro_lead_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/shale" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_shale_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_shale_sulfur_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_shale_lead_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/claystone" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_claystone_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_claystone_sulfur_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_claystone_lead_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/limestone" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_limestone_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_limestone_sulfur_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_limestone_lead_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/conglomerate" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_conglomerate_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_conglomerate_sulfur_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_conglomerate_lead_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dolomite" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_dolomite_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_dolomite_sulfur_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_dolomite_lead_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chert" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_chert_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_chert_sulfur_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_chert_lead_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chalk" + ], + "with": [ + { + "weight": 90, + "block": "gtceu:tfc_chalk_bismuth_ore" + }, + { + "weight": 3, + "block": "gtceu:tfc_chalk_sulfur_ore" + }, + { + "weight": 7, + "block": "gtceu:tfc_chalk_lead_ore" + } + ] + } + ], + "indicator": { + "rarity": 12, + "blocks": [ + { + "block": "tfc:ore/small_bismuthinite" + } + ] + }, + "random_name": "surface_bismuthinite" + } +} \ No newline at end of file diff --git a/kubejs/data/tfc/worldgen/configured_feature/vein/surface_cassiterite.json b/kubejs/data/tfc/worldgen/configured_feature/vein/surface_cassiterite.json new file mode 100644 index 000000000..99df9abf2 --- /dev/null +++ b/kubejs/data/tfc/worldgen/configured_feature/vein/surface_cassiterite.json @@ -0,0 +1,75 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:cluster_vein", + "config": { + "rarity": 20, + "min_y": { + "absolute": 60 + }, + "max_y": { + "absolute": 210 + }, + "size": 15, + "density": 0.4, + "blocks": [ + { + "replace": [ + "tfc:rock/raw/granite" + ], + "with": [ + { + "weight": 60, + "block": "gtceu:tfc_granite_cassiterite_ore" + }, + { + "weight": 20, + "block": "gtceu:tfc_granite_tin_ore" + }, + { + "weight": 20, + "block": "gtceu:tfc_granite_topaz_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "weight": 60, + "block": "gtceu:tfc_diorite_cassiterite_ore" + }, + { + "weight": 40, + "block": "gtceu:tfc_diorite_tin_ore" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gabbro" + ], + "with": [ + { + "weight": 60, + "block": "gtceu:tfc_gabbro_cassiterite_ore" + }, + { + "weight": 40, + "block": "gtceu:tfc_gabbro_tin_ore" + } + ] + } + ], + "indicator": { + "rarity": 12, + "blocks": [ + { + "block": "tfc:ore/small_cassiterite" + } + ] + }, + "random_name": "surface_cassiterite" + } +} \ No newline at end of file diff --git a/kubejs/startup_scripts/gregtech/materials.js b/kubejs/startup_scripts/gregtech/materials.js new file mode 100644 index 000000000..bdb36ca63 --- /dev/null +++ b/kubejs/startup_scripts/gregtech/materials.js @@ -0,0 +1,6 @@ +const $OreProperty = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty") +const $OrePropertyKey = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey") + +GTCEuStartupEvents.registry('gtceu:material', event => { + GTMaterials.Bismuth.setProperty($OrePropertyKey.ORE, new $OreProperty()); +}) \ No newline at end of file diff --git a/kubejs/startup_scripts/gregtech/stonetypes.js b/kubejs/startup_scripts/gregtech/stonetypes.js index 56d8bbbee..16d422a8a 100644 --- a/kubejs/startup_scripts/gregtech/stonetypes.js +++ b/kubejs/startup_scripts/gregtech/stonetypes.js @@ -1,6 +1,6 @@ // priority: 0 -// Replace + Remove Stonetypes +// Replace GTCEuStartupEvents.registry('gtceu:tag_prefix', event => { global.allTFCStoneTypeNames.forEach(stoneTypeName => { event.create("tfc_" + stoneTypeName, 'ore')