From 783e2fe7b90761e015c4fe88f39cfcf19ed3a3f7 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Sun, 28 Jul 2024 00:31:59 +0200 Subject: [PATCH] Build 2.30.0 coming right up --- docs/README.md | 2 +- docs/changelog.html | 17 +++++++++++++++++ gradle.properties | 2 +- .../enigmaticlegacy/EnigmaticLegacy.java | 2 +- .../enigmaticlegacy/items/EldritchPan.java | 18 ++++++++---------- version.txt | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/docs/README.md b/docs/README.md index 0b013486..f6baf43d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ # Enigmatic Legacy [![](http://cf.way2muchnoise.eu/versions/enigmatic-legacy.svg)](https://www.curseforge.com/minecraft/mc-mods/enigmatic-legacy) [![](http://cf.way2muchnoise.eu/full_enigmatic-legacy_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/enigmatic-legacy/files) -**Current Version:** 2.29.0 +**Current Version:** 2.30.0 **Minecraft Version:** 1.20.1 diff --git a/docs/changelog.html b/docs/changelog.html index 285ae996..a1246152 100644 --- a/docs/changelog.html +++ b/docs/changelog.html @@ -1,5 +1,22 @@

The Changelog:


+
[Release 2.30.0]:
+

+ - Implemented The Voracious Pan;
+ - The Judgement now deals infinite damage;
+ - Added suspicious block loot tables to The One Box;
+ - Essence of Raging Life is now compatible with dispensers;
+ - Cursed time requirement for using Abyssal Artifacts is now adjustable in config;
+ - Fixed the Ender Slayer and Axe of Executioner being missing from the mod's creative tab;
+ - Heart of the Earth can now be obtained from suspicious blocks with 3% chance (configurable);
+ - Implemented /getnoringtime and /setnoringtime commands, which display and change the time spent without the Seven Curses respectively;
+ - Fixed the update checker not using the correct branch;
+ - Updated Portuguese localization (thanks sebanimm, #493);
+ - Updated Korean localization (thanks sebanimm, #487);
+ - Updated Chinese localization (thanks NumberSir, #470);
+ - Improved English localization (thanks XenoStone1009, #477).
+



+

[Release 2.29.0]:

 - Initial 1.20.1 port;
diff --git a/gradle.properties b/gradle.properties index 235ca6a1..0d28934a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx4G -Xms4G the_acknowledgment_edition=20 # Mod -mod_version=2.29.0 +mod_version=2.30.0 mod_group=com.aizistral.enigmaticlegacy mod_id=enigmaticlegacy mod_name=Enigmatic Legacy diff --git a/src/main/java/com/aizistral/enigmaticlegacy/EnigmaticLegacy.java b/src/main/java/com/aizistral/enigmaticlegacy/EnigmaticLegacy.java index 0a8cd000..deb92478 100644 --- a/src/main/java/com/aizistral/enigmaticlegacy/EnigmaticLegacy.java +++ b/src/main/java/com/aizistral/enigmaticlegacy/EnigmaticLegacy.java @@ -179,7 +179,7 @@ @Mod(EnigmaticLegacy.MODID) public class EnigmaticLegacy { public static final String MODID = "enigmaticlegacy"; - public static final String VERSION = "2.29.0"; + public static final String VERSION = "2.30.0"; public static final String RELEASE_TYPE = "Release"; public static final String NAME = "Enigmatic Legacy"; diff --git a/src/main/java/com/aizistral/enigmaticlegacy/items/EldritchPan.java b/src/main/java/com/aizistral/enigmaticlegacy/items/EldritchPan.java index cf564fe7..65f142af 100644 --- a/src/main/java/com/aizistral/enigmaticlegacy/items/EldritchPan.java +++ b/src/main/java/com/aizistral/enigmaticlegacy/items/EldritchPan.java @@ -61,13 +61,6 @@ public class EldritchPan extends TieredItem implements Vanishable, ICursed, ICre private static final ItemStack UNSUSPECTING_DIAMOND_SWORD = new ItemStack(Items.DIAMOND_SWORD); public static final Map HOLDING_DURATIONS = new WeakHashMap<>(); - // TODO: - // The Forbidden Fruit interaction - // Metal clang sound effect - // Make enchantable with sword enchants - // Repair with food - // The Acknowledgment lore - public static Omniconfig.DoubleParameter attackDamage = null; public static Omniconfig.DoubleParameter attackSpeed = null; public static Omniconfig.DoubleParameter armorValue = null; @@ -116,7 +109,8 @@ public static void onConfig(OmniconfigWrapper builder) { builder.popPrefix(); } - private final Multimap defaultModifiers; + private final Multimap defaultMainhandModifiers; + private final Multimap defaultOffhandModifiers; //private final float attackDamage, attackSpeed, armorValue; public EldritchPan() { @@ -131,7 +125,11 @@ public EldritchPan() { builder.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, "Weapon modifier", attackDamage.getValue(), AttributeModifier.Operation.ADDITION)); builder.put(Attributes.ATTACK_SPEED, new AttributeModifier(BASE_ATTACK_SPEED_UUID, "Weapon modifier", attackSpeed.getValue(), AttributeModifier.Operation.ADDITION)); builder.put(Attributes.ARMOR, new AttributeModifier(ARMOR_MODIFIER_UUID, "Weapon modifier", armorValue.getValue(), AttributeModifier.Operation.ADDITION)); - this.defaultModifiers = builder.build(); + this.defaultMainhandModifiers = builder.build(); + + builder = ImmutableMultimap.builder(); + builder.put(Attributes.ARMOR, new AttributeModifier(ARMOR_MODIFIER_UUID, "Weapon modifier", armorValue.getValue(), AttributeModifier.Operation.ADDITION)); + this.defaultOffhandModifiers = builder.build(); DispenserBlock.registerBehavior(this, ArmorItem.DISPENSE_ITEM_BEHAVIOR); } @@ -141,7 +139,7 @@ public Multimap getDefaultAttributeModifiers(Equip if (slot != EquipmentSlot.MAINHAND && slot != EquipmentSlot.OFFHAND) return super.getDefaultAttributeModifiers(slot); - return this.defaultModifiers; + return slot == EquipmentSlot.MAINHAND ? this.defaultMainhandModifiers : this.defaultOffhandModifiers; } @Override diff --git a/version.txt b/version.txt index 7fd286ec..71398bcf 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.29.0 Release \ No newline at end of file +2.30.0 Release \ No newline at end of file