Do not call getViewer() on open in shared contexts (#545)

DevNatan · Dec 1, 2023 · 12a80ca · 12a80ca
1 parent abb7508
commit 12a80ca
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 26 deletions.
diff --git a/inventory-framework-anvil-input/build.gradle b/inventory-framework-anvil-input/build.gradle
@@ -6,13 +6,6 @@ plugins {
 apply from: '../library.gradle'
 apply from: '../publish.gradle'
 
-repositories {
-    mavenCentral()
-    maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
-    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-
-}
-
 dependencies {
     compileOnly libs.spigot
     compileOnlyApi projects.inventoryFrameworkPlatformBukkit

diff --git a/inventory-framework-platform-bukkit/build.gradle b/inventory-framework-platform-bukkit/build.gradle
@@ -8,12 +8,6 @@ plugins {
 apply from: '../library.gradle'
 apply from: '../publish.gradle'
 
-repositories {
-    mavenCentral()
-    maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
-    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-}
-
 dependencies {
     api projects.inventoryFrameworkPlatform
     runtimeOnly projects.inventoryFrameworkAnvilInput

diff --git a/...atform/src/main/java/me/devnatan/inventoryframework/pipeline/PlatformOpenInterceptor.java b/...atform/src/main/java/me/devnatan/inventoryframework/pipeline/PlatformOpenInterceptor.java
@@ -74,26 +74,26 @@ IFRenderContext createRenderContext(IFOpenContext openContext) {
         ViewContainer createdContainer = openContext.getContainer();
         if (createdContainer == null) createdContainer = elementFactory.createContainer(openContext);
 
-        final IFRenderContext context = elementFactory.createRenderContext(
+        final IFRenderContext renderContext = elementFactory.createRenderContext(
                 openContext.getId(),
                 root,
                 openContext.getConfig(),
                 createdContainer,
                 new HashMap<>(),
-                openContext.getViewer(),
+                openContext.isShared() ? null : openContext.getViewer(),
                 openContext.getInitialData());
 
-        context.setEndless(openContext.isEndless());
-        openContext.getStateValues().forEach(context::initializeState);
+        renderContext.setEndless(openContext.isEndless());
+        openContext.getStateValues().forEach(renderContext::initializeState);
 
         for (final Viewer viewer : openContext.getIndexedViewers().values()) {
-            if (!viewer.isTransitioning()) viewer.setActiveContext(context);
+            if (!viewer.isTransitioning()) viewer.setActiveContext(renderContext);
             // TODO Pass viewer object as parameter instead
-            root.onViewerAdded(context, viewer.getPlatformInstance(), context.getInitialData());
-            context.addViewer(viewer);
+            root.onViewerAdded(renderContext, viewer.getPlatformInstance(), renderContext.getInitialData());
+            renderContext.addViewer(viewer);
         }
 
-        context.setActive(true);
-        return context;
+        renderContext.setActive(true);
+        return renderContext;
     }
 }
diff --git a/library.gradle b/library.gradle
@@ -4,10 +4,6 @@ apply plugin: 'com.diffplug.spotless'
 group rootProject.group
 version rootProject.version
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     compileOnly libs.jetbrains.annotations
     testCompileOnly libs.jetbrains.annotations

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,14 @@
+buildscript {
+    dependencyResolutionManagement {
+        repositories {
+            mavenCentral()
+            maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
+            maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+            maven { url 'https://repo.papermc.io/repository/maven-public/' }
+        }
+    }
+}
+
 plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }