#35 Early ME Output Bus implementations (Fluid Bus is WIP); changed the default color of machinery; some bug fixes.

Author: KasumiNova

build.gradle

@@ -96,20 +96,18 @@ dependencies {
     implementation fg.deobf("curse.maven:brandonscore-231382:3051539")
     implementation fg.deobf("curse.maven:draconicevolution-223565:3051542")
     implementation fg.deobf("curse.maven:the-one-probe-245211:2667280")
-
-    implementation fg.deobf("curse.maven:gregtech-293327:3266351")
-    //Because GTCEu 2.4 and above and NCo crashed, this is to use GTCEu 2.3.4 for testing
-    //Rendering errors occur when the GTCEu version is tested running, so just compileOnly
-    compileOnly fg.deobf("curse.maven:gregtech-ce-unofficial-557242:3859788")
-
     implementation fg.deobf("curse.maven:Mekanism-268560:2835175")
     implementation fg.deobf("curse.maven:industrialcraft-2-242638:3078604")
     implementation fg.deobf("curse.maven:nuclearcraft-overhauled-336895:3862197")
     implementation fg.deobf("curse.maven:flux-networks-248020:3178199")
     implementation fg.deobf("curse.maven:tinkers-construct-74072:2902483")
     implementation fg.deobf("curse.maven:mantle-74924:2713386")
     implementation fg.deobf("curse.maven:tx-loader-706505:4515357")
-    implementation fg.deobf("curse.maven:ae2-extended-life-570458:4646658")
+    implementation fg.deobf("curse.maven:applied-energistics-2-223794:2747063")
+    implementation fg.deobf("curse.maven:gregtech-293327:3266351")
+    //Because GTCEu 2.4 and above and NCo crashed, this is to use GTCEu 2.3.4 for testing
+    //Rendering errors occur when the GTCEu version is tested running, so just compileOnly
+    compileOnly fg.deobf("curse.maven:gregtech-ce-unofficial-557242:3859788")
 }
 
 jar {

docs/README.md

@@ -1,104 +1,3 @@
-# ModularMachinery: Community Edition
+# ModularMachinery: Community Edition Wiki
 
-Language Select
-
-1. [简体中文](#简体中文)
-2. [English](#English)
-
-## 简体中文
-
-社区版皆在使模块化机械变得更加现代化，并提供更多的可自定义内容。
-
-### 增强功能：
-
-* 提供更多对能源输入仓和能源输出仓的能量核心的搜索配置
-* 更大的控制器 GUI，供魔改员提供更多的信息显示
-
-### 扩展功能：
-
-* 自定义配方失败操作（默认为 still，来自 [咕咕工具](https://github.com/ParaParty/gugu-utils)）
-* TheOneProbe 兼容（目前支持配方进度 / 机械状态显示，支持配置）
-* 新的配方类型
-    * 材料组输入
-    * 催化剂输入
-    * 每 Tick 流体输入输出
-* 基于 CraftTweaker 的高级事件系统和扩展 API
-    * 5 个配方事件
-    * 2 个机械事件
-    * 在 JEI 配方界面添加自定义提示
-    * 动态物品 NBT 判断与动态物品修改器
-    * 动态生成、添加和删除的 RecipeModifier
-    * 动态修改和添加控制器 GUI 状态信息
-    * 内建可持久化（退出游戏保存数据）的自定义数据储存，支持读取和保存
-    * 机械控制器 API
-* 智能数据接口
-    * 智能数据接口可以使用 CraftTweaker 来添加自定义功能
-    * 它可以实现诸如编程电路、速率控制等功能
-
-### 实验性功能：
-
-* 高性能异步实现
-    * 原版模块化机械提供了很多强大的功能，但是它的运行性能令人堪忧，尤其是有大量机械的情况下。
-    * 社区版添加了可异步接口，所有实现此接口的都可以安全的以异步形式完成大量工作。
-    * 根据大量的整合包测试，最高性能提升可达近 **10** 倍。
-    * 唯一的主线程消耗是检查结构，但是它是**不可能**异步的，因为它在一些第三方插件服务端是**不安全**的操作。
-
-* 重绘 JEI 配方界面图标，支持塞入更多的配方元素
-
-开发中的功能：
-
-* 随机物品输出
-* 单方块机械实现
-* 并行配方处理
-* 工厂实现（类似 Mekanism 中的工厂）
-* 合并附属功能
-* 为 TheOneProbe 提供更多支持
-
-## English
-
-The Community Edition is all about modernizing the Modular Machinery and providing more customizable content.
-
-### Enhancements:
-
-* More searchable configurations for the DE Energy Core of the Energy Input Hatch and Energy Output Hatch
-* Larger controller GUI for more information display by the modpackers
-
-### Expanded Features:
-
-* Custom recipe failure operation (default is still, from [gugu-utils](https://github.com/ParaParty/gugu-utils))
-* TheOneProbe compatible (currently supports recipe progress / mechanical status display, supports configuration)
-* New recipe types
-    * Material group input
-    * Catalyst input
-    * Per Tick fluid input and output
-* Advanced event system and extended API based on CraftTweaker
-    * 5 recipe events
-    * 2 mechanical events
-    * Add custom hints to JEI recipe screen
-    * Dynamic item NBT determination and dynamic item modifier
-    * RecipeModifier for dynamic generation, addition and deletion
-    * Dynamic modification and addition of controller GUI status information
-    * Built-in customizable data storage with persistence (save data on exit from game), read and save support
-    * Mechanical controller API
-* Smart Data Interface
-    * Smart Data Interface can be used to add custom functionality using CraftTweaker
-    * It enables features such as programming circuits, rate control, etc.
-
-### Experimental features:
-
-* High-performance asynchronous implementation
-    * The original Modular Machinery offers a lot of powerful features, but it runs with worrisome performance, especially with a large number of controllers.
-    * The community version adds an asynchronizable interface, and all implementations of this interface can safely do a lot of work in an asynchronous form.
-    * Based on extensive modpack testing, the maximum performance improvement can be over **10** times.
-    * The only main thread consumed is structure check, but it is **impossible** to do asynchronously because it is **unsafe** to operate on the side of some third-party plugin services.
-
-* Redrawn JEI recipe interface icon to support stuffing more recipe elements
-
-### Features under development.
-
-* Random item output
-* Single cube mechanical implementation
-* Parallel recipe processing
-* Factory implementation (similar to the factory in Mekanism)
-* Merging of dependent functions
-* Additional support for TheOneProbe
+WIP ;P

src/main/java/github/kasuminova/mmce/client/gui/GuiMEItemOutputBus.java

@@ -0,0 +1,33 @@
+package github.kasuminova.mmce.client.gui;
+
+import appeng.client.gui.AEBaseGui;
+import github.kasuminova.mmce.common.container.ContainerMEItemOutputBus;
+import github.kasuminova.mmce.common.tile.MEItemOutputBus;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ResourceLocation;
+
+public class GuiMEItemOutputBus extends AEBaseGui {
+    // For convenience, the Sky Chest resource was used :P
+    private static final ResourceLocation TEXTURES_OUTPUT_BUS = new ResourceLocation("appliedenergistics2", "textures/guis/skychest.png");
+
+    public GuiMEItemOutputBus(final MEItemOutputBus te, final EntityPlayer player) {
+        super(new ContainerMEItemOutputBus(te, player));
+        this.ySize = 195;
+    }
+
+    @Override
+    public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        this.fontRenderer.drawString(I18n.format("gui.meitemoutputbus.title"), 8, 8, 0x404040);
+        this.fontRenderer.drawString(I18n.format("gui.meitemoutputbus.inventory"), 8, this.ySize - 96 + 2, 0x404040);
+    }
+
+    @Override
+    public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        this.mc.getTextureManager().bindTexture(TEXTURES_OUTPUT_BUS);
+        this.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize);
+    }
+
+}

src/main/java/github/kasuminova/mmce/common/block/appeng/BlockMEItemOutputBus.java

@@ -0,0 +1,97 @@
+package github.kasuminova.mmce.common.block.appeng;
+
+import github.kasuminova.mmce.common.tile.MEItemOutputBus;
+import hellfirepvp.modularmachinery.ModularMachinery;
+import hellfirepvp.modularmachinery.common.CommonProxy;
+import hellfirepvp.modularmachinery.common.block.BlockMachineComponent;
+import hellfirepvp.modularmachinery.common.util.IOInventory;
+import hellfirepvp.modularmachinery.common.util.RedstoneHelper;
+import net.minecraft.block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.util.EnumBlockRenderType;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+@SuppressWarnings("deprecation")
+public class BlockMEItemOutputBus extends BlockMachineComponent {
+
+    public BlockMEItemOutputBus() {
+        super(Material.IRON);
+        setHardness(2F);
+        setResistance(10F);
+        setSoundType(SoundType.METAL);
+        setHarvestLevel("pickaxe", 1);
+        setCreativeTab(CommonProxy.creativeTabModularMachinery);
+    }
+
+    @Override
+    public boolean onBlockActivated(
+            World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull EntityPlayer playerIn,
+            @Nonnull EnumHand hand, @Nonnull EnumFacing facing,
+            float hitX, float hitY, float hitZ) {
+        if (!worldIn.isRemote) {
+            TileEntity te = worldIn.getTileEntity(pos);
+            if (te instanceof MEItemOutputBus) {
+                playerIn.openGui(ModularMachinery.MODID, CommonProxy.GuiType.ME_ITEM_OUTPUT_BUS.ordinal(), worldIn, pos.getX(), pos.getY(), pos.getZ());
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void breakBlock(World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockState state) {
+        TileEntity te = worldIn.getTileEntity(pos);
+        if (te instanceof MEItemOutputBus) {
+            IOInventory inv = ((MEItemOutputBus) te).getInternalInventory();
+            for (int i = 0; i < inv.getSlots(); i++) {
+                ItemStack stack = inv.getStackInSlot(i);
+                if (!stack.isEmpty()) {
+                    spawnAsEntity(worldIn, pos, stack);
+                    inv.setStackInSlot(i, ItemStack.EMPTY);
+                }
+            }
+        }
+        super.breakBlock(worldIn, pos, state);
+    }
+
+    @Nullable
+    @Override
+    public TileEntity createTileEntity(final World world, final IBlockState state) {
+        return new MEItemOutputBus();
+    }
+
+    @Nonnull
+    @Override
+    public EnumBlockRenderType getRenderType(@Nonnull IBlockState state) {
+        return EnumBlockRenderType.MODEL;
+    }
+
+    @Nonnull
+    @Override
+    @SideOnly(Side.CLIENT)
+    public BlockRenderLayer getRenderLayer() {
+        return BlockRenderLayer.CUTOUT;
+    }
+
+    @Override
+    public boolean hasComparatorInputOverride(@Nonnull IBlockState state) {
+        return true;
+    }
+
+    @Override
+    public int getComparatorInputOverride(@Nonnull IBlockState blockState, World worldIn, @Nonnull BlockPos pos) {
+        return RedstoneHelper.getRedstoneLevel(worldIn.getTileEntity(pos));
+    }
+}

src/main/java/github/kasuminova/mmce/common/container/ContainerMEItemOutputBus.java

@@ -0,0 +1,28 @@
+package github.kasuminova.mmce.common.container;
+
+import appeng.container.AEBaseContainer;
+import appeng.container.slot.SlotNormal;
+import github.kasuminova.mmce.common.tile.MEItemOutputBus;
+import net.minecraft.entity.player.EntityPlayer;
+
+public class ContainerMEItemOutputBus extends AEBaseContainer {
+    private final MEItemOutputBus owner;
+
+    public ContainerMEItemOutputBus(final MEItemOutputBus owner, final EntityPlayer player) {
+        super(player.inventory, owner);
+
+        this.owner = owner;
+
+        for (int y = 0; y < 4; y++) {
+            for (int x = 0; x < 9; x++) {
+                this.addSlotToContainer(new SlotNormal(this.owner.getInternalInventory().asGUIAccess(), y * 9 + x, 8 + 18 * x, 24 + 18 * y));
+            }
+        }
+
+        this.bindPlayerInventory(getInventoryPlayer(), 0, 195 - /* height of player inventory */ 82);
+    }
+
+    public MEItemOutputBus getOwner() {
+        return owner;
+    }
+}