update

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

dependencies.gradle

@@ -2,17 +2,20 @@
 
 dependencies {
     api("curse.maven:cofh-lib-220333:2388748")
-    api("com.github.GTNewHorizons:GTNHLib:0.9.6:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.9.46-pre:dev")
 
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.4:api") {transitive = false}
-    compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.12-GTNH:api") {transitive = false}
-    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.55-GTNH:dev") {transitive = false}
-    compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.11:api") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.22-GTNH:api") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.81-GTNH:dev") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.12:dev") {transitive = false}
     compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.225:dev") {transitive = false}
-	compileOnly("com.github.GTNewHorizons:Backhand:1.8.2:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.383:dev") {transitive = false}
+	compileOnly("com.github.GTNewHorizons:Backhand:1.8.4:dev") {transitive = false}
 
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false}
     compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false}
+
+    compileOnly('curse.maven:automagy-222153:2285272')
+    compileOnly('com.github.GTNewHorizons:EnderIO:2.10.22:dev')
 }

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/4945f00643ec68e7c7a6b66f90124f89/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4945f00643ec68e7c7a6b66f90124f89/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3087f28f30be41ab6818c16a488f5f8a/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0ef34dd9312b12d61ba1b8e66126d140/redirect
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3689d0bcdd77ac01674ba3c9dbbe94d0/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
 toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
 }
 
 

src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java

