update

Merge remote-tracking branch 'origin/lets-try-this' into dev
2026-11-15 17:45:08 +00:00 · 2024-06-29 00:14:39 +02:00 · 2024-06-29 00:13:27 +02:00 · 2024-06-29 00:12:51 +02:00 · 2024-06-24 06:48:48 -07:00 · 2024-06-05 22:49:43 +02:00
8 changed files with 53 additions and 27 deletions
@@ -3,19 +3,19 @@
 dependencies {
    api('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive = false}
    compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.7:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.14-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.3.2:dev")
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.11-GTNH:dev')
+    compileOnly("com.github.GTNewHorizons:GTNHLib:0.3.0:dev")
    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:dev')
    api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
    shadowImplementation('cglib:cglib-nodep:3.3.0')

-    compileOnly('com.github.GTNewHorizons:waila:1.8.1:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.8.0:api') {transitive = false}
    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-405-GTNH:api') {transitive = false}
    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.68:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.56:dev') {transitive = false}
    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.8:api') {transitive = false}
    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.5-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.15.1-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.15.0-GTNH:dev') {transitive = false}
    compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.11-GTNH:api') {transitive = false}
    compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
@@ -186,7 +186,7 @@ import crazypants.util.EE3Util;
        modid = MODID,
        name = MOD_NAME,
        version = VERSION,
-        dependencies = "required-after:CoFHLib@(1.0.3B3,);after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel;required-after:gtnhlib@[0.2.10,)",
+        dependencies = "required-after:CoFHLib@(1.0.3B3,);after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel",
        guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
 public class EnderIO {

@@ -2,6 +2,7 @@ package crazypants.enderio.conduit;

 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
@@ -25,7 +26,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;

 import com.enderio.core.client.render.BoundingBox;
-import com.gtnewhorizon.gtnhlib.concurrent.cas.CasList;

 import appeng.api.networking.IGridNode;
 import appeng.api.util.AECableType;
@@ -67,7 +67,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {

    public static final short NBT_VERSION = 1;

-    private final List<IConduit> conduits = new CasList<>();
+    private final List<IConduit> conduits = Collections.synchronizedList(new ArrayList<>());

    private Block facadeId = null;
    private int facadeMeta = 0;
@@ -154,7 +154,8 @@ public class KeyTracker {
                if (player != null) {
                    ItemStack travelItem = player.getHeldItem();
                    if (travelItem == null || travelItem.getItem() == null
-                            || !(travelItem.getItem() instanceof IItemOfTravel)) {
+                            || !(travelItem.getItem() instanceof IItemOfTravel)
+                            || !((IItemOfTravel) travelItem.getItem()).isActive(player, travelItem)) {
                        travelItem = TravelController.instance.findTravelItemInInventoryOrBaubles(player);
                    }

@@ -386,7 +386,15 @@ public class ItemDarkSteelSword extends ItemSword

    @Override
    public boolean isActive(EntityPlayer ep, ItemStack equipped) {
-        return isTravelUpgradeActive(ep, equipped);
+        if (ep != null && equipped != null && isTravelUpgradeActive(ep, equipped)) {
+            // Only "active" if held while sneaking. But still "active" for the purposes of travel keybind if not held
+            if (isEquipped(ep)) {
+                return ep.isSneaking();
+            } else {
+                return true;
+            }
+        }
+        return false;
    }

    @Override
@@ -400,12 +408,12 @@ public class ItemDarkSteelSword extends ItemSword
    }

    private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {
-        return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null;
+        return ep != null && equipped != null && TravelUpgrade.loadFromItem(equipped) != null;
    }

    @Override
    public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
-        if (isTravelUpgradeActive(player, stack)) {
+        if (isActive(player, stack)) {
            if (world.isRemote) {
                if (TravelController.instance.activateTravelAccessable(stack, world, player, TravelSource.STAFF)) {
                    player.swingItem();
@@ -106,6 +106,12 @@ public class ItemTeleportStaff extends ItemTravelStaff {
        return power;
    }

+    @Override
+    public int getEnergyStored(ItemStack item) {
+        // Has infinite energy, always report as being full of energy for any validation-code purposes.
+        return this.capacity;
+    }
+
    @Override
    @SideOnly(Side.CLIENT)
    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
@@ -46,6 +46,7 @@ import com.google.common.collect.Table;
 import com.google.common.collect.TreeBasedTable;
 import com.gtnewhorizon.gtnhlib.GTNHLib;

+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
@@ -162,7 +163,8 @@ public class TravelController {
            case STAFF_BLINK:
                if (Config.travelStaffKeybindEnabled) {
                    if (equippedItem == null || equippedItem.getItem() == null
-                            || !(equippedItem.getItem() instanceof IItemOfTravel)) {
+                            || !(equippedItem.getItem() instanceof IItemOfTravel)
+                            || !((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) {
                        equippedItem = findTravelItemInInventoryOrBaubles(toTp);
                    }
                }
@@ -547,7 +549,8 @@ public class TravelController {

        ItemStack equipped = ep.getCurrentEquippedItem();
        if (checkInventoryAndBaubles) {
-            if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)) {
+            if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)
+                    || !((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
                equipped = findTravelItemInInventoryOrBaubles(ep);
            }
        }
@@ -576,7 +579,8 @@ public class TravelController {
        ItemStack travelItem = null;
        for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
            ItemStack stack = ep.inventory.getStackInSlot(i);
-            if (stack != null && stack.getItem() instanceof IItemOfTravel) {
+            if (stack != null && stack.getItem() instanceof IItemOfTravel
+                    && ((IItemOfTravel) stack.getItem()).isActive(ep, stack)) {
                travelItem = stack;
                break;
            }
@@ -587,7 +591,8 @@ public class TravelController {
            if (baubles != null) {
                for (int i = 0; i < baubles.getSizeInventory(); i++) {
                    ItemStack stack = baubles.getStackInSlot(i);
-                    if (stack != null && stack.getItem() instanceof IItemOfTravel) {
+                    if (stack != null && stack.getItem() instanceof IItemOfTravel
+                            && ((IItemOfTravel) stack.getItem()).isActive(ep, stack)) {
                        travelItem = stack;
                        break;
                    }
@@ -611,7 +616,8 @@ public class TravelController {
        int travelItemSlot = -1;
        for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
            ItemStack stack = ep.inventory.getStackInSlot(i);
-            if (stack != null && (stack.getItem() instanceof IItemOfTravel)) {
+            if (stack != null && stack.getItem() instanceof IItemOfTravel
+                    && ((IItemOfTravel) stack.getItem()).isActive(ep, stack)) {
                travelItemSlot = i;
                break;
            }
@@ -622,7 +628,8 @@ public class TravelController {
            if (baubles != null) {
                for (int i = 0; i < baubles.getSizeInventory(); i++) {
                    ItemStack stack = baubles.getStackInSlot(i);
-                    if (stack != null && stack.getItem() instanceof IItemOfTravel) {
+                    if (stack != null && stack.getItem() instanceof IItemOfTravel
+                            && ((IItemOfTravel) stack.getItem()).isActive(ep, stack)) {
                        travelItemSlot = -(i + 2);
                        break;
                    }
@@ -1187,15 +1194,19 @@ public class TravelController {
    }

    public static void showMessage(EntityPlayer player, IChatComponent chatComponent) {
-        if (player instanceof EntityPlayerMP) {
-            chatComponent.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.WHITE));
-            GTNHLib.proxy.sendMessageAboveHotbar((EntityPlayerMP) player, chatComponent, 60, true, true);
+        if (Loader.isModLoaded("gtnhlib")) {
+            if (player instanceof EntityPlayerMP) {
+                chatComponent.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.WHITE));
+                GTNHLib.proxy.sendMessageAboveHotbar((EntityPlayerMP) player, chatComponent, 60, true, true);
+            } else {
+                GTNHLib.proxy.printMessageAboveHotbar(
+                        EnumChatFormatting.WHITE + chatComponent.getFormattedText(),
+                        60,
+                        true,
+                        true);
+            }
        } else {
-            GTNHLib.proxy.printMessageAboveHotbar(
-                    EnumChatFormatting.WHITE + chatComponent.getFormattedText(),
-                    60,
-                    true,
-                    true);
+            player.addChatComponentMessage(chatComponent);
        }
    }
 }
@@ -150,7 +150,7 @@ enderio.silicon.name=Silicon
 enderio.conduitBinder.name=Conduit Binder
 enderio.binderComposite.name=Binder Composite
 enderio.phasedIronNugget.name=Pulsating Iron Nugget
-tile.blockDarkIronBars.name=Dark Steel Bars
+tile.blockDarkIronBars.name=Dark Iron Bars
 tile.blockSoulariumBars.name=Soularium Bars
 tile.blockEndSteelBars.name=End Steel Bars
 tile.blockEndermanSkull.name=Enderman Skull
Author	SHA1	Message	Date
Martin Robertz	3f08f5891d	update	2024-06-29 00:14:39 +02:00
Martin Robertz	372eaf4716	update	2024-06-29 00:13:27 +02:00
Martin Robertz	3906867d0e	Merge remote-tracking branch 'origin/lets-try-this' into dev	2024-06-29 00:12:51 +02:00
Jason Mitchell	ec6ee40926	Work around CME * Not entirely sure why it's being concurrently modified.. so let's just make it safe for now	2024-06-24 06:48:48 -07:00
Martin Robertz	cce16d497d	Merge branch 'master' into dev	2024-06-05 22:49:43 +02:00
Martin Robertz	9d68880fd5	Merge remote-tracking branch 'TheUnderTaker11/git-please' into dev	2024-06-02 23:09:55 +02:00
CreditScore	77f3e6974f	Travel Staff Blink Keybind fixes. Fixes 2 separate bugs with the SoT keybind. 1. Staff of Teleportation in GTNH pack specifically didn't work due to reporting as having 0 power through the RF API. Fixed this by having it always report that it's full of power since it has infinite. 2. BlackSteelSword and EndSteelSword (The Ender and MKII) both were quite funky with keybind, causing no teleports to happen when they really should have. Fixed this through tweaks to how this is handled in a number of places to allow for proper handling while not changing the default held/shift held behavior. Tested in SP, Anchor behavior while holding staffs and Swords with travel thing on them work as expected. Keybind now works and is able to use swords with travel thing on them. One quirk is that if you are holding a sword with travel upgrade, but NOT shifting, the sword itself stops counting as a valid travel item. So if ONLY using sword no separate SoT the keybind will not work unless you hold shift. If you have another SoT in your inventory it will identify and use that and still blink you upon hitting keybind. This quirk doesn't really matter in most cases, just something worth noting I guess.	2024-05-19 15:13:50 -05:00