1.18.2 support (#75)

* 1.18.2 support

* 2.6.2-Beta

* Update NMSProviderDefault.java

* Update build-1.18+.sh

* Update BuildTools/build-1.18+.sh

Co-authored-by: James Peters <jameslfc19@gmail.com>

BuildTools/build-1.18+.sh

@@ -8,7 +8,7 @@ MAVEN_DIR="$HOME/.m2"
 SPIGOT="${MAVEN_DIR}/repository/org/spigotmc/spigot"
 
 #Versions
-array=("1.18.1")
+array=("1.18.2" "1.18.1")
 
 #Download BuildTools jar
 curl -s -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar

ChestsPlusPlus_1_18_R1/src/main/java/com/jamesdpeters/minecraft/chests/v1_18_R1/NMSProviderImpl.java

@@ -7,7 +7,6 @@ import com.jamesdpeters.minecraft.chests.MaterialChecker;
 import com.jamesdpeters.minecraft.chests.NMSProvider;
 import com.jamesdpeters.minecraft.chests.v1_17_R1.EntityEventListener_1_17;
 import com.jamesdpeters.minecraft.chests.v1_17_R1.MaterialChecker_1_17_R1;
-import com.jamesdpeters.minecraft.chests.v1_18_R1.Crafting;
 import org.bukkit.block.Lidded;
 import org.bukkit.entity.ItemFrame;
 

ChestsPlusPlus_1_18_R2/pom.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <artifactId>ChestsPlusPlus-Parent</artifactId>
+        <groupId>com.jamesdpeters.minecraft.chests</groupId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <properties>
+        <minecraft.version>1.18.2</minecraft.version>
+    </properties>
+
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ChestsPlusPlus_1_18_R2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <repositories>
+        <repository>
+            <id>spigotmc-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.jamesdpeters.minecraft.chests</groupId>
+            <artifactId>ChestsPlusPlus-API</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>${minecraft.version}-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jamesdpeters.minecraft.chests</groupId>
+            <artifactId>ChestsPlusPlus_1_17_R1</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>${minecraft.version}-R0.1-SNAPSHOT</version>
+            <classifier>remapped-mojang</classifier>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.md-5</groupId>
+                <artifactId>specialsource-maven-plugin</artifactId>
+                <version>1.2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>remap</goal>
+                        </goals>
+                        <id>remap-obf</id>
+                        <configuration>
+                            <srgIn>org.spigotmc:minecraft-server:${minecraft.version}-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <reverse>true</reverse>
+                            <remappedDependencies>org.spigotmc:spigot:${minecraft.version}-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedArtifactAttached>true</remappedArtifactAttached>
+                            <remappedClassifierName>remapped-obf</remappedClassifierName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>remap</goal>
+                        </goals>
+                        <id>remap-spigot</id>
+                        <configuration>
+                            <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
+                            <srgIn>org.spigotmc:minecraft-server:${minecraft.version}-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:${minecraft.version}-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

ChestsPlusPlus_1_18_R2/src/main/java/com/jamesdpeters/minecraft/chests/v1_18_R2/Crafting.java

@@ -0,0 +1,97 @@
+package com.jamesdpeters.minecraft.chests.v1_18_R2;
+
+import com.jamesdpeters.minecraft.chests.CraftingProvider;
+import com.jamesdpeters.minecraft.chests.CraftingResult;
+import net.minecraft.core.NonNullList;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.CraftingContainer;
+import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.Level;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.Recipe;
+
+import java.util.ArrayList;
+
+public class Crafting implements CraftingProvider {
+
+    @Override
+    public CraftingResult craft(World world, ItemStack[] items) {
+        CraftWorld craftWorld = (CraftWorld) world;
+
+        // Setup crafting inventories.
+        CraftingContainer inventoryCrafting = new CraftingContainer(new AbstractContainerMenu(null, -1) {
+            @Override
+            public InventoryView getBukkitView() {
+                return null;
+            }
+
+            @Override
+            public boolean stillValid(net.minecraft.world.entity.player.Player player) {
+                return false;
+            }
+
+        }, 3, 3);
+
+        for (int i = 0; i < items.length; i++) {
+            inventoryCrafting.setItem(i, CraftItemStack.asNMSCopy(items[i]));
+        }
+
+        var recipe = ((CraftServer) Bukkit.getServer()).getServer().getRecipeManager().getRecipeFor(RecipeType.CRAFTING, inventoryCrafting, craftWorld.getHandle());
+
+        // Generate the resulting ItemStack from the Crafting Matrix
+        net.minecraft.world.item.ItemStack itemStack = net.minecraft.world.item.ItemStack.EMPTY;
+
+        if (recipe.isPresent()) {
+            itemStack = recipe.get().assemble(inventoryCrafting);
+        }
+
+        return createItemCraftResult(CraftItemStack.asBukkitCopy(itemStack), inventoryCrafting, craftWorld.getHandle());
+    }
+
+    @Override
+    public Recipe getRecipe(Player player, World world, ItemStack[] items) {
+        return Bukkit.getCraftingRecipe(items, world);
+    }
+
+    private CraftingResult createItemCraftResult(ItemStack itemStack, CraftingContainer inventoryCrafting, Level worldServer) {
+        CraftServer server = (CraftServer) Bukkit.getServer();
+        NonNullList<net.minecraft.world.item.ItemStack> remainingItems = server.getServer().getRecipeManager().getRemainingItemsFor(RecipeType.CRAFTING, inventoryCrafting, worldServer);
+
+        CraftingResult craftItemResult = new CraftingResult(itemStack, new ItemStack[9], new ArrayList<>());
+
+        // Create resulting matrix and overflow items
+        for (int i = 0; i < remainingItems.size(); ++i) {
+            net.minecraft.world.item.ItemStack itemstack1 = inventoryCrafting.getItem(i);
+            net.minecraft.world.item.ItemStack itemstack2 = (net.minecraft.world.item.ItemStack) remainingItems.get(i);
+
+            if (!itemstack1.isEmpty()) {
+                inventoryCrafting.removeItem(i, 1);
+                itemstack1 = inventoryCrafting.getItem(i);
+            }
+
+            if (!itemstack2.isEmpty()) {
+                if (itemstack1.isEmpty()) {
+                    inventoryCrafting.setItem(i, itemstack2);
+                } else if (net.minecraft.world.item.ItemStack.tagMatches(itemstack1, itemstack2) && net.minecraft.world.item.ItemStack.matches(itemstack1, itemstack2)) {
+                    itemstack2.grow(itemstack1.getCount());
+                    inventoryCrafting.setItem(i, itemstack2);
+                } else {
+                    craftItemResult.overflowItems().add(CraftItemStack.asBukkitCopy(itemstack2));
+                }
+            }
+        }
+
+        for (int i = 0; i < inventoryCrafting.getContents().size(); i++) {
+            craftItemResult.setResultMatrix(i, CraftItemStack.asBukkitCopy(inventoryCrafting.getItem(i)));
+        }
+
+        return craftItemResult;
+    }
+}

ChestsPlusPlus_1_18_R2/src/main/java/com/jamesdpeters/minecraft/chests/v1_18_R2/NMSProviderImpl.java

@@ -0,0 +1,49 @@
+package com.jamesdpeters.minecraft.chests.v1_18_R2;
+
+import com.jamesdpeters.minecraft.chests.ChestOpener;
+import com.jamesdpeters.minecraft.chests.CraftingProvider;
+import com.jamesdpeters.minecraft.chests.EntityEventListener;
+import com.jamesdpeters.minecraft.chests.MaterialChecker;
+import com.jamesdpeters.minecraft.chests.NMSProvider;
+import com.jamesdpeters.minecraft.chests.v1_17_R1.EntityEventListener_1_17;
+import com.jamesdpeters.minecraft.chests.v1_17_R1.MaterialChecker_1_17_R1;
+import org.bukkit.block.Lidded;
+import org.bukkit.entity.ItemFrame;
+
+public class NMSProviderImpl implements NMSProvider {
+
+    @Override
+    public ChestOpener getChestOpener() {
+        return (inventory, container, tileEntityOpener) -> {
+            if(container instanceof Lidded){
+                if(inventory.getViewers().size() > 0){
+                    ((Lidded) container).open();
+                } else {
+                    ((Lidded) container).close();
+                }
+            }
+            return null;
+        };
+    }
+
+    @Override
+    public MaterialChecker getMaterialChecker() {
+        return new MaterialChecker_1_17_R1();
+    }
+
+    @Override
+    public CraftingProvider getCraftingProvider() {
+        return new Crafting();
+    }
+
+    @Override
+    public EntityEventListener getEntityEventListener() {
+        return new EntityEventListener_1_17();
+    }
+
+    @Override
+    public void setItemFrameVisible(ItemFrame itemFrame, boolean visible) {
+        itemFrame.setVisible(visible);
+    }
+
+}

ChestsPlusPlus_Main/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.jamesdpeters.minecraft.chests</groupId>
     <artifactId>ChestsPlusPlus-Master</artifactId>
-    <version>2.6.1-Beta</version>
+    <version>2.6.2-Beta</version>
 
     <properties>
         <maven.compiler.target>16</maven.compiler.target>
@@ -99,6 +99,13 @@
             <version>2.2.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.jamesdpeters.minecraft.chests</groupId>
+            <artifactId>ChestsPlusPlus_1_18_R2</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.jamesdpeters.minecraft.chests</groupId>
             <artifactId>ChestsPlusPlus_1_18_R1</artifactId>

ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/api/NMSProviderDefault.java

@@ -1,21 +1,31 @@
 package com.jamesdpeters.minecraft.chests.api;
 
-import com.jamesdpeters.minecraft.chests.ChestOpener;
+import com.jamesdpeters.minecraft.chests.*;
-import com.jamesdpeters.minecraft.chests.CraftingProvider;
+import org.bukkit.Bukkit;
-import com.jamesdpeters.minecraft.chests.EntityEventListener;
-import com.jamesdpeters.minecraft.chests.MaterialChecker;
-import com.jamesdpeters.minecraft.chests.NMSProvider;
-import com.jamesdpeters.minecraft.chests.v1_17_R1.NMSProviderImpl;
 import org.bukkit.entity.ItemFrame;
 
 public class NMSProviderDefault implements NMSProvider {
 
     //Latest version at time of build is 1.17
-    //All new versions should be able to run with the default provided after 1.17
+    //All new versions should be able to run with the default provided after 1.17 <- Not seem to be working by: ceze88
-    NMSProviderImpl defaultProvider;
+    NMSProvider defaultProvider;
 
     public NMSProviderDefault() {
-        defaultProvider = new NMSProviderImpl();
+        String NAME = Bukkit.getServer().getClass().getPackage().getName();
+        String VERSION = NAME.substring(NAME.lastIndexOf('.') + 1);
+        switch (VERSION) {
+            case "v1_16_R2" -> defaultProvider = new com.jamesdpeters.minecraft.chests.v1_16_R2.NMSProviderImpl();
+            case "v1_16_R3" -> defaultProvider = new com.jamesdpeters.minecraft.chests.v1_16_R3.NMSProviderImpl();
+            case "v1_17_R1" -> defaultProvider = new com.jamesdpeters.minecraft.chests.v1_17_R1.NMSProviderImpl();
+            case "v1_18_R1" -> defaultProvider = new com.jamesdpeters.minecraft.chests.v1_18_R1.NMSProviderImpl();
+            case "v1_18_R2" -> defaultProvider = new com.jamesdpeters.minecraft.chests.v1_18_R2.NMSProviderImpl();
+            default -> {
+                ChestsPlusPlus.PLUGIN.getLogger().severe("§c=======================================================");
+                ChestsPlusPlus.PLUGIN.getLogger().severe("§cThis version is not supported. Please update your server!");
+                ChestsPlusPlus.PLUGIN.getLogger().severe("§c=======================================================");
+                defaultProvider = new com.jamesdpeters.minecraft.chests.v1_16_R1.NMSProviderImpl();
+            }
+        }
     }
 
     @Override

ChestsPlusPlus_Main/src/main/resources/lang/en_GB.properties

@@ -1,4 +1,4 @@
-# Chests++ Language File (Version 2.6)
+# Chests++ Language File (Version 2.6.2-Beta)
 # NOTE: This file gets replaced when the plugin launches! If you want to make modifications create a copy first!
 # To create a new language file simply create a copy of this file and rename it to your desired choice for example 'en_US.properties'
 # It should be located in the 'lang' folder

pom.xml

@@ -16,6 +16,7 @@
 
     <modules>
         <module>ChestsPlusPlusAPI</module>
+        <module>ChestsPlusPlus_1_18_R2</module>
         <module>ChestsPlusPlus_1_18_R1</module>
         <module>ChestsPlusPlus_1_17_R1</module>
         <module>ChestsPlusPlus_1_16_R3</module>