Add the Soul Engine

src/generated/resources/assets/enderio/blockstates/soul_engine.json

@@ -0,0 +1,34 @@
+{
+  "variants": {
+    "facing=east,powered=false": {
+      "model": "enderio:block/soul_engine_combined",
+      "y": 90
+    },
+    "facing=east,powered=true": {
+      "model": "enderio:block/soul_engine_active_combined",
+      "y": 90
+    },
+    "facing=north,powered=false": {
+      "model": "enderio:block/soul_engine_combined"
+    },
+    "facing=north,powered=true": {
+      "model": "enderio:block/soul_engine_active_combined"
+    },
+    "facing=south,powered=false": {
+      "model": "enderio:block/soul_engine_combined",
+      "y": 180
+    },
+    "facing=south,powered=true": {
+      "model": "enderio:block/soul_engine_active_combined",
+      "y": 180
+    },
+    "facing=west,powered=false": {
+      "model": "enderio:block/soul_engine_combined",
+      "y": 270
+    },
+    "facing=west,powered=true": {
+      "model": "enderio:block/soul_engine_active_combined",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/enderio/lang/en_ud.json

@@ -196,6 +196,7 @@
   "block.enderio.slice_and_splice": "ǝɔıןdS,N,ǝɔıןS",
   "block.enderio.soul_binder": "ɹǝpuıᗺ ןnoS",
   "block.enderio.soul_chain": "uıɐɥƆ ןnoS",
+  "block.enderio.soul_engine": "ǝuıbuƎ ןnoS",
   "block.enderio.soularium_block": "ʞɔoןᗺ ɯnıɹɐןnoS",
   "block.enderio.soularium_pressure_plate": "ǝʇɐןԀ ǝɹnssǝɹԀ ɯnıɹɐןnoS",
   "block.enderio.stirling_generator": "ɹoʇɐɹǝuǝ⅁ buıןɹıʇS",
@@ -243,6 +244,7 @@
   "gui.enderio.category.sag_mill": "ןןıW ⅁ⱯS",
   "gui.enderio.category.slicing": "buıɔıןS",
   "gui.enderio.category.soul_binding": "buıpuıᗺ ןnoS",
+  "gui.enderio.category.soul_engine": "ǝuıbuƎ ןnoS",
   "gui.enderio.category.tank": "ʞuɐ⟘ pınןℲ",
   "gui.enderio.conduit.extract": "ʇɔɐɹʇxƎ",
   "gui.enderio.conduit.insert": "ʇɹǝsuI",

src/generated/resources/assets/enderio/lang/en_us.json

@@ -196,6 +196,7 @@
   "block.enderio.slice_and_splice": "Slice'N'Splice",
   "block.enderio.soul_binder": "Soul Binder",
   "block.enderio.soul_chain": "Soul Chain",
+  "block.enderio.soul_engine": "Soul Engine",
   "block.enderio.soularium_block": "Soularium Block",
   "block.enderio.soularium_pressure_plate": "Soularium Pressure Plate",
   "block.enderio.stirling_generator": "Stirling Generator",
@@ -243,6 +244,7 @@
   "gui.enderio.category.sag_mill": "SAG Mill",
   "gui.enderio.category.slicing": "Slicing",
   "gui.enderio.category.soul_binding": "Soul Binding",
+  "gui.enderio.category.soul_engine": "Soul Engine",
   "gui.enderio.category.tank": "Fluid Tank",
   "gui.enderio.conduit.extract": "Extract",
   "gui.enderio.conduit.insert": "Insert",

src/generated/resources/assets/enderio/models/block/soul_engine_active_combined.json

@@ -0,0 +1,19 @@
+{
+  "parent": "minecraft:block/block",
+  "children": {
+    "machine": {
+      "parent": "enderio:block/soul_engine_active"
+    },
+    "overlay": {
+      "parent": "enderio:block/io_overlay"
+    }
+  },
+  "item_render_order": [
+    "machine",
+    "overlay"
+  ],
+  "loader": "forge:composite",
+  "textures": {
+    "particle": "enderio:block/soul_engine_front"
+  }
+}

src/generated/resources/assets/enderio/models/block/soul_engine_combined.json

@@ -0,0 +1,19 @@
+{
+  "parent": "minecraft:block/block",
+  "children": {
+    "machine": {
+      "parent": "enderio:block/soul_engine"
+    },
+    "overlay": {
+      "parent": "enderio:block/io_overlay"
+    }
+  },
+  "item_render_order": [
+    "machine",
+    "overlay"
+  ],
+  "loader": "forge:composite",
+  "textures": {
+    "particle": "enderio:block/soul_engine_front"
+  }
+}

src/generated/resources/assets/enderio/models/item/soul_engine.json

@@ -0,0 +1,3 @@
+{
+  "parent": "enderio:block/soul_engine"
+}

src/generated/resources/data/enderio/advancements/recipes/misc/soul_engine.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ingredient": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "enderio:ensouled_chassis"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "enderio:soul_engine"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_ingredient",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "enderio:soul_engine"
+    ]
+  },
+  "sends_telemetry_event": false
+}

src/generated/resources/data/enderio/eio_soul/engine/minecraft_blaze.json

@@ -0,0 +1,6 @@
+{
+  "entity": "minecraft:blaze",
+  "fluid": "#minecraft:lava",
+  "power/mb": 300,
+  "tick/mb": 15
+}

src/generated/resources/data/enderio/eio_soul/engine/minecraft_enderman.json

@@ -0,0 +1,6 @@
+{
+  "entity": "minecraft:enderman",
+  "fluid": "enderio:flowing_dew_of_the_void",
+  "power/mb": 900,
+  "tick/mb": 10
+}

src/generated/resources/data/enderio/eio_soul/engine/minecraft_husk.json

@@ -0,0 +1,6 @@
+{
+  "entity": "minecraft:husk",
+  "fluid": "enderio:flowing_nutrient_distillation",
+  "power/mb": 500,
+  "tick/mb": 15
+}

src/generated/resources/data/enderio/eio_soul/engine/minecraft_zombie.json

@@ -0,0 +1,6 @@
+{
+  "entity": "minecraft:zombie",
+  "fluid": "enderio:flowing_nutrient_distillation",
+  "power/mb": 500,
+  "tick/mb": 15
+}

src/generated/resources/data/enderio/eio_soul/engine/minecraft_zombie_villager.json

@@ -0,0 +1,6 @@
+{
+  "entity": "minecraft:zombie_villager",
+  "fluid": "enderio:flowing_nutrient_distillation",
+  "power/mb": 500,
+  "tick/mb": 15
+}

src/generated/resources/data/enderio/loot_tables/blocks/soul_engine.json

@@ -0,0 +1,29 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_nbt",
+              "ops": [
+                {
+                  "op": "replace",
+                  "source": "",
+                  "target": "BlockEntityTag"
+                }
+              ],
+              "source": "block_entity"
+            }
+          ],
+          "name": "enderio:soul_engine"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "enderio:blocks/soul_engine"
+}

src/generated/resources/data/enderio/recipes/soul_engine.json

@@ -0,0 +1,30 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "B": {
+      "item": "minecraft:bucket"
+    },
+    "C": {
+      "item": "enderio:ensouled_chassis"
+    },
+    "G": {
+      "tag": "enderio:fused_quartz"
+    },
+    "I": {
+      "item": "enderio:soularium_ingot"
+    },
+    "Z": {
+      "item": "enderio:zombie_electrode"
+    }
+  },
+  "pattern": [
+    "IGI",
+    "BCB",
+    "IZI"
+  ],
+  "result": {
+    "item": "enderio:soul_engine"
+  },
+  "show_notification": true
+}

src/generated/resources/data/enderio/recipes/soulbinding/soul_engine.json

@@ -0,0 +1,10 @@
+{
+  "type": "enderio:soul_binding",
+  "energy": 188000,
+  "exp": 5,
+  "input": {
+    "item": "enderio:soul_engine"
+  },
+  "output": "enderio:soul_engine",
+  "souldata": "engine"
+}

