HitchingPost: Allow individual unhitching

Author: ago1024

modules/demo/hitchingpost/src/main/java/org/gotti/wurmunlimited/mods/hitchingpost/HitchingPostMod.java

@@ -6,16 +6,19 @@
 
 import org.gotti.wurmunlimited.modloader.interfaces.Initable;
 import org.gotti.wurmunlimited.modloader.interfaces.ItemTemplatesCreatedListener;
+import org.gotti.wurmunlimited.modloader.interfaces.PreInitable;
 import org.gotti.wurmunlimited.modloader.interfaces.ServerStartedListener;
 import org.gotti.wurmunlimited.modloader.interfaces.WurmServerMod;
 import org.gotti.wurmunlimited.modsupport.ItemTemplateBuilder;
+import org.gotti.wurmunlimited.modsupport.actions.ModActions;
 import org.gotti.wurmunlimited.modsupport.vehicles.ModVehicleBehaviours;
 
 import com.wurmonline.server.MiscConstants;
 import com.wurmonline.server.items.AdvancedCreationEntry;
 import com.wurmonline.server.items.CreationCategories;
 import com.wurmonline.server.items.CreationEntryCreator;
 import com.wurmonline.server.items.CreationRequirement;
+import com.wurmonline.server.items.Item;
 import com.wurmonline.server.items.ItemList;
 import com.wurmonline.server.items.ItemTemplate;
 import com.wurmonline.server.items.ItemTypes;
@@ -30,7 +33,7 @@
  * 3. Register a custom vehicle behaviour
  * 
  */
-public class HitchingPostMod implements WurmServerMod, Initable, ServerStartedListener, ItemTemplatesCreatedListener, ItemTypes, MiscConstants {
+public class HitchingPostMod implements WurmServerMod, PreInitable, Initable, ServerStartedListener, ItemTemplatesCreatedListener, ItemTypes, MiscConstants {
 
 	private static Logger logger = Logger.getLogger(HitchingPostMod.class.getName());
 	private int hitchingPostId;
@@ -113,10 +116,23 @@ public void onServerStarted() {
 			creationEntry.addRequirement(new CreationRequirement(3, ItemList.plank, 2, true));
 			creationEntry.addRequirement(new CreationRequirement(4, ItemList.horseShoe, 3, true));
 		}
+		
+		UnhitchAction unhitchAction = new UnhitchAction(this);
+		ModActions.registerBehaviourProvider(unhitchAction);
+		ModActions.registerActionPerformer(unhitchAction);
 	}
 
 	@Override
 	public void init() {
 		ModVehicleBehaviours.init();
 	}
+	
+	@Override
+	public void preInit() {
+		ModActions.init();
+	}
+	
+	public boolean isHitchingPost(Item item) {
+		return item != null && item.getTemplateId() == hitchingPostId;
+	}
 }

modules/demo/hitchingpost/src/main/java/org/gotti/wurmunlimited/mods/hitchingpost/UnhitchAction.java

@@ -0,0 +1,102 @@
+package org.gotti.wurmunlimited.mods.hitchingpost;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
+import org.gotti.wurmunlimited.modsupport.actions.ActionPropagation;
+import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
+import org.gotti.wurmunlimited.modsupport.vehicles.VehicleFacadeImpl;
+
+import com.wurmonline.server.NoSuchItemException;
+import com.wurmonline.server.behaviours.Action;
+import com.wurmonline.server.behaviours.ActionEntry;
+import com.wurmonline.server.behaviours.Actions;
+import com.wurmonline.server.behaviours.Vehicle;
+import com.wurmonline.server.behaviours.VehicleBehaviour;
+import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.creatures.Creatures;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.zones.VolaTile;
+import com.wurmonline.server.zones.Zone;
+import com.wurmonline.server.zones.Zones;
+
+public class UnhitchAction implements BehaviourProvider, ActionPerformer {
+	
+	private static Logger logger = Logger.getLogger(HitchingPostMod.class.getName());
+	
+	private HitchingPostMod mod;
+	
+	protected UnhitchAction(HitchingPostMod mod) {
+		this.mod = mod;
+	}
+	
+	@Override
+	public short getActionId() {
+		return Actions.UNHITCH;
+	}
+	
+	private boolean canUnhitch(Creature performer, Creature target) {
+		try {
+			if (!target.isHitched()) {
+				return false;
+			}
+			final Vehicle hitched = target.getHitched();
+			if (hitched == null) {
+				return false;
+			}
+			
+			final Item item = new VehicleFacadeImpl(hitched).getItem();
+			if (mod.isHitchingPost(item) && (VehicleBehaviour.hasKeyForVehicle(performer, item) || VehicleBehaviour.mayDriveVehicle(performer, item, null))) {
+				return true;
+			}
+			return false;
+		} catch (NoSuchItemException e) {
+			logger.log(Level.WARNING, e.getMessage(), e);
+			return false;
+		}
+	}
+	
+	@Override
+	public List<ActionEntry> getBehavioursFor(Creature performer, Item subject, Creature target) {
+		return getBehavioursFor(performer, target);
+	}
+	
+	@Override
+	public List<ActionEntry> getBehavioursFor(Creature performer, Creature target) {
+		if (canUnhitch(performer, target)) {
+			return Arrays.asList(Actions.actionEntrys[Actions.UNHITCH]);
+		}
+		return null;
+	}
+	
+	@Override
+	public boolean action(Action action, Creature performer, Creature target, short num, float counter) {
+		if (canUnhitch(performer, target)) {
+			final Vehicle hitched = target.getHitched();
+			try {
+				final Zone z = Zones.getZone(target.getTilePos(), target.isOnSurface());
+				target.getStatus().savePosition(target.getWurmId(), true, z.getId(), true);
+			} catch (Exception ex) {
+				logger.log(Level.WARNING, ex.getMessage(), ex);
+			}
+			hitched.removeDragger(target);
+			Creatures.getInstance().setLastLed(target.getWurmId(), performer.getWurmId());
+			final VolaTile t = target.getCurrentTile();
+			if (t == null) {
+				logger.log(Level.WARNING, target.getName() + " has no tile?");
+				return propagate(action, ActionPropagation.NO_SERVER_PROPAGATION, ActionPropagation.NO_ACTION_PERFORMER_PROPAGATION, ActionPropagation.FINISH_ACTION);
+			}
+			t.sendAttachCreature(target.getWurmId(), -10L, 0.0f, 0.0f, 0.0f, 0);
+			return propagate(action, ActionPropagation.NO_SERVER_PROPAGATION, ActionPropagation.NO_ACTION_PERFORMER_PROPAGATION, ActionPropagation.FINISH_ACTION);
+		}
+		return propagate(action);
+	}
+	
+	@Override
+	public boolean action(Action action, Creature performer, Item source, Creature target, short num, float counter) {
+		return this.action(action, performer, target, num, counter);
+	}
+}

