Put compat versions "right". (Rename MC1_4_6 to CB2545.)

This commit is contained in:
asofold 2012-12-21 18:08:18 +01:00
parent 74e3085ee0
commit 77975c2659
9 changed files with 19 additions and 19 deletions

View File

@ -20,7 +20,7 @@ import fr.neatmonster.nocheatplus.utilities.BlockCache;
public interface MCAccess {
/**
* Simple version identifier like 1.4.
* Simple version identifiers, if several must be separated by '|' like "1.4.2|1.4.4|1.4.5".
* @return
*/
public String getMCVersion();

View File

@ -33,7 +33,7 @@ public class MCAccessCB2511 implements MCAccess {
@Override
public String getMCVersion() {
return "1.4";
return "1.4.2|1.4.4|1.4.5";
}
@Override

View File

@ -32,7 +32,7 @@ public class MCAccessCB2512 implements MCAccess{
@Override
public String getMCVersion() {
return "1.4";
return "1.4.5";
}
@Override

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>ncpcompatmc1_4_6</artifactId>
<artifactId>ncpcompatcb2545</artifactId>
<packaging>jar</packaging>
<name>NCPCompatMC1_4_6</name>
<name>NCPCompatCB2545</name>
<version>1.0.0</version>
<parent>
@ -31,7 +31,7 @@
</dependency>
</dependencies>
<description>Compatibility since MC 1.4.6.
<description>Compatibility since CB2545 (MC 1.4.6).
Version updating is done for NCPPlugin mainly, expect the other poms version to change randomly rather.</description>
</project>

View File

@ -1,4 +1,4 @@
package fr.neatmonster.nocheatplus.compat.mc1_4_6;
package fr.neatmonster.nocheatplus.compat.cb2545;
import java.util.Iterator;
import java.util.List;
@ -17,14 +17,14 @@ import org.bukkit.entity.EntityType;
import fr.neatmonster.nocheatplus.utilities.BlockCache;
public class BlockCacheMC1_4_6 extends BlockCache implements IBlockAccess{
public class BlockCacheCB2545 extends BlockCache implements IBlockAccess{
/** Box for one time use, no nesting, no extra storing this(!). */
protected static final AxisAlignedBB useBox = AxisAlignedBB.a(0, 0, 0, 0, 0, 0);
protected net.minecraft.server.v1_4_6.World world;
public BlockCacheMC1_4_6(World world) {
public BlockCacheCB2545(World world) {
setAccess(world);
}

View File

@ -1,4 +1,4 @@
package fr.neatmonster.nocheatplus.compat.mc1_4_6;
package fr.neatmonster.nocheatplus.compat.cb2545;
import net.minecraft.server.v1_4_6.AxisAlignedBB;
import net.minecraft.server.v1_4_6.Block;
@ -21,12 +21,12 @@ import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
import fr.neatmonster.nocheatplus.compat.MCAccess;
import fr.neatmonster.nocheatplus.utilities.BlockCache;
public class MCAccessMC1_4_6 implements MCAccess{
public class MCAccessCB2545 implements MCAccess{
/**
* Constructor to let it fail.
*/
public MCAccessMC1_4_6(){
public MCAccessCB2545(){
getCommandMap();
}
@ -37,7 +37,7 @@ public class MCAccessMC1_4_6 implements MCAccess{
@Override
public String getServerVersionTag() {
return "MC1_4_6";
return "CB2545";
}
@Override
@ -47,7 +47,7 @@ public class MCAccessMC1_4_6 implements MCAccess{
@Override
public BlockCache getBlockCache(final World world) {
return new BlockCacheMC1_4_6(world);
return new BlockCacheCB2545(world);
}
@Override

View File

@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>fr.neatmonster</groupId>
<artifactId>ncpcompatmc1_4_6</artifactId>
<artifactId>ncpcompatcb2545</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
@ -102,7 +102,7 @@
<include>fr.neatmonster:ncpcompat</include>
<include>fr.neatmonster:ncpcompatcb2511</include>
<include>fr.neatmonster:ncpcompatcb2512</include>
<include>fr.neatmonster:ncpcompatmc1_4_6</include>
<include>fr.neatmonster:ncpcompatcb2545</include>
<!-- <include>fr.neatmonster:ncpplugin</include> -->
<!-- <include>fr.neatmonster:nocheatplus-parent</include> -->
</includes>

View File

@ -5,7 +5,7 @@ import java.util.List;
import fr.neatmonster.nocheatplus.compat.cb2511.MCAccessCB2511;
import fr.neatmonster.nocheatplus.compat.cb2512.MCAccessCB2512;
import fr.neatmonster.nocheatplus.compat.mc1_4_6.MCAccessMC1_4_6;
import fr.neatmonster.nocheatplus.compat.cb2545.MCAccessCB2545;
import fr.neatmonster.nocheatplus.utilities.LogUtil;
/**
@ -35,7 +35,7 @@ public class MCAccessFactory {
throwables.add(t);
};
try{
return new MCAccessMC1_4_6();
return new MCAccessCB2545();
}
catch(Throwable t){
throwables.add(t);

View File

@ -17,7 +17,7 @@
<module>NCPCompatCB2511</module>
<module>NCPCompatCB2512</module>
<module>NCPPlugin</module>
<module>NCPCompatMC1_4_6</module>
<module>NCPCompatCB2545</module>
</modules>
<repositories>