renamed native interfaces

DevCybran · DevCybran · commit d52963981448 · 2013-11-07T15:57:14.000+01:00
diff --git a/.classpath b/.classpath
@@ -6,6 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="F:/workspace/craftbukkit-1.6.4-R2.0.jar"/>
+	<classpathentry kind="lib" path="/libraries/craftbukkit/craftbukkit-1.6.4-R2.0.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/NativeInterfaces.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/NativeInterfaces.java
@@ -1,33 +1,33 @@
 package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces;
 
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.CBInterfaceJavaPluginLoader;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.CBInterfacePluginClassLoader;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NmsAttributeModifiable;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NmsAttributeModifier;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NmsAttributeRanged;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NmsEntityInsentient;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NmsGenericAttributes;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NmsIAttribute;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NotchInterfaceControllerJump;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NotchInterfaceControllerLook;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NotchInterfaceEntity;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NotchInterfaceNavigation;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NotchInterfacePathfinderGoal;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NotchInterfacePathfinderGoalSelector;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NotchInterfacePathfinderGoalSelectorItem;
-import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes.NotchInterfaceWorld;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.CBInterfaceJavaPluginLoader;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.CBInterfacePluginClassLoader;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsAttributeModifiable;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsAttributeModifier;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsAttributeRanged;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsEntityInsentient;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsGenericAttributes;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsIAttribute;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsControllerJump;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsControllerLook;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsEntity;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsNavigation;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsInterfacePathfinderGoal;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsPathfinderGoalSelector;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsPathfinderGoalSelectorItem;
+import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server.NmsWorld;
 
 public final class NativeInterfaces {
-	public static final NotchInterfaceControllerJump CONTROLLERJUMP = new NotchInterfaceControllerJump();
-	public static final NotchInterfaceControllerLook CONTROLLERLOOK = new NotchInterfaceControllerLook();
-	public static final NotchInterfaceEntity ENTITY = new NotchInterfaceEntity();
+	public static final NmsControllerJump CONTROLLERJUMP = new NmsControllerJump();
+	public static final NmsControllerLook CONTROLLERLOOK = new NmsControllerLook();
+	public static final NmsEntity ENTITY = new NmsEntity();
 	public static final CBInterfaceJavaPluginLoader JAVAPLUGINLOADER = new CBInterfaceJavaPluginLoader();
-	public static final NotchInterfaceNavigation NAVIGATION = new NotchInterfaceNavigation();
-	public static final NotchInterfacePathfinderGoal PATHFINDERGOAL = new NotchInterfacePathfinderGoal();
-	public static final NotchInterfacePathfinderGoalSelector PATHFINDERGOALSELECTOR = new NotchInterfacePathfinderGoalSelector();
-	public static final NotchInterfacePathfinderGoalSelectorItem PATHFINDERGOALSELECTORITEM = new NotchInterfacePathfinderGoalSelectorItem();
+	public static final NmsNavigation NAVIGATION = new NmsNavigation();
+	public static final NmsInterfacePathfinderGoal PATHFINDERGOAL = new NmsInterfacePathfinderGoal();
+	public static final NmsPathfinderGoalSelector PATHFINDERGOALSELECTOR = new NmsPathfinderGoalSelector();
+	public static final NmsPathfinderGoalSelectorItem PATHFINDERGOALSELECTORITEM = new NmsPathfinderGoalSelectorItem();
 	public static final CBInterfacePluginClassLoader PLUGINCLASSLOADER = new CBInterfacePluginClassLoader();
-	public static final NotchInterfaceWorld WORLD = new NotchInterfaceWorld();
+	public static final NmsWorld WORLD = new NmsWorld();
 	public static final NmsIAttribute IATTRIBUTE = new NmsIAttribute();
 	public static final NmsAttributeRanged ATTRIBUTERANGED = new NmsAttributeRanged();
 	public static final NmsAttributeModifiable ATTRIBUTEMODIFIABLE = new NmsAttributeModifiable();
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/CBInterfaceJavaPluginLoader.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/CBInterfaceJavaPluginLoader.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import org.bukkit.Server;
 import org.bukkit.plugin.java.JavaPluginLoader;
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/CBInterfacePluginClassLoader.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/CBInterfacePluginClassLoader.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.plugin.java.PluginClassLoader;
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsAttributeModifiable.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsAttributeModifiable.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsAttributeModifier.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsAttributeModifier.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import java.util.UUID;
 
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsAttributeRanged.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsAttributeRanged.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.AttributeRanged;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.primitives.NativeFieldDouble;
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsControllerJump.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsControllerJump.java
@@ -1,9 +1,9 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.ControllerJump;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.system.NativeMethodPublic;
 
-public class NotchInterfaceControllerJump {
+public class NmsControllerJump {
 	public final Jump METHOD_JUMP = new Jump();
 	
 	public class Jump extends NativeMethodPublic {
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsControllerLook.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsControllerLook.java
@@ -1,9 +1,9 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.ControllerLook;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.system.NativeMethodPublic;
 
-public class NotchInterfaceControllerLook {
+public class NmsControllerLook {
 	public final Look METHOD_LOOKATCOORDINATES = new Look();
 	
 	public class Look extends NativeMethodPublic {
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsEntity.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsEntity.java
@@ -1,9 +1,9 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.Entity;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.system.NativeMethodPublic;
 
-public class NotchInterfaceEntity {
+public class NmsEntity {
 	public final GetEntityDistanceSquared METHOD_GETDISTANCETOENTITYSQUARED = new GetEntityDistanceSquared();
 	public final GetLocationDistance METHOD_GETDISTANCETOLOCATION = new GetLocationDistance();
 	
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsEntityInsentient.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsEntityInsentient.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.EntityInsentient;
 import net.minecraft.server.v1_6_R3.PathfinderGoalSelector;
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsGenericAttributes.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsGenericAttributes.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.GenericAttributes;
 import net.minecraft.server.v1_6_R3.IAttribute;
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsIAttribute.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsIAttribute.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.IAttribute;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.system.NativeMethodPublic;
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsInterfacePathfinderGoal.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsInterfacePathfinderGoal.java
@@ -1,9 +1,9 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.PathfinderGoal;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.system.NativeMethodPublic;
 
-public final class NotchInterfacePathfinderGoal {
+public final class NmsInterfacePathfinderGoal {
 	public final OnEnd METHOD_ONEND = new OnEnd();
 	
 	public class OnEnd extends NativeMethodPublic {
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsNavigation.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsNavigation.java
@@ -1,11 +1,11 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.EntityLiving;
 import net.minecraft.server.v1_6_R3.Navigation;
 import net.minecraft.server.v1_6_R3.PathEntity;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.system.NativeMethodPublic;
 
-public class NotchInterfaceNavigation {
+public class NmsNavigation {
 	// set in constructor, 3rd argument for world.findPath
 	//public final NativeFieldFloat<Navigation> FIELD_MAXPATHLENGTH = new NativeFieldFloat<Navigation>(Navigation.class, "e");
 	public final IsMoveFinished METHOD_ISNOTMOVING = new IsMoveFinished();
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsPathfinderGoalSelector.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsPathfinderGoalSelector.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.PathfinderGoal;
 import net.minecraft.server.v1_6_R3.PathfinderGoalSelector;
@@ -8,7 +8,7 @@
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.primitives.NativeFieldObject;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.system.NativeMethodPublic;
 
-public final class NotchInterfacePathfinderGoalSelector {
+public final class NmsPathfinderGoalSelector {
 	public final NativeFieldObject<PathfinderGoalSelector, UnsafeList<Object>> FIELD_GOALITEMS = new NativeFieldObject<PathfinderGoalSelector, UnsafeList<Object>>(PathfinderGoalSelector.class, "a");
 	public final NativeFieldObject<PathfinderGoalSelector, UnsafeList<Object>> FIELD_ACTIVEGOALITEMS = new NativeFieldObject<PathfinderGoalSelector, UnsafeList<Object>>(PathfinderGoalSelector.class, "b");
 	public final AddPathfinderGoal METHOD_ADDPATHFINDERGOAL = new AddPathfinderGoal();
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsPathfinderGoalSelectorItem.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsPathfinderGoalSelectorItem.java
@@ -1,10 +1,10 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import net.minecraft.server.v1_6_R3.PathfinderGoal;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.primitives.NativeFieldInt;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.primitives.NativeFieldObject;
 
-public final class NotchInterfacePathfinderGoalSelectorItem {
+public final class NmsPathfinderGoalSelectorItem {
 	public final NativeFieldObject<Object, PathfinderGoal> FIELD_GOAL = new NativeFieldObject<Object, PathfinderGoal>("a");
 	public final NativeFieldInt<Object> FIELD_PRIORITY = new NativeFieldInt<Object>("b");
 
diff --git a/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsWorld.java b/src/java/de/ntcomputer/minecraft/controllablemobs/implementation/nativeinterfaces/server/NmsWorld.java
@@ -1,4 +1,4 @@
-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;
+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;
 
 import java.util.Collections;
 import java.util.List;
@@ -9,7 +9,7 @@
 import net.minecraft.server.v1_6_R3.World;
 import de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.system.NativeMethodPublic;
 
-public class NotchInterfaceWorld {
+public class NmsWorld {
 	public final SearchEntities METHOD_SEARCHENTITIES = new SearchEntities();
 	
 	public class SearchEntities extends NativeMethodPublic {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.classes;`
	`1`	`+package de.ntcomputer.minecraft.controllablemobs.implementation.nativeinterfaces.server;`
`2`	`2`
`3`	`3`	`import org.bukkit.Server;`
`4`	`4`	`import org.bukkit.plugin.java.JavaPluginLoader;`