src/machines/java/com/enderio/machines/client/gui/screen/SoulEngineScreen.java

@@ -0,0 +1,77 @@
+package com.enderio.machines.client.gui.screen;
+
+import com.enderio.EnderIO;
+import com.enderio.api.misc.Vector2i;
+import com.enderio.base.common.lang.EIOLang;
+import com.enderio.core.client.gui.screen.EIOScreen;
+import com.enderio.core.client.gui.widgets.EnumIconWidget;
+import com.enderio.machines.client.gui.widget.CapacitorEnergyWidget;
+import com.enderio.machines.client.gui.widget.FluidStackWidget;
+import com.enderio.machines.client.gui.widget.ioconfig.IOConfigButton;
+import com.enderio.machines.common.menu.SoulEngineMenu;
+import com.enderio.machines.common.souldata.EngineSoul;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraftforge.registries.ForgeRegistries;
+
+import java.util.Optional;
+
+public class SoulEngineScreen extends EIOScreen<SoulEngineMenu>{
+
+    public static final ResourceLocation BG_TEXTURE = EnderIO.loc("textures/gui/soul_engine.png");
+
+    public SoulEngineScreen(SoulEngineMenu pMenu, Inventory pPlayerInventory, Component pTitle) {
+        super(pMenu, pPlayerInventory, pTitle);
+    }
+
+    @Override
+    protected void init() {
+        super.init();
+
+        addRenderableOnly(new CapacitorEnergyWidget(this, getMenu().getBlockEntity()::getEnergyStorage, getMenu().getBlockEntity()::isCapacitorInstalled, 16 + leftPos, 14 + topPos, 9, 42));
+
+        addRenderableWidget(new EnumIconWidget<>(this, leftPos + imageWidth - 8 - 12, topPos + 6, () -> menu.getBlockEntity().getRedstoneControl(),
+            control -> menu.getBlockEntity().setRedstoneControl(control), EIOLang.REDSTONE_MODE));
+
+        addRenderableOnly(new FluidStackWidget(this, getMenu().getBlockEntity()::getFluidTank, 80 + leftPos, 21 + topPos, 16, 47));
+
+        addRenderableWidget(new IOConfigButton<>(this, leftPos + imageWidth - 6 - 16, topPos + 22, 16, 16, menu, this::addRenderableWidget, font));
+
+    }
+
+    @Override
+    protected void renderLabels(GuiGraphics guiGraphics, int pMouseX, int pMouseY) {
+        super.renderLabels(guiGraphics, pMouseX, pMouseY);
+        Optional<ResourceLocation> rl = getMenu().getBlockEntity().getEntityType();
+        if (rl.isPresent()) {
+            EntityType<?> type = ForgeRegistries.ENTITY_TYPES.getValue(rl.get());
+            if (type != null && ForgeRegistries.ENTITY_TYPES.getKey(type).equals(rl.get())) { // check we don't get the default pig
+                String name = type.getDescription().getString();
+                guiGraphics.drawString(font, name, imageWidth / 2f - font.width(name) / 2f, 10, 4210752, false);
+            } else {
+                guiGraphics.drawString(font, rl.get().toString(), imageWidth / 2f - font.width(rl.get().toString()) / 2f, 10, 4210752, false);
+            }
+            EngineSoul.SoulData data = EngineSoul.ENGINE.map.get(rl.get());
+            if (data != null) {
+                guiGraphics.drawString(font, data.tickpermb() + " t/mb", imageWidth / 2f + 12 , 40, 4210752, false);
+                guiGraphics.drawString(font, data.powerpermb() + " µI/mb", imageWidth / 2f + 12 , 50, 4210752, false);
+
+            }
+        }
+
+
+    }
+
+    @Override
+    public ResourceLocation getBackgroundImage() {
+        return BG_TEXTURE;
+    }
+
+    @Override
+    protected Vector2i getBackgroundImageSize() {
+        return new Vector2i(176, 166);
+    }
+}