Optimize Images & Workflow (#46)

.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

@@ -3,9 +3,11 @@
 dependencies {
 	compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.1:dev')
 	api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-	api('com.github.GTNewHorizons:Baubles:1.0.4:dev')
+	api('com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev')
 
-	runtimeOnly('com.github.GTNewHorizons:TCNEIAdditions:1.4.2:dev')
+	runtimeOnly('com.github.GTNewHorizons:TCNEIAdditions:1.4.8:dev') {
+		exclude module: 'Baubles'
+	}
 }
 
 

gradle.properties

@@ -14,7 +14,7 @@ modId = thaumicinsurgence
 modGroup = thaumicinsurgence
 
 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -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.<modid>.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!
@@ -151,7 +153,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -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.

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

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

src/main/java/thaumicinsurgence/item/baubles/ItemPactRing.java

@@ -4,7 +4,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 
-import baubles.common.items.ItemRing;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumicinsurgence.main.utils.TabThaumicInsurgence;

src/main/java/thaumicinsurgence/item/baubles/ItemRing.java

@@ -0,0 +1,119 @@
+package thaumicinsurgence.item.baubles;
+
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import baubles.api.BaubleType;
+import baubles.api.IBauble;
+import baubles.common.container.InventoryBaubles;
+import baubles.common.lib.PlayerHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class ItemRing extends Item implements IBauble {
+
+    public ItemRing() {
+        super();
+        this.setMaxStackSize(1);
+        this.setHasSubtypes(true);
+        this.setMaxDamage(0);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+
+    public IIcon icon;
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void registerIcons(IIconRegister ir) {
+        icon = ir.registerIcon("baubles:ring");
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public IIcon getIconFromDamage(int meta) {
+        return icon;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+        par3List.add(new ItemStack(this, 1, 0));
+    }
+
+    @Override
+    public BaubleType getBaubleType(ItemStack itemstack) {
+        return BaubleType.RING;
+    }
+
+    @Override
+    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
+        if (!par2World.isRemote) {
+            InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(par3EntityPlayer);
+            for (int i = 0; i < baubles.getSizeInventory(); i++)
+                if (baubles.getStackInSlot(i) == null && baubles.isItemValidForSlot(i, par1ItemStack)) {
+                    baubles.setInventorySlotContents(i, par1ItemStack.copy());
+                    if (!par3EntityPlayer.capabilities.isCreativeMode) {
+                        par3EntityPlayer.inventory
+                                .setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null);
+                    }
+                    onEquipped(par1ItemStack, par3EntityPlayer);
+                    break;
+                }
+        }
+
+        return par1ItemStack;
+    }
+
+    @Override
+    public void onWornTick(ItemStack itemstack, EntityLivingBase player) {
+        if (itemstack.getItemDamage() == 0 && !player.isPotionActive(Potion.digSpeed)) {
+            player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 40, 0, true));
+        }
+    }
+
+    @Override
+    public boolean hasEffect(ItemStack par1ItemStack, int a) {
+        return true;
+    }
+
+    @Override
+    public EnumRarity getRarity(ItemStack par1ItemStack) {
+        return EnumRarity.rare;
+    }
+
+    @Override
+    public String getUnlocalizedName(ItemStack par1ItemStack) {
+        return super.getUnlocalizedName() + "." + par1ItemStack.getItemDamage();
+    }
+
+    @Override
+    public void onEquipped(ItemStack itemstack, EntityLivingBase player) {
+        if (!player.worldObj.isRemote) {
+            player.worldObj.playSoundAtEntity(player, "random.orb", 0.1F, 1.3f);
+        }
+    }
+
+    @Override
+    public void onUnequipped(ItemStack itemstack, EntityLivingBase player) {}
+
+    @Override
+    public boolean canEquip(ItemStack itemstack, EntityLivingBase player) {
+        return true;
+    }
+
+    @Override
+    public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) {
+        return true;
+    }
+}

src/main/java/thaumicinsurgence/item/baubles/SilverRing.java

@@ -3,7 +3,6 @@ package thaumicinsurgence.item.baubles;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import baubles.common.items.ItemRing;
 import thaumcraft.api.IVisDiscountGear;
 import thaumcraft.api.aspects.Aspect;