* Fix deployment usages with unity gui and add 1.19.2 anvil support.

the-h-team · Sep 6, 2022 · e65f85c · e65f85c
1 parent e349b0e
commit e65f85c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/labyrinth-common/src/main/java/com/github/sanctum/labyrinth/library/InventorySync.java b/labyrinth-common/src/main/java/com/github/sanctum/labyrinth/library/InventorySync.java
@@ -33,7 +33,9 @@ public Inventory getParent() {
 
 	@Override
 	public Deployable<Void> remove(ItemCompost compost) {
-		return Deployable.of(null, unused -> compost.remove(this), 0);
+		return Deployable.of(() -> {
+			compost.remove(this);
+		}, 0);
 	}
 
 }
diff --git a/...-gui/src/main/java/com/github/sanctum/labyrinth/gui/unity/construct/MenuRegistration.java b/...-gui/src/main/java/com/github/sanctum/labyrinth/gui/unity/construct/MenuRegistration.java
@@ -37,7 +37,7 @@ static MenuRegistration getInstance() {
 
 			@Override
 			public <M extends Menu> Deployable<Void> register(M menu) throws MenuDuplicationException, MenuNotCacheableException {
-				return Deployable.of(null, unused -> {
+				return Deployable.of(() -> {
 					PantherCollection<Menu> menus = cache.get(menu.getHost());
 					if (menus != null) {
 						if (menus.contains(menu))
@@ -55,7 +55,7 @@ public <M extends Menu> Deployable<Void> register(M menu) throws MenuDuplication
 
 			@Override
 			public Deployable<Void> unregister(Menu menu) throws MenuNotCacheableException {
-				return Deployable.of(null, unused -> {
+				return Deployable.of(() -> {
 					PantherCollection<Menu> menus = cache.get(menu.getHost());
 					if (menus != null) {
 						if (!menus.contains(menu)) throw new MenuNotCacheableException("Menu not cached.");

diff --git a/labyrinth-gui/src/main/java/com/github/sanctum/labyrinth/gui/unity/impl/MenuType.java b/labyrinth-gui/src/main/java/com/github/sanctum/labyrinth/gui/unity/impl/MenuType.java
@@ -117,15 +117,15 @@ public Menu.Builder<T, K> build() {
 	}
 
 	public boolean exists(String key) {
-		return registration.get(key) != null;
+		return registration.get(key).deploy().get() != null;
 	}
 
 	public T get(String key) {
-		return (T) registration.get(key);
+		return (T) registration.get(key).deploy().get();
 	}
 
 	public T get(Predicate<Menu> predicate) {
-		for (Menu m : registration.getAll().get()) {
+		for (Menu m : registration.getAll().deploy().get()) {
 			if (predicate.test(m)) {
 				return (T) m;
 			}

diff --git a/labyrinth-gui/src/main/java/com/github/sanctum/labyrinth/gui/unity/simple/MemoryDocket.java b/labyrinth-gui/src/main/java/com/github/sanctum/labyrinth/gui/unity/simple/MemoryDocket.java
@@ -233,7 +233,7 @@ public <V> MemoryDocket<T> setUniqueDataConverter(@NotNull V t, @NotNull BiFunct
 											r = dataConverter.apply(r, value);
 										}
 										MenuRegistration registration = MenuRegistration.getInstance();
-										Menu registered = registration.get(r).get();
+										Menu registered = registration.get(r).deploy().get();
 										if (registered != null) {
 											registered.open(click.getElement());
 										} else {
@@ -361,7 +361,7 @@ protected void handleClickEvent(MemoryItem item, ItemElement<?> ed) {
 						open = uniqueDataConverter.apply(open, uniqueData);
 					}
 					MenuRegistration registration = MenuRegistration.getInstance();
-					Menu registered = registration.get(open).deploy().get();
+					Menu registered = registration.get(open).deploy().complete();
 					if (registered != null) {
 						registered.open(click.getElement());
 					} else {

diff --git a/labyrinth-plugin/src/main/resources/lib/1_19_1_R1.jar b/labyrinth-plugin/src/main/resources/lib/1_19_1_R1.jar
diff --git a/labyrinth-plugin/src/main/resources/lib/1_19_2_R1.jar b/labyrinth-plugin/src/main/resources/lib/1_19_2_R1.jar
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <templates.version>1.1.0</templates.version>
-        <panther.version>1.0.0</panther.version>
+        <panther.version>1.0.1.R1-SNAPSHOT</panther.version>
         <project.version>${version}</project.version>
     </properties>