Mineattack/Minions
4
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

1.21 and other things

Browse Source
This commit is contained in:
skippyall
2024-08-31 17:00:27 +02:00
parent 60fd7f0891
commit ac4f58b9a2
70 changed files with 706 additions and 1610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+2 -2
View File
@@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.5-SNAPSHOT' id 'fabric-loom' version '1.6-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
@@ -44,7 +44,7 @@ processResources {
} }
} }
def targetJavaVersion = 17 def targetJavaVersion = 21
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is // ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly // this fixes some edge cases with special characters not displaying correctly
gradle.properties
+6 -6
View File
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.20.4 minecraft_version=1.21.1
loader_version=0.15.6 loader_version=0.16.3
yarn_mappings=1.20.4+build.3 yarn_mappings=1.21.1+build.3
# Mod Properties # Mod Properties
mod_version = 0.0.1 mod_version = 0.0.1
@@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx1G
# Dependencies # Dependencies
# check this on https://modmuss50.me/fabric.html # check this on https://modmuss50.me/fabric.html
fabric_version=0.95.4+1.20.4 fabric_version=0.103.0+1.21.1
polymer_version=0.7.5+1.20.4 polymer_version=0.9.12+1.21.1
sgui_version=1.4.1+1.20.4 sgui_version=1.6.0+1.21
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
oldSrc/io/github/skippyall/minions/MinionInventory.java
-46
View File
@@ -1,46 +0,0 @@
package io.github.skippyall.minions;
import eu.pb4.sgui.api.ClickType;
import eu.pb4.sgui.api.elements.GuiElement;
import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.elements.GuiElementInterface;
import eu.pb4.sgui.api.gui.SimpleGui;
import eu.pb4.sgui.api.gui.SlotGuiInterface;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
public class MinionInventory {
public static void openInventory(ServerPlayer player, MinionFakePlayer minion) {
}
public static void openServerSideInventory(ServerPlayer player, MinionFakePlayer minion) {
SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, player, false);
gui.setTitle(Component.literal("Minion"));
gui.setSlot(4, new GuiElementBuilder()
.setItem(Items.REDSTONE)
.setName(Component.literal("Programming"))
.setCallback((i, clickType, clickType1) -> {
openProgrammingInventory(player, minion);
})
);
gui.setSlot(3, new GuiElementBuilder()
.setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
.setName(Component.literal("Modules and Detectors"))
.setCallback((i, clickType, clickType1) -> {
})
);
gui.open();
}
public static void openProgrammingInventory(ServerPlayer player, MinionFakePlayer minion) {
}
public static void open
}
oldSrc/io/github/skippyall/minions/MinionItem.java
-56
View File
@@ -1,56 +0,0 @@
package io.github.skippyall.minions;
import eu.pb4.polymer.core.api.item.PolymerItem;
import eu.pb4.polymer.core.api.item.PolymerItemUtils;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.network.chat.ComponentContents;
import net.minecraft.network.chat.contents.PlainTextContents;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.UseOnContext;
import org.jetbrains.annotations.Nullable;
public class MinionItem extends Item implements PolymerItem {
public MinionItem() {
super(new FabricItemSettings());
}
@Override
public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayer player) {
return Items.PLAYER_HEAD;
}
@Override
public ItemStack getPolymerItemStack(ItemStack stack, TooltipFlag flag, ServerPlayer player) {
ItemStack out = PolymerItemUtils.createItemStack(stack, flag, player);
//CompoundTag tag = out.getOrCreateTag();
//PlayerHeadItem.TAG_SKULL_OWNER;
return out;
}
/*@Override
public int getPolymerCustomModelData(ItemStack itemStack, @Nullable ServerPlayer player) {
return 10;
}*/
public InteractionResult useOn(UseOnContext context) {
System.out.println("Minion spawned "+ context.getItemInHand().getDisplayName());
ComponentContents contents = context.getItemInHand().getHoverName().getContents();
String name;
if(contents instanceof PlainTextContents plainContents) {
name = plainContents.text();
} else {
name = "Minion";
}
if(!context.getLevel().isClientSide) {
MinionFakePlayer.createMinion(name, (ServerLevel) context.getLevel(), (ServerPlayer) context.getPlayer(), context.getClickedPos().getCenter().add(0,0.5,0), 0, 0);
}
return InteractionResult.SUCCESS;
}
}
oldSrc/io/github/skippyall/minions/Minions.java
-27
View File
@@ -1,27 +0,0 @@
package io.github.skippyall.minions;
import eu.pb4.polymer.core.api.entity.PolymerEntityUtils;
import io.github.skippyall.minions.networking.ClientToServerNetworking;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerLoginPacketListenerImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Minions implements ModInitializer {
public static final String MOD_ID = "minions";
public static final MinionItem MINION_ITEM = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(MOD_ID, "minion"), new MinionItem());
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
@Override
public void onInitialize() {
PolymerEntityUtils.registerType();
}
}
oldSrc/io/github/skippyall/minions/client/MinionsClient.java
-16
View File
@@ -1,16 +0,0 @@
package io.github.skippyall.minions.client;
import io.github.skippyall.minions.networking.ClientToServerNetworking;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationConnectionEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents;
public class MinionsClient implements ClientModInitializer {
/**
* Runs the mod initializer on the client environment.
*/
@Override
public void onInitializeClient() {
ClientConfigurationConnectionEvents.INIT.register(ClientToServerNetworking::onConfigurationInit);
}
}
oldSrc/io/github/skippyall/minions/fakeplayer/ClientConnectionInterface.java
-7
View File
@@ -1,7 +0,0 @@
package io.github.skippyall.minions.fakeplayer;
import io.netty.channel.Channel;
public interface ClientConnectionInterface {
void setChannel(Channel channel);
}
oldSrc/io/github/skippyall/minions/fakeplayer/EntityPlayerActionPack.java
-626
View File
@@ -1,626 +0,0 @@
package io.github.skippyall.minions.fakeplayer;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.commands.arguments.EntityAnchorArgument;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket;
import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.animal.horse.AbstractHorse;
import net.minecraft.world.entity.decoration.ItemFrame;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.vehicle.Boat;
import net.minecraft.world.entity.vehicle.Minecart;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec2;
import net.minecraft.world.phys.Vec3;
public class EntityPlayerActionPack
{
private final ServerPlayer player;
private final Map<ActionType, Action> actions = new EnumMap<>(ActionType.class);
private BlockPos currentBlock;
private int blockHitDelay;
private boolean isHittingBlock;
private float curBlockDamageMP;
private boolean sneaking;
private boolean sprinting;
private float forward;
private float strafing;
private int itemUseCooldown;
public EntityPlayerActionPack(ServerPlayer playerIn)
{
player = playerIn;
stopAll();
}
public void copyFrom(EntityPlayerActionPack other)
{
actions.putAll(other.actions);
currentBlock = other.currentBlock;
blockHitDelay = other.blockHitDelay;
isHittingBlock = other.isHittingBlock;
curBlockDamageMP = other.curBlockDamageMP;
sneaking = other.sneaking;
sprinting = other.sprinting;
forward = other.forward;
strafing = other.strafing;
itemUseCooldown = other.itemUseCooldown;
}
public EntityPlayerActionPack start(ActionType type, Action action)
{
Action previous = actions.remove(type);
if (previous != null) type.stop(player, previous);
if (action != null)
{
actions.put(type, action);
type.start(player, action); // noop
}
return this;
}
public EntityPlayerActionPack setSneaking(boolean doSneak)
{
sneaking = doSneak;
player.setShiftKeyDown(doSneak);
if (sprinting && sneaking)
setSprinting(false);
return this;
}
public EntityPlayerActionPack setSprinting(boolean doSprint)
{
sprinting = doSprint;
player.setSprinting(doSprint);
if (sneaking && sprinting)
setSneaking(false);
return this;
}
public EntityPlayerActionPack setForward(float value)
{
forward = value;
return this;
}
public EntityPlayerActionPack setStrafing(float value)
{
strafing = value;
return this;
}
public EntityPlayerActionPack look(Direction direction)
{
return switch (direction)
{
case NORTH -> look(180, 0);
case SOUTH -> look(0, 0);
case EAST -> look(-90, 0);
case WEST -> look(90, 0);
case UP -> look(player.getYRot(), -90);
case DOWN -> look(player.getYRot(), 90);
};
}
public EntityPlayerActionPack look(Vec2 rotation)
{
return look(rotation.x, rotation.y);
}
public EntityPlayerActionPack look(float yaw, float pitch)
{
player.setYRot(yaw % 360); //setYaw
player.setXRot(Mth.clamp(pitch, -90, 90)); // setPitch
// maybe player.moveTo(player.getX(), player.getY(), player.getZ(), yaw, Mth.clamp(pitch,-90.0F, 90.0F));
return this;
}
public EntityPlayerActionPack lookAt(Vec3 position)
{
player.lookAt(EntityAnchorArgument.Anchor.EYES, position);
return this;
}
public EntityPlayerActionPack turn(float yaw, float pitch)
{
return look(player.getYRot() + yaw, player.getXRot() + pitch);
}
public EntityPlayerActionPack turn(Vec2 rotation)
{
return turn(rotation.x, rotation.y);
}
public EntityPlayerActionPack stopMovement()
{
setSneaking(false);
setSprinting(false);
forward = 0.0F;
strafing = 0.0F;
return this;
}
public EntityPlayerActionPack stopAll()
{
for (ActionType type : actions.keySet()) type.stop(player, actions.get(type));
actions.clear();
return stopMovement();
}
public EntityPlayerActionPack mount(boolean onlyRideables)
{
//test what happens
List<Entity> entities;
if (onlyRideables)
{
entities = player.level().getEntities(player, player.getBoundingBox().inflate(3.0D, 1.0D, 3.0D),
e -> e instanceof Minecart || e instanceof Boat || e instanceof AbstractHorse);
}
else
{
entities = player.level().getEntities(player, player.getBoundingBox().inflate(3.0D, 1.0D, 3.0D));
}
if (entities.size()==0)
return this;
Entity closest = null;
double distance = Double.POSITIVE_INFINITY;
Entity currentVehicle = player.getVehicle();
for (Entity e: entities)
{
if (e == player || (currentVehicle == e))
continue;
double dd = player.distanceToSqr(e);
if (dd<distance)
{
distance = dd;
closest = e;
}
}
if (closest == null) return this;
if (closest instanceof AbstractHorse && onlyRideables)
((AbstractHorse) closest).mobInteract(player, InteractionHand.MAIN_HAND);
else
player.startRiding(closest,true);
return this;
}
public EntityPlayerActionPack dismount()
{
player.stopRiding();
return this;
}
public void onUpdate()
{
Map<ActionType, Boolean> actionAttempts = new HashMap<>();
actions.values().removeIf(e -> e.done);
for (Map.Entry<ActionType, Action> e : actions.entrySet())
{
ActionType type = e.getKey();
Action action = e.getValue();
// skipping attack if use was successful
if (!(actionAttempts.getOrDefault(ActionType.USE, false) && type == ActionType.ATTACK))
{
Boolean actionStatus = action.tick(this, type);
if (actionStatus != null)
actionAttempts.put(type, actionStatus);
}
// optionally retrying use after successful attack and unsuccessful use
if (type == ActionType.ATTACK
&& actionAttempts.getOrDefault(ActionType.ATTACK, false)
&& !actionAttempts.getOrDefault(ActionType.USE, true) )
{
// according to MinecraftClient.handleInputEvents
Action using = actions.get(ActionType.USE);
if (using != null) // this is always true - we know use worked, but just in case
{
using.retry(this, ActionType.USE);
}
}
}
float vel = sneaking?0.3F:1.0F;
// The != 0.0F checks are needed given else real players can't control minecarts, however it works with fakes and else they don't stop immediately
if (forward != 0.0F || player instanceof MinionFakePlayer) {
player.zza = forward * vel;
}
if (strafing != 0.0F || player instanceof MinionFakePlayer) {
player.xxa = strafing * vel;
}
}
static HitResult getTarget(ServerPlayer player)
{
double reach = player.gameMode.isCreative() ? 5 : 4.5f;
return Tracer.rayTrace(player, 1, reach, false);
}
private void dropItemFromSlot(int slot, boolean dropAll)
{
Inventory inv = player.getInventory(); // getInventory;
if (!inv.getItem(slot).isEmpty())
player.drop(inv.removeItem(slot,
dropAll ? inv.getItem(slot).getCount() : 1
), false, true); // scatter, keep owner
}
public void drop(int selectedSlot, boolean dropAll)
{
Inventory inv = player.getInventory(); // getInventory;
if (selectedSlot == -2) // all
{
for (int i = inv.getContainerSize(); i >= 0; i--)
dropItemFromSlot(i, dropAll);
}
else // one slot
{
if (selectedSlot == -1)
selectedSlot = inv.selected;
dropItemFromSlot(selectedSlot, dropAll);
}
}
public void setSlot(int slot)
{
player.getInventory().selected = slot-1;
player.connection.send(new ClientboundSetCarriedItemPacket(slot-1));
}
public enum ActionType
{
USE(true)
{
@Override
boolean execute(ServerPlayer player, Action action)
{
EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
if (ap.itemUseCooldown > 0)
{
ap.itemUseCooldown--;
return true;
}
if (player.isUsingItem())
{
return true;
}
HitResult hit = getTarget(player);
for (InteractionHand hand : InteractionHand.values())
{
switch (hit.getType())
{
case BLOCK:
{
player.resetLastActionTime();
ServerLevel world = player.serverLevel();
BlockHitResult blockHit = (BlockHitResult) hit;
BlockPos pos = blockHit.getBlockPos();
Direction side = blockHit.getDirection();
if (pos.getY() < player.level().getMaxBuildHeight() - (side == Direction.UP ? 1 : 0) && world.mayInteract(player, pos))
{
InteractionResult result = player.gameMode.useItemOn(player, world, player.getItemInHand(hand), hand, blockHit);
if (result.consumesAction())
{
if (result.shouldSwing()) player.swing(hand);
ap.itemUseCooldown = 3;
return true;
}
}
break;
}
case ENTITY:
{
player.resetLastActionTime();
EntityHitResult entityHit = (EntityHitResult) hit;
Entity entity = entityHit.getEntity();
boolean handWasEmpty = player.getItemInHand(hand).isEmpty();
boolean itemFrameEmpty = (entity instanceof ItemFrame) && ((ItemFrame) entity).getItem().isEmpty();
Vec3 relativeHitPos = entityHit.getLocation().subtract(entity.getX(), entity.getY(), entity.getZ());
if (entity.interactAt(player, relativeHitPos, hand).consumesAction())
{
ap.itemUseCooldown = 3;
return true;
}
// fix for SS itemframe always returns CONSUME even if no action is performed
if (player.interactOn(entity, hand).consumesAction() && !(handWasEmpty && itemFrameEmpty))
{
ap.itemUseCooldown = 3;
return true;
}
break;
}
}
ItemStack handItem = player.getItemInHand(hand);
if (player.gameMode.useItem(player, player.level(), handItem, hand).consumesAction())
{
ap.itemUseCooldown = 3;
return true;
}
}
return false;
}
@Override
void inactiveTick(ServerPlayer player, Action action)
{
EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
ap.itemUseCooldown = 0;
player.releaseUsingItem();
}
},
ATTACK(true) {
@Override
boolean execute(ServerPlayer player, Action action) {
HitResult hit = getTarget(player);
switch (hit.getType()) {
case ENTITY: {
EntityHitResult entityHit = (EntityHitResult) hit;
if (!action.isContinuous)
{
player.attack(entityHit.getEntity());
player.swing(InteractionHand.MAIN_HAND);
}
player.resetAttackStrengthTicker();
player.resetLastActionTime();
return true;
}
case BLOCK: {
EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
if (ap.blockHitDelay > 0)
{
ap.blockHitDelay--;
return false;
}
BlockHitResult blockHit = (BlockHitResult) hit;
BlockPos pos = blockHit.getBlockPos();
Direction side = blockHit.getDirection();
if (player.blockActionRestricted(player.level(), pos, player.gameMode.getGameModeForPlayer())) return false;
if (ap.currentBlock != null && player.level().getBlockState(ap.currentBlock).isAir())
{
ap.currentBlock = null;
return false;
}
BlockState state = player.level().getBlockState(pos);
boolean blockBroken = false;
if (player.gameMode.getGameModeForPlayer().isCreative())
{
player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxBuildHeight(), -1);
ap.blockHitDelay = 5;
blockBroken = true;
}
else if (ap.currentBlock == null || !ap.currentBlock.equals(pos))
{
if (ap.currentBlock != null)
{
player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, side, player.level().getMaxBuildHeight(), -1);
}
player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxBuildHeight(), -1);
boolean notAir = !state.isAir();
if (notAir && ap.curBlockDamageMP == 0)
{
state.attack(player.level(), pos, player);
}
if (notAir && state.getDestroyProgress(player, player.level(), pos) >= 1)
{
ap.currentBlock = null;
//instamine??
blockBroken = true;
}
else
{
ap.currentBlock = pos;
ap.curBlockDamageMP = 0;
}
}
else
{
ap.curBlockDamageMP += state.getDestroyProgress(player, player.level(), pos);
if (ap.curBlockDamageMP >= 1)
{
player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, side, player.level().getMaxBuildHeight(), -1);
ap.currentBlock = null;
ap.blockHitDelay = 5;
blockBroken = true;
}
player.level().destroyBlockProgress(-1, pos, (int) (ap.curBlockDamageMP * 10));
}
player.resetLastActionTime();
player.swing(InteractionHand.MAIN_HAND);
return blockBroken;
}
}
return false;
}
@Override
void inactiveTick(ServerPlayer player, Action action)
{
EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
if (ap.currentBlock == null) return;
player.level().destroyBlockProgress(-1, ap.currentBlock, -1);
player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.level().getMaxBuildHeight(), -1);
ap.currentBlock = null;
}
},
JUMP(true)
{
@Override
boolean execute(ServerPlayer player, Action action)
{
if (action.limit == 1)
{
if (player.onGround()) player.jumpFromGround(); // onGround
}
else
{
player.setJumping(true);
}
return false;
}
@Override
void inactiveTick(ServerPlayer player, Action action)
{
player.setJumping(false);
}
},
DROP_ITEM(true)
{
@Override
boolean execute(ServerPlayer player, Action action)
{
player.resetLastActionTime();
player.drop(false); // dropSelectedItem
return false;
}
},
DROP_STACK(true)
{
@Override
boolean execute(ServerPlayer player, Action action)
{
player.resetLastActionTime();
player.drop(true); // dropSelectedItem
return false;
}
},
SWAP_HANDS(true)
{
@Override
boolean execute(ServerPlayer player, Action action)
{
player.resetLastActionTime();
ItemStack itemStack_1 = player.getItemInHand(InteractionHand.OFF_HAND);
player.setItemInHand(InteractionHand.OFF_HAND, player.getItemInHand(InteractionHand.MAIN_HAND));
player.setItemInHand(InteractionHand.MAIN_HAND, itemStack_1);
return false;
}
};
public final boolean preventSpectator;
ActionType(boolean preventSpectator)
{
this.preventSpectator = preventSpectator;
}
void start(ServerPlayer player, Action action) {}
abstract boolean execute(ServerPlayer player, Action action);
void inactiveTick(ServerPlayer player, Action action) {}
void stop(ServerPlayer player, Action action)
{
inactiveTick(player, action);
}
}
public static class Action
{
public boolean done = false;
public final int limit;
public final int interval;
public final int offset;
private int count;
private int next;
private final boolean isContinuous;
private Action(int limit, int interval, int offset, boolean continuous)
{
this.limit = limit;
this.interval = interval;
this.offset = offset;
next = interval + offset;
isContinuous = continuous;
}
public static Action once()
{
return new Action(1, 1, 0, false);
}
public static Action continuous()
{
return new Action(-1, 1, 0, true);
}
public static Action interval(int interval)
{
return new Action(-1, interval, 0, false);
}
public static Action interval(int interval, int offset)
{
return new Action(-1, interval, offset, false);
}
Boolean tick(EntityPlayerActionPack actionPack, ActionType type)
{
next--;
Boolean cancel = null;
if (next <= 0)
{
if (interval == 1 && !isContinuous)
{
// need to allow entity to tick, otherwise won't have effect (bow)
// actions are 20 tps, so need to clear status mid tick, allowing entities process it till next time
if (!type.preventSpectator || !actionPack.player.isSpectator())
{
type.inactiveTick(actionPack.player, this);
}
}
if (!type.preventSpectator || !actionPack.player.isSpectator())
{
cancel = type.execute(actionPack.player, this);
}
count++;
if (count == limit)
{
type.stop(actionPack.player, null);
done = true;
return cancel;
}
next = interval;
}
else
{
if (!type.preventSpectator || !actionPack.player.isSpectator())
{
type.inactiveTick(actionPack.player, this);
}
}
return cancel;
}
void retry(EntityPlayerActionPack actionPack, ActionType type)
{
//assuming action run but was unsuccesful that tick, but opportunity emerged to retry it, lets retry it.
if (!type.preventSpectator || !actionPack.player.isSpectator())
{
type.execute(actionPack.player, this);
}
count++;
if (count == limit)
{
type.stop(actionPack.player, null);
done = true;
}
}
}
}
oldSrc/io/github/skippyall/minions/fakeplayer/FakeClientConnection.java
-37
View File
@@ -1,37 +0,0 @@
package io.github.skippyall.minions.fakeplayer;
import io.netty.channel.embedded.EmbeddedChannel;
import net.minecraft.network.Connection;
import net.minecraft.network.PacketListener;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.PacketFlow;
public class FakeClientConnection extends Connection {
public FakeClientConnection(PacketFlow p)
{
super(p);
// compat with adventure-platform-fabric. This does NOT trigger other vanilla handlers for establishing a channel
// also makes #isOpen return true, allowing enderpearls to teleport fake players
((ClientConnectionInterface)this).setChannel(new EmbeddedChannel());
}
@Override
public void setReadOnly()
{
}
@Override
public void handleDisconnection() {
getPacketListener().onDisconnect(getDisconnectedReason()==null ? Component.literal("Disconnected"): getDisconnectedReason());
}
@Override
public void setListenerForServerboundHandshake(PacketListener packetListener)
{
}
@Override
public void setListener(PacketListener packetListener) {
}
}
oldSrc/io/github/skippyall/minions/fakeplayer/MinionFakePlayer.java
-201
View File
@@ -1,201 +0,0 @@
package io.github.skippyall.minions.fakeplayer;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.yggdrasil.ProfileResult;
import net.minecraft.core.BlockPos;
import net.minecraft.core.UUIDUtil;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket;
import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.TickTask;
import net.minecraft.server.level.ClientInformation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.food.FoodData;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.GameType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.Vec3;
import java.util.UUID;
public class MinionFakePlayer extends ServerPlayer {
public Runnable fixStartingPosition = () -> {};
public boolean isAShadow;
public static void createMinion(String username, ServerLevel level, ServerPlayer owner, Vec3 pos, double yaw, double pitch) {
MinecraftServer server = level.getServer();
server.getProfileCache().getAsync(username).thenAcceptAsync((optional) -> {
GameProfile profile = null;
if(optional.isPresent()){
UUID uuid = optional.get().getId();
ProfileResult result = server.getSessionService().fetchProfile(uuid, true);
if(result != null) {
profile = result.profile();
}
}
if(profile == null) {
profile = new GameProfile(UUIDUtil.createOfflinePlayerUUID(username), username);
}
MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, ClientInformation.createDefault(), false);
instance.fixStartingPosition = () -> instance.moveTo(pos.x, pos.y, pos.z, (float) yaw, (float) pitch);
server.getPlayerList().placeNewPlayer(new FakeClientConnection(PacketFlow.SERVERBOUND), instance, new CommonListenerCookie(profile, 0, instance.clientInformation()));
instance.teleportTo(level, pos.x, pos.y, pos.z, (float) yaw, (float) pitch);
instance.setHealth(20.0F);
instance.unsetRemoved();
instance.gameMode.changeGameModeForPlayer(GameType.SURVIVAL);
server.getPlayerList().broadcastAll(new ClientboundRotateHeadPacket(instance, (byte) (instance.yHeadRot * 256 / 360)), level.dimension());//instance.dimension);
server.getPlayerList().broadcastAll(new ClientboundTeleportEntityPacket(instance), level.dimension());//instance.dimension);
//instance.world.getChunkManager(). updatePosition(instance);
instance.entityData.set(DATA_PLAYER_MODE_CUSTOMISATION, (byte) 0x7f); // show all model layers (incl. capes)
instance.getAbilities().flying = false;
instance.setMaxUpStep(0.6F);
});
}
@SuppressWarnings("unused") //Don't know if I'll need this
public static MinionFakePlayer createShadow(MinecraftServer server, ServerPlayer player)
{
player.getServer().getPlayerList().remove(player);
player.connection.disconnect(Component.translatable("multiplayer.disconnect.duplicate_login"));
ServerLevel worldIn = player.serverLevel();//.getWorld(player.dimension);
GameProfile gameprofile = player.getGameProfile();
MinionFakePlayer playerShadow = new MinionFakePlayer(server, worldIn, gameprofile, player.clientInformation(), true);
playerShadow.setChatSession(player.getChatSession());
server.getPlayerList().placeNewPlayer(new FakeClientConnection(PacketFlow.SERVERBOUND), playerShadow, new CommonListenerCookie(gameprofile, 0, player.clientInformation()));
playerShadow.setHealth(player.getHealth());
playerShadow.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
playerShadow.gameMode.changeGameModeForPlayer(player.gameMode.getGameModeForPlayer());
((ServerPlayerInterface) playerShadow).getActionPack().copyFrom(((ServerPlayerInterface) player).getActionPack());
playerShadow.entityData.set(DATA_PLAYER_MODE_CUSTOMISATION, player.getEntityData().get(DATA_PLAYER_MODE_CUSTOMISATION));
server.getPlayerList().broadcastAll(new ClientboundRotateHeadPacket(playerShadow, (byte) (player.yHeadRot * 256 / 360)), playerShadow.level().dimension());
server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, playerShadow));
//player.world.getChunkManager().updatePosition(playerShadow);
playerShadow.getAbilities().flying = player.getAbilities().flying;
return playerShadow;
}
public static MinionFakePlayer respawnFake(MinecraftServer server, ServerLevel level, GameProfile profile, ClientInformation cli)
{
return new MinionFakePlayer(server, level, profile, cli, false);
}
private MinionFakePlayer(MinecraftServer server, ServerLevel worldIn, GameProfile profile, ClientInformation cli, boolean shadow)
{
super(server, worldIn, profile, cli);
isAShadow = shadow;
}
@Override
public void onEquipItem(final EquipmentSlot slot, final ItemStack previous, final ItemStack stack)
{
if (!isUsingItem()) super.onEquipItem(slot, previous, stack);
}
@Override
public void kill()
{
kill(Component.literal("Killed"));
}
public void kill(Component reason)
{
shakeOff();
if (reason.getContents() instanceof TranslatableContents text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) {
this.connection.onDisconnect(reason);
} else {
this.server.tell(new TickTask(this.server.getTickCount(), () -> {
this.connection.onDisconnect(reason);
}));
}
}
@Override
public void tick()
{
if (this.getServer().getTickCount() % 10 == 0)
{
this.connection.resetPosition();
this.serverLevel().getChunkSource().move(this);
}
try
{
super.tick();
this.doTick();
}
catch (NullPointerException ignored)
{
// happens with that paper port thingy - not sure what that would fix, but hey
// the game not gonna crash violently.
}
}
private void shakeOff()
{
if (getVehicle() instanceof Player) stopRiding();
for (Entity passenger : getIndirectPassengers())
{
if (passenger instanceof Player) passenger.stopRiding();
}
}
@Override
public void die(DamageSource cause)
{
shakeOff();
super.die(cause);
setHealth(20);
this.foodData = new FoodData();
kill(this.getCombatTracker().getDeathMessage());
}
@Override
public String getIpAddress()
{
return "127.0.0.1";
}
@Override
public boolean allowsListing() {
return false;
}
@Override
protected void checkFallDamage(double y, boolean onGround, BlockState state, BlockPos pos) {
doCheckFallDamage(0.0, y, 0.0, onGround);
}
@Override
public Entity changeDimension(ServerLevel serverLevel)
{
super.changeDimension(serverLevel);
if (wonGame) {
ServerboundClientCommandPacket p = new ServerboundClientCommandPacket(ServerboundClientCommandPacket.Action.PERFORM_RESPAWN);
connection.handleClientCommand(p);
}
// If above branch was taken, *this* has been removed and replaced, the new instance has been set
// on 'our' connection (which is now theirs, but we still have a ref).
if (connection.player.isChangingDimension()) {
connection.player.hasChangedDimension();
}
return connection.player;
}
}
oldSrc/io/github/skippyall/minions/fakeplayer/NetHandlerPlayServerFake.java
-46
View File
@@ -1,46 +0,0 @@
package io.github.skippyall.minions.fakeplayer;
import net.minecraft.network.Connection;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraft.network.protocol.Packet;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.world.entity.RelativeMovement;
import java.util.Set;
public class NetHandlerPlayServerFake extends ServerGamePacketListenerImpl
{
public NetHandlerPlayServerFake(final MinecraftServer minecraftServer, final Connection connection, final ServerPlayer serverPlayer, final CommonListenerCookie i)
{
super(minecraftServer, connection, serverPlayer, i);
}
@Override
public void send(final Packet<?> packetIn)
{
}
@Override
public void disconnect(Component message)
{
if (message.getContents() instanceof TranslatableContents text && (text.getKey().equals("multiplayer.disconnect.idling") || text.getKey().equals("multiplayer.disconnect.duplicate_login")))
{
((MinionFakePlayer) player).kill(message);
}
}
@Override
public void teleport(double d, double e, double f, float g, float h, Set<RelativeMovement> set)
{
super.teleport(d, e, f, g, h, set);
if (player.serverLevel().getPlayerByUUID(player.getUUID()) != null) {
resetPosition();
player.serverLevel().getChunkSource().move(player);
}
}
}
oldSrc/io/github/skippyall/minions/fakeplayer/ServerPlayerInterface.java
-8
View File
@@ -1,8 +0,0 @@
package io.github.skippyall.minions.fakeplayer;
import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
public interface ServerPlayerInterface
{
EntityPlayerActionPack getActionPack();
}
oldSrc/io/github/skippyall/minions/fakeplayer/Tracer.java
-90
View File
@@ -1,90 +0,0 @@
package io.github.skippyall.minions.fakeplayer;
import java.util.Optional;
import java.util.function.Predicate;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.ClipContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
public class Tracer
{
public static HitResult rayTrace(Entity source, float partialTicks, double reach, boolean fluids)
{
BlockHitResult blockHit = rayTraceBlocks(source, partialTicks, reach, fluids);
double maxSqDist = reach * reach;
if (blockHit != null)
{
maxSqDist = blockHit.getLocation().distanceToSqr(source.getEyePosition(partialTicks));
}
EntityHitResult entityHit = rayTraceEntities(source, partialTicks, reach, maxSqDist);
return entityHit == null ? blockHit : entityHit;
}
public static BlockHitResult rayTraceBlocks(Entity source, float partialTicks, double reach, boolean fluids)
{
Vec3 pos = source.getEyePosition(partialTicks);
Vec3 rotation = source.getViewVector(partialTicks);
Vec3 reachEnd = pos.add(rotation.x * reach, rotation.y * reach, rotation.z * reach);
return source.level().clip(new ClipContext(pos, reachEnd, ClipContext.Block.OUTLINE, fluids ?
ClipContext.Fluid.ANY : ClipContext.Fluid.NONE, source));
}
public static EntityHitResult rayTraceEntities(Entity source, float partialTicks, double reach, double maxSqDist)
{
Vec3 pos = source.getEyePosition(partialTicks);
Vec3 reachVec = source.getViewVector(partialTicks).scale(reach);
AABB box = source.getBoundingBox().expandTowards(reachVec).inflate(1);
return rayTraceEntities(source, pos, pos.add(reachVec), box, e -> !e.isSpectator() && e.isPickable(), maxSqDist);
}
public static EntityHitResult rayTraceEntities(Entity source, Vec3 start, Vec3 end, AABB box, Predicate<Entity> predicate, double maxSqDistance)
{
Level world = source.level();
double targetDistance = maxSqDistance;
Entity target = null;
Vec3 targetHitPos = null;
for (Entity current : world.getEntities(source, box, predicate))
{
AABB currentBox = current.getBoundingBox().inflate(current.getPickRadius());
Optional<Vec3> currentHit = currentBox.clip(start, end);
if (currentBox.contains(start))
{
if (targetDistance >= 0)
{
target = current;
targetHitPos = currentHit.orElse(start);
targetDistance = 0;
}
}
else if (currentHit.isPresent())
{
Vec3 currentHitPos = currentHit.get();
double currentDistance = start.distanceToSqr(currentHitPos);
if (currentDistance < targetDistance || targetDistance == 0)
{
if (current.getRootVehicle() == source.getRootVehicle())
{
if (targetDistance == 0)
{
target = current;
targetHitPos = currentHitPos;
}
}
else
{
target = current;
targetHitPos = currentHitPos;
targetDistance = currentDistance;
}
}
}
}
return target == null ? null : new EntityHitResult(target, targetHitPos);
}
}
oldSrc/io/github/skippyall/minions/mixins/ConnectionMixin.java
-14
View File
@@ -1,14 +0,0 @@
package io.github.skippyall.minions.mixins;
import io.github.skippyall.minions.fakeplayer.ClientConnectionInterface;
import io.netty.channel.Channel;
import net.minecraft.network.Connection;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(Connection.class)
public abstract class ConnectionMixin implements ClientConnectionInterface {
@Override
@Accessor //Compat with adventure-platform-fabric
public abstract void setChannel(Channel channel);
}
oldSrc/io/github/skippyall/minions/mixins/PlayerListMixin.java
-56
View File
@@ -1,56 +0,0 @@
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.mojang.authlib.GameProfile;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.fakeplayer.NetHandlerPlayServerFake;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.Connection;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ClientInformation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.server.players.PlayerList;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(PlayerList.class)
public class PlayerListMixin {
@Shadow
@Final
private MinecraftServer server;
@Inject(method = "load", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
private void fixStartingPos(ServerPlayer serverPlayerEntity_1, CallbackInfoReturnable<CompoundTag> cir)
{
if (serverPlayerEntity_1 instanceof MinionFakePlayer)
{
((MinionFakePlayer) serverPlayerEntity_1).fixStartingPosition.run();
}
}
@WrapOperation(method = "placeNewPlayer", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/Connection;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/server/network/CommonListenerCookie;)Lnet/minecraft/server/network/ServerGamePacketListenerImpl;"))
private ServerGamePacketListenerImpl replaceNetworkHandler(MinecraftServer minecraftServer, Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, Operation<ServerGamePacketListenerImpl> original)
{
if (serverPlayer instanceof MinionFakePlayer fake) {
return new NetHandlerPlayServerFake(this.server, connection, fake, commonListenerCookie);
} else {
return original.call(minecraftServer, connection, serverPlayer, commonListenerCookie);
}
}
@WrapOperation(method = "respawn", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/level/ServerLevel;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/server/level/ClientInformation;)Lnet/minecraft/server/level/ServerPlayer;"))
public ServerPlayer makePlayerForRespawn(MinecraftServer minecraftServer, ServerLevel serverLevel, GameProfile gameProfile, ClientInformation clientInformation, Operation<ServerPlayer> original, ServerPlayer serverPlayer, boolean bl) {
if (serverPlayer instanceof MinionFakePlayer) {
return MinionFakePlayer.respawnFake(minecraftServer, serverLevel, gameProfile, clientInformation);
}
return original.call(minecraftServer, serverLevel, gameProfile, clientInformation);
}
}
oldSrc/io/github/skippyall/minions/mixins/ServerPlayerMixin.java
-37
View File
@@ -1,37 +0,0 @@
package io.github.skippyall.minions.mixins;
import com.mojang.authlib.GameProfile;
import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.fakeplayer.ServerPlayerInterface;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ClientInformation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ServerPlayer.class)
public abstract class ServerPlayerMixin implements ServerPlayerInterface {
@Unique
public EntityPlayerActionPack actionPack;
@Override
public EntityPlayerActionPack getActionPack()
{
return actionPack;
}
@Inject(method = "<init>", at = @At(value = "RETURN"))
private void onServerPlayerEntityContructor(MinecraftServer minecraftServer, ServerLevel serverLevel, GameProfile gameProfile, ClientInformation clientInformation, CallbackInfo ci)
{
this.actionPack = new EntityPlayerActionPack((ServerPlayer) (Object) this);
}
@Inject(method = "tick", at = @At(value = "HEAD"))
private void onTick(CallbackInfo ci)
{
actionPack.onUpdate();
}
}
oldSrc/io/github/skippyall/minions/networking/ClientToServerNetworking.java
-41
View File
@@ -1,41 +0,0 @@
package io.github.skippyall.minions.networking;
import io.github.skippyall.minions.Minions;
import io.netty.buffer.Unpooled;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientConfigurationPacketListenerImpl;
import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerConfigurationPacketListenerImpl;
import net.minecraft.world.entity.player.Player;
public class ClientToServerNetworking {
public static final ResourceLocation RL = new ResourceLocation(Minions.MOD_ID, "network");
@Environment(EnvType.CLIENT)
public static void sendJoinPacket(Player player) {
FriendlyByteBuf pbf = new FriendlyByteBuf(Unpooled.buffer());
pbf.writeUtf("BN|Init|V0.1");
ClientConfigurationNetworking.send(RL, pbf);
}
@Environment(EnvType.CLIENT)
public static void onConfigurationInit(ClientConfigurationPacketListenerImpl handler, Minecraft client) {
sendJoinPacket(client.player);
}
@Environment(EnvType.SERVER)
public static void receive(MinecraftServer server, ServerConfigurationPacketListenerImpl handler, FriendlyByteBuf buf, PacketSender responseSender) {
String message = buf.readUtf();
if (!message.startsWith("BN|")) {
Minions.LOGGER.debug("Message with wrong format: " + message);
}
String[] parts = message.split("|");
}
}
oldSrc/io/github/skippyall/minions/networking/VersionChecker.java
-22
View File
@@ -1,22 +0,0 @@
package io.github.skippyall.minions.networking;
import net.minecraft.world.entity.player.Player;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
public class VersionChecker {
protected static List<UUID> hasSupportedMod = new ArrayList<>();
public static boolean supportVersion(String version) {
return version.equals("v0.1");
}
public static boolean useSupportedMod(Player p) {
return hasSupportedMod.contains(p.getUUID());
}
public static void resetPlayer(UUID uuid) {
hasSupportedMod.remove(uuid);
}
}
oldSrc/io/github/skippyall/minions/program/block/CodeBlock.java
-12
View File
@@ -1,12 +0,0 @@
package io.github.skippyall.minions.program.block;
import io.github.skippyall.minions.program.variables.Type;
import java.util.List;
public abstract class CodeBlock {
public CodeBlock(String name, List<Type> arguments) {
}
public abstract Object execute(Object... args);
}
oldSrc/io/github/skippyall/minions/program/block/CodeBlocks.java
-5
View File
@@ -1,5 +0,0 @@
package io.github.skippyall.minions.program.block;
public class CodeBlocks {
public static final ForwardBlock FORWARD = new ForwardBlock();
}
oldSrc/io/github/skippyall/minions/program/block/ForwardBlock.java
-19
View File
@@ -1,19 +0,0 @@
package io.github.skippyall.minions.program.block;
import io.github.skippyall.minions.program.variables.IntegerType;
import io.github.skippyall.minions.program.variables.Type;
import io.github.skippyall.minions.program.variables.Types;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ForwardBlock extends CodeBlock{
public ForwardBlock() {
super("forward", Arrays.asList(Types.INTEGER));
}
public Object execute(Object... args) {
return null;
}
}
oldSrc/io/github/skippyall/minions/program/module/Modul.java
-15
View File
@@ -1,15 +0,0 @@
package io.github.skippyall.minions.program.module;
import eu.pb4.polymer.core.api.item.PolymerItem;
import io.github.skippyall.minions.program.block.CodeBlock;
import java.util.List;
public abstract class Modul implements PolymerItem {
private final String name;
Modul(String name) {
this.name = name;
}
public abstract List<CodeBlock> getCodeBlocks();
}
oldSrc/io/github/skippyall/minions/program/module/Modules.java
-5
View File
@@ -1,5 +0,0 @@
package io.github.skippyall.minions.program.module;
public class Modules {
MoveModul MOVE = new MoveModul();
}
oldSrc/io/github/skippyall/minions/program/module/MoveModul.java
-30
View File
@@ -1,30 +0,0 @@
package io.github.skippyall.minions.program.module;
import io.github.skippyall.minions.program.block.CodeBlock;
import io.github.skippyall.minions.program.block.CodeBlocks;
import io.github.skippyall.minions.program.block.ForwardBlock;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
public class MoveModul extends Modul{
MoveModul() {
super("Movement");
}
public List<CodeBlock> getCodeBlocks() {
List<CodeBlock> codeBlocks = new ArrayList<>();
codeBlocks.add(CodeBlocks.FORWARD);
return codeBlocks;
}
@Override
public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayer player) {
return Items.PURPLE_GLAZED_TERRACOTTA;
}
}
oldSrc/io/github/skippyall/minions/program/variables/IntegerType.java
-4
View File
@@ -1,4 +0,0 @@
package io.github.skippyall.minions.program.variables;
public class IntegerType extends Type{
}
oldSrc/io/github/skippyall/minions/program/variables/Type.java
-4
View File
@@ -1,4 +0,0 @@
package io.github.skippyall.minions.program.variables;
public abstract class Type {
}
oldSrc/io/github/skippyall/minions/program/variables/Types.java
-5
View File
@@ -1,5 +0,0 @@
package io.github.skippyall.minions.program.variables;
public class Types {
public static final IntegerType INTEGER = new IntegerType();
}
oldSrc/io/github/skippyall/minions/server/MinionsServer.java
-22
View File
@@ -1,22 +0,0 @@
package io.github.skippyall.minions.server;
import io.github.skippyall.minions.networking.ClientToServerNetworking;
import io.github.skippyall.minions.networking.VersionChecker;
import net.fabricmc.api.DedicatedServerModInitializer;
import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents;
import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerConfigurationPacketListenerImpl;
public class MinionsServer implements DedicatedServerModInitializer {
@Override
public void onInitializeServer() {
ServerConfigurationNetworking.registerGlobalReceiver(ClientToServerNetworking.RL, ClientToServerNetworking::receive);
ServerConfigurationConnectionEvents.CONFIGURE.register(new ServerConfigurationConnectionEvents.Configure() {
@Override
public void onSendConfiguration(ServerConfigurationPacketListenerImpl handler, MinecraftServer server) {
VersionChecker.resetPlayer(handler.getOwner().getId());
}
});
}
}
src/main/java/io/github/skippyall/minions/Minions.java
+6 -1
View File
@@ -3,19 +3,24 @@ package io.github.skippyall.minions;
import eu.pb4.polymer.core.api.entity.PolymerEntityUtils; import eu.pb4.polymer.core.api.entity.PolymerEntityUtils;
import io.github.skippyall.minions.minion.MinionItem; import io.github.skippyall.minions.minion.MinionItem;
import net.fabricmc.api.ModInitializer; import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry; import net.minecraft.registry.Registry;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class Minions implements ModInitializer { public class Minions implements ModInitializer {
public static final String MOD_ID = "minions"; public static final String MOD_ID = "minions";
public static final MinionItem MINION_ITEM = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "minion"), new MinionItem()); public static final MinionItem MINION_ITEM = Registry.register(Registries.ITEM, Identifier.of(MOD_ID, "minion"), new MinionItem(false));
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
@Override @Override
public void onInitialize() { public void onInitialize() {
PolymerEntityUtils.registerType(); PolymerEntityUtils.registerType();
ServerLifecycleEvents.SERVER_STARTED.register(server -> {
});
} }
} }
src/main/java/io/github/skippyall/minions/client/MinionsClient.java
+1 -1
View File
@@ -11,6 +11,6 @@ public class MinionsClient implements ClientModInitializer {
*/ */
@Override @Override
public void onInitializeClient() { public void onInitializeClient() {
ClientConfigurationConnectionEvents.INIT.register(ClientToServerNetworking::onConfigurationInit); //ClientConfigurationConnectionEvents.INIT.register(ClientToServerNetworking::onConfigurationInit);
} }
} }
src/main/java/io/github/skippyall/minions/fakeplayer/FakeClientConnection.java
+2 -3
View File
@@ -3,6 +3,7 @@ package io.github.skippyall.minions.fakeplayer;
import io.netty.channel.embedded.EmbeddedChannel; import io.netty.channel.embedded.EmbeddedChannel;
import net.minecraft.network.ClientConnection; import net.minecraft.network.ClientConnection;
import net.minecraft.network.NetworkSide; import net.minecraft.network.NetworkSide;
import net.minecraft.network.NetworkState;
import net.minecraft.network.listener.PacketListener; import net.minecraft.network.listener.PacketListener;
import net.minecraft.text.Text; import net.minecraft.text.Text;
@@ -22,7 +23,6 @@ public class FakeClientConnection extends ClientConnection {
@Override @Override
public void handleDisconnection() { public void handleDisconnection() {
getPacketListener().onDisconnected(getDisconnectReason()==null ? Text.literal("Disconnected"): getDisconnectReason());
} }
@Override @Override
@@ -31,7 +31,6 @@ public class FakeClientConnection extends ClientConnection {
} }
@Override @Override
public void setPacketListener(PacketListener packetListener) { public <T extends PacketListener> void transitionInbound(NetworkState<T> state, T packetListener) {
} }
} }
src/main/java/io/github/skippyall/minions/fakeplayer/MinionFakePlayer.java
+50 -17
View File
@@ -2,23 +2,29 @@ package io.github.skippyall.minions.fakeplayer;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.mojang.authlib.yggdrasil.ProfileResult; import com.mojang.authlib.yggdrasil.ProfileResult;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.minion.MinionInventory; import io.github.skippyall.minions.minion.MinionInventory;
import io.github.skippyall.minions.minion.ModuleInventory; import io.github.skippyall.minions.minion.ModuleInventory;
import net.fabricmc.fabric.api.entity.FakePlayer; import io.github.skippyall.minions.program.runtime.MinionRuntime;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.MovementType; import net.minecraft.entity.MovementType;
import net.minecraft.entity.attribute.EntityAttributes;
import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.damage.DamageSource;
import net.minecraft.entity.player.HungerManager; import net.minecraft.entity.player.HungerManager;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.network.DisconnectionInfo;
import net.minecraft.network.NetworkSide; import net.minecraft.network.NetworkSide;
import net.minecraft.network.packet.StatusPackets;
import net.minecraft.network.packet.c2s.common.SyncedClientOptions; import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
import net.minecraft.network.packet.c2s.play.ClientStatusC2SPacket; import net.minecraft.network.packet.c2s.play.ClientStatusC2SPacket;
import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket; import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
import net.minecraft.network.packet.s2c.play.EntitySetHeadYawS2CPacket; import net.minecraft.network.packet.s2c.play.EntitySetHeadYawS2CPacket;
import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket; import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
import net.minecraft.network.packet.s2c.query.PingResultS2CPacket;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerTask; import net.minecraft.server.ServerTask;
import net.minecraft.server.network.ConnectedClientData; import net.minecraft.server.network.ConnectedClientData;
@@ -32,6 +38,8 @@ import net.minecraft.util.Uuids;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.world.GameMode; import net.minecraft.world.GameMode;
import net.minecraft.world.TeleportTarget;
import java.util.UUID; import java.util.UUID;
public class MinionFakePlayer extends ServerPlayerEntity { public class MinionFakePlayer extends ServerPlayerEntity {
@@ -42,7 +50,8 @@ public class MinionFakePlayer extends ServerPlayerEntity {
private float moveSideways; private float moveSideways;
private boolean programmable; private boolean programmable;
private ModuleInventory moduleInventory = new ModuleInventory(); private final ModuleInventory moduleInventory = new ModuleInventory();
private final MinionRuntime runtime = new MinionRuntime(this);
public static void createMinion(String username, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, double yaw, double pitch) { public static void createMinion(String username, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, double yaw, double pitch) {
MinecraftServer server = level.getServer(); MinecraftServer server = level.getServer();
@@ -60,20 +69,18 @@ public class MinionFakePlayer extends ServerPlayerEntity {
} }
MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault(), false, canProgram); MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault(), false, canProgram);
instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(pos.x, pos.y, pos.z, (float) yaw, (float) pitch); instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(pos.x, pos.y, pos.z, (float) yaw, (float) pitch);
server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(profile, 0, instance.getClientOptions())); server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(profile, 0, instance.getClientOptions(), false));
instance.teleport(level, pos.x, pos.y, pos.z, (float) yaw, (float) pitch); instance.teleport(level, pos.x, pos.y, pos.z, (float) yaw, (float) pitch);
instance.setHealth(20.0F); instance.setHealth(20.0F);
instance.unsetRemoved(); instance.unsetRemoved();
instance.getAttributeInstance(EntityAttributes.GENERIC_STEP_HEIGHT).setBaseValue(0.6F);
instance.interactionManager.changeGameMode(GameMode.SURVIVAL); instance.interactionManager.changeGameMode(GameMode.SURVIVAL);
server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey());//instance.dimension); server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey());//instance.dimension);
server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), level.getRegistryKey());//instance.dimension); server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), level.getRegistryKey());//instance.dimension);
//instance.world.getChunkManager(). updatePosition(instance); //instance.world.getChunkManager(). updatePosition(instance);
instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes) instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes)
instance.getAbilities().flying = false; instance.getAbilities().flying = false;
instance.setStepHeight(0.6F);
}); });
} }
@SuppressWarnings("unused") //Don't know if I'll need this @SuppressWarnings("unused") //Don't know if I'll need this
@@ -85,7 +92,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
GameProfile gameprofile = player.getGameProfile(); GameProfile gameprofile = player.getGameProfile();
MinionFakePlayer playerShadow = new MinionFakePlayer(server, worldIn, gameprofile, player.getClientOptions(), true, false); MinionFakePlayer playerShadow = new MinionFakePlayer(server, worldIn, gameprofile, player.getClientOptions(), true, false);
playerShadow.setSession(player.getSession()); playerShadow.setSession(player.getSession());
server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), playerShadow, new ConnectedClientData(gameprofile, 0, player.getClientOptions())); server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), playerShadow, new ConnectedClientData(gameprofile, 0, player.getClientOptions(), false));
playerShadow.setHealth(player.getHealth()); playerShadow.setHealth(player.getHealth());
playerShadow.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.getYaw(), player.getPitch()); playerShadow.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.getYaw(), player.getPitch());
@@ -121,7 +128,11 @@ public class MinionFakePlayer extends ServerPlayerEntity {
return moduleInventory; return moduleInventory;
} }
public EntityPlayerActionPack getActionPack() { public MinionRuntime getRuntime() {
return runtime;
}
public EntityPlayerActionPack getMinionActionPack() {
return ((ServerPlayerInterface)this).getActionPack(); return ((ServerPlayerInterface)this).getActionPack();
} }
@@ -155,10 +166,10 @@ public class MinionFakePlayer extends ServerPlayerEntity {
shakeOff(); shakeOff();
if (reason.getContent() instanceof TranslatableTextContent text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) { if (reason.getContent() instanceof TranslatableTextContent text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) {
this.networkHandler.onDisconnected(reason); this.networkHandler.onDisconnected(new DisconnectionInfo(reason));
} else { } else {
this.server.send(new ServerTask(this.server.getTicks(), () -> { this.server.send(new ServerTask(this.server.getTicks(), () -> {
this.networkHandler.onDisconnected(reason); this.networkHandler.onDisconnected(new DisconnectionInfo(reason));
})); }));
} }
} }
@@ -181,7 +192,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
// happens with that paper port thingy - not sure what that would fix, but hey // happens with that paper port thingy - not sure what that would fix, but hey
// the game not gonna crash violently. // the game not gonna crash violently.
} }
runtime.tick();
} }
@@ -221,9 +232,9 @@ public class MinionFakePlayer extends ServerPlayerEntity {
} }
@Override @Override
public Entity moveToWorld(ServerWorld serverLevel) public Entity teleportTo(TeleportTarget target)
{ {
super.moveToWorld(serverLevel); super.teleportTo(target);
if (notInAnyWorld) { if (notInAnyWorld) {
ClientStatusC2SPacket p = new ClientStatusC2SPacket(ClientStatusC2SPacket.Mode.PERFORM_RESPAWN); ClientStatusC2SPacket p = new ClientStatusC2SPacket(ClientStatusC2SPacket.Mode.PERFORM_RESPAWN);
networkHandler.onClientStatus(p); networkHandler.onClientStatus(p);
@@ -239,7 +250,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
public void moveForward(float forward) { public void moveForward(float forward) {
this.moveForward += forward; this.moveForward += forward;
EntityPlayerActionPack actionPack = getActionPack(); EntityPlayerActionPack actionPack = getMinionActionPack();
if (moveForward != 0) { if (moveForward != 0) {
actionPack.setForward(moveForward > 0 ? 1 : -1); actionPack.setForward(moveForward > 0 ? 1 : -1);
} }
@@ -247,7 +258,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
public void moveSideways(float sideways) { public void moveSideways(float sideways) {
this.moveSideways += sideways; this.moveSideways += sideways;
EntityPlayerActionPack actionPack = getActionPack(); EntityPlayerActionPack actionPack = getMinionActionPack();
if (moveSideways != 0) { if (moveSideways != 0) {
actionPack.setStrafing(moveSideways > 0 ? 1 : -1); actionPack.setStrafing(moveSideways > 0 ? 1 : -1);
} }
@@ -261,17 +272,39 @@ public class MinionFakePlayer extends ServerPlayerEntity {
if ((newForward < 0 && moveForward >= 0) || (newForward > 0 && moveForward <= 0)) { if ((newForward < 0 && moveForward >= 0) || (newForward > 0 && moveForward <= 0)) {
newMovement = new Vec3d(newMovement.x, newMovement.y, moveForward); newMovement = new Vec3d(newMovement.x, newMovement.y, moveForward);
moveForward = 0; moveForward = 0;
getActionPack().setForward(0); getMinionActionPack().setForward(0);
}else { }else {
moveForward = newForward; moveForward = newForward;
} }
if ((newSideways < 0 && moveSideways >= 0) || (newSideways > 0 && moveSideways <= 0)) { if ((newSideways < 0 && moveSideways >= 0) || (newSideways > 0 && moveSideways <= 0)) {
newMovement = new Vec3d(newMovement.x, newMovement.y, moveSideways); newMovement = new Vec3d(newMovement.x, newMovement.y, moveSideways);
moveSideways = 0; moveSideways = 0;
getActionPack().setStrafing(0); getMinionActionPack().setStrafing(0);
}else { }else {
moveSideways = newSideways; moveSideways = newSideways;
} }
super.move(movementType, newMovement); super.move(movementType, newMovement);
} }
@Override
protected void drop(ServerWorld world, DamageSource damageSource) {
super.drop(world, damageSource);
dropItem(new ItemStack(Minions.MINION_ITEM), true, false);
for(ItemStack item : moduleInventory.getItems()) {
dropItem(item, true, false);
}
moduleInventory.clear();
}
@Override
public void writeCustomDataToNbt(NbtCompound nbt) {
super.writeCustomDataToNbt(nbt);
nbt.put("modules", moduleInventory.writeNbt(new NbtCompound(), getRegistryManager()));
}
@Override
public void readCustomDataFromNbt(NbtCompound nbt) {
super.readCustomDataFromNbt(nbt);
moduleInventory.readNbt(nbt.getCompound("modules"), getRegistryManager());
}
} }
src/main/java/io/github/skippyall/minions/minion/CommandsInventory.java
+25
View File
@@ -0,0 +1,25 @@
package io.github.skippyall.minions.minion;
import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.gui.SimpleGui;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import net.minecraft.item.Items;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
public class CommandsInventory {
public static void openServerCommandsInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, player, false);
gui.setSlot(0, new GuiElementBuilder()
.setItem(Items.MINECART)
.setName(Text.literal("Get into minecart"))
.setCallback(() -> {
minion.getMinionActionPack().mount(true);
})
);
gui.open();
}
}
src/main/java/io/github/skippyall/minions/minion/MinionInventory.java
+17 -3
View File
@@ -19,30 +19,44 @@ public class MinionInventory {
public static void openServerSideInventory(ServerPlayerEntity player, MinionFakePlayer minion) { public static void openServerSideInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false); SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false);
gui.setTitle(Text.literal("Minion")); gui.setTitle(Text.literal("Minion"));
gui.setSlot(1, new GuiElementBuilder()
.setItem(Items.COMMAND_BLOCK)
.setName(Text.literal("Commands"))
.setCallback((i, clickType, slotActionType) -> {
openCommandsGui(player, minion);
})
);
if(minion.isProgrammable()) {
gui.setSlot(4, new GuiElementBuilder() gui.setSlot(4, new GuiElementBuilder()
.setItem(Items.REDSTONE) .setItem(Items.REDSTONE)
.setName(Text.literal("Programming")) .setName(Text.literal("Programming"))
.setCallback((i, clickType, clickType1) -> { .setCallback((i, clickType, slotActionType) -> {
openProgrammingInventory(player, minion); openProgrammingInventory(player, minion);
}) })
); );
}
gui.setSlot(3, new GuiElementBuilder() gui.setSlot(3, new GuiElementBuilder()
.setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE) .setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
.setName(Text.literal("Modules and Detectors")) .setName(Text.literal("Modules and Detectors"))
.setCallback((i, clickType, clickType1) -> { .setCallback((i, clickType, slotActionType) -> {
openModuleInventory(player, minion); openModuleInventory(player, minion);
}) })
); );
gui.setSlot(5, new GuiElementBuilder() gui.setSlot(5, new GuiElementBuilder()
.setItem(Items.CHEST) .setItem(Items.CHEST)
.setName(Text.literal("Inventory")) .setName(Text.literal("Inventory"))
.setCallback((i, clickType, clickType1) -> { .setCallback((i, clickType, slotActionType) -> {
openMinionInventory(player, minion); openMinionInventory(player, minion);
}) })
); );
gui.open(); gui.open();
} }
public static void openCommandsGui(ServerPlayerEntity player, MinionFakePlayer minion) {
CommandsInventory.openServerCommandsInventory(player, minion);
}
public static void openProgrammingInventory(ServerPlayerEntity player, MinionFakePlayer minion) { public static void openProgrammingInventory(ServerPlayerEntity player, MinionFakePlayer minion) {
} }
src/main/java/io/github/skippyall/minions/minion/MinionItem.java
+9 -11
View File
@@ -3,22 +3,20 @@ package io.github.skippyall.minions.minion;
import eu.pb4.polymer.core.api.item.PolymerItem; import eu.pb4.polymer.core.api.item.PolymerItem;
import eu.pb4.polymer.core.api.item.PolymerItemUtils; import eu.pb4.polymer.core.api.item.PolymerItemUtils;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.component.DataComponentTypes;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.enchantment.Enchantments;
import net.minecraft.item.*; import net.minecraft.item.*;
import net.minecraft.nbt.NbtCompound; import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.PlainTextContent;
import net.minecraft.text.TextContent;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public class MinionItem extends Item implements PolymerItem { public class MinionItem extends Item implements PolymerItem {
private boolean canProgram; private final boolean canProgram;
public MinionItem(boolean canProgram) { public MinionItem(boolean canProgram) {
super(new FabricItemSettings()); super(new Item.Settings());
this.canProgram = canProgram;
} }
@Override @Override
@@ -27,9 +25,9 @@ public class MinionItem extends Item implements PolymerItem {
} }
@Override @Override
public ItemStack getPolymerItemStack(ItemStack stack, TooltipContext flag, ServerPlayerEntity player) { public ItemStack getPolymerItemStack(ItemStack stack, TooltipType tooltipType, RegistryWrapper.WrapperLookup lookup, ServerPlayerEntity player) {
ItemStack out = PolymerItemUtils.createItemStack(stack, flag, player); ItemStack out = PolymerItemUtils.createItemStack(stack, lookup, player);
out.addEnchantment(Enchantments.MENDING, 1); out.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true);
return out; return out;
} }
src/main/java/io/github/skippyall/minions/minion/MinionPersistentState.java
+90
View File
@@ -0,0 +1,90 @@
package io.github.skippyall.minions.minion;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import net.minecraft.nbt.*;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.PersistentState;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
public class MinionPersistentState extends PersistentState {
public static Type<MinionPersistentState> TYPE = new Type<>(MinionPersistentState::new, MinionPersistentState::read, null);
public static MinionPersistentState INSTANCE;
public static List<MinionData> minionData = new ArrayList<>();
@Override
public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
NbtList list = new NbtList();
for(MinionData data : minionData) {
list.add(data.writeNbt());
}
nbt.put("minions", list);
return nbt;
}
public static MinionPersistentState read(NbtCompound compound, RegistryWrapper.WrapperLookup lookup) {
NbtList list = compound.getList("minions", NbtElement.COMPOUND_TYPE);
for(NbtElement element : list) {
minionData.add(MinionData.readNbt((NbtCompound) element));
}
return new MinionPersistentState();
}
public static void create(MinecraftServer server) {
INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE, "minion");
}
public static class MinionData {
public UUID uuid;
public MinionData(UUID uuid) {
this.uuid = uuid;
}
public NbtCompound writeNbt() {
NbtCompound nbt = new NbtCompound();
/*NbtList posList = new NbtList();
posList.add(NbtDouble.of(pos.getX()));
posList.add(NbtDouble.of(pos.getY()));
posList.add(NbtDouble.of(pos.getZ()));
nbt.put("pos", posList);
NbtList rotList = new NbtList();
rotList.add(NbtFloat.of(rot.x));
rotList.add(NbtFloat.of(rot.y));
nbt.put("rotation", rotList);*/
nbt.putUuid("uuid", uuid);
return nbt;
}
public static MinionData readNbt(NbtCompound nbt) {
/*NbtList posList = nbt.getList("pos", NbtElement.DOUBLE_TYPE);
double x = posList.getDouble(0);
double y = posList.getDouble(1);
double z = posList.getDouble(2);
Vec3d pos = new Vec3d(x, y, z);
NbtList rotList = nbt.getList("rotation", NbtElement.FLOAT_TYPE);
float yaw = rotList.getFloat(0);
float pitch = rotList.getFloat(1);
Vec2f rot = new Vec2f(yaw, pitch);*/
UUID uuid = nbt.getUuid("uuid");
return new MinionData(uuid);
}
public static MinionData fromMinion(MinionFakePlayer minion) {
return new MinionData(minion.getUuid());
}
}
}
src/main/java/io/github/skippyall/minions/minion/ModuleInventory.java
+6 -5
View File
@@ -6,12 +6,13 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.tag.TagKey;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.collection.DefaultedList;
public class ModuleInventory implements ImplementedInventory { public class ModuleInventory implements ImplementedInventory {
private static final TagKey<Item> MODULES = TagKey.of(RegistryKeys.ITEM, new Identifier(Minions.MOD_ID,"modules")); private static final TagKey<Item> MODULES = TagKey.of(RegistryKeys.ITEM, Identifier.of(Minions.MOD_ID,"modules"));
private DefaultedList<ItemStack> stacks = DefaultedList.ofSize(27, ItemStack.EMPTY); private DefaultedList<ItemStack> stacks = DefaultedList.ofSize(27, ItemStack.EMPTY);
public ModuleInventory() { public ModuleInventory() {
@@ -32,11 +33,11 @@ public class ModuleInventory implements ImplementedInventory {
return stacks; return stacks;
} }
public void readNbt(NbtCompound nbt) { public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
Inventories.readNbt(nbt, stacks); Inventories.readNbt(nbt, stacks, lookup);
} }
public void writeNbt(NbtCompound nbt) { public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup lookup) {
Inventories.writeNbt(nbt, stacks); return Inventories.writeNbt(nbt, stacks, lookup);
} }
} }
src/main/java/io/github/skippyall/minions/mixins/MinecraftServerMixin.java
+22
View File
@@ -0,0 +1,22 @@
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Mixin(MinecraftServer.class)
public class MinecraftServerMixin {
@ModifyExpressionValue(method = "createMetadataPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;getPlayerList()Ljava/util/List;"))
public List<ServerPlayerEntity> ignoreFakePlayers(List<ServerPlayerEntity> original) {
return original.stream()
.filter(player -> !(player instanceof MinionFakePlayer))
.collect(Collectors.toCollection(ArrayList::new));
}
}
src/main/java/io/github/skippyall/minions/mixins/PlayerListEntryS2CPacket$EntryMixin.java
+21
View File
@@ -0,0 +1,21 @@
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.sugar.Local;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
@Mixin(PlayerListS2CPacket.Entry.class)
public class PlayerListEntryS2CPacket$EntryMixin {
@ModifyArg(method = "<init>(Lnet/minecraft/server/network/ServerPlayerEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/PlayerListS2CPacket$Entry;<init>(Ljava/util/UUID;Lcom/mojang/authlib/GameProfile;ZILnet/minecraft/world/GameMode;Lnet/minecraft/text/Text;Lnet/minecraft/network/encryption/PublicPlayerSession$Serialized;)V"))
private static boolean removeMinionFromTabList(boolean original, @Local(argsOnly = true) ServerPlayerEntity player) {
if(player instanceof MinionFakePlayer) {
return false;
}
return original;
}
}
src/main/java/io/github/skippyall/minions/networking/ClientToServerNetworking.java
+2 -2
View File
@@ -15,7 +15,7 @@ import net.minecraft.server.network.ServerConfigurationNetworkHandler;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
public class ClientToServerNetworking { public class ClientToServerNetworking {
public static final Identifier RL = new Identifier(Minions.MOD_ID, "network"); /*public static final Identifier RL = Identifier.of(Minions.MOD_ID, "network");
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public static void sendJoinPacket(PlayerEntity player) { public static void sendJoinPacket(PlayerEntity player) {
PacketByteBuf pbf = new PacketByteBuf(Unpooled.buffer()); PacketByteBuf pbf = new PacketByteBuf(Unpooled.buffer());
@@ -36,5 +36,5 @@ public class ClientToServerNetworking {
} }
String[] parts = message.split("|"); String[] parts = message.split("|");
} }*/
} }
src/main/java/io/github/skippyall/minions/program/MinionRuntime.java
-26
View File
@@ -1,26 +0,0 @@
package io.github.skippyall.minions.program;
import io.github.skippyall.minions.program.statement.StatementList;
import io.github.skippyall.minions.program.variables.Variable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class MinionRuntime implements Runnable{
private boolean run = true;
public final Map<String, Variable> variables = new HashMap<>();
private final List<StatementList.Run> runs = new ArrayList<>();
@Override
public void run() {
while(run) {
}
}
public void stop() {
run = false;
}
}
src/main/java/io/github/skippyall/minions/program/argument/Arg.java
+9
View File
@@ -0,0 +1,9 @@
package io.github.skippyall.minions.program.argument;
import io.github.skippyall.minions.program.runtime.ProgramRuntime;
import io.github.skippyall.minions.program.variables.Type;
public interface Arg<T> {
T resolve(ProgramRuntime runtime);
Type<T> getType();
}
src/main/java/io/github/skippyall/minions/program/argument/ArgUtils.java
+16
View File
@@ -0,0 +1,16 @@
package io.github.skippyall.minions.program.argument;
import io.github.skippyall.minions.program.runtime.ProgramRuntime;
import io.github.skippyall.minions.program.tuple.Tuple;
import io.github.skippyall.minions.program.tuple.Tuple0;
public class ArgUtils {
public static Tuple resolveArgs(Tuple args, ProgramRuntime runtime) {
Tuple tuple = new Tuple0();
for(Object object : args) {
Arg<?> arg =(Arg<?>) object;
tuple = tuple.add(arg.getType().cast(arg.resolve(runtime)));
}
return tuple;
}
}
src/main/java/io/github/skippyall/minions/program/block/CodeBlock.java
+19 -8
View File
@@ -1,23 +1,34 @@
package io.github.skippyall.minions.program.block; package io.github.skippyall.minions.program.block;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.program.argument.Arg;
import io.github.skippyall.minions.program.statement.Arg; import io.github.skippyall.minions.program.runtime.ProgramRuntime;
import io.github.skippyall.minions.program.statement.Statement;
import io.github.skippyall.minions.program.tuple.Tuple;
import io.github.skippyall.minions.program.variables.Type; import io.github.skippyall.minions.program.variables.Type;
import java.util.List; import java.util.List;
import java.util.concurrent.ForkJoinPool;
public abstract class CodeBlock { public abstract class CodeBlock<R, A extends Tuple> {
private String name; private String name;
private final List<Type> arguments; private final List<Type<?>> arguments;
private final Type returnType; private final Type<?> returnType;
public CodeBlock(String name, List<Type> arguments, Type returnType) {
public CodeBlock(String name, List<Type<?>> arguments, Type<?> returnType) {
this.arguments = arguments; this.arguments = arguments;
this.returnType = returnType; this.returnType = returnType;
} }
public abstract Object execute(MinionFakePlayer minion, Object... args); protected abstract R execute(ProgramRuntime runtime, A args, Statement<R,A>.Run run);
public boolean fits(Arg arg, int slot) { public boolean fits(Arg<?> arg, int slot) {
return arguments.get(slot) == arg.getType(); return arguments.get(slot) == arg.getType();
} }
public void start(ProgramRuntime runtime, A args, Statement<R,A>.Run run) {
ForkJoinPool.commonPool().execute(() -> {
R result = execute(runtime, args, run);
run.afterRun(result);
});
}
} }
src/main/java/io/github/skippyall/minions/program/block/GoBlock.java
+11 -8
View File
@@ -3,23 +3,26 @@ package io.github.skippyall.minions.program.block;
import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack; import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.fakeplayer.ServerPlayerInterface; import io.github.skippyall.minions.fakeplayer.ServerPlayerInterface;
import io.github.skippyall.minions.program.variables.IntegerType; import io.github.skippyall.minions.program.runtime.MinionRuntime;
import io.github.skippyall.minions.program.variables.Type; import io.github.skippyall.minions.program.runtime.ProgramRuntime;
import io.github.skippyall.minions.program.statement.Statement;
import io.github.skippyall.minions.program.tuple.Tuple2;
import io.github.skippyall.minions.program.variables.Types; import io.github.skippyall.minions.program.variables.Types;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class GoBlock extends CodeBlock{ public class GoBlock extends CodeBlock<Void, Tuple2<Float, Float>> {
public GoBlock() { public GoBlock() {
super("move", List.of(Types.FLOAT, Types.FLOAT), Types.VOID); super("move", List.of(Types.FLOAT, Types.FLOAT), Types.VOID);
} }
public Object execute(MinionFakePlayer minion, Object... args) { public Void execute(ProgramRuntime runtime, Tuple2<Float, Float> args, Statement<Void, Tuple2<Float, Float>>.Run run) {
if(runtime instanceof MinionRuntime minionRuntime) {
MinionFakePlayer minion = minionRuntime.getMinion();
EntityPlayerActionPack action = ((ServerPlayerInterface) minion).getActionPack(); EntityPlayerActionPack action = ((ServerPlayerInterface) minion).getActionPack();
minion.moveForward((Float) args[0]); minion.moveForward(args.v0());
minion.moveSideways((Float) args[1]); minion.moveSideways(args.v1());
}
return null; return null;
} }
} }
src/main/java/io/github/skippyall/minions/program/block/UseBlock.java
+11 -6
View File
@@ -2,20 +2,25 @@ package io.github.skippyall.minions.program.block;
import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack; import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.fakeplayer.ServerPlayerInterface; import io.github.skippyall.minions.program.runtime.MinionRuntime;
import io.github.skippyall.minions.program.variables.Type; import io.github.skippyall.minions.program.runtime.ProgramRuntime;
import io.github.skippyall.minions.program.statement.Statement;
import io.github.skippyall.minions.program.tuple.Tuple0;
import io.github.skippyall.minions.program.variables.Types; import io.github.skippyall.minions.program.variables.Types;
import java.util.List; import java.util.List;
public class UseBlock extends CodeBlock{ public class UseBlock extends CodeBlock<Void, Tuple0>{
public UseBlock(String name, List<Type> arguments, Type returnType) { public UseBlock(String name) {
super("use", List.of(), Types.VOID); super("use", List.of(), Types.VOID);
} }
@Override @Override
public Object execute(MinionFakePlayer minion, Object... args) { public Void execute(ProgramRuntime runtime, Tuple0 args, Statement<Void,Tuple0>.Run run) {
minion.getActionPack().start(EntityPlayerActionPack.ActionType.USE, EntityPlayerActionPack.Action.once()); if(runtime instanceof MinionRuntime minionRuntime) {
MinionFakePlayer minion = minionRuntime.getMinion();
minion.getMinionActionPack().start(EntityPlayerActionPack.ActionType.USE, EntityPlayerActionPack.Action.once());
}
return null; return null;
} }
} }
src/main/java/io/github/skippyall/minions/program/module/Module.java
+2 -3
View File
@@ -2,7 +2,6 @@ package io.github.skippyall.minions.program.module;
import eu.pb4.polymer.core.api.item.PolymerItem; import eu.pb4.polymer.core.api.item.PolymerItem;
import io.github.skippyall.minions.program.block.CodeBlock; import io.github.skippyall.minions.program.block.CodeBlock;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import java.util.List; import java.util.List;
@@ -10,7 +9,7 @@ import java.util.List;
public abstract class Module extends Item implements PolymerItem { public abstract class Module extends Item implements PolymerItem {
private final String name; private final String name;
public Module(String name) { public Module(String name) {
super(new FabricItemSettings().maxCount(1)); super(new Item.Settings().maxCount(1));
this.name = name; this.name = name;
} }
@@ -18,5 +17,5 @@ public abstract class Module extends Item implements PolymerItem {
return name; return name;
} }
public abstract List<CodeBlock> getCodeBlocks(); public abstract List<CodeBlock<?,?>> getCodeBlocks();
} }
src/main/java/io/github/skippyall/minions/program/module/MoveModule.java
+2 -2
View File
@@ -16,8 +16,8 @@ public class MoveModule extends Module {
super("Movement"); super("Movement");
} }
public List<CodeBlock> getCodeBlocks() { public List<CodeBlock<?,?>> getCodeBlocks() {
List<CodeBlock> codeBlocks = new ArrayList<>(); List<CodeBlock<?,?>> codeBlocks = new ArrayList<>();
codeBlocks.add(CodeBlocks.GO); codeBlocks.add(CodeBlocks.GO);
return codeBlocks; return codeBlocks;
} }
src/main/java/io/github/skippyall/minions/program/runtime/MinionRuntime.java
+19
View File
@@ -0,0 +1,19 @@
package io.github.skippyall.minions.program.runtime;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import net.fabricmc.fabric.api.entity.event.v1.ServerEntityCombatEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
import net.fabricmc.fabric.api.message.v1.ServerMessageEvents;
public class MinionRuntime extends ProgramRuntime {
private final MinionFakePlayer minion;
public MinionRuntime(MinionFakePlayer minion) {
this.minion = minion;
}
public MinionFakePlayer getMinion() {
return minion;
}
}
src/main/java/io/github/skippyall/minions/program/runtime/ProgramRuntime.java
+42
View File
@@ -0,0 +1,42 @@
package io.github.skippyall.minions.program.runtime;
import io.github.skippyall.minions.program.statement.StatementList;
import java.util.HashMap;
import java.util.Map;
public abstract class ProgramRuntime {
private final Map<String, Object> variables = new HashMap<>();
private StatementList statements;
private StatementList.Run run;
public ProgramRuntime() {
this(new StatementList());
}
public ProgramRuntime(StatementList statements) {
this.statements = statements;
}
public void start() {
run = statements.start(this);
}
public void tick() {
if(run != null) {
run.tick();
}
}
public StatementList getStatementList() {
return statements;
}
public Object getVariable(String name) {
return variables.get(name);
}
public void setVariable(String name, Object value) {
variables.put(name, value);
}
}
src/main/java/io/github/skippyall/minions/program/statement/Arg.java
-8
View File
@@ -1,8 +0,0 @@
package io.github.skippyall.minions.program.statement;
import io.github.skippyall.minions.program.variables.Type;
public interface Arg {
Object getValue();
Type getType();
}
src/main/java/io/github/skippyall/minions/program/statement/Statement.java
+64 -6
View File
@@ -1,15 +1,73 @@
package io.github.skippyall.minions.program.statement; package io.github.skippyall.minions.program.statement;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.program.argument.ArgUtils;
import io.github.skippyall.minions.program.block.CodeBlock; import io.github.skippyall.minions.program.block.CodeBlock;
import io.github.skippyall.minions.program.runtime.ProgramRuntime;
import io.github.skippyall.minions.program.tuple.Tuple;
import io.github.skippyall.minions.program.variables.ValueStorage;
import java.util.List; public record Statement<R,A extends Tuple>(CodeBlock<R,A> codeBlock, A args, ValueStorage<R> valueStorage) {
@SuppressWarnings("unchecked")
public Run start(ProgramRuntime runtime) {
Run run = new Run(runtime);
codeBlock.start(runtime, (A) ArgUtils.resolveArgs(args, runtime), run);
return run;
}
public class Statement { public class Run {
private CodeBlock codeBlock; private boolean running = false;
private List<Arg> args; private boolean waiting = false;
private boolean afterRun = false;
private R cachedResult;
private int ticksRunning = 0;
private int ticksLeft = 0;
public void execute(MinionFakePlayer minion) { private final ProgramRuntime runtime;
Run(ProgramRuntime runtime) {
this.runtime = runtime;
}
public boolean isDone() {
return !running;
}
public void tick() {
if(running) {
ticksRunning ++;
ticksLeft --;
if(ticksLeft == 0 && waiting && afterRun) {
complete(cachedResult);
}
}
}
public void afterRun(R result) {
afterRun = true;
if(ticksLeft == 0) {
complete(result);
}
}
private void complete(R result) {
if(valueStorage != null) {
valueStorage.storeValue(result, runtime);
}
running = false;
waiting = false;
cachedResult = null;
ticksRunning = 0;
ticksLeft = 0;
}
public void completeAfter(int ticks, R value) {
waiting = true;
ticksLeft = ticks;
cachedResult = value;
}
public int getTicksRunning() {
return ticksRunning;
}
} }
} }
src/main/java/io/github/skippyall/minions/program/statement/StatementList.java
+34 -21
View File
@@ -1,37 +1,50 @@
package io.github.skippyall.minions.program.statement; package io.github.skippyall.minions.program.statement;
import java.util.ArrayList; import io.github.skippyall.minions.program.runtime.ProgramRuntime;
import java.util.Iterator;
import java.util.List; import java.util.List;
public class StatementList { public class StatementList {
private final List<Statement> statements; private final List<Statement<?,?>> statements;
private boolean finish;
StatementList() { public StatementList() {
this(new ArrayList<>()); this.statements = List.of();
} }
StatementList(List<Statement> statements) { public StatementList(List<Statement<?,?>> statements) {
this.statements = statements; this.statements = List.copyOf(statements);
} }
public void runNext(Run run) { public Run start(ProgramRuntime runtime) {
return new Run(runtime);
}
public boolean canRunNext(Run run) {
return true;
}
public boolean isFinish(Run run) {
return finish;
}
public Run createRunInstance() {
return null;
} }
public class Run { public class Run {
final ProgramRuntime runtime;
final Iterator<Statement<?,?>> iterator;
Statement<?,?>.Run run;
public Run(ProgramRuntime runtime) {
this.runtime = runtime;
iterator = statements.iterator();
startNext();
}
private boolean startNext() {
if(iterator.hasNext()) {
run = iterator.next().start(runtime);
return true;
} else {
return false;
}
}
public void tick() {
run.tick();
if(run.isDone()){
startNext();
}
}
} }
} }
src/main/java/io/github/skippyall/minions/program/tuple/Tuple.java
+29
View File
@@ -0,0 +1,29 @@
package io.github.skippyall.minions.program.tuple;
import org.jetbrains.annotations.NotNull;
import java.util.Iterator;
import java.util.List;
public interface Tuple extends Iterable<Object>{
<T> Tuple add(T value);
Tuple removeLast();
List<Object> getValueList();
int size();
@NotNull
@Override
default Iterator<Object> iterator() {
return getValueList().iterator();
}
static Tuple ofList(List<?> list) {
return switch (list.size()) {
case 0 -> new Tuple0();
case 1 -> new Tuple1<Object>(list.get(0));
case 2 -> new Tuple2<Object, Object>(list.get(0), list.get(1));
case 3 -> new Tuple3<Object, Object, Object>(list.get(0), list.get(1), list.get(2));
default -> throw new UnsupportedOperationException();
};
}
}
src/main/java/io/github/skippyall/minions/program/tuple/Tuple0.java
+25
View File
@@ -0,0 +1,25 @@
package io.github.skippyall.minions.program.tuple;
import java.util.List;
public record Tuple0() implements Tuple{
@Override
public <T> Tuple add(T value) {
return new Tuple1<>(value);
}
@Override
public Tuple removeLast() {
throw new UnsupportedOperationException("Cannot remove element from length 0 tuple.");
}
@Override
public List<Object> getValueList() {
return List.of();
}
@Override
public int size() {
return 0;
}
}
src/main/java/io/github/skippyall/minions/program/tuple/Tuple1.java
+25
View File
@@ -0,0 +1,25 @@
package io.github.skippyall.minions.program.tuple;
import java.util.List;
public record Tuple1<T0>(T0 v0) implements Tuple{
@Override
public <T> Tuple add(T value) {
return new Tuple2<>(v0, value);
}
@Override
public Tuple removeLast() {
return new Tuple0();
}
@Override
public List<Object> getValueList() {
return List.of(v0);
}
@Override
public int size() {
return 1;
}
}
src/main/java/io/github/skippyall/minions/program/tuple/Tuple2.java
+25
View File
@@ -0,0 +1,25 @@
package io.github.skippyall.minions.program.tuple;
import java.util.List;
public record Tuple2<T0, T1>(T0 v0, T1 v1) implements Tuple {
@Override
public <T> Tuple add(T value) {
return new Tuple3<>(v0, v1, value);
}
@Override
public Tuple removeLast() {
return new Tuple1<>(v0);
}
@Override
public List<Object> getValueList() {
return List.of(v0, v1);
}
@Override
public int size() {
return 2;
}
}
src/main/java/io/github/skippyall/minions/program/tuple/Tuple3.java
+25
View File
@@ -0,0 +1,25 @@
package io.github.skippyall.minions.program.tuple;
import java.util.List;
public record Tuple3<T0, T1, T2>(T0 v0, T1 v1, T2 v2) implements Tuple {
@Override
public <T> Tuple add(T value) {
return new Tuple4<>(v0, v1, v2, value);
}
@Override
public Tuple removeLast() {
return new Tuple2<>(v0, v1);
}
@Override
public List<Object> getValueList() {
return List.of(v0, v1, v2);
}
@Override
public int size() {
return 3;
}
}
src/main/java/io/github/skippyall/minions/program/tuple/Tuple4.java
+25
View File
@@ -0,0 +1,25 @@
package io.github.skippyall.minions.program.tuple;
import java.util.List;
public record Tuple4<T0, T1, T2, T3, T4>(T0 v0, T1 v1, T2 v2, T3 v3) implements Tuple {
@Override
public <T> Tuple add(T value) {
return new Tuple5<>(v0, v1, v2, v3, value);
}
@Override
public Tuple removeLast() {
return new Tuple3<>(v0, v1, v2);
}
@Override
public List<Object> getValueList() {
return List.of(v0, v1, v2, v3);
}
@Override
public int size() {
return 4;
}
}
src/main/java/io/github/skippyall/minions/program/tuple/Tuple5.java
+25
View File
@@ -0,0 +1,25 @@
package io.github.skippyall.minions.program.tuple;
import java.util.List;
public record Tuple5<T0, T1, T2, T3, T4>(T0 v0, T1 v1, T2 v2, T3 v3, T4 v4) implements Tuple {
@Override
public <T> Tuple add(T value) {
throw new UnsupportedOperationException("Cannot add element to length 5 tuple.");
}
@Override
public Tuple removeLast() {
return new Tuple4<>(v0, v1, v2, v3);
}
@Override
public List<Object> getValueList() {
return List.of(v0, v1, v2, v3, v4);
}
@Override
public int size() {
return 5;
}
}
src/main/java/io/github/skippyall/minions/program/variables/FloatType.java
+1 -1
View File
@@ -1,4 +1,4 @@
package io.github.skippyall.minions.program.variables; package io.github.skippyall.minions.program.variables;
public class FloatType extends Type{ public class FloatType extends Type<Float>{
} }
src/main/java/io/github/skippyall/minions/program/variables/IntegerType.java
+1 -1
View File
@@ -1,4 +1,4 @@
package io.github.skippyall.minions.program.variables; package io.github.skippyall.minions.program.variables;
public class IntegerType extends Type{ public class IntegerType extends Type<Integer>{
} }
src/main/java/io/github/skippyall/minions/program/variables/Type.java
+5 -1
View File
@@ -1,4 +1,8 @@
package io.github.skippyall.minions.program.variables; package io.github.skippyall.minions.program.variables;
public abstract class Type { public abstract class Type<T> {
@SuppressWarnings("unchecked")
public T cast(Object object) throws ClassCastException {
return (T) object;
}
} }
src/main/java/io/github/skippyall/minions/program/variables/Types.java
+1 -1
View File
@@ -3,5 +3,5 @@ package io.github.skippyall.minions.program.variables;
public class Types { public class Types {
public static final IntegerType INTEGER = new IntegerType(); public static final IntegerType INTEGER = new IntegerType();
public static final FloatType FLOAT = new FloatType(); public static final FloatType FLOAT = new FloatType();
public static final Type VOID = new Type() {}; public static final Type<Void> VOID = new Type<>() {};
} }
src/main/java/io/github/skippyall/minions/program/variables/ValueStorage.java
+7
View File
@@ -0,0 +1,7 @@
package io.github.skippyall.minions.program.variables;
import io.github.skippyall.minions.program.runtime.ProgramRuntime;
public interface ValueStorage<T> {
void storeValue(T value, ProgramRuntime runtime);
}
src/main/java/io/github/skippyall/minions/program/variables/Variable.java
+13 -8
View File
@@ -1,24 +1,29 @@
package io.github.skippyall.minions.program.variables; package io.github.skippyall.minions.program.variables;
import io.github.skippyall.minions.program.statement.Arg; import io.github.skippyall.minions.program.argument.Arg;
import io.github.skippyall.minions.program.runtime.ProgramRuntime;
public class Variable implements Arg { public class Variable<T> implements Arg<T>, ValueStorage<T> {
private final Type type; private final Type<T> type;
private final String name; private final String name;
private Object value;
public Variable(Type type, String name) { public Variable(Type<T> type, String name) {
this.type = type; this.type = type;
this.name = name; this.name = name;
} }
@Override @Override
public Object getValue() { public T resolve(ProgramRuntime runtime) {
return value; return type.cast(runtime.getVariable(name));
} }
@Override @Override
public Type getType() { public Type<T> getType() {
return type; return type;
} }
@Override
public void storeValue(T value, ProgramRuntime runtime) {
runtime.setVariable(name, value);
}
} }
src/main/java/io/github/skippyall/minions/server/MinionsServer.java
+3 -2
View File
@@ -11,12 +11,13 @@ import net.minecraft.server.network.ServerConfigurationNetworkHandler;
public class MinionsServer implements DedicatedServerModInitializer { public class MinionsServer implements DedicatedServerModInitializer {
@Override @Override
public void onInitializeServer() { public void onInitializeServer() {
ServerConfigurationNetworking.registerGlobalReceiver(ClientToServerNetworking.RL, ClientToServerNetworking::receive); /*ServerConfigurationNetworking.registerGlobalReceiver(ClientToServerNetworking.RL, ClientToServerNetworking::receive);
ServerConfigurationConnectionEvents.CONFIGURE.register(new ServerConfigurationConnectionEvents.Configure() { ServerConfigurationConnectionEvents.CONFIGURE.register(new ServerConfigurationConnectionEvents.Configure() {
@Override @Override
public void onSendConfiguration(ServerConfigurationNetworkHandler handler, MinecraftServer server) { public void onSendConfiguration(ServerConfigurationNetworkHandler handler, MinecraftServer server) {
VersionChecker.resetPlayer(handler.getDebugProfile().getId()); VersionChecker.resetPlayer(handler.getDebugProfile().getId());
} }
}); });*/
} }
} }
src/main/resources/minions.mixins.json
+2
View File
@@ -5,6 +5,8 @@
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_17",
"mixins": [ "mixins": [
"ConnectionMixin", "ConnectionMixin",
"MinecraftServerMixin",
"PlayerListEntryS2CPacket$EntryMixin",
"PlayerListMixin", "PlayerListMixin",
"ServerPlayerMixin" "ServerPlayerMixin"
], ],
src/main/resources/r.0.-1.mca
BIN
View File
Binary file not shown.