From 7aa1ae38a73bdc0a2dbe8ef36e85410e8707f3fe Mon Sep 17 00:00:00 2001 From: Abdiel Kavash <19243993+AbdielKavash@users.noreply.github.com> Date: Sun, 1 Jun 2025 03:04:43 -0600 Subject: [PATCH] Tag Orb of Armok as creative. (#53) --- dependencies.gradle | 18 +++++++++--------- .../compat/bloodmagic/ItemOrbArmok.java | 16 ++++++++++------ .../resources/assets/avaritia/lang/en_US.lang | 4 +++- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1deb317..0d890be 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,21 +1,21 @@ // Add your dependencies here dependencies { - devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.38-GTNH:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.49-GTNH:dev") - compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.7:api") {transitive = false} - compileOnly("com.github.GTNewHorizons:Botania:1.12.6-GTNH:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.10:api") {transitive = false} + compileOnly("com.github.GTNewHorizons:Botania:1.12.10-GTNH:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.21-GTNH:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.9:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.1:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.37:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.254:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.28-GTNH:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.32") {transitive = false} + compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.66:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.314:dev") {transitive = false} compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false} compileOnly("curse.maven:cofh-lib-220333:2388748") {transitive = false} compileOnly("curse.maven:cofh-core-69162:2388751") {transitive = false} compileOnly("curse.maven:witchery-69673:2234410") {transitive = false} - runtimeOnly("com.github.GTNewHorizons:GTNHLib:0.6.20:dev") + runtimeOnly("com.github.GTNewHorizons:GTNHLib:0.6.25:dev") } diff --git a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java index 0c0bafc..13f006d 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java +++ b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java @@ -41,18 +41,17 @@ public class ItemOrbArmok extends Item implements IBloodOrb, IBindable { NBTTagCompound itemTag = stack.stackTagCompound; if (itemTag == null || itemTag.getString("ownerName").equals("")) return; - SoulNetworkHandler.setCurrentEssence(itemTag.getString("ownerName"), getMaxEssence()); + SoulNetworkHandler + .addCurrentEssenceToMaximum(itemTag.getString("ownerName"), Integer.MAX_VALUE, getMaxEssence()); } } @Override public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean wut) { tooltip.add(StatCollector.translateToLocal("tooltip.armok.desc")); - if (item.getTagCompound() != null) { - tooltip.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + item.getTagCompound().getString("ownerName")); - } + tooltip.add(StatCollector.translateToLocal("tooltip.armok.desc2")); + tooltip.add(StatCollector.translateToLocalFormatted("tooltip.armok.capacity", getMaxEssence())); + addBindingInformation(item, tooltip); } @Override @@ -65,6 +64,11 @@ public class ItemOrbArmok extends Item implements IBloodOrb, IBindable { return 6; } + @Override + public boolean isFilledForFree() { + return true; + } + @Override public EnumRarity getRarity(ItemStack itemstack) { return LudicrousItems.cosmic; diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index 980c5f9..19ab6c8 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -69,7 +69,9 @@ tile.alfheim_deadrock3.name=Cracked Deadrock Brick tile.alfheim_deadrock4.name=Chiselled Deadrock # # Tooltips -tooltip.armok.desc=Stores unlimited Life Essence while held +tooltip.armok.desc=Always contains maximum Life Essence +tooltip.armok.desc2=while held or in a filled Altar +tooltip.armok.capacity=Capacity: %,d LP tooltip.crystal_matrix_ingot.desc=This isn't even its final form. tooltip.neutron_pile.desc=Try not to think about it. tooltip.neutron_nugget.desc=About 35.6 million metric tons.