From 8d1d7ab4107b29bb2af5787ef40a90b20295930c Mon Sep 17 00:00:00 2001 From: asofold Date: Tue, 9 Jan 2018 21:38:42 +0100 Subject: [PATCH] Backlash. --- NCPCompatNonFree/NCPCompatCBDev/pom.xml | 8 ++++---- NCPCompatNonFree/NCPCompatSpigotCB1_10_R1/pom.xml | 8 ++++---- NCPCompatNonFree/NCPCompatSpigotCB1_11_R1/pom.xml | 8 ++++---- .../copy_NCPCompatCBDev.py | 0 NCPCompatNonFree/pom.xml | 9 ++++++++- README.md | 4 ++-- 6 files changed, 22 insertions(+), 15 deletions(-) rename copy_NCPCompatCBDev.py => NCPCompatNonFree/copy_NCPCompatCBDev.py (100%) diff --git a/NCPCompatNonFree/NCPCompatCBDev/pom.xml b/NCPCompatNonFree/NCPCompatCBDev/pom.xml index 5ffbd7bf..0c75a8d8 100644 --- a/NCPCompatNonFree/NCPCompatCBDev/pom.xml +++ b/NCPCompatNonFree/NCPCompatCBDev/pom.xml @@ -30,10 +30,10 @@ Compatibility for the development version (latest of the supported Minecraft versions). -To add a new compat module two other pom.xml files have to be modified: -- Root pom (parent): Add as module within profile with id 'all'. -- NCPPlugin: Add as dependency for the profile with id 'all'. -- (Add a new profile for this specific module, altering both poms mentioned above. If the profile already exists, pointing at ncpcompatcbdev, a new profile can be made with updating NCPCompatCBDev then.) +To add a new compat module the pom.xml file within NCPCompatNonFree has to be modified: +- Add as module within the profile with id 'all'. +- Add as dependency within the profile with id 'all'. +- (Add a new profile with both the module and dependency set.) The NCPPlugin sub-project contains the relevant factories (MCAccessFactory, EntityAccessFactory, AttributeAccessFactory). diff --git a/NCPCompatNonFree/NCPCompatSpigotCB1_10_R1/pom.xml b/NCPCompatNonFree/NCPCompatSpigotCB1_10_R1/pom.xml index 385170b1..ef955efc 100644 --- a/NCPCompatNonFree/NCPCompatSpigotCB1_10_R1/pom.xml +++ b/NCPCompatNonFree/NCPCompatSpigotCB1_10_R1/pom.xml @@ -30,10 +30,10 @@ Compatibility for SpigotCB1_10_R1. -To add a new compat module two other pom.xml files have to be modified: -- Root pom (parent): Add as module within profile with id 'all'. -- NCPPlugin: Add as dependency for the profile with id 'all'. -- (Add a new profile for this specific module, altering both poms mentioned above. If the profile already exists, pointing at ncpcompatspigotcb1_10_R1, a new profile can be made with updating NCPCompatSpigotCB1_10_R1 then.) +To add a new compat module the pom.xml file within NCPCompatNonFree has to be modified: +- Add as module within the profile with id 'all'. +- Add as dependency within the profile with id 'all'. +- (Add a new profile with both the module and dependency set.) The NCPPlugin sub-project contains the relevant factories (MCAccessFactory, EntityAccessFactory, AttributeAccessFactory). diff --git a/NCPCompatNonFree/NCPCompatSpigotCB1_11_R1/pom.xml b/NCPCompatNonFree/NCPCompatSpigotCB1_11_R1/pom.xml index 63e677d7..9217e12f 100644 --- a/NCPCompatNonFree/NCPCompatSpigotCB1_11_R1/pom.xml +++ b/NCPCompatNonFree/NCPCompatSpigotCB1_11_R1/pom.xml @@ -30,10 +30,10 @@ Compatibility for SpigotCB1_11_R1. -To add a new compat module two other pom.xml files have to be modified: -- Root pom (parent): Add as module within profile with id 'all'. -- NCPPlugin: Add as dependency for the profile with id 'all'. -- (Add a new profile for this specific module, altering both poms mentioned above. If the profile already exists, pointing at ncpcompatspigotcb1_11_R1, a new profile can be made with updating NCPCompatSpigotCB1_11_R1 then.) +To add a new compat module the pom.xml file within NCPCompatNonFree has to be modified: +- Add as module within the profile with id 'all'. +- Add as dependency within the profile with id 'all'. +- (Add a new profile with both the module and dependency set.) The NCPPlugin sub-project contains the relevant factories (MCAccessFactory, EntityAccessFactory, AttributeAccessFactory). diff --git a/copy_NCPCompatCBDev.py b/NCPCompatNonFree/copy_NCPCompatCBDev.py similarity index 100% rename from copy_NCPCompatCBDev.py rename to NCPCompatNonFree/copy_NCPCompatCBDev.py diff --git a/NCPCompatNonFree/pom.xml b/NCPCompatNonFree/pom.xml index 1754dffb..3d7fc4f7 100644 --- a/NCPCompatNonFree/pom.xml +++ b/NCPCompatNonFree/pom.xml @@ -6,7 +6,14 @@ ncpcompatnonfree 1.1-SNAPSHOT NCPCompatNonFree - Combine compatibility modules with dependencies that can't be obtained from a public maven repository, such as CraftBukkit or Spigot builds, hence "NonFree". + Combine compatibility modules with dependencies that can't be obtained from a public maven repository, such as CraftBukkit or Spigot builds, hence "NonFree". + +To add a new compat module: +- Add as module within the profile with id 'all'. +- Add as dependency within the profile with id 'all'. +- (Add a new profile with both the module and dependency set.) + +The NCPPlugin sub-project contains the relevant factories (MCAccessFactory, EntityAccessFactory, AttributeAccessFactory). fr.neatmonster nocheatplus-parent diff --git a/README.md b/README.md index f5c56572..4bbaa335 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Compiling NoCheatPlus --------- * NoCheatPlus used to be compiled with java 6 compliance (note OpenJDK, possibly we'll switch to 8 directly, once appropriate, e.g. with ProtocolLib dropping support for 7.). * We use [Maven](http://maven.apache.org/download.cgi) 3 to handle the dependencies. -* You can compile with this Maven goal: `mvn clean package`, if you don't want any dedicated CraftBukkit modules, or if you are lacking the jar files - **for best performance and compatibility, choose the appropriate build profile(s) from below**. If you do have all the legacy dependencies, you can set the parameter `cbdedicated` to `true` and activate the profile `all` adding `-P all` to the maven goals. For more options, see the table below. If your specific needs are not met by the provided options, you can still build only using the compat module(s) that you need, e.g. by adjusting the build/dependency profiles or adding your own profile, which means changing/adding a profile both in the root pom.xml for modules to have and in NCPPlugin/pom.xml for the dependency inclusion. The preset profiles should be enough of a hint for that. If you add custom modules with a different package naming than `fr.neatmonster`, you might have to add the source inclusion to the NoCheatPlus/pom.xml as well. +* You can compile with this Maven goal: `mvn clean package`, if you don't want any dedicated CraftBukkit modules, or if you are lacking the jar files - **for best performance and compatibility, choose the appropriate build profile(s) from below**. If you do have all the legacy dependencies, you can activate the profile `all` adding `-P all` to the maven goals. For more options, see the table below. If your specific needs are not met by the provided options, you can still build only using the compat module(s) that you need, e.g. by adjusting the build/dependency profiles or adding your own profile, which means changing/adding a profile both in the root pom.xml for modules to have and in NCPPlugin/pom.xml for the dependency inclusion. The preset profiles should be enough of a hint for that. If you add custom modules with a different package naming than `fr.neatmonster`, you might have to add the source inclusion to the NoCheatPlus/pom.xml as well. * Jar files for the dedicated compat modules, which your local maven repository might be missing, can be installed manually. Example for Eclipse with embedded maven: Add a new maven build run configuration, name it appropriately, e.g. ```Install CB 1.7.5```. @@ -36,7 +36,7 @@ All profiles for reference: | Profile | Description | | :------------------ | :-------------- | -| none_ | Default build without any of the native access modules, might pose compatibility issues with latest Minecraft versions. The reflection based module is included here. | +| _none_ | Default build without any of the native access modules, might pose compatibility issues with latest Minecraft versions. The reflection based module is included here. | | `-P all` | All compatibility modules. | | `-P spigot1_7_r4` | Just Spigot 1.7 R4 (MC 1.7.10). | | `-P spigot1_8_r3` | Just Spigot 1.8 R3 (MC 1.8.4-1.8.8). |