Merge pull request #2 from bartimaeusnek/master

sync

Former-commit-id: a75efdb8d833a45ced59e77a4f830b3e8f7dd325

8 files changed, 32 insertions, 15 deletions

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 58e1c59ce1..3af6a933ed 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -23,4 +23,4 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build
+      run: ./gradlew build -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.http.connectionTimeout=60000
diff --git a/.travis.yml b/.travis.yml
index 7625510d22..9470b6a66f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ jobs:
 #      secure: "KW2U8HenTpLQOXT+OxCsu4noCKH6ZkUATld36YTbwAwzVKt6aesqtKHkZuo+Y+a143GI184pdnhMcRB1F49Wf0IQTkOhvopfnSEg+AKWZJb+gAbZQaYkaoe04pVzdwnpBXPDZR0DnTJX09VJGlES0RMiYfaQDHAYuPRQRBf17mLWvhXf7ZfNshGLikmzQcXWoXMpB+z9BaJ9Vr9/+Jn4Geuh9MWsbc2xZyQU8hoTTtKxqj5sTVRkwmxTf0ooGrMKohoOQ5JeZLDWM0Z/7KW64kFCE3xDrKg2gnKyKNLU6qIwbgCtVkcqGb28tXuqNdRSZ5BHb70dZb0E2+9VGhS7xPA8iUVmktJRKKG+f34HtDlsXqA00SEF2u+fq+TDz7fcPHLM8z1IcUI2XF5c5A/6E1k161i3kMB9xpd5Rq4waywo+/2j+L2CE6u5aj7BeL7KUQKD7k5gx3bXUyIo2QdjzeJeUJTSaxchcae9iIO+W6rwc68fD5/UNHVp+O75QNz2B+pklz6hCFVaoUep8rl4LO58ODBU1GL4JfeTM0RzOofOFepPXIi39iCk89c61WBtxX8RPkv3nBDsrXCGU7UNH1thP1nmgCfB4HGRxixWBAnmPDHNLEW81RG+meGRpHX7RkWISmrl95x15QXb016hldvK3sAegxxVPUdyJxRplgE="
 #   script: "./gradlew sonarqube"
  - stage: buildAndDeploy
-   script: "./gradlew build"
+   script: "./gradlew build -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.http.connectionTimeout=60000"
    deploy:
     provider: releases
     api_key:
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java
index d5875e4609..6c55b603e8 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java
@@ -25,6 +25,7 @@ package com.github.bartimaeusnek.bartworks.client.ClientEventHandler;
 import com.github.bartimaeusnek.bartworks.API.BioVatLogicAdder;
 import com.github.bartimaeusnek.bartworks.MainMod;
 import com.github.bartimaeusnek.bartworks.common.blocks.BW_Blocks;
+import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import com.github.bartimaeusnek.bartworks.system.oredict.OreDictHandler;
 import com.github.bartimaeusnek.bartworks.util.BW_ColorUtil;
 import com.github.bartimaeusnek.bartworks.util.ChatColorHelper;
