generified give commands and blueprints a bit

Author: RobertSkalko

CHANGELOG.txt

@@ -168,4 +168,6 @@ v5.0.4
 
 - added new supp gems: LMP, GMP, Barrage versions, faster projectiles
 
-- added leech cap stat, and base leech is now 5% total hp etc capped per second
+- added leech cap stat, and base leech is now 5% total hp etc capped per second
+
+- added remaining spirit tooltip to aura gems

src/main/java/com/robertx22/age_of_exile/capability/player/data/DeathFavorData.java

@@ -3,11 +3,17 @@
 import com.robertx22.age_of_exile.config.forge.ServerContainer;
 import com.robertx22.age_of_exile.database.data.rarities.GearRarity;
 import com.robertx22.age_of_exile.database.registry.ExileDB;
+import com.robertx22.age_of_exile.mmorpg.SlashRef;
 import com.robertx22.age_of_exile.uncommon.MathHelper;
 import com.robertx22.age_of_exile.uncommon.interfaces.data_items.IRarity;
+import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DeathFavorData {
 
     private float favor = 250;
@@ -42,6 +48,30 @@ public GearRarity getRarity() {
         return rar;
     }
 
+    public List<Component> getTooltip() {
+        List<Component> tooltip = new ArrayList<>();
+
+        GearRarity rar = getRarity();
+
+        tooltip.add(rar.locName().append(" Favor").withStyle(rar.textFormatting()));
+
+        tooltip.add(Component.empty());
+
+        tooltip.add(Component.literal("Current: " + (int) favor).withStyle(ChatFormatting.YELLOW));
+
+        tooltip.add(Component.empty());
+
+
+        tooltip.add(Component.literal("Loot/Exp Multiplier: " + getLootExpMulti() + "x").withStyle(rar.textFormatting()));
+
+
+        return tooltip;
+    }
+
+    public ResourceLocation getTexture() {
+        return SlashRef.guiId("favor/" + getRarity().item_tier);
+    }
+
     public float getLootExpMulti() {
         return getRarity().favor_loot_multi;
     }

src/main/java/com/robertx22/age_of_exile/capability/player/helper/GemInventoryHelper.java

@@ -118,7 +118,8 @@ public List<SkillGemData> getAurasGems() {
         return list;
     }
 
-    public float getSpiritReserved(Player p, float multi) {
+    public float getSpiritReserved(Player p) {
+        float multi = getPlayerSpiritReserveMulti(p);
 
         float res = 0;
 
@@ -129,12 +130,24 @@ public float getSpiritReserved(Player p, float multi) {
         return res;
     }
 
-    public void removeAurasIfCantWear(Player p) {
+    public float getRemainingSpirit(Player p) {
+
+        float reserved = getSpiritReserved(p);
+
+        float remaining = 1 - reserved;
+
+        return remaining * 100F;
+    }
 
+    public float getPlayerSpiritReserveMulti(Player p) {
         float multi = Load.Unit(p).getUnit().getCalculatedStat(AuraCostReduction.getInstance()).getReverseMultiplier();
+        return multi;
+    }
 
 
-        if (getSpiritReserved(p, multi) > 1) {
+    public void removeAurasIfCantWear(Player p) {
+
+        if (getSpiritReserved(p) > 1) {
             for (ItemStack s : getAuras()) {
                 PlayerUtils.giveItem(s.copy(), p);
                 s.shrink(100);

src/main/java/com/robertx22/age_of_exile/database/data/support_gem/SupportGems.java

@@ -27,7 +27,7 @@ public static void init() {
         new SupportGem("gmp_barrage", "Greater Barrage Projectiles", PlayStyle.DEX, 1.5F,
                 Arrays.asList(
                         new StatMod(-50, -50, Stats.TOTAL_DAMAGE.get(), ModType.MORE),
-                        new StatMod(10, 30, Stats.PROJECTILE_DAMAGE.get(), ModType.MORE),
+                        new StatMod(10, 30, Stats.PROJECTILE_DAMAGE.get(), ModType.FLAT),
                         new StatMod(4, 4, Stats.PROJECTILE_COUNT.get(), ModType.FLAT),
                         new StatMod(1, 1, Stats.PROJECTILE_BARRAGE.get(), ModType.FLAT)
                 ))
@@ -37,7 +37,7 @@ public static void init() {
         new SupportGem("gmp", "Greater Multiple Projectiles", PlayStyle.DEX, 1.5F,
                 Arrays.asList(
                         new StatMod(-50, -50, Stats.TOTAL_DAMAGE.get(), ModType.MORE),
-                        new StatMod(10, 30, Stats.PROJECTILE_DAMAGE.get(), ModType.MORE),
+                        new StatMod(10, 30, Stats.PROJECTILE_DAMAGE.get(), ModType.FLAT),
                         new StatMod(4, 4, Stats.PROJECTILE_COUNT.get(), ModType.FLAT)
                 ))
                 .setOneOfAKind(PROJ_COUNT)
@@ -46,7 +46,7 @@ public static void init() {
         new SupportGem("lmp_barrage", "Lesser Barrage Projectiles", PlayStyle.DEX, 1.5F,
                 Arrays.asList(
                         new StatMod(-30, -30, Stats.TOTAL_DAMAGE.get(), ModType.MORE),
-                        new StatMod(10, 30, Stats.PROJECTILE_DAMAGE.get(), ModType.MORE),
+                        new StatMod(10, 30, Stats.PROJECTILE_DAMAGE.get(), ModType.FLAT),
                         new StatMod(2, 2, Stats.PROJECTILE_COUNT.get(), ModType.FLAT),
                         new StatMod(1, 1, Stats.PROJECTILE_BARRAGE.get(), ModType.FLAT)
                 ))
@@ -55,7 +55,7 @@ public static void init() {
         new SupportGem("lmp", "Lesser Multiple Projectiles", PlayStyle.DEX, 1.5F,
                 Arrays.asList(
                         new StatMod(-30, -30, Stats.TOTAL_DAMAGE.get(), ModType.MORE),
-                        new StatMod(10, 30, Stats.PROJECTILE_DAMAGE.get(), ModType.MORE),
+                        new StatMod(10, 30, Stats.PROJECTILE_DAMAGE.get(), ModType.FLAT),
                         new StatMod(2, 2, Stats.PROJECTILE_COUNT.get(), ModType.FLAT)
                 ))
                 .setOneOfAKind(PROJ_COUNT).registerToExileRegistry();

src/main/java/com/robertx22/age_of_exile/gui/buttons/FavorButton.java

@@ -0,0 +1,44 @@
+package com.robertx22.age_of_exile.gui.buttons;
+
+import com.robertx22.age_of_exile.uncommon.datasaving.Load;
+import com.robertx22.library_of_exile.utils.TextUTIL;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.resources.ResourceLocation;
+
+public class FavorButton extends ImageButton {
+
+    public static int FAVOR_BUTTON_SIZE_X = 34;
+    public static int FAVOR_BUTTON_SIZE_Y = 34;
+
+    Minecraft mc = Minecraft.getInstance();
+
+    public FavorButton(int xPos, int yPos) {
+        super(xPos, yPos, FAVOR_BUTTON_SIZE_X, FAVOR_BUTTON_SIZE_Y, 0, 0, FAVOR_BUTTON_SIZE_Y, new ResourceLocation("empty"), (button) -> {
+        });
+
+    }
+
+    @Override
+    public void render(GuiGraphics gui, int mouseX, int mouseY, float delta) {
+        setModTooltip();
+        super.render(gui, mouseX, mouseY, delta);
+    }
+
+    @Override
+    public void renderWidget(GuiGraphics gui, int mouseX, int mouseY, float delta) {
+        ResourceLocation tex = Load.player(mc.player).favor.getTexture();
+        gui.setColor(1.0F, 1.0F, 1.0F, 1.0F);
+        gui.blit(tex, getX(), getY(), FAVOR_BUTTON_SIZE_X, FAVOR_BUTTON_SIZE_X, FAVOR_BUTTON_SIZE_X, FAVOR_BUTTON_SIZE_X, FAVOR_BUTTON_SIZE_X, FAVOR_BUTTON_SIZE_X);
+
+    }
+
+    public void setModTooltip() {
+        this.setTooltip(Tooltip.create(TextUTIL.mergeList(Load.player(mc.player).favor.getTooltip())));
+
+    }
+
+
+}

src/main/java/com/robertx22/age_of_exile/gui/screens/character_screen/MainHubScreen.java

@@ -23,6 +23,7 @@
 import com.robertx22.age_of_exile.gui.bases.BaseScreen;
 import com.robertx22.age_of_exile.gui.bases.INamedScreen;
 import com.robertx22.age_of_exile.gui.buttons.CharacterStatsButtons;
+import com.robertx22.age_of_exile.gui.buttons.FavorButton;
 import com.robertx22.age_of_exile.gui.inv_gui.GuiInventoryGrids;
 import com.robertx22.age_of_exile.gui.screens.OpenBackpack;
 import com.robertx22.age_of_exile.gui.screens.OpenInvGuiScreen;
@@ -219,6 +220,9 @@ public void init() {
         // screens.add(new SpellScreen());
 
 
+        publicAddButton(new FavorButton(guiLeft + sizeX / 2 - FavorButton.FAVOR_BUTTON_SIZE_X / 2, guiTop - FavorButton.FAVOR_BUTTON_SIZE_Y));
+
+
         int x = guiLeft + sizeX - 1;
         int y = guiTop + 20;
 

src/main/java/com/robertx22/age_of_exile/loot/blueprints/GearBlueprint.java

@@ -1,8 +1,7 @@
 package com.robertx22.age_of_exile.loot.blueprints;
 
 import com.robertx22.age_of_exile.loot.LootInfo;
-import com.robertx22.age_of_exile.loot.blueprints.bases.GearItemSlotPart;
-import com.robertx22.age_of_exile.loot.blueprints.bases.GearRarityPart;
+import com.robertx22.age_of_exile.loot.blueprints.bases.GearTypePart;
 import com.robertx22.age_of_exile.loot.blueprints.bases.UniqueGearPart;
 import com.robertx22.age_of_exile.loot.generators.SoulLootGen;
 import com.robertx22.age_of_exile.loot.generators.util.GearCreationUtils;
@@ -11,7 +10,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 
-public class GearBlueprint extends ItemBlueprint {
+public class GearBlueprint extends RarityItemBlueprint implements ITypeBlueprint {
 
     public Item item = Items.AIR;
 
@@ -22,9 +21,8 @@ public GearBlueprint(LootInfo info) {
         this.rarity.setupChances(info);
     }
 
- 
-    public GearItemSlotPart gearItemSlot = new GearItemSlotPart(this);
-    public GearRarityPart rarity = new GearRarityPart(this);
+
+    public GearTypePart gearItemSlot = new GearTypePart(this);
     public UniqueGearPart uniquePart = new UniqueGearPart(this);
 
 
@@ -43,4 +41,8 @@ ItemStack generate() {
         }
     }
 
+    @Override
+    public void setType(String type) {
+        this.gearItemSlot.set(type);
+    }
 }

src/main/java/com/robertx22/age_of_exile/loot/blueprints/ITypeBlueprint.java

@@ -0,0 +1,6 @@
+package com.robertx22.age_of_exile.loot.blueprints;
+
+public interface ITypeBlueprint {
+
+    void setType(String type);
+}

src/main/java/com/robertx22/age_of_exile/loot/blueprints/JewelBlueprint.java

@@ -1,7 +1,6 @@
 package com.robertx22.age_of_exile.loot.blueprints;
 
 import com.robertx22.age_of_exile.loot.LootInfo;
-import com.robertx22.age_of_exile.loot.blueprints.bases.GearRarityPart;
 import com.robertx22.age_of_exile.saveclasses.jewel.JewelItemData;
 import com.robertx22.age_of_exile.uncommon.datasaving.StackSaving;
 import com.robertx22.age_of_exile.uncommon.enumclasses.PlayStyle;
@@ -10,11 +9,9 @@
 
 import java.util.Arrays;
 
-public class JewelBlueprint extends ItemBlueprint {
+public class JewelBlueprint extends RarityItemBlueprint {
 
 
-    public GearRarityPart rarity = new GearRarityPart(this);
-
     public JewelBlueprint(LootInfo info) {
         super(info);
         this.rarity.chanceForHigherRarity = 50;

src/main/java/com/robertx22/age_of_exile/loot/blueprints/LootChestBlueprint.java

@@ -1,21 +1,20 @@
 package com.robertx22.age_of_exile.loot.blueprints;
 
 import com.robertx22.age_of_exile.database.data.loot_chest.base.LootChestData;
+import com.robertx22.age_of_exile.database.registry.ExileDB;
 import com.robertx22.age_of_exile.loot.LootInfo;
-import com.robertx22.age_of_exile.loot.blueprints.bases.GearRarityPart;
 import com.robertx22.age_of_exile.loot.blueprints.bases.LootChestPart;
 import com.robertx22.age_of_exile.uncommon.datasaving.StackSaving;
 import com.robertx22.library_of_exile.utils.RandomUtils;
 import net.minecraft.world.item.ItemStack;
 
-public class LootChestBlueprint extends ItemBlueprint {
+public class LootChestBlueprint extends RarityItemBlueprint implements ITypeBlueprint {
 
     public LootChestBlueprint(LootInfo info) {
         super(info);
         this.rarity.chanceForHigherRarity = 75;
     }
 
-    public GearRarityPart rarity = new GearRarityPart(this);
     public LootChestPart type = new LootChestPart(this);
 
     @Override
@@ -45,4 +44,8 @@ public LootChestData createData() {
     }
 
 
+    @Override
+    public void setType(String type) {
+        this.type.set(ExileDB.LootChests().get(type));
+    }
 }