From 28cf99b6e4b615eb3a47a4b62040086a43d35a09 Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Fri, 14 Nov 2025 16:18:03 -0500 Subject: [PATCH] Integrate with item transferring API (#52) Co-authored-by: Martin Robertz --- dependencies.gradle | 14 +-- gradle.properties | 10 +- gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 +- gradlew.bat | 4 +- settings.gradle | 2 +- .../storagedrawers/StorageDrawers.java | 2 +- .../block/tile/TileEntityDrawers.java | 90 +++++++++++++++++- 9 files changed, 113 insertions(+), 15 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4c22bc1..a2cf720 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,14 +1,16 @@ // Add your dependencies here dependencies { - compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta62:api') - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-718-GTNH:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.64:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.19-GTNH:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:waila:1.9.2:dev') {transitive=false} + implementation("com.github.GTNewHorizons:GTNHLib:0.8.6:dev") + compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta68:api') + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-742-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.106:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.37-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:waila:1.9.9:dev') {transitive=false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('curse.maven:refined-relocation-75811:2262970') compileOnly('curse.maven:minetweaker3-224029:2255759') - compileOnly("com.github.GTNewHorizons:Avaritia:1.77:dev") + compileOnly("com.github.GTNewHorizons:Avaritia:1.78:dev") compileOnly("com.github.GTNewHorizons:Backhand:1.8.0:dev") + compileOnly("org.jetbrains:annotations:26.0.2") } diff --git a/gradle.properties b/gradle.properties index 731aacd..aafd2f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -96,7 +96,9 @@ usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = -# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +# Specify the package that contains all of your Mixins. The package must exist or +# the build will fail. If you have a package property defined in your mixins..json, +# it must match with this or the build will fail. mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! @@ -172,6 +174,12 @@ curseForgeRelations = # projects. New projects should not use this parameter. # customArchiveBaseName = +# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory. +# runClientWorkingDirectory = run/client + +# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory. +# runServerWorkingDirectory = run/server + # Optional parameter to have the build automatically fail if an illegal version is used. # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. # The check is ONLY performed if the version is a git tag. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch delta 642 zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|** z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$ z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O% zFic^X{7^$?^Ho04eona9n#mGMxKhA=~8B%JN`M zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n zVkxF2rjrjWR+_xr6e6@_u@s~2uv{9vi*1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^ z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK I1x7am0No)LiU0rr delta 584 zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe z+ES)HSrVnWLtJ&)lO%hRkV9zl5qqWRt0e;bb zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts AA^-pY diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf9300..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..db3a6ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle index 9105fb7..e883289 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.44' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48' } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 959968f..ff38a13 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -40,7 +40,7 @@ import cpw.mods.fml.relauncher.Side; modid = StorageDrawers.MOD_ID, name = StorageDrawers.MOD_NAME, version = StorageDrawers.MOD_VERSION, - dependencies = "after:waila;", + dependencies = "after:waila;required-after:gtnhlib;", guiFactory = StorageDrawers.SOURCE_PATH + "core.ModGuiFactory") public class StorageDrawers { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 738b059..cb7e200 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -15,9 +15,19 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.Constants; +import net.minecraftforge.common.util.ForgeDirection; import org.apache.logging.log4j.Level; +import org.jetbrains.annotations.NotNull; +import com.gtnewhorizon.gtnhlib.capability.CapabilityProvider; +import com.gtnewhorizon.gtnhlib.capability.item.ItemIO; +import com.gtnewhorizon.gtnhlib.capability.item.ItemSink; +import com.gtnewhorizon.gtnhlib.capability.item.ItemSource; +import com.gtnewhorizon.gtnhlib.item.AbstractInventoryIterator; +import com.gtnewhorizon.gtnhlib.item.ImmutableItemStack; +import com.gtnewhorizon.gtnhlib.item.InventoryIterator; +import com.gtnewhorizon.gtnhlib.item.SimpleItemIO; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; @@ -39,9 +49,10 @@ import com.jaquadro.minecraft.storagedrawers.storage.IUpgradeProvider; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; +import it.unimi.dsi.fastutil.ints.IntIterators; public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawerGroupInteractive, ISidedInventory, - IUpgradeProvider, ILockable, ISealable, IProtectable, IDowngradable { + IUpgradeProvider, ILockable, ISealable, IProtectable, IDowngradable, CapabilityProvider { private IDrawer[] drawers; private IDrawerInventory inventory; @@ -977,4 +988,81 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return autoSides; } } + + private DrawerItemIO io; + + @Override + public @Nullable T getCapability(@NotNull Class capability, @NotNull ForgeDirection side) { + if (capability == ItemSource.class || capability == ItemSink.class || capability == ItemIO.class) { + if (io == null) io = new DrawerItemIO(); + + return capability.cast(io); + } + + return null; + } + + private class DrawerItemIO extends SimpleItemIO { + + private final int[] presentSlots = IntIterators.unwrap(IntIterators.fromTo(0, drawers.length)); + + @Override + protected @NotNull InventoryIterator iterator(int[] allowedSlots) { + return new AbstractInventoryIterator(presentSlots, allowedSlots) { + + @Override + protected ItemStack getStackInSlot(int slot) { + if (slot < 0 || slot >= drawers.length) return null; + + return drawers[slot].getStoredItemCopy(); + } + + @Override + public ItemStack extract(int amount, boolean forced) { + int slot = getCurrentSlot(); + + if (slot < 0 || slot >= drawers.length) return null; + + IDrawer drawer = drawers[slot]; + + ItemStack stored = drawer.getStoredItemCopy(); + + if (stored == null) return null; + + int toExtract = Math.min(stored.stackSize, amount); + + stored.stackSize = toExtract; + drawer.setStoredItemCount(drawer.getStoredItemCount() - toExtract); + + return stored; + } + + @Override + public int insert(ImmutableItemStack stack, boolean forced) { + int slot = getCurrentSlot(); + + if (slot < 0 || slot >= drawers.length) return stack.getStackSize(); + + IDrawer drawer = drawers[slot]; + + ItemStack insertExample = stack.toStackFast(); + + if (!drawer.canItemBeStored(insertExample)) return stack.getStackSize(); + + int capacity = forced ? Integer.MAX_VALUE : drawer.getMaxCapacity(insertExample); + int remaining = capacity - drawer.getStoredItemCount(); + + int toInsert = Math.min(remaining, stack.getStackSize()); + + if (drawer.getStoredItemPrototype() == null) { + drawer.setStoredItemRedir(stack.toStack(1), toInsert); + } else { + drawer.setStoredItemCount(drawer.getStoredItemCount() + toInsert); + } + + return stack.getStackSize() - toInsert; + } + }; + } + } }