adjust recipe

Team-EnderIO · Jul 20, 2024 · 2bb3c87 · 2bb3c87
1 parent 3fbe01a
commit 2bb3c87
Show file tree

Hide file tree

Showing 20 changed files with 64 additions and 54 deletions.
diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_and_filter.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_and_filter.json
@@ -10,9 +10,7 @@
     }
   },
   "pattern": [
-    " T ",
-    " B ",
-    " T "
+    "TBT"
   ],
   "result": {
     "count": 1,

diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_counting_filter.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_counting_filter.json
@@ -2,17 +2,17 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
+    "A": {
+      "tag": "c:ingots/redstone_alloy"
+    },
     "B": {
       "item": "enderio:redstone_filter_base"
-    },
-    "I": {
-      "tag": "c:ingots/redstone_alloy"
     }
   },
   "pattern": [
-    "I  ",
-    "IBI",
-    "I  "
+    " A ",
+    "ABA",
+    " A "
   ],
   "result": {
     "count": 1,

diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_not_filter.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_not_filter.json
@@ -2,18 +2,20 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
+    "A": {
+      "tag": "c:ingots/redstone_alloy"
+    },
     "B": {
       "item": "enderio:redstone_filter_base"
     },
-    "I": {
-      "tag": "c:ingots/redstone_alloy"
-    },
     "T": {
       "item": "minecraft:redstone_torch"
     }
   },
   "pattern": [
-    "TBI"
+    "T",
+    "B",
+    "A"
   ],
   "result": {
     "count": 1,

diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_or_filter.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_or_filter.json
@@ -2,17 +2,15 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
+    "A": {
+      "tag": "c:ingots/redstone_alloy"
+    },
     "B": {
       "item": "enderio:redstone_filter_base"
-    },
-    "I": {
-      "tag": "c:ingots/redstone_alloy"
     }
   },
   "pattern": [
-    " I ",
-    " B ",
-    " I "
+    "ABA"
   ],
   "result": {
     "count": 1,

diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_sensor_filter.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_sensor_filter.json
@@ -2,18 +2,20 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
+    "A": {
+      "tag": "c:ingots/redstone_alloy"
+    },
     "B": {
       "item": "enderio:redstone_filter_base"
     },
     "C": {
       "item": "minecraft:comparator"
-    },
-    "I": {
-      "tag": "c:ingots/redstone_alloy"
     }
   },
   "pattern": [
-    "CBI"
+    "C",
+    "B",
+    "A"
   ],
   "result": {
     "count": 1,

diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_timer_filter.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_timer_filter.json
@@ -2,18 +2,20 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
+    "A": {
+      "tag": "c:ingots/redstone_alloy"
+    },
     "B": {
       "item": "enderio:redstone_filter_base"
     },
     "C": {
       "item": "minecraft:clock"
-    },
-    "I": {
-      "tag": "c:ingots/redstone_alloy"
     }
   },
   "pattern": [
-    "IBC"
+    "A",
+    "B",
+    "C"
   ],
   "result": {
     "count": 1,

diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_toggle_filter.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_toggle_filter.json
@@ -2,18 +2,20 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
+    "A": {
+      "tag": "c:ingots/redstone_alloy"
+    },
     "B": {
       "item": "enderio:redstone_filter_base"
     },
-    "I": {
-      "tag": "c:ingots/redstone_alloy"
-    },
     "L": {
       "item": "minecraft:lever"
     }
   },
   "pattern": [
-    "LBI"
+    "L",
+    "B",
+    "A"
   ],
   "result": {
     "count": 1,

diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_xor_filter.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/redstone_xor_filter.json
@@ -2,20 +2,20 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
+    "A": {
+      "tag": "c:ingots/redstone_alloy"
+    },
     "B": {
       "item": "enderio:redstone_filter_base"
     },
-    "I": {
-      "tag": "c:ingots/redstone_alloy"
-    },
     "T": {
       "item": "minecraft:redstone_torch"
     }
   },
   "pattern": [
     " T ",
-    "IBI",
-    " T "
+    "ABA",
+    " A "
   ],
   "result": {
     "count": 1,

diff --git a/enderio-machines/src/generated/resources/data/enderio/data_maps/item/vat_reagent.json b/enderio-machines/src/generated/resources/data/enderio/data_maps/item/vat_reagent.json
@@ -1,10 +1,13 @@
 {
   "values": {
     "minecraft:fire_charge": {
-      "#enderio:explosives": 0.5
+      "#enderio:explosives": 0.2
     },
     "minecraft:firework_rocket": {
-      "#enderio:explosives": 0.5
+      "#enderio:explosives": 0.1
+    },
+    "minecraft:firework_star": {
+      "#enderio:explosives": 0.2
     },
     "minecraft:glow_berries": {
       "#enderio:natural_lights": 0.15

diff --git a/enderio-machines/src/generated/resources/data/enderio/eio_soul/engine/minecraft_creeper.json b/enderio-machines/src/generated/resources/data/enderio/eio_soul/engine/minecraft_creeper.json
@@ -1,6 +1,6 @@
 {
   "entity": "minecraft:creeper",
   "fluid": "enderio:fluid_rocket_fuel_still",
-  "power/mb": 500,
+  "power/mb": 700,
   "tick/mb": 15
 }
diff --git a/...chines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json b/...chines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json
@@ -10,5 +10,5 @@
     "id": "enderio:fluid_fire_water_still"
   },
   "right_reagent": "c:dusts/redstone",
-  "ticks": 150
+  "ticks": 400
 }
diff --git a/...o-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_hootch_still.json b/...o-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_hootch_still.json
@@ -10,5 +10,5 @@
     "id": "enderio:fluid_hootch_still"
   },
   "right_reagent": "c:crops",
-  "ticks": 100
+  "ticks": 200
 }
