GTOS stuff

src/main/java/gregtech/GregTechMod.java

@@ -13,7 +13,7 @@
 import gregtech.api.model.ResourcePackHook;
 import gregtech.api.net.NetworkHandler;
 import gregtech.api.recipes.RecipeMap;
-import gregtech.api.terminal.util.GuideJsonLoader;
+import gregtech.api.terminal.TerminalRegistry;
 import gregtech.api.unification.OreDictUnifier;
 import gregtech.api.unification.material.IMaterialHandler;
 import gregtech.api.unification.material.Material;
@@ -39,8 +39,6 @@
 import gregtech.common.worldgen.WorldGenRubberTree;
 import gregtech.integration.theoneprobe.TheOneProbeCompatibility;
 import gregtech.loaders.dungeon.DungeonLootLoader;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.SimpleReloadableResourceManager;
 import gregtech.loaders.recipe.component.AnnotatedComponentHandlerLoader;
 import net.minecraftforge.classloading.FMLForgePlugin;
 import net.minecraftforge.common.MinecraftForge;
@@ -71,7 +69,6 @@ public class GregTechMod {
             BlockOreFactory.init();
             BlockCompressedFactory.init();
             BlockFrameFactory.init();
-            ((SimpleReloadableResourceManager)Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new GuideJsonLoader());
         }
     }
 

src/main/java/gregtech/api/capability/GregtechCapabilities.java

@@ -6,6 +6,7 @@
 import gregtech.api.capability.tool.IScrewdriverItem;
 import gregtech.api.capability.tool.ISoftHammerItem;
 import gregtech.api.capability.tool.IWrenchItem;
