diff --git a/CHANGELOG.md b/CHANGELOG.md index 227b659c8..2c857a41e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Complete rework of prospector's picks. (#1594) @Redeix - Removed the mod that was causing placed entities to sometimes not spawn - Removed energy P2P (#1661) @TomPlop @BlueBoat29 +- Removed GT bedrock miners, replaced with a new system for Moon infinites (#1569) @TomPlop ### Changes - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie @@ -21,6 +22,8 @@ - Added IV fridge, and IV-UV aqueous accumulator, food processor, food oven, and gas compressor machines @Pyritie - Added machine recipes for the wrought iron grill @Pyritie - Added recipes for redyeing/bleaching shipping containers (#1631) @Pyritie +- Adjusted recipes for ME Interface and Pattern Provider for consistency (#1569) @TomPlop +- Changed the cost of the ME Quantum Tunnel (#1569) @TomPlop ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index db04fc032..1721efdff 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -122,77 +122,6 @@ const registerGTCEUMetals = (event) => { event.metal('gtceu:aluminium_silicate', 1540, 0.00857, '#forge:ingots/aluminium_silicate', null, null, 1, 'tfg:aluminium_silicate') } - -const registerGTCEUBedrockOreVeins = (event) => { -/* - // Tin, Magnesium - event.add('tfg:moon_tin', vein => { - vein.weight(75) - .size(2) - .yield(1, 4) - .material(GTMaterials.Cassiterite, 5) - .material(GTMaterials.Tin, 2) - .material(GTMaterials.Olivine, 1) - .dimensions('ad_astra:moon') - }) - - // Iron, Gold, Magnesium - event.add('tfg:moon_magnetite', vein => { - vein.weight(75) - .size(2) - .yield(1, 4) - .material(GTMaterials.Magnetite, 8) - .material(GTMaterials.Gold, 3) - .material(GTMaterials.Olivine, 1) - .dimensions('ad_astra:moon') - }) - - // Copper, Arsenic, Tin - event.add('tfg:moon_copper', vein => { - vein.weight(100) - .size(2) - .yield(1, 4) - .material(GTMaterials.Chalcopyrite, 10) - .material(GTMaterials.Zeolite, 4) - .material(GTMaterials.Cassiterite, 3) - .dimensions('ad_astra:moon') - }) - - // Certus Quartz, Barium - event.add('tfg:moon_certus', vein => { - vein.weight(20) - .size(1) - .yield(1, 2) - .material(GTMaterials.CertusQuartz, 6) - .material(GTMaterials.Barite, 2) - .material(GTMaterials.Quartzite, 7) - .dimensions('ad_astra:moon') - }) - - // Asbestos, Tin, Calcium - event.add('tfg:moon_asbestos', vein => { - vein.weight(100) - .size(2) - .yield(1, 5) - .material(GTMaterials.Asbestos, 3) - .material(GTMaterials.CassiteriteSand, 4) - .material(GTMaterials.Diatomite, 1) - .dimensions('ad_astra:moon') - }) - - // Mica - Talc Silicon Aluminium Potassium Fluorine Caesium - event.add('tfg:moon_mica', vein => { - vein.weight(50) - .size(1) - .yield(1, 3) - .material(GTMaterials.Mica, 5) - .material(GTMaterials.Kyanite, 2) - .material(GTMaterials.Pollucite, 1) - .dimensions('ad_astra:moon') - }) - */ -} - function registerGTCEUBedrockFluidVeins(event) { event.add('tfg:moon_helium_3', vein => { diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index c2af044ab..46f6bc168 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -187,10 +187,6 @@ GTCEuServerEvents.oreVeins(event => { event.removeAll() }) -GTCEuServerEvents.bedrockOreVeins(event => { - registerGTCEUBedrockOreVeins(event) -}) - GTCEuServerEvents.fluidVeins(event => { registerGTCEUBedrockFluidVeins(event) })