From 339387c460184f3676dafe82a634f212391c70bd Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 4 Jan 2024 15:22:27 +0700 Subject: [PATCH] remove copper coils --- .gitignore | 4 ++-- config/exposure-common.toml | 1 + config/{terrafirmagreg.json => tfg.json} | 0 .../textures/block/copper_coil_block.png | Bin 6504 -> 0 bytes .../textures/block/copper_coil_block.png.mcmeta | 5 ----- .../textures/block/copper_coil_block_bloom.png | Bin 2765 -> 0 bytes .../block/copper_coil_block_bloom.png.mcmeta | 6 ------ .../block/copper_coil_block_bloom_ctm.png | Bin 3422 -> 0 bytes .../textures/block/copper_coil_block_ctm.png | Bin 8063 -> 0 bytes kubejs/server_scripts/gregtech/recipes.js | 8 -------- kubejs/startup_scripts/gtceu/blocks.js | 13 +------------ kubejs/startup_scripts/gtceu/machines.js | 2 +- 12 files changed, 5 insertions(+), 34 deletions(-) rename config/{terrafirmagreg.json => tfg.json} (100%) delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png diff --git a/.gitignore b/.gitignore index 38c9735d9..43a31fe38 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ XaeroWorldMap/* CustomSkinLoader/* screenshots/* shaderpacks/* +chiselsandbits/* # Extensions **/*.log @@ -62,5 +63,4 @@ knownkeys.txt .github/buildtools/serverpack/banned-ips.json .github/buildtools/serverpack/banned-players.json .github/buildtools/serverpack/ops.json -.github/buildtools/serverpack/whitelist.json - +.github/buildtools/serverpack/whitelist.json \ No newline at end of file diff --git a/config/exposure-common.toml b/config/exposure-common.toml index 47b44b60e..f619bc6de 100644 --- a/config/exposure-common.toml +++ b/config/exposure-common.toml @@ -3,6 +3,7 @@ #Default focal range of the camera (with built in lens). Default: 18-55 DefaultFocalRange = "18-55" #Focal Range per lens. Item ID and min-max (or single number for primes) focal lengths. Separated by a comma. Allowed range: 10-300 + #Note: to attach the custom lens to the camera - it needs to be added to '#exposure:lenses' item tag. #Default: ["minecraft:spyglass,55-200"] LensFocalRanges = ["minecraft:spyglass,55-200"] diff --git a/config/terrafirmagreg.json b/config/tfg.json similarity index 100% rename from config/terrafirmagreg.json rename to config/tfg.json diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png deleted file mode 100644 index e4edb9e4bfea95af0134c4c8f941830747830a87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6504 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 Hne+bxy#)Hr diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta deleted file mode 100644 index df6100a46..000000000 --- a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ldlib": { - "connection": "terrafirmagreg:block/copper_coil_block_bloom_ctm", - "emissive": true - } -} \ No newline at end of file diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png deleted file mode 100644 index b58e4f54aace10a2afb128ea5083b3e3b9eec9d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3422 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 diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png deleted file mode 100644 index 74e65ef6e4697af383bf407422521c6e2c12a7a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8063 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 { E: '#forge:cables/single/copper' }).id('tfg:shaped/alternator') - // Медная катушка - event.recipes.gtceu.assembler('copper_coil') - .itemInputs('8x #forge:wires/double/copper', '8x #forge:foils/bronze') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 144)) - .itemOutputs('terrafirmagreg:copper_coil_block') - .duration(200) - .EUt(30) - // Compressed Coke Clay event.shaped('gtceu:compressed_coke_clay', [ 'AAA', diff --git a/kubejs/startup_scripts/gtceu/blocks.js b/kubejs/startup_scripts/gtceu/blocks.js index 35624b24d..d389a83f2 100644 --- a/kubejs/startup_scripts/gtceu/blocks.js +++ b/kubejs/startup_scripts/gtceu/blocks.js @@ -1,16 +1,5 @@ // priority: 0 const registerGTCEuBlocks = (event) => { - event.create('terrafirmagreg:copper_coil_block', 'gtceu:coil') - .temperature(1100) - .level(0) - .energyDiscount(1) - .tier(0) - .coilMaterial(GTMaterials.get('copper')) - .texture('terrafirmagreg:block/copper_coil_block') - .hardness(4) - .requiresTool(true) - .tagBlock('mineable/pickaxe') - .mapColor('metal') - .soundType('metal') + } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 1209e5558..0a415b613 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -32,7 +32,7 @@ const registerGTCEuMachines = (event) => { .aisle("CWC", "K#E", "CWC") .aisle("CWI", "CWA", "#W#") .where('A', Predicates.controller(Predicates.blocks(definition.get()))) - .where('W', Predicates.blocks('terrafirmagreg:copper_coil_block')) + .where('W', Predicates.blocks('gtceu:cupronickel_coil_block')) .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get())) .where('#', Predicates.any()) .where('K', Predicates.abilities(PartAbility.INPUT_KINETIC).setExactLimit(1))