1.20.1

ported to 1.20.1
2023-12-09 13:08:34 +00:00
parent 63e6647c23
commit 9c4dbfeef7
160 changed files with 4397 additions and 6506 deletions
--- a/kubejs/server_scripts/gregtech/components.js
+++ b/kubejs/server_scripts/gregtech/components.js
@@ -1,17 +1,24 @@
-ServerEvents.recipes(event => {
-  const greg = event.recipes.gtceu
-  event.remove({output: "gtceu:fluid_voiding_cover"})
-  event.remove({id: "gtceu:macerator/macerate_fluid_voiding_cover"})
-  greg.assembler("fluid_voiding_cover")
-    .itemInputs("2x #forge:screws/steel", "gtceu:fluid_detector_cover", "gtceu:bronze_normal_fluid_pipe")
+ServerEvents.recipes((event) => {
+  const greg = event.recipes.gtceu;
+  event.remove({ output: "gtceu:fluid_voiding_cover" });
+  event.remove({ id: "gtceu:macerator/macerate_fluid_voiding_cover" });
+  greg
+    .assembler("fluid_voiding_cover")
+    .itemInputs(
+      "2x #forge:screws/steel",
+      "gtceu:fluid_detector_cover",
+      "gtceu:bronze_normal_fluid_pipe"
+    )
    .itemOutputs("gtceu:fluid_voiding_cover")
-    .duration(100).EUt(30)
-  
-  event.remove({output: "gtceu:item_voiding_cover"})
-  event.remove({id: "gtceu:macerator/macerate_item_voiding_cover"})
-  greg.assembler("item_voiding_cover")
+    .duration(100)
+    .EUt(30);
+
+  event.remove({ output: "gtceu:item_voiding_cover" });
+  event.remove({ id: "gtceu:macerator/macerate_item_voiding_cover" });
+  greg
+    .assembler("item_voiding_cover")
    .itemInputs("2x #forge:screws/steel", "gtceu:item_detector_cover", "hopper")
    .itemOutputs("gtceu:item_voiding_cover")
-    .duration(100).EUt(30)
-    
-})
+    .duration(100)
+    .EUt(30);
+});
--- a/kubejs/server_scripts/gregtech/greenhouse.js
+++ b/kubejs/server_scripts/gregtech/greenhouse.js
@@ -1,5 +1,5 @@
-ServerEvents.recipes(event => {
-  const greg = event.recipes.gtceu
+ServerEvents.recipes((event) => {
+  const greg = event.recipes.gtceu;
  const trees = [
    ["minecraft:oak_sapling", "minecraft:oak_log"],
    ["minecraft:spruce_sapling", "minecraft:spruce_log"],
@@ -7,8 +7,9 @@ ServerEvents.recipes(event => {
    ["minecraft:jungle_sapling", "minecraft:jungle_log"],
    ["minecraft:acacia_sapling", "minecraft:acacia_log"],
    ["minecraft:dark_oak_sapling", "minecraft:dark_oak_log"],
-    ["minecraft:mangrove_propagule", "minecraft:mangrove_log"]
-  ]
+    ["minecraft:mangrove_propagule", "minecraft:mangrove_log"],
+    ["minecraft:cherry_sapling", "minecraft:cherry_log"],
+  ];
  const plants = [
    ["minecraft:pumpkin_seeds", "minecraft:pumpkin", 6],
    ["minecraft:beetroot_seeds", "minecraft:beetroot", 16],
@@ -19,63 +20,83 @@ ServerEvents.recipes(event => {
    ["minecraft:cactus", "minecraft:cactus", 12],
    ["minecraft:brown_mushroom", "minecraft:brown_mushroom", 12],
    ["minecraft:red_mushroom", "minecraft:red_mushroom", 12],
-    ["minecraft:nether_wart", "minecraft:nether_wart", 12]
-  ]
+    ["minecraft:nether_wart", "minecraft:nether_wart", 12],
+  ];

-  event.shaped("gtceu:greenhouse", [
-    'GGG',
-    'CHC',
-    'PUP'
-  ] , {
+  event.shaped("gtceu:greenhouse", ["GGG", "CHC", "PUP"], {
    G: "gtceu:tempered_glass",
    C: "#forge:circuits/mv",
    H: "gtceu:mv_machine_hull",
    P: "gtceu:mv_electric_piston",
-    U: "gtceu:mv_electric_pump"
-  })
-  trees.forEach(woodType => {
-    greg.greenhouse(woodType[0])
+    U: "gtceu:mv_electric_pump",
+  });
+  trees.forEach((woodType) => {
+    greg
+      .greenhouse(woodType[0])
      .notConsumable(woodType[0])
-      .inputFluids('water 1000')
+      .inputFluids("water 1000")
      .itemOutputs("64x " + woodType[1], "6x " + woodType[0])
-      .duration(1200).EUt(40)
-      .circuit(1)
+      .duration(1200)
+      .EUt(40)
+      .circuit(1);

-    greg.greenhouse(woodType[0] + "_fertiliser")
+    greg
+      .greenhouse(woodType[0] + "_fertiliser")
      .notConsumable(woodType[0])
      .itemInputs("4x gtceu:fertilizer")
-      .inputFluids('water 1000')
-      .itemOutputs("64x " + woodType[1], "64x " + woodType[1], "12x " + woodType[0])
-      .duration(900).EUt(60)
-      .circuit(2)
-  })
-  
-  plants.forEach(seedType => {
-    greg.greenhouse(seedType[0])
+      .inputFluids("water 1000")
+      .itemOutputs(
+        "64x " + woodType[1],
+        "64x " + woodType[1],
+        "12x " + woodType[0]
+      )
+      .duration(900)
+      .EUt(60)
+      .circuit(2);
+  });
+
+  plants.forEach((seedType) => {
+    greg
+      .greenhouse(seedType[0])
      .notConsumable(seedType[0])
-      .inputFluids('water 1000')
+      .inputFluids("water 1000")
      .itemOutputs(seedType[2] + "x " + seedType[1])
-      .duration(1200).EUt(40)
-      .circuit(1)
-    greg.greenhouse(seedType[0] + "_fertilizer")
+      .duration(1200)
+      .EUt(40)
+      .circuit(1);
+    greg
+      .greenhouse(seedType[0] + "_fertilizer")
      .notConsumable(seedType[0])
      .itemInputs("4x gtceu:fertilizer")
-      .inputFluids('water 1000')
-      .itemOutputs(2*seedType[2] + "x " + seedType[1])
-      .duration(900).EUt(60)
-      .circuit(2)
-  })
-  greg.greenhouse("rubber_wood")
-  .notConsumable("gtceu:rubber_sapling")
-  .inputFluids('water 1000')
-  .itemOutputs("16x gtceu:rubber_log", "3x gtceu:rubber_sapling", "4x gtceu:sticky_resin")
-  .duration(1200).EUt(40)
-  .circuit(1)
-greg.greenhouse("rubber_wood_fertiliser")
-  .notConsumable("gtceu:rubber_sapling")
-  .itemInputs("4x gtceu:fertilizer")
-  .inputFluids('water 1000')
-  .itemOutputs("32x gtceu:rubber_log", "6x gtceu:rubber_sapling", "8x gtceu:sticky_resin")
-  .duration(900).EUt(60)
-  .circuit(2)
-})
+      .inputFluids("water 1000")
+      .itemOutputs(2 * seedType[2] + "x " + seedType[1])
+      .duration(900)
+      .EUt(60)
+      .circuit(2);
+  });
+  greg
+    .greenhouse("rubber_wood")
+    .notConsumable("gtceu:rubber_sapling")
+    .inputFluids("water 1000")
+    .itemOutputs(
+      "16x gtceu:rubber_log",
+      "3x gtceu:rubber_sapling",
+      "4x gtceu:sticky_resin"
+    )
+    .duration(1200)
+    .EUt(40)
+    .circuit(1);
+  greg
+    .greenhouse("rubber_wood_fertiliser")
+    .notConsumable("gtceu:rubber_sapling")
+    .itemInputs("4x gtceu:fertilizer")
+    .inputFluids("water 1000")
+    .itemOutputs(
+      "32x gtceu:rubber_log",
+      "6x gtceu:rubber_sapling",
+      "8x gtceu:sticky_resin"
+    )
+    .duration(900)
+    .EUt(60)
+    .circuit(2);
+});
--- a/kubejs/server_scripts/gregtech/inscriber.js
+++ b/kubejs/server_scripts/gregtech/inscriber.js
@@ -1,29 +1,36 @@
-ServerEvents.recipes(event => {
-  const greg = event.recipes.gtceu
+ServerEvents.recipes((event) => {
+  const greg = event.recipes.gtceu;
  // Printed Silicon
-  greg.forming_press("printed_silicon_circuit")
+  greg
+    .forming_press("printed_silicon_circuit")
    .itemInputs("#forge:plates/silicon")
    .notConsumable("ae2:silicon_press")
    .itemOutputs("ae2:printed_silicon")
-    .duration(200).EUt(30)
-  
+    .duration(200)
+    .EUt(30);
+
  // Printed Logic Circuit
-  greg.forming_press("printed_logic_processor")
+  greg
+    .forming_press("printed_logic_processor")
    .itemInputs("#forge:plates/gold")
    .notConsumable("ae2:logic_processor_press")
    .itemOutputs("ae2:printed_logic_processor")
-    .duration(200).EUt(30)
+    .duration(200)
+    .EUt(30);

  // Printed Engineering Circuit
-  greg.forming_press("printed_engineering_processor")
+  greg
+    .forming_press("printed_engineering_processor")
    .itemInputs("#forge:plates/diamond")
    .notConsumable("ae2:engineering_processor_press")
    .itemOutputs("ae2:printed_engineering_processor")
-    .duration(200).EUt(30)
+    .duration(200)
+    .EUt(30);

  // Printed Calculation Circuit
-  greg.forming_press("printed_calculation_circuit")
+  greg
+    .forming_press("printed_calculation_circuit")
    .itemInputs("#forge:plates/certus_quartz")
    .notConsumable("ae2:calculation_processor_press")
-    .itemOutputs("ae2:printed_calculation_processor")
-})
+    .itemOutputs("ae2:printed_calculation_processor");
+});
--- a/kubejs/server_scripts/gregtech/tools.js
+++ b/kubejs/server_scripts/gregtech/tools.js
@@ -0,0 +1,61 @@
+ServerEvents.recipes((event) => {
+  const murderingUtensils = ["sword", "knife", "butchery_knife", "axe"];
+
+  const miningUtensils = [
+    "pickaxe",
+    "shovel",
+    "hoe",
+    "mining_hammer",
+    "saw",
+    "hammer",
+    "wrench",
+    "file",
+    "crowbar",
+    "screwdriver",
+    "wire_cutter",
+    "scythe",
+    "plunger",
+  ];
+
+  miningUtensils.forEach((miningUtensil) => {
+    let addEnchantment = (
+      tooltype,
+      material,
+      enchantment,
+      enchantmentLevel
+    ) => {
+      event.replaceOutput(
+        { id: `gtceu:shaped/${tooltype}_${material}` },
+        `gtceu:${material}_${tooltype}`,
+        Item.of(`gtceu:${material}_${tooltype}`, "{Damage:0}").enchant(
+          `minecraft:${enchantment}`,
+          `${enchantmentLevel}`
+        )
+      );
+    };
+    addEnchantment(miningUtensil, "damascus_steel", "fortune", 3);
+    addEnchantment(miningUtensil, "rose_gold", "fortune", 2);
+    addEnchantment(miningUtensil, "invar", "efficiency", 1);
+  });
+
+  murderingUtensils.forEach((murderingUtensil) => {
+    let addEnchantment = (
+      tooltype,
+      material,
+      enchantment,
+      enchantmentLevel
+    ) => {
+      event.replaceOutput(
+        { id: `gtceu:shaped/${tooltype}_${material}` },
+        `gtceu:${material}_${tooltype}`,
+        Item.of(`gtceu:${material}_${tooltype}`, "{Damage:0}").enchant(
+          `minecraft:${enchantment}`,
+          `${enchantmentLevel}`
+        )
+      );
+    };
+    addEnchantment(murderingUtensil, "damascus_steel", "looting", 3);
+    addEnchantment(murderingUtensil, "rose_gold", "looting", 2);
+    addEnchantment(murderingUtensil, "invar", "unbreaking", 1);
+  });
+});