First try pushing

This commit is contained in:
Indyuce 2022-08-16 11:22:10 +02:00
parent aade084e93
commit c0c822b97f
9 changed files with 120 additions and 45 deletions

View File

@ -1,5 +1,3 @@
This project is owned and maintained by Lumine LLC and is distributed with "All Right's Reserved".
This is just to protect the project and its status as a Paid Resource.
This project is owned and maintained by PhoenixDvpt and is distributed with "All Right's Reserved".
You can fork and modify the source code of this project as you wish to meet your server's needs, and merge requests are accepted under the terms that you grant full rights to us using any pushed code. However, you may not distribute the plugin for any purpose other than providing cross-compatibility with other Minecraft plugins, and may not bypass any anti-piracy protection.

View File

@ -16,16 +16,80 @@
<maven.compiler.target>16</maven.compiler.target>
</properties>
<repositories>
<repository>
<id>phoenix</id>
<url>https://nexus.phoenixdvpt.fr/repository/maven-public/</url>
</repository>
<build>
<finalName>${project.name}-${project.version}</finalName>
<sourceDirectory>src/main/java</sourceDirectory>
<defaultGoal>clean package install</defaultGoal>
<repository>
<id>lumine</id>
<url>https://mvn.lumine.io/repository/maven/</url>
</repository>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>16</source>
<target>16</target>
<encoding>UTF-8</encoding>
<compilerArgument>-proc:none</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0-SNAPSHOT</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<relocations>
<relocation>
<pattern>io.papermc.lib</pattern>
<shadedPattern>net.Indyuce.mmocore.paperlib</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
<!--
This flattens the pom.xml from the API module as well so that it can be uploaded
to Nexus. For plugins which have no API/Bukkit differenciation like MythicLib we
can just use the main plugin pom.xml file.
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<updatePomFile>true</updatePomFile>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>package</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>placeholderapi</id>
@ -70,11 +134,11 @@
</dependency>
<!-- Extra libs -->
<dependency>
<groupId>io.papermc</groupId>
<artifactId>paperlib</artifactId>
<version>1.0.5</version>
<optional>true</optional>
</dependency>
<dependency>

View File

@ -1,13 +1,8 @@
package net.Indyuce.mmocore.api.load;
import io.lumine.mythic.lib.api.MMOLineConfig;
import mmocore.api.quest.objective.*;
import mmocore.api.quest.trigger.*;
import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser;
import mmocore.experience.source.*;
import net.Indyuce.mmocore.experience.source.type.ExperienceSource;
import mmocore.loot.chest.condition.*;
import mmocore.loot.droptable.dropitem.*;
import net.Indyuce.mmocore.api.block.BlockType;
import net.Indyuce.mmocore.api.block.SkullBlockType;
import net.Indyuce.mmocore.api.block.VanillaBlockType;

View File

@ -1,7 +1,6 @@
package net.Indyuce.mmocore.comp.mythicmobs;
import io.lumine.mythic.lib.api.MMOLineConfig;
import mmocore.comp.mythicmobs.load.*;
import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser;
import net.Indyuce.mmocore.experience.source.type.ExperienceSource;
import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem;

View File

@ -1,11 +1,10 @@
package net.Indyuce.mmocore.manager;
import net.Indyuce.mmocore.MMOCore;
import mmocore.api.player.profess.event.trigger.*;
import net.Indyuce.mmocore.api.player.profess.event.trigger.*;
import net.Indyuce.mmocore.api.player.profess.ClassOption;
import net.Indyuce.mmocore.api.player.profess.PlayerClass;
import net.Indyuce.mmocore.api.player.profess.event.EventTriggerHandler;
import net.Indyuce.mmocore.api.player.profess.event.trigger.*;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.Material;

View File

@ -5,7 +5,6 @@ import java.util.List;
import java.util.logging.Level;
import net.Indyuce.mmocore.MMOCore;
import mmocore.gui.*;
import net.Indyuce.mmocore.gui.social.friend.EditableFriendList;
import net.Indyuce.mmocore.gui.*;
import net.Indyuce.mmocore.gui.social.friend.EditableFriendRemoval;

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MMOCore</artifactId>
<groupId>net.Indyuce</groupId>
<version>1.9.5-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -17,6 +17,18 @@
</properties>
<build>
<!--
Includes default files in the Bukkit module
-->
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
</resource>
</resources>
<plugins>
<!--
@ -27,7 +39,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<finalName>${project.name}-${revision}</finalName>
<finalName>MMOCore-${revision}</finalName>
<outputDirectory>../target/</outputDirectory>
</configuration>
</plugin>
@ -96,10 +108,24 @@
<groupId>net.Indyuce</groupId>
<artifactId>MMOCore-API</artifactId>
<version>${revision}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<!-- Spigot API -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-1.17.1</artifactId>
<version>dev</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.lumine</groupId>
<artifactId>MythicLib-dist</artifactId>
<version>1.3.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@ -38,15 +38,8 @@ public class PlayerListener implements Listener {
// Register custom inventory clicks
@EventHandler
public void b(InventoryClickEvent event) {
if (event.getInventory().getHolder() instanceof PluginInventory) {
int slot = event.getRawSlot();
if (event.getCurrentItem() != null && event.getCurrentItem().getItemMeta() != null)
((PluginInventory) event.getInventory().getHolder())
.whenClicked(new InventoryClickContext(slot, event.getCurrentItem(), event.getClick(), event));
}
if (event.getInventory().getHolder() instanceof PluginInventory && event.getCurrentItem() != null && event.getCurrentItem().getItemMeta() != null)
((PluginInventory) event.getInventory().getHolder()).whenClicked(new InventoryClickContext(event.getRawSlot(), event.getCurrentItem(), event.getClick(), event));
}
// Register custom inventory close effect

24
pom.xml
View File

@ -24,17 +24,6 @@
</properties>
<build>
<finalName>${project.name}-${project.version}</finalName>
<defaultGoal>clean package install</defaultGoal>
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -69,4 +58,17 @@
</plugins>
</build>
<repositories>
<repository>
<id>phoenix</id>
<url>https://nexus.phoenixdvpt.fr/repository/maven-public/</url>
</repository>
<repository>
<id>lumine</id>
<url>https://mvn.lumine.io/repository/maven/</url>
</repository>
</repositories>
</project>