Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Include the _R... part for naming compat modules.

This commit is contained in:
asofold 2015-05-24 14:56:45 +02:00
parent 2d74443a7b
commit 806b31ec4f
7 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NCPCompatSpigotCB1_8/pom.xml → NCPCompatSpigotCB1_8_R1/pom.xml
View File

@ -2,9 +2,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fr.neatmonster</groupId>
<artifactId>ncpcompatspigotcb1_8</artifactId>
<artifactId>ncpcompatspigotcb1_8_r1</artifactId>
<packaging>jar</packaging>
<name>NCPCompatSpigotCB1_8</name>
<name>NCPCompatSpigotCB1_8_R1</name>
<version>1.1-SNAPSHOT</version>
<parent>
@ -26,6 +26,5 @@
</dependency>
</dependencies>
<description>Compatibility for Minecraft 1.8 with CraftBukkit/Spigot.
</description>
<description>Compatibility for Minecraft 1.8 with CraftBukkit/Spigot (R1).</description>
</project>

6
NCPCompatSpigotCB1_8/src/main/java/fr/neatmonster/nocheatplus/compat/spigotcb1_8/BlockCacheSpigotCB1_8.java → NCPCompatSpigotCB1_8_R1/src/main/java/fr/neatmonster/nocheatplus/compat/spigotcb1_8_r1/BlockCacheSpigotCB1_8_R1.java
View File

@ -1,4 +1,4 @@
package fr.neatmonster.nocheatplus.compat.spigotcb1_8;
package fr.neatmonster.nocheatplus.compat.spigotcb1_8_r1;
import java.util.Iterator;
import java.util.List;
@ -18,12 +18,12 @@ import org.bukkit.entity.Entity;
import fr.neatmonster.nocheatplus.utilities.BlockCache;
public class BlockCacheSpigotCB1_8 extends BlockCache implements IBlockAccess{
public class BlockCacheSpigotCB1_8_R1 extends BlockCache implements IBlockAccess{
protected net.minecraft.server.v1_8_R1.WorldServer world;
protected World bukkitWorld; // WHACKS
public BlockCacheSpigotCB1_8(World world) {
public BlockCacheSpigotCB1_8_R1(World world) {
setAccess(world);
}

10
NCPCompatSpigotCB1_8/src/main/java/fr/neatmonster/nocheatplus/compat/spigotcb1_8/MCAccessSpigotCB1_8.java → NCPCompatSpigotCB1_8_R1/src/main/java/fr/neatmonster/nocheatplus/compat/spigotcb1_8_r1/MCAccessSpigotCB1_8_R1.java
View File

@ -1,4 +1,4 @@
package fr.neatmonster.nocheatplus.compat.spigotcb1_8;
package fr.neatmonster.nocheatplus.compat.spigotcb1_8_r1;
import net.minecraft.server.v1_8_R1.AxisAlignedBB;
import net.minecraft.server.v1_8_R1.Block;
@ -23,12 +23,12 @@ import fr.neatmonster.nocheatplus.compat.MCAccess;
import fr.neatmonster.nocheatplus.utilities.BlockCache;
import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
public class MCAccessSpigotCB1_8 implements MCAccess{
public class MCAccessSpigotCB1_8_R1 implements MCAccess{
/**
* Constructor to let it fail.
*/
public MCAccessSpigotCB1_8() {
public MCAccessSpigotCB1_8_R1() {
getCommandMap();
ReflectionUtil.checkMembers("net.minecraft.server.v1_8_R1.", new String[] {"Entity" , "dead"});
// block bounds, original: minX, maxX, minY, maxY, minZ, maxZ
@ -45,7 +45,7 @@ public class MCAccessSpigotCB1_8 implements MCAccess{
@Override
public String getServerVersionTag() {
return "Spigot-CB-1.8";
return "Spigot-CB-1.8_R1";
}
@Override
@ -55,7 +55,7 @@ public class MCAccessSpigotCB1_8 implements MCAccess{
@Override
public BlockCache getBlockCache(final World world) {
return new BlockCacheSpigotCB1_8(world);
return new BlockCacheSpigotCB1_8_R1(world);
}
@Override

2
NCPPlugin/pom.xml
View File

@ -92,7 +92,7 @@
</dependency>
<dependency>
<groupId>fr.neatmonster</groupId>
<artifactId>ncpcompatspigotcb1_8</artifactId>
<artifactId>ncpcompatspigotcb1_8_r1</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>

2
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccessFactory.java
View File

@ -91,7 +91,7 @@ public class MCAccessFactory {
// Current DEV / LATEST: CB (Spigot)
"fr.neatmonster.nocheatplus.compat.cbdev.MCAccessCBDev", // 1.8.3
// Dedicated: CB (Spigot)
"fr.neatmonster.nocheatplus.compat.spigotcb1_8.MCAccessSpigotCB1_8", // 1.8
"fr.neatmonster.nocheatplus.compat.spigotcb1_8_r1.MCAccessSpigotCB1_8_R1", // 1.8
// Dedicated CB (original)
"fr.neatmonster.nocheatplus.compat.cb3100.MCAccessCB3100", // 1.7.10
"fr.neatmonster.nocheatplus.compat.cb3043.MCAccessCB3043", // 1.7.8|1.7.9

2
NoCheatPlus/pom.xml
View File

@ -93,7 +93,7 @@
<include>fr.neatmonster:ncpcompatcb3026</include>
<include>fr.neatmonster:ncpcompatcb3043</include>
<include>fr.neatmonster:ncpcompatcb3100</include>
<include>fr.neatmonster:ncpcompatspigotcb1_8</include>
<include>fr.neatmonster:ncpcompatspigotcb1_8_r1</include>
<include>fr.neatmonster:ncpcompatcbdev</include>
<include>fr.neatmonster:ncpcompatprotocollib</include>
<include>fr.neatmonster:ncpcompatglowstone</include>

2
pom.xml
View File

@ -31,7 +31,7 @@
<module>NCPCompatCB3026</module>
<module>NCPCompatCB3043</module>
<module>NCPCompatCB3100</module>
<module>NCPCompatSpigotCB1_8</module>
<module>NCPCompatSpigotCB1_8_R1</module>
<module>NCPCompatCBDev</module>
<module>NCPCompatProtocolLib</module>
<module>NCPCompatGlowstone</module>