workbookは常にメインハンドでのみ使えるように

iesika · Aug 23, 2017 · 04aef0e · 04aef0e
1 parent 647af0a
commit 04aef0e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/src/main/java/com/iesika/aem/common/ai/EntityAIExport.java b/src/main/java/com/iesika/aem/common/ai/EntityAIExport.java
@@ -9,7 +9,6 @@
 import net.blacklab.lmr.entity.EntityLittleMaid;
 import net.blacklab.lmr.entity.mode.EntityModeBase;
 import net.blacklab.lmr.util.EnumSound;
-import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
@@ -31,7 +30,6 @@ public EntityAIExport(EntityLittleMaid owner) {
 		this.owner = owner;
 		this.opinv = false;
 		this.cflag = true;
-		owner.getEntityAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(50);
 		setMutexBits(7);
 	}
 

diff --git a/src/main/java/com/iesika/aem/common/ai/EntityAIImport.java b/src/main/java/com/iesika/aem/common/ai/EntityAIImport.java
@@ -10,7 +10,6 @@
 import net.blacklab.lmr.entity.EntityLittleMaid;
 import net.blacklab.lmr.entity.mode.EntityModeBase;
 import net.blacklab.lmr.util.EnumSound;
-import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -31,7 +30,6 @@ public EntityAIImport(EntityLittleMaid owner) {
 		this.owner = owner;
 		this.opinv = false;
 		this.cflag = true;
-		owner.getEntityAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(50);
 		setMutexBits(7);
 	}
 

diff --git a/src/main/java/com/iesika/aem/mode/EntityModeCarrier.java b/src/main/java/com/iesika/aem/mode/EntityModeCarrier.java
@@ -20,7 +20,6 @@ public class EntityModeCarrier extends EntityModeBase {
 	public static final int mmode_Carrier = 0x4201;
 	public static final String CarrierModeName = "Carrier";
 
-	public boolean useMainHand;
 	public MaidTaskManager maidTaskManager;
 
 	static {
@@ -29,7 +28,6 @@ public class EntityModeCarrier extends EntityModeBase {
 
 	public EntityModeCarrier(EntityLittleMaid maid) {
 		super(maid);
-		this.useMainHand = true;
 	}
 
 	@Override
@@ -39,25 +37,14 @@ public int priority() {
 
 	@Override
 	public boolean changeMode(EntityPlayer pentityplayer) {
-		//メインハンド優先
 		ItemStack mainHand = owner.maidInventory.mainHandInventory[0];
-		if (mainHand != null) {
-			if (mainHand.getItem() == AEMItems.workbook) {
+		if (mainHand != null){
+			if (shouldChangeToCarrierMode(mainHand)){
 				owner.setMaidMode(CarrierModeName);
-				useMainHand = true;
 				Logger.info("maid mode -> Carrier (use main hand)");
 				return true;
 			}
 		}
-		ItemStack offHand = owner.maidInventory.offHandInventory[0];
-		if (offHand != null) {
-			if (offHand.getItem() == AEMItems.workbook) {
-				owner.setMaidMode(CarrierModeName);
-				useMainHand = false;
-				Logger.info("maid mode -> Carrier (use off hand)");
-				return true;
-			}
-		}
 		return false;
 	}
 
@@ -85,7 +72,7 @@ public boolean setMode(int pMode) {
 		switch (pMode) {
 		case mmode_Carrier:
 			owner.setBloodsuck(false);
-			return shouldChangeToCarrierMode(useMainHand ? owner.maidInventory.mainHandInventory[0] : owner.maidInventory.offHandInventory[0]);
+			return shouldChangeToCarrierMode(owner.maidInventory.mainHandInventory[0]);
 		}
 		return false;
 	}