From 0764b2ddf1f8e8ff28670ba7bd3954dff18aa2a6 Mon Sep 17 00:00:00 2001
From: Patbox <39821509+Patbox@users.noreply.github.com>
Date: Tue, 8 Mar 2022 21:37:08 +0100
Subject: [PATCH] Update Polymer Port to 1.18.2

---
 build.gradle                                              | 6 +++---
 gradle.properties                                         | 2 +-
 .../java/wraith/waystones/gui/UniversalWaystoneGui.java   | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7305dc8..0b8ed5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,10 +30,10 @@ dependencies {
 
 	modCompileOnly 'curse.maven:repurposed-structures-fabric-391366:3542863'
 
-	modImplementation include("eu.pb4:sgui:1.0.0-rc6+1.18-pre5")
+	modImplementation include("eu.pb4:sgui:1.0.0+1.18.1")
 	modImplementation include("eu.pb4:hologram-api:0.2.1+1.18-pre5")
-	modImplementation include("eu.pb4:polymer:0.2.0-beta.25+1.18.1")
-	modImplementation include("fr.catcore:server-translations-api:1.4.8+1.18-pre1")
+	modImplementation include("eu.pb4:polymer:0.2.0-beta.29+1.18.2")
+	modImplementation include("fr.catcore:server-translations-api:1.4.9+1.18.2-rc1")
 }
 
 loom {
diff --git a/gradle.properties b/gradle.properties
index 56e5d9b..cb7f012 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,5 +13,5 @@ archives_base_name=wraith-waystones
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.47.8+1.18.2
 
-sub_version=2
+sub_version=0
 
diff --git a/src/main/java/wraith/waystones/gui/UniversalWaystoneGui.java b/src/main/java/wraith/waystones/gui/UniversalWaystoneGui.java
index 35368df..f20c95a 100644
--- a/src/main/java/wraith/waystones/gui/UniversalWaystoneGui.java
+++ b/src/main/java/wraith/waystones/gui/UniversalWaystoneGui.java
@@ -138,7 +138,7 @@ private void updateWaystones() {
                 }
             }
         }
-        this.sortedWaystones.sort(Comparator.comparing(a -> Waystones.WAYSTONE_STORAGE.getWaystone(a).getWaystoneName()));
+        this.sortedWaystones.sort(Comparator.comparing(a -> Waystones.WAYSTONE_STORAGE.getWaystoneData(a).getWaystoneName()));
     }
 
     @Override
@@ -150,7 +150,7 @@ protected int getPageAmount() {
     protected DisplayElement getElement(int id) {
         if (this.sortedWaystones.size() > id) {
             var hash = this.sortedWaystones.get(id);
-            var tmpWaystone = Waystones.WAYSTONE_STORAGE.getWaystone(hash);
+            var tmpWaystone = Waystones.WAYSTONE_STORAGE.getWaystoneData(hash);
 
             var builder =  new GuiElementBuilder(tmpWaystone.isGlobal() ? Items.ENDER_EYE : Items.ENDER_PEARL)
                     .setName(new LiteralText(tmpWaystone.getWaystoneName()))
@@ -168,7 +168,7 @@ protected DisplayElement getElement(int id) {
     }
 
     private void handleSelection(int i, ClickType type, SlotActionType actionType, String hash) {
-        var waystone = Waystones.WAYSTONE_STORAGE.getWaystone(hash);
+        var waystone = Waystones.WAYSTONE_STORAGE.getWaystoneEntity(hash);
         if (waystone == null) {
             return;
         }
@@ -209,7 +209,7 @@ protected DisplayElement getNavElement(int id) {
 
     protected DisplayElement getCost() {
             String cost = Config.getInstance().teleportType();
-            int amount = Config.getInstance().teleportCost();
+            int amount = Config.getInstance().baseTeleportCost();
 
             Item item;
             String type;