From 0e01675682d499e608ed38fbf50b61123fb0398a Mon Sep 17 00:00:00 2001 From: ferriarnus <61201275+ferriarnus@users.noreply.github.com> Date: Tue, 16 Jul 2024 00:27:39 +0200 Subject: [PATCH 1/3] start --- .../enderio/machines/common/tag/MachineTags.java | 15 +++++++++++++++ .../data/recipes/FermentingRecipeProvider.java | 3 +++ 2 files changed, 18 insertions(+) diff --git a/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java b/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java index 3e544ccc31..eb2916d1ad 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java +++ b/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java @@ -4,13 +4,28 @@ import net.minecraft.core.registries.Registries; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.Item; public class MachineTags { public static void register() { + ItemTags.init(); EntityTypes.init(); } + public static class ItemTags { + + private static void init() {} + + public static TagKey EXPLOSIVES = create("explosives"); + public static TagKey REDSTONE_SOURCE = create("redstone_source"); + + private static TagKey create(String pName) { + return TagKey.create(Registries.ITEM, EnderIOBase.loc(pName)); + } + + } + public static class EntityTypes { private static void init() {} diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/recipes/FermentingRecipeProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/recipes/FermentingRecipeProvider.java index 08120d6afb..fc0d100244 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/data/recipes/FermentingRecipeProvider.java +++ b/enderio-machines/src/main/java/com/enderio/machines/data/recipes/FermentingRecipeProvider.java @@ -3,6 +3,7 @@ import com.enderio.EnderIOBase; import com.enderio.base.common.init.EIOFluids; import com.enderio.machines.common.recipe.FermentingRecipe; +import com.enderio.machines.common.tag.MachineTags; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; @@ -27,6 +28,8 @@ public FermentingRecipeProvider(PackOutput packOutput, CompletableFuture leftReagent, TagKey rightReagent, From 3fbe01a14485b8e3f0b01a173a890bfe4e03e84b Mon Sep 17 00:00:00 2001 From: ferriarnus <61201275+ferriarnus@users.noreply.github.com> Date: Tue, 16 Jul 2024 22:36:40 +0200 Subject: [PATCH 2/3] add more vat recipes --- .../enderio/advancement/recipes/misc/vat.json | 32 ++++++++++++++++++ .../enderio/data_maps/item/vat_reagent.json | 21 ++++++++++++ .../eio_soul/engine/minecraft_creeper.json | 6 ++++ .../fermenting/fluid_fire_water_still.json | 14 ++++++++ .../fluid_liquid_sunshine_still.json | 14 ++++++++ .../fluid_nutrient_distillation_still.json | 14 ++++++++ .../fermenting/fluid_rocket_fuel_still.json | 14 ++++++++ .../resources/data/enderio/recipe/vat.json | 33 +++++++++++++++++++ .../data/enderio/tags/item/blaze_powder.json | 5 +++ .../data/enderio/tags/item/explosives.json | 7 ++++ .../enderio/tags/item/natural_lights.json | 11 +++++++ .../data/enderio/tags/item/sunflower.json | 5 +++ .../com/enderio/machines/EnderIOMachines.java | 5 +++ .../machines/common/tag/MachineTags.java | 4 ++- .../data/reagentdata/ReagentDataProvider.java | 9 +++++ .../recipes/FermentingRecipeProvider.java | 10 +++--- .../data/recipes/MachineRecipeProvider.java | 14 ++++++++ .../data/souldata/SoulDataProvider.java | 1 + .../data/tag/MachineBlockTagsProvider.java | 20 +++++++++++ .../data/tag/MachineItemTagsProvider.java | 27 +++++++++++++++ 20 files changed, 261 insertions(+), 5 deletions(-) create mode 100644 enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/vat.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/eio_soul/engine/minecraft_creeper.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/recipe/vat.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/tags/item/blaze_powder.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/tags/item/explosives.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/tags/item/natural_lights.json create mode 100644 enderio-machines/src/generated/resources/data/enderio/tags/item/sunflower.json create mode 100644 enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineBlockTagsProvider.java create mode 100644 enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineItemTagsProvider.java diff --git a/enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/vat.json b/enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/vat.json new file mode 100644 index 0000000000..980af94437 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/vat.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "minecraft:barrel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:vat" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "enderio:vat" + ] + } +} \ No newline at end of file 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 index 4fea5d770f..63e1bbeb52 100644 --- 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,5 +1,26 @@ { "values": { + "minecraft:fire_charge": { + "#enderio:explosives": 0.5 + }, + "minecraft:firework_rocket": { + "#enderio:explosives": 0.5 + }, + "minecraft:glow_berries": { + "#enderio:natural_lights": 0.15 + }, + "minecraft:glow_ink_sac": { + "#enderio:natural_lights": 0.2 + }, + "minecraft:glow_lichen": { + "#enderio:natural_lights": 0.2 + }, + "minecraft:glowstone_dust": { + "#enderio:natural_lights": 0.25 + }, + "minecraft:sea_pickle": { + "#enderio:natural_lights": 0.25 + }, "minecraft:wheat": { "#c:crops": 3.0, "#c:seeds": 2.0 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 new file mode 100644 index 0000000000..6e462db55c --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/eio_soul/engine/minecraft_creeper.json @@ -0,0 +1,6 @@ +{ + "entity": "minecraft:creeper", + "fluid": "enderio:fluid_rocket_fuel_still", + "power/mb": 500, + "tick/mb": 15 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json new file mode 100644 index 0000000000..0f7cfc83ee --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json @@ -0,0 +1,14 @@ +{ + "type": "enderio:vat_fermenting", + "input": { + "amount": 1000, + "fluid": "enderio:fluid_hootch_still" + }, + "left_reagent": "enderio:blaze_powder", + "output": { + "amount": 1000, + "id": "enderio:fluid_fire_water_still" + }, + "right_reagent": "c:dusts/redstone", + "ticks": 150 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json new file mode 100644 index 0000000000..af446b04c2 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json @@ -0,0 +1,14 @@ +{ + "type": "enderio:vat_fermenting", + "input": { + "amount": 1000, + "tag": "minecraft:water" + }, + "left_reagent": "enderio:natural_lights", + "output": { + "amount": 1000, + "id": "enderio:fluid_liquid_sunshine_still" + }, + "right_reagent": "enderio:sunflower", + "ticks": 100 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json new file mode 100644 index 0000000000..6143b39945 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json @@ -0,0 +1,14 @@ +{ + "type": "enderio:vat_fermenting", + "input": { + "amount": 1000, + "tag": "minecraft:water" + }, + "left_reagent": "minecraft:meat", + "output": { + "amount": 250, + "id": "enderio:fluid_nutrient_distillation_still" + }, + "right_reagent": "c:crops", + "ticks": 100 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json new file mode 100644 index 0000000000..c257fabe24 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json @@ -0,0 +1,14 @@ +{ + "type": "enderio:vat_fermenting", + "input": { + "amount": 1000, + "fluid": "enderio:fluid_hootch_still" + }, + "left_reagent": "enderio:explosives", + "output": { + "amount": 1000, + "id": "enderio:fluid_rocket_fuel_still" + }, + "right_reagent": "c:dusts/redstone", + "ticks": 150 +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/vat.json b/enderio-machines/src/generated/resources/data/enderio/recipe/vat.json new file mode 100644 index 0000000000..751ef23ae3 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/recipe/vat.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "tag": "c:ingots/copper_alloy" + }, + "B": { + "item": "minecraft:barrel" + }, + "C": { + "item": "enderio:void_chassis" + }, + "M": { + "tag": "c:gears/iron" + }, + "R": { + "tag": "c:ingots/redstone_alloy" + }, + "S": { + "tag": "c:ingots/dark_steel" + } + }, + "pattern": [ + "SBS", + "ACA", + "MRM" + ], + "result": { + "count": 1, + "id": "enderio:vat" + } +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/tags/item/blaze_powder.json b/enderio-machines/src/generated/resources/data/enderio/tags/item/blaze_powder.json new file mode 100644 index 0000000000..10d5c86815 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/tags/item/blaze_powder.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:blaze_powder" + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000000..eec88ed0a3 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/tags/item/explosives.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:tnt", + "minecraft:firework_star", + "minecraft:firework_rocket" + ] +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/tags/item/natural_lights.json b/enderio-machines/src/generated/resources/data/enderio/tags/item/natural_lights.json new file mode 100644 index 0000000000..fc9c9f7fc9 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/tags/item/natural_lights.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:glowstone_dust", + "minecraft:glowstone", + "minecraft:sea_lantern", + "minecraft:sea_pickle", + "minecraft:glow_lichen", + "minecraft:glow_berries", + "minecraft:glow_ink_sac" + ] +} \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/tags/item/sunflower.json b/enderio-machines/src/generated/resources/data/enderio/tags/item/sunflower.json new file mode 100644 index 0000000000..55320195f2 --- /dev/null +++ b/enderio-machines/src/generated/resources/data/enderio/tags/item/sunflower.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:sunflower" + ] +} \ No newline at end of file diff --git a/enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java b/enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java index 5486390585..52b424ec80 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java +++ b/enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java @@ -31,7 +31,9 @@ import com.enderio.machines.data.recipes.SoulBindingRecipeProvider; import com.enderio.machines.data.recipes.TankRecipeProvider; import com.enderio.machines.data.souldata.SoulDataProvider; +import com.enderio.machines.data.tag.MachineBlockTagsProvider; import com.enderio.machines.data.tag.MachineEntityTypeTagsProvider; +import com.enderio.machines.data.tag.MachineItemTagsProvider; import com.enderio.regilite.Regilite; import net.minecraft.Util; import net.minecraft.core.HolderLookup; @@ -109,6 +111,9 @@ public static void gatherData(GatherDataEvent event) { provider.addSubProvider(event.includeServer(), new PaintingRecipeProvider(packOutput, lookupProvider)); provider.addSubProvider(event.includeServer(), new SoulDataProvider(packOutput)); provider.addSubProvider(event.includeServer(), new MachineEntityTypeTagsProvider(packOutput, lookupProvider, event.getExistingFileHelper())); + var b = new MachineBlockTagsProvider(packOutput, lookupProvider, event.getExistingFileHelper()); + provider.addSubProvider(event.includeServer(), b); + provider.addSubProvider(event.includeServer(), new MachineItemTagsProvider(packOutput, lookupProvider, b.contentsGetter(), event.getExistingFileHelper())); provider.addSubProvider(event.includeServer(), new ReagentDataProvider(packOutput, lookupProvider, event.getExistingFileHelper())); generator.addProvider(true, provider); diff --git a/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java b/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java index eb2916d1ad..6e19f1bc0e 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java +++ b/enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java @@ -18,7 +18,9 @@ public static class ItemTags { private static void init() {} public static TagKey EXPLOSIVES = create("explosives"); - public static TagKey REDSTONE_SOURCE = create("redstone_source"); + public static TagKey BLAZE_POWDER = create("blaze_powder"); + public static final TagKey NATURAL_LIGHTS = create("natural_lights"); + public static final TagKey SUNFLOWER = create("sunflower"); private static TagKey create(String pName) { return TagKey.create(Registries.ITEM, EnderIOBase.loc(pName)); diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java index cba2793b8e..2bc482a8c0 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java +++ b/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java @@ -2,6 +2,7 @@ import com.enderio.EnderIOBase; import com.enderio.machines.common.datamap.VatReagent; +import com.enderio.machines.common.tag.MachineTags; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.data.CachedOutput; @@ -35,6 +36,14 @@ public ReagentDataProvider(PackOutput packOutput, CompletableFuture leftReagent, TagKey rightReagent, diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java index a13b9d9874..00fdcebc41 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java +++ b/enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java @@ -407,6 +407,20 @@ protected void buildRecipes(RecipeOutput recipeOutput) { .pattern("A") .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(MachineBlocks.AVERSION_OBELISK).build())) .save(recipeOutput); + + ShapedRecipeBuilder + .shaped(RecipeCategory.MISC, MachineBlocks.VAT.get()) + .define('B', Blocks.BARREL) + .define('C', EIOBlocks.VOID_CHASSIS) + .define('M', EIOTags.Items.GEARS_IRON) + .define('A', EIOTags.Items.INGOTS_COPPER_ALLOY) + .define('R', EIOTags.Items.INGOTS_REDSTONE_ALLOY) + .define('S', EIOTags.Items.INGOTS_DARK_STEEL) + .pattern("SBS") + .pattern("ACA") + .pattern("MRM") + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(Blocks.BARREL).build())) + .save(recipeOutput); // TODO: Enable once the block detector has a model. /*ShapedRecipeBuilder 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 index 6df85504aa..105f2392d0 100644 --- 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,6 +121,7 @@ public void buildSoulData(Consumer> 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); addSolarData(EntityType.PHANTOM, false, true, null, finshedSoulDataConsumer); } diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineBlockTagsProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineBlockTagsProvider.java new file mode 100644 index 0000000000..d571bec20a --- /dev/null +++ b/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineBlockTagsProvider.java @@ -0,0 +1,20 @@ +package com.enderio.machines.data.tag; + +import com.enderio.EnderIOBase; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.neoforged.neoforge.common.data.BlockTagsProvider; + +import java.util.concurrent.CompletableFuture; + +public class MachineBlockTagsProvider extends BlockTagsProvider { + + public MachineBlockTagsProvider(PackOutput packOutput, CompletableFuture provider, net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) { + super(packOutput, provider, EnderIOBase.REGISTRY_NAMESPACE, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + + } +} 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 new file mode 100644 index 0000000000..e4802fc8d8 --- /dev/null +++ b/enderio-machines/src/main/java/com/enderio/machines/data/tag/MachineItemTagsProvider.java @@ -0,0 +1,27 @@ +package com.enderio.machines.data.tag; + +import com.enderio.EnderIOBase; +import com.enderio.machines.common.tag.MachineTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Block; +import net.neoforged.neoforge.common.data.ExistingFileHelper; + +import java.util.concurrent.CompletableFuture; + +public class MachineItemTagsProvider extends ItemTagsProvider { + + public MachineItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> blockTags, ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, blockTags, EnderIOBase.REGISTRY_NAMESPACE, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider provider) { + tag(MachineTags.ItemTags.EXPLOSIVES).add(Items.TNT, Items.FIREWORK_STAR, Items.FIREWORK_ROCKET); + 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); + } +} From 2bb3c87a4686ca72fe390ecee8d1ef09caacd96c Mon Sep 17 00:00:00 2001 From: ferriarnus <61201275+ferriarnus@users.noreply.github.com> Date: Sat, 20 Jul 2024 18:39:23 +0200 Subject: [PATCH 3/3] adjust recipe --- .../data/enderio/recipe/redstone_and_filter.json | 4 +--- .../enderio/recipe/redstone_counting_filter.json | 12 ++++++------ .../data/enderio/recipe/redstone_not_filter.json | 10 ++++++---- .../data/enderio/recipe/redstone_or_filter.json | 10 ++++------ .../data/enderio/recipe/redstone_sensor_filter.json | 10 ++++++---- .../data/enderio/recipe/redstone_timer_filter.json | 10 ++++++---- .../data/enderio/recipe/redstone_toggle_filter.json | 10 ++++++---- .../data/enderio/recipe/redstone_xor_filter.json | 10 +++++----- .../data/enderio/data_maps/item/vat_reagent.json | 7 +++++-- .../enderio/eio_soul/engine/minecraft_creeper.json | 2 +- .../recipe/fermenting/fluid_fire_water_still.json | 2 +- .../recipe/fermenting/fluid_hootch_still.json | 2 +- .../fermenting/fluid_liquid_sunshine_still.json | 2 +- .../fluid_nutrient_distillation_still.json | 2 +- .../recipe/fermenting/fluid_rocket_fuel_still.json | 2 +- .../resources/data/enderio/tags/item/explosives.json | 3 ++- .../data/reagentdata/ReagentDataProvider.java | 6 ++++-- .../data/recipes/FermentingRecipeProvider.java | 10 +++++----- .../machines/data/souldata/SoulDataProvider.java | 2 +- .../machines/data/tag/MachineItemTagsProvider.java | 2 +- 20 files changed, 64 insertions(+), 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 index 2a42519638..af77399341 100644 --- 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 index 854e3ee56a..9eb69d45ab 100644 --- 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 index 0b4702235f..c3dd6e01db 100644 --- 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 index 4539ec9736..af5f63e49f 100644 --- 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 index aa3dabcba3..c0e5bafd72 100644 --- 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 index cfe2cdad7d..69aa619d4a 100644 --- 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 index dc9746ed40..687710dcf7 100644 --- 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 index 4a16c2e8fc..91c710a061 100644 --- 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 index 63e1bbeb52..97cd1daeb5 100644 --- 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 index 6e462db55c..119d3041c5 100644 --- 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 } \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json index 0f7cfc83ee..77dae19690 100644 --- a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_fire_water_still.json +++ b/enderio-machines/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 } \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_hootch_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_hootch_still.json index b088d8032d..27f405f52c 100644 --- a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_hootch_still.json +++ b/enderio-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 } \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json index af446b04c2..6ff414ea1c 100644 --- a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_liquid_sunshine_still.json +++ b/enderio-machines/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 } \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json index 6143b39945..e1c9e7d895 100644 --- a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_nutrient_distillation_still.json +++ b/enderio-machines/src/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 } \ No newline at end of file diff --git a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json b/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json index c257fabe24..598d91fcda 100644 --- a/enderio-machines/src/generated/resources/data/enderio/recipe/fermenting/fluid_rocket_fuel_still.json +++ b/enderio-machines/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 } \ No newline at end of file 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 index eec88ed0a3..3ffc9abec9 100644 --- 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" ] } \ No newline at end of file diff --git a/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java b/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java index 2bc482a8c0..9c715c9739 100644 --- a/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java +++ b/enderio-machines/src/main/java/com/enderio/machines/data/reagentdata/ReagentDataProvider.java @@ -36,14 +36,16 @@ public ReagentDataProvider(PackOutput packOutput, CompletableFuture leftReagent, TagKey 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 index 105f2392d0..980ce6ba9c 100644 --- 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> 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 index e4802fc8d8..c02ef6eb06 100644 --- 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