+import gregtech.api.terminal.hardware.HardwareProvider;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.capabilities.Capability;
@@ -41,6 +42,9 @@ public class GregtechCapabilities {
     @CapabilityInject(IMultiblockController.class)
     public static Capability<IMultiblockController> CAPABILITY_MULTIBLOCK_CONTROLLER = null;
 
+    @CapabilityInject(HardwareProvider.class)
+    public static Capability<HardwareProvider> CAPABILITY_HARDWARE_PROVIDER = null;
+
     private static final ResourceLocation CAPABILITY_EU_TO_FE = new ResourceLocation(GTValues.MODID, "fe_capability");
 
     @SubscribeEvent

src/main/java/gregtech/api/capability/GregtechTileCapabilities.java

@@ -1,5 +1,6 @@
 package gregtech.api.capability;
 
+import gregtech.api.capability.impl.AbstractRecipeLogic;
 import gregtech.api.cover.ICoverable;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityInject;
@@ -18,4 +19,7 @@ public class GregtechTileCapabilities {
     @CapabilityInject(IActiveOutputSide.class)
     public static Capability<IActiveOutputSide> CAPABILITY_ACTIVE_OUTPUT_SIDE = null;
 
+    @CapabilityInject(AbstractRecipeLogic.class)
+    public static Capability<AbstractRecipeLogic> CAPABILITY_RECIPE_LOGIC = null;
+
 }

src/main/java/gregtech/api/capability/IActiveOutputSide.java

@@ -6,5 +6,7 @@ public interface IActiveOutputSide {
 
     boolean isAutoOutputFluids();
 
-    boolean isAllowInputFromOutputSide();
+    boolean isAllowInputFromOutputSideItems();
+
+    boolean isAllowInputFromOutputSideFluids();
 }

src/main/java/gregtech/api/capability/IElectricItem.java

@@ -14,6 +14,8 @@ public interface IElectricItem {
      */
     boolean canProvideChargeExternally();
 
+    boolean chargeable();
+
     /**
      * Adds charge listener to this electric item
      *

src/main/java/gregtech/api/capability/SimpleCapabilityManager.java

@@ -1,10 +1,12 @@
 package gregtech.api.capability;
 
+import gregtech.api.capability.impl.AbstractRecipeLogic;
 import gregtech.api.capability.tool.ICutterItem;
 import gregtech.api.capability.tool.IScrewdriverItem;
 import gregtech.api.capability.tool.ISoftHammerItem;
 import gregtech.api.capability.tool.IWrenchItem;
 import gregtech.api.cover.ICoverable;
+import gregtech.api.terminal.hardware.HardwareProvider;
 import gregtech.api.worldgen.generator.GTWorldGenCapability;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.util.EnumFacing;
@@ -42,6 +44,8 @@ public static void init() {
         registerCapabilityWithNoDefault(IActiveOutputSide.class);
         registerCapabilityWithNoDefault(IFuelable.class);
         registerCapabilityWithNoDefault(IMultiblockController.class);
+        registerCapabilityWithNoDefault(AbstractRecipeLogic.class);
+        registerCapabilityWithNoDefault(HardwareProvider.class);
 
         registerCapabilityWithNoDefault(IWrenchItem.class);
         registerCapabilityWithNoDefault(ICutterItem.class);

src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java

@@ -21,7 +21,6 @@
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidTank;
-import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 import java.util.ArrayList;
@@ -108,6 +107,8 @@ public <T> T getCapability(Capability<T> capability) {
             return GregtechTileCapabilities.CAPABILITY_WORKABLE.cast(this);
         } else if (capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) {
             return GregtechTileCapabilities.CAPABILITY_CONTROLLABLE.cast(this);
+        } else if (capability == GregtechTileCapabilities.CAPABILITY_RECIPE_LOGIC) {
+            return GregtechTileCapabilities.CAPABILITY_RECIPE_LOGIC.cast(this);
         }
         return null;
     }

src/main/java/gregtech/api/capability/impl/ElectricItem.java

@@ -96,6 +96,11 @@ public boolean canProvideChargeExternally() {
         return this.canProvideEnergyExternally;
     }
 
+    @Override
+    public boolean chargeable() {
+        return chargeable;
+    }
+
     @Override
     public long charge(long amount, int chargerTier, boolean ignoreTransferLimit, boolean simulate) {
         if (itemStack.getCount() != 1) {

src/main/java/gregtech/api/entities/particle/GTParticleManager.java

@@ -16,8 +16,6 @@
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -34,17 +32,15 @@
  * @Description: ParticleManger register, spawn, efficient rendering, update our custom particles.
  */
 @SideOnly(Side.CLIENT)
-@Mod.EventBusSubscriber(Side.CLIENT)
 public class GTParticleManager {
-    public static GTParticleManager instance = new GTParticleManager();
+    public final static GTParticleManager INSTANCE = new GTParticleManager();
+
     private static World currentWorld = null;
     private static ParticleManager particleManager = Minecraft.getMinecraft().effectRenderer;
 
     private final Map<IGTParticleHandler, ArrayDeque<GTParticle>[]> renderQueue = new HashMap<>();
     private final Queue<Tuple<IGTParticleHandler, GTParticle>> newParticleQueue = new ArrayDeque<>();
 
-    private GTParticleManager() { }
-
     public void addEffect(Particle... particles) {
         if (particleManager == null) {
             particleManager = Minecraft.getMinecraft().effectRenderer;
@@ -59,9 +55,7 @@ public void addEffect(Particle... particles) {
     }
 
     public void updateEffects() {
-        for (int i = 0; i < 4; ++i) {
-            updateEffectLayer(i);
-        }
+        updateEffectLayer();
         if (!newParticleQueue.isEmpty()) {
             for (Tuple<IGTParticleHandler, GTParticle> handlerParticle = newParticleQueue.poll(); handlerParticle != null; handlerParticle = newParticleQueue.poll()) {
                 IGTParticleHandler handler = handlerParticle.getFirst();
@@ -79,20 +73,28 @@ public void updateEffects() {
         }
     }
 
-    private void updateEffectLayer(int layer) {
+    private void updateEffectLayer() {
+        if (renderQueue.isEmpty()) return;
+        boolean empty = true;
         for (ArrayDeque<GTParticle>[] array : renderQueue.values()) {
-            ArrayDeque<GTParticle> queue = array[layer];
-            if (!queue.isEmpty()) {
-                Iterator<GTParticle> iterator = queue.iterator();
-                while (iterator.hasNext()) {
-                    Particle particle = iterator.next();
-                    tickParticle(particle);
-                    if (!particle.isAlive()) {
-                        iterator.remove();
+            for (int layer = 0; layer < 4; ++layer) {
+                ArrayDeque<GTParticle> queue = array[layer];
+                if (!queue.isEmpty()) {
+                    empty = false;
+                    Iterator<GTParticle> iterator = queue.iterator();
+                    while (iterator.hasNext()) {
+                        Particle particle = iterator.next();
+                        tickParticle(particle);
+                        if (!particle.isAlive()) {
+                            iterator.remove();
+                        }
                     }
                 }
             }
         }
+        if (empty) {
+            renderQueue.clear();
+        }
     }
 
     public void clearAllEffects() {
@@ -123,6 +125,7 @@ public String call() {
     }
 
     public void renderParticles(Entity entityIn, float partialTicks) {
+        if (renderQueue.isEmpty()) return;
         float rotationX = ActiveRenderInfo.getRotationX();
         float rotationZ = ActiveRenderInfo.getRotationZ();
         float rotationYZ = ActiveRenderInfo.getRotationYZ();
@@ -141,8 +144,6 @@ public void renderParticles(Entity entityIn, float partialTicks) {
 
         renderGlParticlesInLayer(tessellator, entityIn, partialTicks, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ);
 
-
-
         GlStateManager.depthMask(true);
         GlStateManager.disableBlend();
         GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F);
@@ -185,7 +186,6 @@ public String getStatistics() {
         return " GLFX: " + g;
     }
 
-    @SubscribeEvent
     public static void clientTick(TickEvent.ClientTickEvent event) {
         Minecraft mc = Minecraft.getMinecraft();
         if (event.phase != TickEvent.Phase.END || mc.isGamePaused()) {
@@ -194,24 +194,22 @@ public static void clientTick(TickEvent.ClientTickEvent event) {
 
         if (currentWorld != mc.world) {
             currentWorld = mc.world;
-            instance.clearAllEffects();
+            INSTANCE.clearAllEffects();
         }
 
         if (mc.world != null) {
-            instance.updateEffects();
+            INSTANCE.updateEffects();
         }
     }
 
-    @SubscribeEvent
     public static void renderWorld(RenderWorldLastEvent event) {
-        instance.renderParticles(Minecraft.getMinecraft().player, event.getPartialTicks());
+        INSTANCE.renderParticles(Minecraft.getMinecraft().player, event.getPartialTicks());
     }
 
-    @SubscribeEvent
     public static void debugOverlay(RenderGameOverlayEvent.Text event) {
-        if (event.getLeft().size() >= 5 && instance != null) {
+        if (event.getLeft().size() >= 5) {
             String particleTxt = event.getLeft().get(4);
-            particleTxt += "." + TextFormatting.GOLD + " BC-P: " + instance.getStatistics();
+            particleTxt += "." + TextFormatting.GOLD + " BC-P: " + INSTANCE.getStatistics();
             event.getLeft().set(4, particleTxt);
         }
     }

src/main/java/gregtech/api/gui/GuiTextures.java

@@ -37,6 +37,7 @@ public class GuiTextures {
     public static final TextureArea BUTTON_OVERCLOCK = TextureArea.fullImage("textures/gui/widget/button_overclock.png");
     public static final TextureArea BUTTON_RIGHT = TextureArea.fullImage("textures/gui/widget/right.png");
     public static final TextureArea BUTTON_SWITCH_VIEW = TextureArea.fullImage("textures/gui/widget/button_switch_view.png");
+    public static final TextureArea BUTTON_WORKING_ENABLE = TextureArea.fullImage("textures/gui/widget/button_working_enable.png");
     public static final TextureArea CLIPBOARD_BUTTON = TextureArea.fullImage("textures/gui/widget/clipboard_button.png");
     public static final SizedTextureArea CLIPBOARD_TEXT_BOX = AdoptableTextureArea.fullImage("textures/gui/widget/clipboard_text_box.png", 9, 18, 1, 1);
     public static final TextureArea DISTRIBUTION_MODE = TextureArea.fullImage("textures/gui/widget/button_distribution_mode.png");
@@ -202,5 +203,7 @@ public class GuiTextures {
     public final static TextureArea ICON_LOCATION = TextureArea.fullImage("textures/gui/terminal/icon/guide_hover.png");
     public final static TextureArea ICON_VISIBLE = TextureArea.fullImage("textures/gui/terminal/icon/appearance_hover.png");
     public final static TextureArea ICON_CALCULATOR = TextureArea.fullImage("textures/gui/terminal/icon/other/calculator_hover.png");
+    public final static TextureArea UI_FRAME_SIDE_UP = TextureArea.fullImage("textures/gui/terminal/frame_side_up.png");
+    public final static TextureArea UI_FRAME_SIDE_DOWN = TextureArea.fullImage("textures/gui/terminal/frame_side_down.png");
 
 }

src/main/java/gregtech/api/gui/INativeWidget.java

@@ -11,13 +11,10 @@
  * That means controls are delegated to vanilla {@link net.minecraft.client.gui.inventory.GuiContainer}
  * Rendering is still handled by widget via helpers in {@link gregtech.api.gui.IRenderContext}
  */
-public interface INativeWidget extends EnableNotifiedWidget {
+public interface INativeWidget {
 
     ItemStack VANILLA_LOGIC = new ItemStack(Items.AIR);
 
-    @Override
-    void setEnabled(boolean isEnabled);
-
     /**
      * You should return MC slot handle instance you created earlier
      *

src/main/java/gregtech/api/gui/ModularUI.java

@@ -35,6 +35,7 @@ public final class ModularUI implements ISizeProvider {
     private final ImmutableList<Runnable> uiCloseCallback;
 
     public boolean isJEIHandled;
+    public boolean needNativeClick;
 
     /**
      * UIHolder of this modular UI