Merging changes from maintained fork

Omniscience-Core/pom.xml

@@ -4,19 +4,24 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>Omniscience</artifactId>
-        <groupId>net.lordofthecraft</groupId>
-        <version>1.0.5</version>
-        <relativePath>../pom.xml</relativePath>
+        <groupId>io.github.warhead501</groupId>
+        <version>1.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Omniscience-Core</artifactId>
 
-    <description>The Spigot solution to block logging and rollbacks for 1.13.2+</description>
+    <description>The Spigot solution to block logging and rollbacks for 1.18.X+</description>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    <url>https://lotc.co/</url>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>https://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
 
     <build>
         <finalName>Omniscience</finalName>
@@ -25,16 +30,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.9.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>3.3.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -44,19 +49,18 @@
                         <configuration>
                             <shadedArtifactAttached>false</shadedArtifactAttached>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-
                             <relocations>
                                 <relocation>
                                     <pattern>me.lucko.commodore</pattern>
-                                    <shadedPattern>net.lordofthecraft.omniscience.commodore</shadedPattern>
+                                    <shadedPattern>io.github.warhead501.omniscience.commodore</shadedPattern>
                                 </relocation>
                             </relocations>
-
                             <artifactSet>
                                 <includes>
                                     <include>org.mongodb:mongo-java-driver:**</include>
                                     <include>me.lucko:commodore</include>
-                                    <include>net.lordofthecraft:OmniscienceAPI</include>
+                                    <include>org.apache.commons:commons-lang3</include>
+                                    <include>io.github.warhead501:OmniscienceAPI</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
@@ -74,15 +78,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.lordofthecraft</groupId>
+            <groupId>io.github.warhead501</groupId>
             <artifactId>OmniscienceAPI</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
+            <version>7.3.0-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -99,18 +103,25 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-dynamodb</artifactId>
-            <version>1.11.462</version>
+            <version>1.12.239</version>
         </dependency>
         <dependency>
             <groupId>me.lucko</groupId>
             <artifactId>commodore</artifactId>
-            <version>1.2</version>
+            <version>2.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.23.0</version>
+            <version>4.6.1</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/junit/junit-->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Omniscience-Core/src/main/java/net/lordofthecraft/omniscience/OmniConfig.java → Omniscience-Core/src/main/java/io/github/warhead501/omniscience/OmniConfig.java

@@ -1,12 +1,14 @@
-package net.lordofthecraft.omniscience;
+package io.github.warhead501.omniscience;
 
-import net.lordofthecraft.omniscience.io.StorageHandler;
-import net.lordofthecraft.omniscience.io.dynamo.DynamoStorageHandler;
-import net.lordofthecraft.omniscience.io.mongo.MongoStorageHandler;
+import io.github.warhead501.omniscience.io.dynamo.DynamoStorageHandler;
+import io.github.warhead501.omniscience.io.StorageHandler;
+import io.github.warhead501.omniscience.io.mongo.MongoStorageHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.persistence.PersistentDataType;
 
 /**
  * The singular location for all end user configured directives from the plugin.yml
@@ -246,10 +248,22 @@ public int getPurgeBatchLimit() {
     /**
      * @return The material used for the search wand. Must be a block.
      */
