Skip to content

Commit

Permalink
Update to 1.20.4 (Polymer Port)
Browse files Browse the repository at this point in the history
  • Loading branch information
Patbox committed Jan 7, 2024
1 parent 270c27c commit 2d55eeb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ fabric_version=0.91.2+1.20.4
cca_version=5.4.0
mod_menu_version=9.0.0-pre.1

port_version=1
port_version=2


polymer_version=0.7.4+1.20.4
sgui_version=1.4.1+1.20.2
sgui_version=1.4.1+1.20.4
translation_version=2.2.0+1.20.3-rc1
pda_version=0.4.0+1.20.3
8 changes: 4 additions & 4 deletions src/main/java/dev/emi/trinkets/poly/TrinketsFlatUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public TrinketsFlatUI(ServerPlayerEntity player, boolean compact) {
.flatMap((x) -> x.values().stream().sorted(Comparator.comparingInt(a -> a.getSlotType().getOrder())))
.collect(Collectors.toList());

this.setTitle(PolymerResourcePackUtils.hasPack(player)
this.setTitle(PolymerResourcePackUtils.hasMainPack(player)
? Text.empty().append(Text.literal(compact ? "-1." : "-0.")
.setStyle(Style.EMPTY.withColor(Formatting.WHITE).withFont(new Identifier(TrinketsMain.MOD_ID, "gui"))))
.append(Text.translatable("trinkets.name"))
Expand All @@ -77,7 +77,7 @@ public static int open(ServerPlayerEntity player) {
}

public void drawLines() {
if (this.compact && !PolymerResourcePackUtils.hasPack(this.player)) {
if (this.compact && !PolymerResourcePackUtils.hasMainPack(this.player)) {
for (int x = 0; x < 5; x++) {
this.setSlot(9 * x + 4, Elements.FILLER);
}
Expand Down Expand Up @@ -130,7 +130,7 @@ private void drawLine(int index, TrinketInventory trinketInventory, int subPage)
this.setSlot(base + slot++, Elements.FILLER);
}

boolean hasPack = PolymerResourcePackUtils.hasPack(player);
boolean hasPack = PolymerResourcePackUtils.hasMainPack(player);

if (trinketInventory.size() <= invSize) {
for (int i = 0; i < invSize; i++) {
Expand Down Expand Up @@ -189,7 +189,7 @@ private void drawLine(int index, TrinketInventory trinketInventory, int subPage)
}

private void drawNavbar() {
boolean addNavbarFiller = !PolymerResourcePackUtils.hasPack(this.player);
boolean addNavbarFiller = !PolymerResourcePackUtils.hasMainPack(this.player);

if (this.inventories.size() > this.displayPerPage) {

Expand Down

0 comments on commit 2d55eeb

Please sign in to comment.