diff --git a/...s/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json b/...s/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json
@@ -10,5 +10,5 @@
     "id": "enderio:fluid_liquid_sunshine_still"
   },
   "right_reagent": "enderio:sunflower",
-  "ticks": 100
+  "ticks": 200
 }
diff --git a/...generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json b/...generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json
@@ -10,5 +10,5 @@
     "id": "enderio:fluid_nutrient_distillation_still"
   },
   "right_reagent": "c:crops",
-  "ticks": 100
+  "ticks": 200
 }
diff --git a/...hines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json b/...hines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json
@@ -10,5 +10,5 @@
     "id": "enderio:fluid_rocket_fuel_still"
   },
   "right_reagent": "c:dusts/redstone",
-  "ticks": 150
+  "ticks": 400
 }
diff --git a/enderio-machines/src/generated/resources/data/enderio/tags/item/explosives.json b/enderio-machines/src/generated/resources/data/enderio/tags/item/explosives.json
@@ -2,6 +2,7 @@
   "values": [
     "minecraft:tnt",
     "minecraft:firework_star",
-    "minecraft:firework_rocket"
+    "minecraft:firework_rocket",
+    "minecraft:fire_charge"
   ]
 }
diff --git a/...rio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java b/...rio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java
@@ -36,14 +36,16 @@ public ReagentDataProvider(PackOutput packOutput, CompletableFuture<HolderLookup
     protected void gather() {
         addReagent(Items.WHEAT, Tags.Items.CROPS, 3D);
         addReagent(Items.WHEAT, Tags.Items.SEEDS, 2D);
+
         addReagent(Items.GLOWSTONE_DUST, MachineTags.ItemTags.NATURAL_LIGHTS, 0.25D);
         addReagent(Items.SEA_PICKLE, MachineTags.ItemTags.NATURAL_LIGHTS, 0.25D);
         addReagent(Items.GLOW_INK_SAC, MachineTags.ItemTags.NATURAL_LIGHTS, 0.20D);
         addReagent(Items.GLOW_LICHEN, MachineTags.ItemTags.NATURAL_LIGHTS, 0.20D);
         addReagent(Items.GLOW_BERRIES, MachineTags.ItemTags.NATURAL_LIGHTS, 0.15D);
 
-        addReagent(Items.FIRE_CHARGE, MachineTags.ItemTags.EXPLOSIVES, 0.5D);
-        addReagent(Items.FIREWORK_ROCKET, MachineTags.ItemTags.EXPLOSIVES, 0.5D);
+        addReagent(Items.FIRE_CHARGE, MachineTags.ItemTags.EXPLOSIVES, 0.2D);
+        addReagent(Items.FIREWORK_STAR, MachineTags.ItemTags.EXPLOSIVES, 0.2D);
+        addReagent(Items.FIREWORK_ROCKET, MachineTags.ItemTags.EXPLOSIVES, 0.1D);
     }
 
     @Override

diff --git a/...io-machines/src/main/java/com/enderio/machines/data/recipes/FermentingRecipeProvider.java b/...io-machines/src/main/java/com/enderio/machines/data/recipes/FermentingRecipeProvider.java
@@ -27,11 +27,11 @@ public FermentingRecipeProvider(PackOutput packOutput, CompletableFuture<HolderL
 
     @Override
     protected void buildRecipes(RecipeOutput recipeOutput) {
-        build(new FluidStack(EIOFluids.HOOTCH.getSource(), 250), SizedFluidIngredient.of(FluidTags.WATER, 1000), Tags.Items.SEEDS, Tags.Items.CROPS, 100, recipeOutput);
-        build(new FluidStack(EIOFluids.ROCKET_FUEL.getSource(), 1000), SizedFluidIngredient.of(EIOFluids.HOOTCH.getSource(), 1000), MachineTags.ItemTags.EXPLOSIVES, Tags.Items.DUSTS_REDSTONE, 150, recipeOutput);
-        build(new FluidStack(EIOFluids.NUTRIENT_DISTILLATION.getSource(), 250), SizedFluidIngredient.of(FluidTags.WATER, 1000), ItemTags.MEAT, Tags.Items.CROPS, 100, recipeOutput);
-        build(new FluidStack(EIOFluids.FIRE_WATER.getSource(), 1000), SizedFluidIngredient.of(EIOFluids.HOOTCH.getSource(), 1000), MachineTags.ItemTags.BLAZE_POWDER, Tags.Items.DUSTS_REDSTONE, 150, recipeOutput);
-        build(new FluidStack(EIOFluids.LIQUID_SUNSHINE.getSource(), 1000), SizedFluidIngredient.of(FluidTags.WATER, 1000), MachineTags.ItemTags.NATURAL_LIGHTS, MachineTags.ItemTags.SUNFLOWER, 100, recipeOutput);
+        build(new FluidStack(EIOFluids.HOOTCH.getSource(), 250), SizedFluidIngredient.of(FluidTags.WATER, 1000), Tags.Items.SEEDS, Tags.Items.CROPS, 200, recipeOutput);
+        build(new FluidStack(EIOFluids.ROCKET_FUEL.getSource(), 1000), SizedFluidIngredient.of(EIOFluids.HOOTCH.getSource(), 1000), MachineTags.ItemTags.EXPLOSIVES, Tags.Items.DUSTS_REDSTONE, 400, recipeOutput);
+        build(new FluidStack(EIOFluids.NUTRIENT_DISTILLATION.getSource(), 250), SizedFluidIngredient.of(FluidTags.WATER, 1000), ItemTags.MEAT, Tags.Items.CROPS, 200, recipeOutput);
+        build(new FluidStack(EIOFluids.FIRE_WATER.getSource(), 1000), SizedFluidIngredient.of(EIOFluids.HOOTCH.getSource(), 1000), MachineTags.ItemTags.BLAZE_POWDER, Tags.Items.DUSTS_REDSTONE, 400, recipeOutput);
+        build(new FluidStack(EIOFluids.LIQUID_SUNSHINE.getSource(), 1000), SizedFluidIngredient.of(FluidTags.WATER, 1000), MachineTags.ItemTags.NATURAL_LIGHTS, MachineTags.ItemTags.SUNFLOWER, 200, recipeOutput);
     }
 
     protected void build(FluidStack output, SizedFluidIngredient input, TagKey<Item> leftReagent, TagKey<Item> rightReagent,

diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/souldata/SoulDataProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/souldata/SoulDataProvider.java
@@ -121,7 +121,7 @@ public void buildSoulData(Consumer<FinshedSoulData<?>> finshedSoulDataConsumer)
         addEngineData(EntityType.ZOMBIE_VILLAGER, EIOFluids.NUTRIENT_DISTILLATION.getSource(), 500, 15, finshedSoulDataConsumer);
         addEngineData(EntityType.HUSK, EIOFluids.NUTRIENT_DISTILLATION.getSource(), 500, 15, finshedSoulDataConsumer);
         addEngineData(EntityType.ENDERMAN, EIOFluids.DEW_OF_THE_VOID.getSource(), 900, 10, finshedSoulDataConsumer);
-        addEngineData(EntityType.CREEPER, EIOFluids.ROCKET_FUEL.getSource(), 500, 15, finshedSoulDataConsumer);
+        addEngineData(EntityType.CREEPER, EIOFluids.ROCKET_FUEL.getSource(), 700, 15, finshedSoulDataConsumer);
 
         addSolarData(EntityType.PHANTOM, false, true, null, finshedSoulDataConsumer);
     }

diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineItemTagsProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineItemTagsProvider.java
@@ -19,7 +19,7 @@ public MachineItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup
 
     @Override
     protected void addTags(HolderLookup.Provider provider) {
-        tag(MachineTags.ItemTags.EXPLOSIVES).add(Items.TNT, Items.FIREWORK_STAR, Items.FIREWORK_ROCKET);
+        tag(MachineTags.ItemTags.EXPLOSIVES).add(Items.TNT, Items.FIREWORK_STAR, Items.FIREWORK_ROCKET, Items.FIRE_CHARGE);
         tag(MachineTags.ItemTags.NATURAL_LIGHTS).add(Items.GLOWSTONE_DUST, Items.GLOWSTONE, Items.SEA_LANTERN, Items.SEA_PICKLE, Items.GLOW_LICHEN, Items.GLOW_BERRIES, Items.GLOW_INK_SAC);
         tag(MachineTags.ItemTags.SUNFLOWER).add(Items.SUNFLOWER);
         tag(MachineTags.ItemTags.BLAZE_POWDER).add(Items.BLAZE_POWDER);
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,9 +10,7 @@ @@
         }
       },
       "pattern": [
-        " T ",
-        " B ",
-        " T "
+        "TBT"
       ],
       "result": {
         "count": 1,
@@ Expand Down @@