@@ -51,6 +51,9 @@ public class DraconicEvolution {
 
     public static Enchantment reaperEnchant;
 
+    public static final boolean isAutomagyLoaded = cpw.mods.fml.common.Loader.isModLoaded("Automagy");
+    public static final boolean isEioLoaded = cpw.mods.fml.common.Loader.isModLoaded("EnderIO");
+
     public DraconicEvolution() {
         LogHelper.info("Hello Minecraft!!!");
     }

src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DissEnchanter.java

@@ -3,6 +3,7 @@ package com.brandon3055.draconicevolution.common.blocks.machine;
 import java.util.List;
 import java.util.Random;
 
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -98,6 +99,22 @@ public class DissEnchanter extends BlockCustomDrop {
     @Override
     protected void getCustomTileEntityDrops(TileEntity te, List<ItemStack> droppes) {}
 
+    @Override
+    public void onNeighborBlockChange(World worldIn, int x, int y, int z, Block neighbor) {
+        boolean powered = worldIn.isBlockIndirectlyGettingPowered(x, y, z)
+                || worldIn.isBlockIndirectlyGettingPowered(x, y - 1, z);
+        int meta = worldIn.getBlockMetadata(x, y, z);
+        boolean metaUnpowered = (meta & 8) == 0;
+
+        if (powered && metaUnpowered) {
+            if (worldIn.getTileEntity(x, y, z) instanceof TileDissEnchanter tde) tde.buttonClick(null);
+            worldIn.setBlockMetadataWithNotify(x, y, z, meta | 8, 4);
+            return;
+        }
+        if (powered || metaUnpowered) return;
+        worldIn.setBlockMetadataWithNotify(x, y, z, meta & -9, 4);
+    }
+
     @Override
     @SideOnly(Side.CLIENT)
     public void randomDisplayTick(World world, int x, int y, int z, Random rand) {

src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDissEnchanter.java

@@ -1,5 +1,9 @@
 package com.brandon3055.draconicevolution.common.tileentities;
 
+import static com.brandon3055.draconicevolution.DraconicEvolution.isAutomagyLoaded;
+import static com.brandon3055.draconicevolution.DraconicEvolution.isEioLoaded;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -18,6 +22,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeHooks;
 
 import com.brandon3055.draconicevolution.common.utils.ItemNBTHelper;
+import com.gtnewhorizon.gtnhlib.geometry.CubeIterator;
+
+import crazypants.enderio.machine.obelisk.xp.TileExperienceObelisk;
+import crazypants.enderio.xp.ExperienceContainer;
+import tuhljin.automagy.tiles.TileEntityJarXP;
 
 /**
  * Created by Brandon on 27/06/2014.
@@ -89,7 +98,64 @@ public class TileDissEnchanter extends TileEntity implements ISidedInventory {
 
     public void buttonClick(EntityPlayer player) {
         if (!isValidRecipe) return;
-        if (player.experienceLevel < dissenchantCost && !player.capabilities.isCreativeMode) return;
+        if (player != null) {
+            if (player.experienceLevel < dissenchantCost && !player.capabilities.isCreativeMode) return;
+        } else if (dissenchantCost > 0) {
+            ArrayList<TileEntityJarXP> jarsToEmpty = new ArrayList<>();
+            ArrayList<ExperienceContainer> obelisksToEmpty = new ArrayList<>();
+            int xpCost = dissenchantCost < 16 ? dissenchantCost * 17
+                    : dissenchantCost < 30 ? Math.round(dissenchantCost * (1.5f * dissenchantCost - 29.5f)) + 360
+                            : Math.round(dissenchantCost * (3.5f * dissenchantCost - 151.5f)) + 2220;
+            int xp;
+            absorb: {
+                if (isAutomagyLoaded) {
+                    CubeIterator iter = new CubeIterator(8);
+                    while (iter.hasNext()) {
+                        iter.next();
+                        if (worldObj.getTileEntity(
+                                iter.n + xCoord,
+                                iter.l + yCoord,
+                                iter.m + zCoord) instanceof TileEntityJarXP jar) {
+                            xp = jar.getXP();
+                            if (xp >= xpCost) {
+                                if (!worldObj.isRemote) {
+                                    jarsToEmpty.forEach(j -> j.setXP(0));
+                                    jar.setXP(xp - xpCost);
+                                }
+                                break absorb;
+                            }
+                            xpCost -= xp;
+                            jarsToEmpty.add(jar);
+                        }
+                    }
+                }
+                if (isEioLoaded) {
+                    CubeIterator iter = new CubeIterator(8);
+                    while (iter.hasNext()) {
+                        iter.next();
+                        if (worldObj.getTileEntity(
+                                iter.n + xCoord,
+                                iter.l + yCoord,
+                                iter.m + zCoord) instanceof TileExperienceObelisk obelisk) {
+                            ExperienceContainer cont = obelisk.getContainer();
+                            xp = cont.getExperienceTotal();
+                            if (xp >= xpCost) {
+                                if (!worldObj.isRemote) {
+                                    jarsToEmpty.forEach(j -> j.setXP(0));
+                                    obelisksToEmpty.forEach(o -> o.drain(null, Integer.MAX_VALUE, true));
+                                    cont.drain(null, Integer.MAX_VALUE, true);
+                                    cont.addExperience(Math.max(0, xp - xpCost));
+                                }
+                                break absorb;
+                            }
+                            xpCost -= xp;
+                            obelisksToEmpty.add(cont);
+                        }
+                    }
+                }
+                return;
+            }
+        }
         ItemStack input = items[0];
         ItemStack enchantedBook = new ItemStack(Items.enchanted_book);
         Map enchants = EnchantmentHelper.getEnchantments(input);
@@ -119,21 +185,21 @@ public class TileDissEnchanter extends TileEntity implements ISidedInventory {
         compound.removeTag(tagName);
         if (list.tagCount() > 0) input.setTagInfo(tagName, list);
         if (input.getItem() == Items.enchanted_book && list.tagCount() == 0) setInventorySlotContents(0, null);
-        if (!player.capabilities.isCreativeMode) player.addExperienceLevel(-dissenchantCost);
+        if (player != null && !player.capabilities.isCreativeMode) player.addExperienceLevel(-dissenchantCost);
         if (items[0] != null && ItemNBTHelper.getInteger(items[0], "RepairCost", 0) > 0) ItemNBTHelper.setInteger(
                 items[0],
                 "RepairCost",
                 ItemNBTHelper.getInteger(items[0], "RepairCost", 0)
                         - Math.min(2, ItemNBTHelper.getInteger(items[0], "RepairCost", 0)));
-        if (!player.capabilities.isCreativeMode) decrStackSize(1, 1);
+        if (player != null || !player.capabilities.isCreativeMode) decrStackSize(1, 1);
         int maxDamage = items[0] != null ? items[0].getMaxDamage() : 0;
         float damageF = (40f - bookPower) / 100f;
         int damage = (int) (damageF * (float) maxDamage);
         int damageResult = items[0] != null ? items[0].getItemDamage() + damage : 0;
 
-        if (!player.capabilities.isCreativeMode && damageResult > maxDamage && maxDamage > 0) {
+        if ((player == null || !player.capabilities.isCreativeMode) && damageResult > maxDamage && maxDamage > 0) {
             setInventorySlotContents(0, null);
-        } else if (!player.capabilities.isCreativeMode && maxDamage > 0 && items[0] != null) {
+        } else if ((player == null || !player.capabilities.isCreativeMode) && maxDamage > 0 && items[0] != null) {
             items[0].setItemDamage(damageResult);
         }
         onInventoryChanged();
@@ -231,13 +297,13 @@ public class TileDissEnchanter extends TileEntity implements ISidedInventory {
 
     @Override
     public boolean isItemValidForSlot(int i, ItemStack itemstack) {
-        if (i == 1 && itemstack.getItem().equals(Items.book)) return true;
-        return false;
+        return i == 1 ? itemstack.getItem().equals(Items.book)
+                : i == 0 ? EnchantmentHelper.getEnchantments(itemstack).size() != 0 : false;
     }
 
     @Override
     public int[] getAccessibleSlotsFromSide(int var1) {
-        return new int[] { 1 };
+        return var1 == 0 ? new int[] { 0, 2 } : new int[] { 0, 1 };
     }
 
     @Override
@@ -247,7 +313,7 @@ public class TileDissEnchanter extends TileEntity implements ISidedInventory {
 
     @Override
     public boolean canExtractItem(int slot, ItemStack item, int side) {
-        return true;
+        return slot != 0 || EnchantmentHelper.getEnchantments(item).size() == 0;
     }
 
     // ===========================================================================================================//
@@ -284,4 +350,5 @@ public class TileDissEnchanter extends TileEntity implements ISidedInventory {
         bookPower = compound.getFloat("ServivalChance");
         super.readFromNBT(compound);
     }
+
 }