@@ -64,7 +65,7 @@ public class TooltipEventHandler {
             ItemStack tmp = event.itemStack.copy();
             Pair<Integer,Short> abstractedStack = new Pair<>(Item.getIdFromItem(tmp.getItem()), (short) tmp.getItemDamage());
             List<String> tooAdd = new ArrayList<>();
-            if (OreDictHandler.getNonBWCache().contains(abstractedStack)) {
+            if (ConfigHandler.sharedItemStackTooltip && OreDictHandler.getNonBWCache().contains(abstractedStack)) {
                 for (Pair<Integer,Short> pair : OreDictHandler.getNonBWCache()) {
                     if (pair.equals(abstractedStack)) {
                         GameRegistry.UniqueIdentifier UI = GameRegistry.findUniqueIdentifierFor(tmp.getItem());
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
index a6f781bf98..5833067110 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
@@ -25,6 +25,7 @@ package com.github.bartimaeusnek.bartworks.common.configs;
 
 import com.github.bartimaeusnek.ASM.BWCoreTransformer;
 import com.github.bartimaeusnek.bartworks.API.API_ConfigValues;
+import com.github.bartimaeusnek.bartworks.API.SideReference;
 import net.minecraftforge.common.config.Configuration;
 
 import java.util.Arrays;
@@ -64,6 +65,7 @@ public class ConfigHandler {
 
     public static boolean GTppLogDisabler;
     public static boolean tooltips = true;
+    public static boolean sharedItemStackTooltip = true;
     public static boolean[] enabledPatches;
 
     public static byte maxTierRoss;
@@ -108,7 +110,10 @@ public class ConfigHandler {
         ConfigHandler.c = C;
         ConfigHandler.classicMode= ConfigHandler.c.get("System", "Enable Classic Mode", false, "Enables the classic Mode (all recipes in normal machines are doable in MV").getBoolean(false);
         ConfigHandler.creativeScannerID = ConfigHandler.c.get("System", "Creative Debug Scanner", 0, "ID for the Creative Debug Scanner Block").getInt(0);
+
         ConfigHandler.tooltips = ConfigHandler.c.get("System", "BartWorksToolTips", true, "If you wish to enable extra tooltips").getBoolean(true);
+        ConfigHandler.sharedItemStackTooltip = ConfigHandler.c.get("System", "BartWorksSharedItemStackToolTips", true, "If you wish to enable \"Shared Item Stack\" tooltips").getBoolean(true);
+
         ConfigHandler.IDOffset = ConfigHandler.c.get("System", "ID Offset", 12600, "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS").getInt(12600);
         ConfigHandler.ezmode = ConfigHandler.c.get("System", "Mode switch", false, "If GTNH is Loaded, this will enable easy recipes, if not, it will enable harder recipes.").getBoolean(false);
         ConfigHandler.teslastaff = ConfigHandler.c.get("System", "Enable Teslastaff", false, "Enables the Teslastaff, an Item used to destroy Electric Armors").getBoolean(false);
@@ -166,7 +171,7 @@ public class ConfigHandler {
     private static void setUpComments() {
         ConfigHandler.c.addCustomCategoryComment("ASM fixes", "Disable ASM fixes here.");
         ConfigHandler.c.addCustomCategoryComment("Singleblocks", "Singleblock Options can be set here.");
-        ConfigHandler.c.addCustomCategoryComment("Multiblocks", "Multliblock Options can be set here.");
+        ConfigHandler.c.addCustomCategoryComment("Multiblocks", "Multiblock Options can be set here.");
         ConfigHandler.c.addCustomCategoryComment("System", "Different System Settings can be set here.");
         ConfigHandler.c.addCustomCategoryComment("CrossMod Interactions", "CrossMod Interaction Settings can be set here. For Underground Fluid settings change the Gregtech.cfg!");
         ConfigHandler.c.addCustomCategoryComment("Ross Ruin Metas", "Ruin Metas and Tiers can be set here.");
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index c4dedef9d7..d63bff14dc 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -191,9 +191,10 @@ public class WerkstoffLoader {
     }
 
     //TODO:
-    //FREE ID RANGE: 95-29_999
-    //bartimaeusnek reserved 0-10_000
-    //Tec & basdxz reserved range 30_000-31_000
+    //FREE ID RANGE:                10_001-28_998
+    //bartimaeusnek reserved             0-10_000
+    //bot reserved range            29_899-29_999
+    //Tec & basdxz reserved range   30_000-31_000
     //GT Material range reserved on 31_767-32_767
     public static final Werkstoff Bismutite = new Werkstoff(
             new short[]{255, 233, 0, 0},
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/multi/GT_Replacement/TT_MultiSmelter.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/multi/GT_Replacement/TT_MultiSmelter.java
index b542625787..f0345a3330 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/multi/GT_Replacement/TT_MultiSmelter.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/multi/GT_Replacement/TT_MultiSmelter.java
@@ -71,7 +71,7 @@ public class TT_MultiSmelter extends TT_Abstract_GT_Replacement_Coils {
                     transpose(new String[][]{
                             {"AAA", "AMA", "AAA"},
                             {"CCC", "C-C", "CCC"},
-                            {"B~B", "BBB", "BBB"}
+                            {"A~A", "AAA", "AAA"}
                     })
             ).addElement(
                     'C',
@@ -84,12 +84,6 @@ public class TT_MultiSmelter extends TT_Abstract_GT_Replacement_Coils {
                     )
             ).addElement(
                     'A',
-                    ofBlock(
-                            GregTech_API.sBlockCasings1, TEXTURE_INDEX,
-                            GregTech_API.sBlockCasings1, TEXTURE_INDEX
-                    )
-            ).addElement(
-                    'B',
                     ofHatchAdderOptional(
                             TT_MultiSmelter::addEBFInputsBottom, TEXTURE_INDEX,
                             GregTech_API.sBlockCasings1, TEXTURE_INDEX,
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_Abstract_LowPowerLaserThingy.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_Abstract_LowPowerLaserThingy.java
index 1b82aedace..34473eab6c 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_Abstract_LowPowerLaserThingy.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_Abstract_LowPowerLaserThingy.java
@@ -56,6 +56,7 @@ public abstract class TT_Abstract_LowPowerLaserThingy extends GT_MetaTileEntity_
         this.AMPERES = aAmperes;
     }
 
+    @Override
     public long getAMPERES() {
         return AMPERES;
     }
@@ -85,7 +86,6 @@ public abstract class TT_Abstract_LowPowerLaserThingy extends GT_MetaTileEntity_
         return true;
     }
 
-
     @Override
     public boolean isGivingInformation() {
         return true;
@@ -121,6 +121,16 @@ public abstract class TT_Abstract_LowPowerLaserThingy extends GT_MetaTileEntity_
     }
 
     @Override
+    public boolean isEnetInput() {
+        return false;
+    }
+
+    @Override
+    public boolean isEnetOutput() {
+        return false;
+    }
+
+    @Override
     public long maxEUInput() {
         return GT_Values.V[this.mTier];
     }
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java
index 7fe4d93a29..abecbe811f 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java
@@ -54,26 +54,32 @@ public class TT_MetaTileEntity_LowPowerLaserBox extends TT_Abstract_LowPowerLase
         return false;
     }
 
+    @Override
     public long maxAmperesOut() {
         return !this.getBaseMetaTileEntity().isAllowedToWork() ? AMPERES : 0;
     }
 
+    @Override
     public long maxAmperesIn() {
         return this.getBaseMetaTileEntity().isAllowedToWork() ? AMPERES + (AMPERES / 4) : 0;
     }
 
+    @Override
     public boolean hasAlternativeModeText() {
         return true;
     }
 
+    @Override
     public String getAlternativeModeText() {
         return isReceiver() ? "Set to receiving mode" : "Set to sending mode";
     }
 
+    @Override
     public boolean isEnetInput() {
         return this.getBaseMetaTileEntity().isAllowedToWork();
     }
 
+    @Override
     public boolean isEnetOutput() {
         return !this.getBaseMetaTileEntity().isAllowedToWork();
     }