-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e1f7499
commit 9f96788
Showing
32 changed files
with
433 additions
and
195 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 0 additions & 29 deletions
29
...main/java/rbasamoyai/industrialwarfare/common/commands/AllDiplomaticRelationsCommand.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
src/main/java/rbasamoyai/industrialwarfare/common/entityai/taskscrollcmds/EquipCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| package rbasamoyai.industrialwarfare.common.entityai.taskscrollcmds; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
|
|
||
| import net.minecraft.entity.ai.brain.Brain; | ||
| import net.minecraft.entity.ai.brain.memory.MemoryModuleStatus; | ||
| import net.minecraft.entity.ai.brain.memory.MemoryModuleType; | ||
| import net.minecraft.inventory.EquipmentSlotType; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.tileentity.TileEntity; | ||
| import net.minecraft.util.Direction; | ||
| import net.minecraft.util.math.AxisAlignedBB; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.world.server.ServerWorld; | ||
| import net.minecraftforge.common.util.LazyOptional; | ||
| import net.minecraftforge.items.CapabilityItemHandler; | ||
| import net.minecraftforge.items.IItemHandler; | ||
| import rbasamoyai.industrialwarfare.common.capabilities.entities.npc.INPCDataHandler; | ||
| import rbasamoyai.industrialwarfare.common.containers.npcs.EquipmentItemHandler; | ||
| import rbasamoyai.industrialwarfare.common.entities.NPCEntity; | ||
| import rbasamoyai.industrialwarfare.common.entityai.taskscrollcmds.commandtree.CommandTrees; | ||
| import rbasamoyai.industrialwarfare.common.items.taskscroll.TaskScrollOrder; | ||
| import rbasamoyai.industrialwarfare.core.init.MemoryModuleTypeInit; | ||
| import rbasamoyai.industrialwarfare.core.init.NPCComplaintInit; | ||
| import rbasamoyai.industrialwarfare.utils.CommandUtils; | ||
|
|
||
| public class EquipCommand extends TaskScrollCommand { | ||
|
|
||
| private static final int POS_ARG_INDEX = 0; | ||
| private static final int EQUIP_ITEM_ARG_INDEX = 1; | ||
| private static final int EQUIP_SLOT_ARG_INDEX = 2; | ||
| private static final int ACCESS_SIDE_ARG_INDEX = 3; | ||
|
|
||
| public EquipCommand() { | ||
| super(CommandTrees.EQUIP, () -> ImmutableMap.of( | ||
| MemoryModuleType.LOOK_TARGET, MemoryModuleStatus.REGISTERED, | ||
| MemoryModuleType.WALK_TARGET, MemoryModuleStatus.REGISTERED | ||
| )); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean checkExtraStartConditions(ServerWorld world, NPCEntity npc, TaskScrollOrder order) { | ||
| EquipmentSlotType type = CommandUtils.equipmentSlotTypeFromFilterFlag(order.getWrappedArg(EQUIP_SLOT_ARG_INDEX).getArgNum()); | ||
| boolean canWearEquipment = npc.getDataHandler().map(INPCDataHandler::canWearEquipment).orElse(false); | ||
|
|
||
| if (type.getType() == EquipmentSlotType.Group.ARMOR && !canWearEquipment) { | ||
| CommandUtils.complain(npc, NPCComplaintInit.CANT_WEAR_ARMOR.get()); | ||
| return false; | ||
| } | ||
|
|
||
| return CommandUtils.validatePos(world, npc, order.getWrappedArg(POS_ARG_INDEX).getPos(), TaskScrollCommand.MAX_DISTANCE_FROM_POI, NPCComplaintInit.INVALID_ORDER.get()); | ||
| } | ||
|
|
||
| @Override | ||
| public void start(ServerWorld world, NPCEntity npc, long gameTime, TaskScrollOrder order) { | ||
| CommandUtils.trySetInterfaceWalkTarget(world, npc, order.getWrappedArg(POS_ARG_INDEX).getPos().get(), TaskScrollCommand.SPEED_MODIFIER, TaskScrollCommand.CLOSE_ENOUGH_DIST); | ||
| } | ||
|
|
||
| @Override | ||
| public void tick(ServerWorld world, NPCEntity npc, long gameTime, TaskScrollOrder order) { | ||
| Brain<?> brain = npc.getBrain(); | ||
| BlockPos pos = order.getWrappedArg(POS_ARG_INDEX).getPos().orElse(BlockPos.ZERO); | ||
| AxisAlignedBB box = new AxisAlignedBB(pos.offset(-1, -2, -1), pos.offset(2, 1, 2)); | ||
|
|
||
| if (!box.contains(npc.position())) { | ||
| if (npc.getNavigation().isDone()) { | ||
| CommandUtils.trySetInterfaceWalkTarget(world, npc, pos, TaskScrollCommand.SPEED_MODIFIER, TaskScrollCommand.CLOSE_ENOUGH_DIST); | ||
| } | ||
| return; | ||
| } | ||
|
|
||
| TileEntity te = world.getBlockEntity(pos); | ||
| if (te == null) { | ||
| brain.setMemory(MemoryModuleTypeInit.COMPLAINT.get(), NPCComplaintInit.NOTHING_HERE.get()); | ||
| return; | ||
| } | ||
|
|
||
| Direction side = Direction.from3DDataValue(order.getWrappedArg(ACCESS_SIDE_ARG_INDEX).getArgNum()); | ||
| LazyOptional<IItemHandler> lzop = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); | ||
| if (!lzop.isPresent()) { | ||
| brain.setMemory(MemoryModuleTypeInit.COMPLAINT.get(), NPCComplaintInit.CANT_OPEN.get()); | ||
| return; | ||
| } | ||
| IItemHandler blockInv = lzop.resolve().get(); | ||
|
|
||
| EquipmentSlotType type = CommandUtils.equipmentSlotTypeFromFilterFlag(order.getWrappedArg(EQUIP_SLOT_ARG_INDEX).getArgNum()); | ||
|
|
||
| ItemStack filter = order.getWrappedArg(EQUIP_ITEM_ARG_INDEX).getItem().orElse(ItemStack.EMPTY); | ||
| for (int i = 0; i < blockInv.getSlots(); i++) { | ||
| if (!CommandUtils.filterMatches(filter, blockInv.getStackInSlot(i))) continue; | ||
|
|
||
| ItemStack takeItem = blockInv.extractItem(i, blockInv.getSlotLimit(i), false); | ||
| int slot = EquipmentItemHandler.getTypeSlot(type); | ||
| EquipmentItemHandler npcEquipment = npc.getEquipmentItemHandler(); | ||
| ItemStack insertItem = npcEquipment.extractItem(slot, npcEquipment.getSlotLimit(slot), false); | ||
|
|
||
| npcEquipment.insertItem(slot, takeItem, false); | ||
| blockInv.insertItem(i, insertItem, false); | ||
| break; | ||
| } | ||
| brain.setMemory(MemoryModuleTypeInit.STOP_EXECUTION.get(), true); | ||
| } | ||
|
|
||
| @Override | ||
| public void stop(ServerWorld world, NPCEntity npc, long gameTime, TaskScrollOrder order) { | ||
| if (!CommandUtils.hasComplaint(npc)) { | ||
| CommandUtils.incrementCurrentInstructionIndexMemory(npc); | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.