Skip to content

Commit

Permalink
Build 2.30.0 coming right up
Browse files Browse the repository at this point in the history
  • Loading branch information
Aizistral committed Jul 27, 2024
1 parent accfe86 commit 783e2fe
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
17 changes: 17 additions & 0 deletions docs/changelog.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
<h3><b>The Changelog:</b></h3><br/>

<h5><b>[Release 2.30.0]:</b></h5>
<p>
&nbsp;- Implemented The Voracious Pan;<br/>
&nbsp;- The Judgement now deals infinite damage;<br/>
&nbsp;- Added suspicious block loot tables to The One Box;<br/>
&nbsp;- Essence of Raging Life is now compatible with dispensers;<br/>
&nbsp;- Cursed time requirement for using Abyssal Artifacts is now adjustable in config;<br/>
&nbsp;- Fixed the Ender Slayer and Axe of Executioner being missing from the mod's creative tab;<br/>
&nbsp;- Heart of the Earth can now be obtained from suspicious blocks with 3% chance (configurable);<br/>
&nbsp;- Implemented /getnoringtime and /setnoringtime commands, which display and change the time spent without the Seven Curses respectively;<br/>
&nbsp;- Fixed the update checker not using the correct branch;<br/>
&nbsp;- Updated Portuguese localization (<a href="https://github.com/Aizistral-Studios/Enigmatic-Legacy/pull/493">thanks sebanimm, #493</a>);<br/>
&nbsp;- Updated Korean localization (<a href="https://github.com/Aizistral-Studios/Enigmatic-Legacy/pull/487">thanks sebanimm, #487</a>);<br/>
&nbsp;- Updated Chinese localization (<a href="https://github.com/Aizistral-Studios/Enigmatic-Legacy/pull/470">thanks NumberSir, #470</a>);<br/>
&nbsp;- Improved English localization (<a href="https://github.com/Aizistral-Studios/Enigmatic-Legacy/pull/477">thanks XenoStone1009, #477</a>).<br/>
<p/><br/><br/>

<h5><b>[Release 2.29.0]:</b></h5>
<p>
&nbsp;- Initial 1.20.1 port;<br/>
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
18 changes: 8 additions & 10 deletions src/main/java/com/aizistral/enigmaticlegacy/items/EldritchPan.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Player, Integer> 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;
Expand Down Expand Up @@ -116,7 +109,8 @@ public static void onConfig(OmniconfigWrapper builder) {
builder.popPrefix();
}

private final Multimap<Attribute, AttributeModifier> defaultModifiers;
private final Multimap<Attribute, AttributeModifier> defaultMainhandModifiers;
private final Multimap<Attribute, AttributeModifier> defaultOffhandModifiers;
//private final float attackDamage, attackSpeed, armorValue;

public EldritchPan() {
Expand All @@ -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);
}
Expand All @@ -141,7 +139,7 @@ public Multimap<Attribute, AttributeModifier> 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
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.29.0 Release
2.30.0 Release

0 comments on commit 783e2fe

Please sign in to comment.