modules/dist/src/assembly/modlauncher.xml

@@ -18,7 +18,6 @@
         <exclude>${project.groupId}:christmasmod</exclude>
         <exclude>${project.groupId}:creaturedemo</exclude>
         <exclude>${project.groupId}:digtoground</exclude>
-        <exclude>${project.groupId}:hitchingpost</exclude>
         <exclude>${project.groupId}:serverfixes</exclude>
       </excludes>
       <useProjectArtifact>false</useProjectArtifact>    

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/vehicles/VehicleFacade.java

@@ -1,6 +1,8 @@
 package org.gotti.wurmunlimited.modsupport.vehicles;
 
+import com.wurmonline.server.NoSuchItemException;
 import com.wurmonline.server.behaviours.Seat;
+import com.wurmonline.server.items.Item;
 
 public interface VehicleFacade {
 
@@ -33,6 +35,11 @@ public interface VehicleFacade {
 	void setMaxSpeed(float f);
 
 	void setCanHaveEquipment(boolean b);
+
+	Item getItem() throws NoSuchItemException;
+
+	long getWurmid();
+
 }
 
 

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/vehicles/VehicleFacadeImpl.java

@@ -6,21 +6,26 @@
 
 import org.gotti.wurmunlimited.modloader.ReflectionUtil;
 
+import com.wurmonline.server.Items;
+import com.wurmonline.server.NoSuchItemException;
 import com.wurmonline.server.behaviours.Seat;
 import com.wurmonline.server.behaviours.Vehicle;
+import com.wurmonline.server.items.Item;
 
 public class VehicleFacadeImpl implements VehicleFacade {
 
-	private static Method createOnlyPassengerSeats;
-	private static Method createPassengerSeats;
-	private static Field embarkString;
-	private static Field maxSpeed;
-	private static Field canHaveEquipment;
+	private static final Method createOnlyPassengerSeats;
+	private static final Method createPassengerSeats;
+	private static final Method getWurmid;
+	private static final Field embarkString;
+	private static final Field maxSpeed;
+	private static final Field canHaveEquipment;
 
 	static {
 		try {
 			createOnlyPassengerSeats = ReflectionUtil.getMethod(Vehicle.class, "createOnlyPassengerSeats");
 			createPassengerSeats = ReflectionUtil.getMethod(Vehicle.class, "createPassengerSeats");
+			getWurmid = ReflectionUtil.getMethod(Vehicle.class, "getWurmid", new Class[] {});
 			embarkString = ReflectionUtil.getField(Vehicle.class, "embarkString");
 			maxSpeed = ReflectionUtil.getField(Vehicle.class, "maxSpeed");
 			canHaveEquipment = ReflectionUtil.getField(Vehicle.class, "canHaveEquipment");
@@ -126,5 +131,15 @@ public void setMaxSpeed(float f) {
 	public void setCanHaveEquipment(boolean b) {
 		setPrivateField(canHaveEquipment, b);
 	}
+	
+	@Override
+	public Item getItem() throws NoSuchItemException {
+		return Items.getItem(this.getWurmid());
+	}
+	
+	@Override
+	public long getWurmid() {
+		return callPrivateMethod(getWurmid);
+	}
 
 }