Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add bonus glyph slot override #1472

Merged
merged 5 commits into from
Nov 3, 2024
Merged

feat: add bonus glyph slot override #1472

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c18df5
feat: add glyph slot modifier interface
Jarva Oct 28, 2024
a893565
chore: remove unused interface
Jarva Oct 28, 2024
1ebb664
fix: remove default interface implementation
Jarva Oct 28, 2024
f1880d4
chore: remove unused import
Jarva Oct 28, 2024
cd88715
fix: move to AbstractCaster
Jarva Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/com/hollingsworth/arsnouveau/api/item/IGlyphSlotModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.hollingsworth.arsnouveau.api.item;

public interface IGlyphSlotModifier {
int getBonusGlyphSlots();
}
20 changes: 15 additions & 5 deletions src/main/java/com/hollingsworth/arsnouveau/client/gui/book/GuiSpellBook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.hollingsworth.arsnouveau.ArsNouveau;
import com.hollingsworth.arsnouveau.api.ArsNouveauAPI;
import com.hollingsworth.arsnouveau.api.item.IGlyphSlotModifier;
import com.hollingsworth.arsnouveau.api.registry.FamiliarRegistry;
import com.hollingsworth.arsnouveau.api.registry.GlyphRegistry;
import com.hollingsworth.arsnouveau.api.registry.SpellCasterRegistry;
Expand Down Expand Up @@ -93,6 +94,7 @@ public class GuiSpellBook extends BaseBook {
public PageButton nextGlyphButton;
public PageButton prevGlyphButton;
public int spellWindowOffset = 0;
public int bonusSlots = 0;

public GuiSpellBook(InteractionHand hand){
super();
Expand All @@ -109,6 +111,9 @@ public GuiSpellBook(InteractionHand hand){
if(heldStack.getItem() instanceof SpellBook book){
tier = book.getTier().value;
}
if (heldStack.getItem() instanceof IGlyphSlotModifier modifier) {
bonusSlots = modifier.getBonusGlyphSlots();
Jarva marked this conversation as resolved.
Show resolved Hide resolved
}
this.bookStack = heldStack;
this.unlockedSpells = parts;
this.displayedGlyphs = new ArrayList<>(this.unlockedSpells);
Expand Down Expand Up @@ -204,7 +209,7 @@ public void init() {
spell = new ArrayList<>(recipe);

//infinite spells
if (ServerConfig.INFINITE_SPELLS.get()) {
if (getExtraGlyphSlots() > 0) {
this.nextGlyphButton = addRenderableWidget(new PageButton(bookRight - 25, bookBottom - 30, true, i -> updateWindowOffset(spellWindowOffset + 1), true));
this.prevGlyphButton = addRenderableWidget(new PageButton(bookLeft, bookBottom - 30, false, i -> updateWindowOffset(spellWindowOffset - 1), true));
updateWindowOffset(0);
Expand Down Expand Up @@ -377,10 +382,14 @@ public void onPageDec(Button button) {
validate();
}

public int getExtraGlyphSlots() {
return (ServerConfig.INFINITE_SPELLS.get() ? ServerConfig.NOT_SO_INFINITE_SPELLS.get() : 0) + bonusSlots;
}

@Override
public boolean mouseScrolled(double pMouseX, double pMouseY, double pScrollX, double pScrollY) {
boolean isShiftDown = InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), Minecraft.getInstance().options.keyShift.getKey().getValue());
if(ServerConfig.INFINITE_SPELLS.get() && isShiftDown){
if(getExtraGlyphSlots() > 0 && isShiftDown){
if (pScrollY < 0 && nextGlyphButton.active) {
updateWindowOffset(spellWindowOffset + 1);
} else if (pScrollY > 0 && prevGlyphButton.active) {
Expand Down Expand Up @@ -475,7 +484,7 @@ public void onGlyphClick(Button button) {


private void updateNextGlyphArrow() {
if (spellWindowOffset >= ServerConfig.NOT_SO_INFINITE_SPELLS.get() || spellWindowOffset >= spell.size() - 1) {
if (spellWindowOffset >= getExtraGlyphSlots() || spellWindowOffset >= spell.size() - 1) {
nextGlyphButton.active = false;
nextGlyphButton.visible = false;
} else {
Expand Down Expand Up @@ -527,9 +536,10 @@ public void updateCraftingSlots(int bookSlot) {

public void updateWindowOffset(int offset) {
//do nothing if the spell is empty and nextGlyphButton is clicked
if (ServerConfig.INFINITE_SPELLS.get())
int extraSlots = getExtraGlyphSlots();
if (extraSlots > 0)
if (spellWindowOffset != 0 || offset <= 0 || !spell.stream().allMatch(Objects::isNull)) {
this.spellWindowOffset = Mth.clamp(offset, 0, ServerConfig.NOT_SO_INFINITE_SPELLS.get());
this.spellWindowOffset = Mth.clamp(offset, 0, extraSlots);
for (int i = 0; i < 10; i++) {
var cell = craftingCells.get(i);
cell.slotNum = spellWindowOffset + i;
Expand Down