From f5ed7a61b28de28cd1fb58a5eea6299040eb8043 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 2 May 2026 12:16:30 +0200 Subject: [PATCH] sa+deps --- dependencies.gradle | 6 ++-- gradle/gradle-daemon-jvm.properties | 8 ++--- .../java/forestry/core/gui/GuiHandler.java | 11 +++---- .../java/forestry/core/gui/GuiIdRegistry.java | 5 ++-- .../forestry/core/gui/IGuiHandlerItem.java | 3 +- .../core/inventory/ItemInventory.java | 5 ++-- .../forestry/core/inventory/ItemLocation.java | 2 +- .../core/items/ItemSolderingIron.java | 2 +- .../java/forestry/food/items/ItemInfuser.java | 2 +- .../items/ItemFlutterlyzer.java | 2 +- .../forestry/mail/items/ItemCatalogue.java | 2 +- .../java/forestry/mail/items/ItemLetter.java | 2 +- .../storage/gui/ContainerBackpack.java | 2 +- .../inventory/ItemInventoryBackpack.java | 2 +- .../inventory/ItemInventoryBackpackPaged.java | 4 +-- .../forestry/storage/items/ItemBackpack.java | 29 ++++++++++--------- .../storage/items/ItemBackpackNaturalist.java | 2 +- 17 files changed, 47 insertions(+), 42 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index d16c791e5..a367437b2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,10 +2,10 @@ dependencies { api('curse.maven:cofh-lib-220333:2388748') - compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta64:api') - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev') + compileOnlyApi('com.github.GTNewHorizons:Angelica:2.1.19:api') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.93-GTNH:dev') compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api') - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api') + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.59:api') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') compileOnly('curse.maven:craftguide-75557:2459320') devOnlyNonPublishable('net.xonich.mc:NoHotbarNeeded:0.0.3:api') diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 58206c6ed..fa4ed510e 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,12 +1,12 @@ #This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect toolchainVersion=25 diff --git a/src/main/java/forestry/core/gui/GuiHandler.java b/src/main/java/forestry/core/gui/GuiHandler.java index 0ef73c171..ed0a329d1 100644 --- a/src/main/java/forestry/core/gui/GuiHandler.java +++ b/src/main/java/forestry/core/gui/GuiHandler.java @@ -10,6 +10,8 @@ package forestry.core.gui; import static forestry.core.inventory.ItemLocation.TYPE.PLAYER_INVENTORY; +import javax.annotation.Nullable; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,8 +24,6 @@ import cpw.mods.fml.common.network.IGuiHandler; import forestry.api.core.ForestryAPI; import forestry.core.inventory.ItemLocation; -import javax.annotation.Nullable; - public class GuiHandler implements IGuiHandler { public static void openGui(EntityPlayer entityplayer, IGuiHandlerEntity guiHandler) { @@ -78,8 +78,8 @@ public class GuiHandler implements IGuiHandler { } /** - * Encodes data required for GUI handler to function properly. - * Because of minecraft implementation we are limited to 32 bits. + * Encodes data required for GUI handler to function properly. Because of minecraft implementation we are limited to + * 32 bits. * * @param guiHandler GUI handler. * @param data High bits which were encoded by GUI handler. @@ -127,7 +127,8 @@ public class GuiHandler implements IGuiHandler { return getGuiElement(true, guiData, player, world, x, y, z); } - private @Nullable Object getGuiElement(boolean isServerSide, int guiData, EntityPlayer player, World world, int x, int y, int z) { + private @Nullable Object getGuiElement(boolean isServerSide, int guiData, EntityPlayer player, World world, int x, + int y, int z) { GuiId guiId = decodeGuiID(guiData); if (guiId == null) { return null; diff --git a/src/main/java/forestry/core/gui/GuiIdRegistry.java b/src/main/java/forestry/core/gui/GuiIdRegistry.java index 1c425a201..8c84df88e 100644 --- a/src/main/java/forestry/core/gui/GuiIdRegistry.java +++ b/src/main/java/forestry/core/gui/GuiIdRegistry.java @@ -122,8 +122,9 @@ public class GuiIdRegistry { if (idMap.size() > 256) { // see {@link GuiHandler.encodeGuiData(forestry.core.gui.IGuiHandlerForestry, short, int)} - throw new IllegalStateException("Current implementation can't have more than different 256 GUI handlers " + - "because its id is coded by 8 bits"); + throw new IllegalStateException( + "Current implementation can't have more than different 256 GUI handlers " + + "because its id is coded by 8 bits"); } } diff --git a/src/main/java/forestry/core/gui/IGuiHandlerItem.java b/src/main/java/forestry/core/gui/IGuiHandlerItem.java index 232919a8a..154134186 100644 --- a/src/main/java/forestry/core/gui/IGuiHandlerItem.java +++ b/src/main/java/forestry/core/gui/IGuiHandlerItem.java @@ -8,10 +8,11 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.core.inventory.ItemLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import forestry.core.inventory.ItemLocation; + public interface IGuiHandlerItem extends IGuiHandlerForestry { Object getGui(EntityPlayer player, ItemStack heldItem, int data, ItemLocation loc); diff --git a/src/main/java/forestry/core/inventory/ItemInventory.java b/src/main/java/forestry/core/inventory/ItemInventory.java index 5f682f903..e4c0c632c 100755 --- a/src/main/java/forestry/core/inventory/ItemInventory.java +++ b/src/main/java/forestry/core/inventory/ItemInventory.java @@ -8,14 +8,15 @@ ******************************************************************************/ package forestry.core.inventory; -import forestry.core.tiles.IFilterSlotDelegate; +import java.util.Random; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import java.util.Random; +import forestry.core.tiles.IFilterSlotDelegate; public abstract class ItemInventory implements IInventory, IFilterSlotDelegate { diff --git a/src/main/java/forestry/core/inventory/ItemLocation.java b/src/main/java/forestry/core/inventory/ItemLocation.java index b98b43b45..e962419bd 100644 --- a/src/main/java/forestry/core/inventory/ItemLocation.java +++ b/src/main/java/forestry/core/inventory/ItemLocation.java @@ -4,6 +4,7 @@ package forestry.core.inventory; * Location of items in inventory. */ public class ItemLocation { + public enum TYPE { UNKNOWN, HELD_BY_PLAYER, @@ -16,7 +17,6 @@ public class ItemLocation { private final TYPE type; private final int slotIdx; - public ItemLocation(TYPE type, int slotIdx) { this.type = type; this.slotIdx = slotIdx; diff --git a/src/main/java/forestry/core/items/ItemSolderingIron.java b/src/main/java/forestry/core/items/ItemSolderingIron.java index bff253cc0..82d32f239 100644 --- a/src/main/java/forestry/core/items/ItemSolderingIron.java +++ b/src/main/java/forestry/core/items/ItemSolderingIron.java @@ -8,7 +8,6 @@ ******************************************************************************/ package forestry.core.items; -import forestry.core.inventory.ItemLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,6 +15,7 @@ import forestry.core.circuits.ContainerSolderingIron; import forestry.core.circuits.GuiSolderingIron; import forestry.core.circuits.ISolderingIron; import forestry.core.inventory.ItemInventorySolderingIron; +import forestry.core.inventory.ItemLocation; public class ItemSolderingIron extends ItemWithGui implements ISolderingIron { diff --git a/src/main/java/forestry/food/items/ItemInfuser.java b/src/main/java/forestry/food/items/ItemInfuser.java index 399159a98..3d506e581 100644 --- a/src/main/java/forestry/food/items/ItemInfuser.java +++ b/src/main/java/forestry/food/items/ItemInfuser.java @@ -8,10 +8,10 @@ ******************************************************************************/ package forestry.food.items; -import forestry.core.inventory.ItemLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import forestry.core.inventory.ItemLocation; import forestry.core.items.ItemWithGui; import forestry.food.gui.ContainerInfuser; import forestry.food.gui.GuiInfuser; diff --git a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java index 3f7803e51..f5562c98b 100644 --- a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java @@ -8,12 +8,12 @@ ******************************************************************************/ package forestry.lepidopterology.items; -import forestry.core.inventory.ItemLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import forestry.api.core.Tabs; import forestry.core.gui.ContainerAlyzer; +import forestry.core.inventory.ItemLocation; import forestry.core.items.ItemWithGui; import forestry.lepidopterology.gui.GuiFlutterlyzer; import forestry.lepidopterology.inventory.ItemInventoryFlutterlyzer; diff --git a/src/main/java/forestry/mail/items/ItemCatalogue.java b/src/main/java/forestry/mail/items/ItemCatalogue.java index 8c5d7c322..a3f6da9c2 100644 --- a/src/main/java/forestry/mail/items/ItemCatalogue.java +++ b/src/main/java/forestry/mail/items/ItemCatalogue.java @@ -8,10 +8,10 @@ ******************************************************************************/ package forestry.mail.items; -import forestry.core.inventory.ItemLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import forestry.core.inventory.ItemLocation; import forestry.core.items.ItemWithGui; import forestry.mail.gui.ContainerCatalogue; import forestry.mail.gui.GuiCatalogue; diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index ce5b1571e..659103178 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -10,7 +10,6 @@ package forestry.mail.items; import java.util.List; -import forestry.core.inventory.ItemLocation; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +23,7 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.mail.ILetter; +import forestry.core.inventory.ItemLocation; import forestry.core.items.ItemWithGui; import forestry.core.utils.StringUtil; import forestry.mail.Letter; diff --git a/src/main/java/forestry/storage/gui/ContainerBackpack.java b/src/main/java/forestry/storage/gui/ContainerBackpack.java index 15e303702..e7d6f1833 100755 --- a/src/main/java/forestry/storage/gui/ContainerBackpack.java +++ b/src/main/java/forestry/storage/gui/ContainerBackpack.java @@ -8,12 +8,12 @@ ******************************************************************************/ package forestry.storage.gui; -import forestry.core.inventory.ItemLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.slots.SlotFilteredInventory; +import forestry.core.inventory.ItemLocation; import forestry.storage.inventory.ItemInventoryBackpack; public class ContainerBackpack extends ContainerItemInventory { diff --git a/src/main/java/forestry/storage/inventory/ItemInventoryBackpack.java b/src/main/java/forestry/storage/inventory/ItemInventoryBackpack.java index 03cbf5849..81e3f304d 100644 --- a/src/main/java/forestry/storage/inventory/ItemInventoryBackpack.java +++ b/src/main/java/forestry/storage/inventory/ItemInventoryBackpack.java @@ -1,12 +1,12 @@ package forestry.storage.inventory; -import forestry.core.inventory.ItemLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import forestry.api.storage.IBackpackDefinition; import forestry.core.inventory.ItemInventory; +import forestry.core.inventory.ItemLocation; import forestry.storage.items.ItemBackpack; public class ItemInventoryBackpack extends ItemInventory { diff --git a/src/main/java/forestry/storage/inventory/ItemInventoryBackpackPaged.java b/src/main/java/forestry/storage/inventory/ItemInventoryBackpackPaged.java index 3d6ea316a..7779d74cd 100644 --- a/src/main/java/forestry/storage/inventory/ItemInventoryBackpackPaged.java +++ b/src/main/java/forestry/storage/inventory/ItemInventoryBackpackPaged.java @@ -8,12 +8,12 @@ ******************************************************************************/ package forestry.storage.inventory; -import forestry.core.inventory.ItemLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import forestry.core.gui.GuiHandler; import forestry.core.gui.IPagedInventory; +import forestry.core.inventory.ItemLocation; import forestry.storage.items.ItemBackpackNaturalist; public class ItemInventoryBackpackPaged extends ItemInventoryBackpack implements IPagedInventory { @@ -21,7 +21,7 @@ public class ItemInventoryBackpackPaged extends ItemInventoryBackpack implements private final ItemBackpackNaturalist backpackNaturalist; public ItemInventoryBackpackPaged(EntityPlayer player, int size, ItemStack itemstack, - ItemBackpackNaturalist backpackNaturalist, ItemLocation loc) { + ItemBackpackNaturalist backpackNaturalist, ItemLocation loc) { super(player, size, itemstack, loc); this.backpackNaturalist = backpackNaturalist; } diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index e6a9db0d8..f9d058b51 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -8,6 +8,21 @@ ******************************************************************************/ package forestry.storage.items; +import java.util.List; +import java.util.Locale; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; +import net.xonich.mc.nohotbarneeded.api.ActivatableFromInventoryServerSide; + import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,20 +46,6 @@ import forestry.storage.gui.ContainerBackpack; import forestry.storage.gui.GuiBackpack; import forestry.storage.gui.GuiBackpackT2; import forestry.storage.inventory.ItemInventoryBackpack; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; -import net.xonich.mc.nohotbarneeded.api.ActivatableFromInventoryServerSide; - -import java.util.List; -import java.util.Locale; public class ItemBackpack extends ItemWithGui implements ActivatableFromInventoryServerSide { diff --git a/src/main/java/forestry/storage/items/ItemBackpackNaturalist.java b/src/main/java/forestry/storage/items/ItemBackpackNaturalist.java index b2bc559e7..52a0cc6ca 100644 --- a/src/main/java/forestry/storage/items/ItemBackpackNaturalist.java +++ b/src/main/java/forestry/storage/items/ItemBackpackNaturalist.java @@ -8,7 +8,6 @@ ******************************************************************************/ package forestry.storage.items; -import forestry.core.inventory.ItemLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -18,6 +17,7 @@ import forestry.api.storage.IBackpackDefinition; import forestry.core.config.Constants; import forestry.core.gui.GuiHandler; import forestry.core.gui.GuiNaturalistInventory; +import forestry.core.inventory.ItemLocation; import forestry.storage.gui.ContainerNaturalistBackpack; import forestry.storage.inventory.ItemInventoryBackpackPaged;