-    public Material getWandMaterial() {
+    @Deprecated public Material getWandMaterial() {
         return wandMaterial;
     }
 
+    /**
+     * @return The item stack used for the search wand. Must be a block.
+     */
+    public ItemStack getWandItem() {
+        ItemStack is = new ItemStack(this.wandMaterial);
+        var meta = is.getItemMeta();
+        var container = meta.getPersistentDataContainer();
+        container.set(Omniscience.getInstance().getItemKey(), PersistentDataType.STRING,"tool");
+        is.setItemMeta(meta);
+        return is;
+    }
+
     /**
      * @return Whether debug messages are enabled
      */

Omniscience-Core/src/main/java/net/lordofthecraft/omniscience/OmniCore.java → Omniscience-Core/src/main/java/io/github/warhead501/omniscience/OmniCore.java

@@ -1,31 +1,36 @@
-package net.lordofthecraft.omniscience;
+package io.github.warhead501.omniscience;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import io.github.warhead501.omniscience.api.OmniApi;
+import io.github.warhead501.omniscience.api.OmniVersionHelper;
+import io.github.warhead501.omniscience.api.display.*;
+import io.github.warhead501.omniscience.api.entry.*;
+import io.github.warhead501.omniscience.api.flag.*;
+import io.github.warhead501.omniscience.api.interfaces.IOmniscience;
+import io.github.warhead501.omniscience.api.interfaces.WorldEditHandler;
+import io.github.warhead501.omniscience.api.parameter.*;
+import io.github.warhead501.omniscience.api.util.OmniUtils;
+import io.github.warhead501.omniscience.api.util.PastTenseWithEnabled;
+import io.github.warhead501.omniscience.command.OmniscienceCommand;
+import io.github.warhead501.omniscience.command.OmniscienceTabCompleter;
+import io.github.warhead501.omniscience.command.util.OmniTeleCommand;
+import io.github.warhead501.omniscience.listener.CraftBookSignListener;
+import io.github.warhead501.omniscience.listener.PluginInteractionListener;
+import io.github.warhead501.omniscience.listener.WandInteractListener;
+import lombok.Getter;
 import me.lucko.commodore.Commodore;
 import me.lucko.commodore.CommodoreProvider;
-import net.lordofthecraft.omniscience.api.OmniApi;
-import net.lordofthecraft.omniscience.api.display.*;
-import net.lordofthecraft.omniscience.api.entry.*;
-import net.lordofthecraft.omniscience.api.flag.*;
-import net.lordofthecraft.omniscience.api.interfaces.IOmniscience;
-import net.lordofthecraft.omniscience.api.interfaces.WorldEditHandler;
-import net.lordofthecraft.omniscience.api.parameter.*;
-import net.lordofthecraft.omniscience.api.util.PastTenseWithEnabled;
-import net.lordofthecraft.omniscience.command.OmniscienceCommand;
-import net.lordofthecraft.omniscience.command.OmniscienceTabCompleter;
-import net.lordofthecraft.omniscience.command.util.OmniTeleCommand;
-import net.lordofthecraft.omniscience.io.StorageHandler;
-import net.lordofthecraft.omniscience.listener.CraftBookSignListener;
-import net.lordofthecraft.omniscience.listener.PluginInteractionListener;
-import net.lordofthecraft.omniscience.listener.WandInteractListener;
+import io.github.warhead501.omniscience.io.StorageHandler;
 import org.bukkit.Bukkit;
+import org.bukkit.NamespacedKey;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.logging.Level;
@@ -43,10 +48,17 @@ final class OmniCore implements IOmniscience {
     private WorldEditHandler worldEditHandler;
     private StorageHandler storageHandler;
 
+    @Getter private NamespacedKey itemKey;
+
+    private OmniVersionHelper versionHelper;
+
     OmniCore() {
     }
 
     void onEnable(Omniscience omniscience, BukkitScheduler scheduler) {
+        this.itemKey = new NamespacedKey(omniscience,"omnisciencetool");
+        this.versionHelper = OmniVersionHelper.get(OmniUtils.getNMSVersion());
+        if (this.versionHelper==null) throw new UnsupportedOperationException("Omni does not support "+OmniUtils.getNMSVersion()+" version! But it was reporting back as "+OmniUtils.getNMSVersion());
         try {
             OmniApi.setCore(this);
         } catch (IllegalAccessException e) {
@@ -88,9 +100,7 @@ void onEnable(Omniscience omniscience, BukkitScheduler scheduler) {
 
         if (omniscience.getConfig().getBoolean("integration.worldEdit")
                 && Bukkit.getServer().getPluginManager().isPluginEnabled("WorldEdit")) {
-
         }
-
         omniscience.getLogger().log(Level.INFO, "Omniscience is Awake. None can escape.");
     }
 
@@ -141,8 +151,10 @@ private void registerEventHandlers(Omniscience plugin) {
     private void registerParameters() {
         registerParameterHandler(new EventParameter());
         registerParameterHandler(new PlayerParameter());
+        registerParameterHandler(new RecipientParameter());
         registerParameterHandler(new MessageParameter());
         registerParameterHandler(new RadiusParameter());
+        registerParameterHandler(new WorldParameter());
         registerParameterHandler(new TimeParameter());
         registerParameterHandler(new CauseParameter());
         registerParameterHandler(new BlockParameter());
@@ -264,6 +276,11 @@ public void registerParameterHandler(ParameterHandler handler) {
         parameterHandlerList.add(handler);
     }
 
+    @Override
+    public @NotNull OmniVersionHelper getVersion() {
+        return this.versionHelper;
+    }
+
     @Override
     public Optional<Class<? extends DataEntry>> getEventClass(String name) {
         return Optional.ofNullable(eventMap.get(name));
@@ -338,4 +355,5 @@ public void registerWorldEditHandler(WorldEditHandler handler) {
     public String getDateFormat() {
         return OmniConfig.INSTANCE.getDateFormat();
     }
+
 }

Omniscience-Core/src/main/java/net/lordofthecraft/omniscience/OmniEventRegistrar.java → Omniscience-Core/src/main/java/io/github/warhead501/omniscience/OmniEventRegistrar.java

@@ -1,27 +1,24 @@
-package net.lordofthecraft.omniscience;
+package io.github.warhead501.omniscience;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import net.lordofthecraft.omniscience.api.util.PastTenseWithEnabled;
-import net.lordofthecraft.omniscience.listener.OmniListener;
-import net.lordofthecraft.omniscience.listener.block.*;
-import net.lordofthecraft.omniscience.listener.chat.EventCommandListener;
-import net.lordofthecraft.omniscience.listener.chat.EventSayListener;
-import net.lordofthecraft.omniscience.listener.entity.EventDeathListener;
-import net.lordofthecraft.omniscience.listener.entity.EventHitListener;
-import net.lordofthecraft.omniscience.listener.entity.EventInteractAtEntity;
-import net.lordofthecraft.omniscience.listener.entity.EventMountListener;
-import net.lordofthecraft.omniscience.listener.item.*;
-import net.lordofthecraft.omniscience.listener.player.EventJoinListener;
-import net.lordofthecraft.omniscience.listener.player.EventQuitListener;
-import net.lordofthecraft.omniscience.listener.player.EventTeleportListener;
+import io.github.warhead501.omniscience.api.util.PastTenseWithEnabled;
+import io.github.warhead501.omniscience.listener.OmniListener;
+import io.github.warhead501.omniscience.listener.block.*;
+import io.github.warhead501.omniscience.listener.chat.EventCommandListener;
+import io.github.warhead501.omniscience.listener.chat.EventSayListener;
+import io.github.warhead501.omniscience.listener.entity.EventDeathListener;
+import io.github.warhead501.omniscience.listener.entity.EventHitListener;
+import io.github.warhead501.omniscience.listener.entity.EventInteractAtEntity;
+import io.github.warhead501.omniscience.listener.entity.EventMountListener;
+import io.github.warhead501.omniscience.listener.item.*;
+import io.github.warhead501.omniscience.listener.player.EventJoinListener;
+import io.github.warhead501.omniscience.listener.player.EventQuitListener;
+import io.github.warhead501.omniscience.listener.player.EventTeleportListener;
 import org.bukkit.plugin.PluginManager;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 
 public enum OmniEventRegistrar {
     INSTANCE;
@@ -85,7 +82,71 @@ public String getPastTense(String event) {
     }
 
     public Map<String, PastTenseWithEnabled> getEventMapping() {
-        return ImmutableMap.copyOf(eventMapping);
+        try {
+            return ImmutableMap.copyOf(eventMapping);
+        } catch (Exception e) {
+            return new Map<String, PastTenseWithEnabled>() {
+                @Override
+                public int size() {
+                    return 0;
+                }
+
+                @Override
+                public boolean isEmpty() {
+                    return false;
+                }
+
+                @Override
+                public boolean containsKey(Object key) {
+                    return false;
+                }
+
+                @Override
+                public boolean containsValue(Object value) {
+                    return false;
+                }
+
+                @Override
+                public PastTenseWithEnabled get(Object key) {
+                    return null;
+                }
+
+                @Override
+                public PastTenseWithEnabled put(String key, PastTenseWithEnabled value) {
+                    return null;
+                }
+
+                @Override
+                public PastTenseWithEnabled remove(Object key) {
+                    return null;
+                }
+
+                @Override
+                public void putAll(Map<? extends String, ? extends PastTenseWithEnabled> m) {
+
+                }
+
+                @Override
+                public void clear() {
+
+                }
+
+                @Override
+                public Set<String> keySet() {
+                    return null;
+                }
+
+                @Override
+                public Collection<PastTenseWithEnabled> values() {
+                    return null;
+                }
+
+                @Override
+                public Set<Entry<String, PastTenseWithEnabled>> entrySet() {
+                    return null;
+                }
+            };
+        }
     }
 
     void addEvent(String name, String pastTense, boolean enabled) {