Budget CRIBus

src/main/java/com/zorbatron/zbgt/api/render/ZBGTTextures.java

@@ -14,13 +14,18 @@ public class ZBGTTextures {
     public static SimpleOverlayRenderer SWIRLY_INFINITY;
     public static SimpleOverlayRenderer YOTTANK_ME_HATCH;
     public static SimpleOverlayRenderer MAINTENANCE_OVERLAY_STERILE;
+    public static SimpleOverlayRenderer CRIB_ACTIVE;
+    public static SimpleOverlayRenderer CRIB_INACTIVE;
+    public static SimpleOverlayRenderer CRIB_PROXY;
 
     // GUI overlays
     public static TextureArea ITEM_FLUID_OVERLAY;
     public static TextureArea AUTO_PULL;
     public static TextureArea PME;
     public static TextureArea AE2_RW_STATES;
     public static TextureArea SLIME_BALL;
+    public static TextureArea ME_PATTERN_OVERLAY;
+    public static TextureArea EXPORT;
 
     public static TextureArea PROGRESS_BAR_CoAL;
 
@@ -44,12 +49,17 @@ public static void preInit() {
         SWIRLY_INFINITY = new SimpleOverlayRenderer("overlay/machine/swirly_infinity");
         YOTTANK_ME_HATCH = new SimpleOverlayRenderer("overlay/machine/yottank_me_hatch");
         MAINTENANCE_OVERLAY_STERILE = new SimpleOverlayRenderer("overlay/machine/overlay_maintenance_sterile");
+        CRIB_ACTIVE = new SimpleOverlayRenderer("overlay/machine/OVERLAY_ME_CRAFTING_INPUT_BUFFER");
+        CRIB_INACTIVE = new SimpleOverlayRenderer("overlay/machine/OVERLAY_ME_CRAFTING_INPUT_BUS");
+        CRIB_PROXY = new SimpleOverlayRenderer("overlay/machine/OVERLAY_ME_CRAFTING_INPUT_SLAVE");
 
         ITEM_FLUID_OVERLAY = TextureArea.fullImage("textures/gui/widget/item_fluid.png");
         AUTO_PULL = TextureArea.fullImage("textures/gui/widget/auto_pull.png");
         PME = TextureArea.fullImage("textures/gui/widget/pme.png");
         AE2_RW_STATES = TextureArea.fullImage("textures/gui/widget/ae2_rw_states.png");
         SLIME_BALL = TextureArea.fullImage("textures/gui/widget/slimeball.png");
+        ME_PATTERN_OVERLAY = TextureArea.fullImage("textures/gui/widget/pattern_me.png");
+        EXPORT = TextureArea.fullImage("textures/gui/widget/export.png");
 
         PROGRESS_BAR_CoAL = TextureArea.fullImage("textures/gui/progress_bar/progress_bar_component_al.png");
 

src/main/java/com/zorbatron/zbgt/client/widgets/PhantomSlotNoTextWidget.java → src/main/java/com/zorbatron/zbgt/client/widgets/PhantomSlotNoAmountTextWidget.java

@@ -1,9 +1,5 @@
 package com.zorbatron.zbgt.client.widgets;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.RenderItem;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
@@ -17,9 +13,10 @@
 import gregtech.api.util.Position;
 import gregtech.api.util.Size;
 
-public class PhantomSlotNoTextWidget extends PhantomSlotWidget {
+public class PhantomSlotNoAmountTextWidget extends PhantomSlotWidget {
 
-    public PhantomSlotNoTextWidget(IItemHandlerModifiable itemHandler, int slotIndex, int xPosition, int yPosition) {
+    public PhantomSlotNoAmountTextWidget(IItemHandlerModifiable itemHandler, int slotIndex, int xPosition,
+                                         int yPosition) {
         super(itemHandler, slotIndex, xPosition, yPosition);
     }
 
@@ -50,42 +47,13 @@ public void drawInBackground(int mouseX, int mouseY, float partialTicks, IRender
             }
         }
         if (!itemStack.isEmpty()) {
-            GlStateManager.enableBlend();
-            GlStateManager.enableDepth();
-            GlStateManager.disableRescaleNormal();
-            GlStateManager.disableLighting();
-            RenderHelper.disableStandardItemLighting();
-            RenderHelper.enableStandardItemLighting();
-            RenderHelper.enableGUIStandardItemLighting();
-            GlStateManager.pushMatrix();
-            RenderItem itemRender = Minecraft.getMinecraft().getRenderItem();
-            // itemStack.setCount(1);
-            itemRender.renderItemAndEffectIntoGUI(itemStack, pos.x + 1, pos.y + 1);
-            // itemRender.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRenderer, itemStack, pos.x + 1, pos.y +
-            // 1,
-            // null);
-            GlStateManager.enableAlpha();
-            GlStateManager.popMatrix();
-            RenderHelper.disableStandardItemLighting();
+            // Set the stack count to 1 which doesn't show the amount text
+            itemStack.setCount(1);
+            drawItemStack(itemStack, pos.x + 1, pos.y + 1, null);
         }
-        if (isActive()) {
-            if (slotReference instanceof ISlotWidget) {
-                if (isMouseOverElement(mouseX, mouseY)) {
-                    GlStateManager.disableDepth();
-                    GlStateManager.colorMask(true, true, true, false);
-                    drawSolidRect(getPosition().x + 1, getPosition().y + 1, 16, 16, -2130706433);
-                    GlStateManager.colorMask(true, true, true, true);
-                    GlStateManager.enableDepth();
-                    GlStateManager.enableBlend();
-                }
-            }
-        } else {
-            GlStateManager.disableDepth();
-            GlStateManager.colorMask(true, true, true, false);
-            drawSolidRect(getPosition().x + 1, getPosition().y + 1, 16, 16, 0xbf000000);
-            GlStateManager.colorMask(true, true, true, true);
-            GlStateManager.enableDepth();
-            GlStateManager.enableBlend();
+
+        if (isMouseOverElement(mouseX, mouseY)) {
+            drawSelectionOverlay(pos.x + 1, pos.y + 1, 16, 16);
         }
     }
 }

src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java

@@ -30,6 +30,8 @@ public class ZBGTMetaTileEntities {
     public static MetaTileEntityLargeParallelHatch[] ZBGT_PARALLEL_HATCHES = new MetaTileEntityLargeParallelHatch[7];
     public static MetaTileEntityYOTTankMEHatch YOTTANK_ME_HATCH;
     public static MetaTileEntitySterileCleaningHatch STERILE_CLEANING_HATCH;
+    public static MetaTileEntityBudgetCRIB BUDGET_CRIB;
+    public static MetaTileEntityBudgetCRIBProxy BUDGET_CRIB_PROXY;
 
     public static MetaTileEntityMegaEBF MEGA_EBF;
     public static MetaTileEntityMegaLCR MEGA_LCR;
@@ -104,6 +106,11 @@ public static void init() {
         STERILE_CLEANING_HATCH = registerMetaTileEntity(18018,
                 new MetaTileEntitySterileCleaningHatch(zbgtId("sterile_cleaning_hatch")));
 
+        BUDGET_CRIB = registerMetaTileEntity(18019,
+                new MetaTileEntityBudgetCRIB(zbgtId("budget_crib")));
+        BUDGET_CRIB_PROXY = registerMetaTileEntity(18020,
+                new MetaTileEntityBudgetCRIBProxy(zbgtId("budget_crib_proxy")));
+
         // 18050-18099 (50) reserved for multiblocks
         MEGA_EBF = registerMetaTileEntity(18050,
                 new MetaTileEntityMegaEBF(zbgtId("mega_ebf")));