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

Interact and Attack

Browse Source
This commit is contained in:
skippyall
2025-01-21 19:21:18 +01:00
parent fc70b2fe5a
commit 8007778c39
52 changed files with 249 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
yarn_mappings=1.21.3+build.2
# Mod Properties
mod_version = 0.1.1-SNAPSHOT
mod_version = 0.1.2-SNAPSHOT
maven_group = io.github.skippyall
archives_base_name = Minions
src/main/java/io/github/skippyall/minions/Minions.java
+19 -10
View File
@@ -2,7 +2,7 @@ package io.github.skippyall.minions;
import eu.pb4.polymer.core.api.entity.PolymerEntityUtils;
import eu.pb4.polymer.core.api.item.SimplePolymerItem;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.MinionData;
import io.github.skippyall.minions.minion.MinionItem;
import io.github.skippyall.minions.minion.MinionPersistentState;
@@ -10,28 +10,31 @@ import io.github.skippyall.minions.module.Modules;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.minecraft.component.DataComponentTypes;
import net.minecraft.component.type.DamageResistantComponent;
import net.minecraft.entity.boss.WitherEntity;
import net.minecraft.entity.damage.DamageType;
import net.minecraft.item.Item;
import net.minecraft.item.Items;
import net.minecraft.registry.BuiltinRegistries;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.server.MinecraftServer;
import net.minecraft.registry.tag.TagKey;
import net.minecraft.util.Identifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
public class Minions implements ModInitializer {
public static final String MOD_ID = "minions";
private static final Identifier MINION_ITEM_ID = Identifier.of(MOD_ID, "minion");
public static final MinionItem MINION_ITEM = Registry.register(Registries.ITEM, Identifier.of(MOD_ID, "minion"), new MinionItem(new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, MINION_ITEM_ID)),false));
private static final Identifier BASIC_UPGRADE_BASE_ID = Identifier.of(MOD_ID, "basic_upgrade_base");
public static final SimplePolymerItem BASIC_UPGRADE_BASE = Registry.register(Registries.ITEM, BASIC_UPGRADE_BASE_ID, new SimplePolymerItem(new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, BASIC_UPGRADE_BASE_ID)), Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
public static final TagKey<DamageType> MINION_ITEM_RESISTS = TagKey.of(RegistryKeys.DAMAGE_TYPE, Identifier.of(MOD_ID, "minion_item_resists"));
public static final MinionItem MINION_ITEM = registerItem(Identifier.of(MOD_ID, "minion"), settings -> new MinionItem(settings.component(DataComponentTypes.DAMAGE_RESISTANT, new DamageResistantComponent(MINION_ITEM_RESISTS)),false));
public static final SimplePolymerItem BASIC_UPGRADE_BASE = registerItem(Identifier.of(MOD_ID, "basic_upgrade_base"), settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
public static final SimplePolymerItem ADVANCED_UPGRADE_BASE = registerItem(Identifier.of(MOD_ID, "advanced_upgrade_base"), settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE));
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
@@ -40,12 +43,10 @@ public class Minions implements ModInitializer {
@Override
public void onInitialize() {
MinionData.register();
LOGGER.debug("Add Customthing");
PolymerEntityUtils.registerType();
ServerLifecycleEvents.SERVER_STARTED.register(server -> {
MinionPersistentState.create(server);
MinionPersistentState.INSTANCE.getMinionData().forEach(data -> {
System.out.println("spawn Minion " + data.name());
MinionFakePlayer.spawnMinionAt(data, server.getOverworld(), null, null);
});
});
@@ -61,6 +62,14 @@ public class Minions implements ModInitializer {
Modules.register();
}
private static <T extends Item> T registerItem(Identifier identifier, Function<Item.Settings, T> constructor, Item.Settings settings) {
return Registry.register(Registries.ITEM, identifier, constructor.apply(settings.registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))));
}
private static <T extends Item> T registerItem(Identifier identifier, Function<Item.Settings, T> constructor) {
return registerItem(identifier, constructor, new Item.Settings());
}
private static synchronized void exec(Runnable run) {
run.run();
}
src/main/java/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);
}
}
src/main/java/io/github/skippyall/minions/command/CommandExecutor.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.github.skippyall.minions.command;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.server.network.ServerPlayerEntity;
public interface CommandExecutor {
src/main/java/io/github/skippyall/minions/command/SimpleCommand.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.github.skippyall.minions.command;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.item.Item;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
src/main/java/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();
}
src/main/java/io/github/skippyall/minions/gui/CommandsGui.java
+1 -1
View File
@@ -3,7 +3,7 @@ package io.github.skippyall.minions.gui;
import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.gui.SimpleGui;
import io.github.skippyall.minions.command.Command;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.module.ModuleItem;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.server.network.ServerPlayerEntity;
src/main/java/io/github/skippyall/minions/gui/MinionGui.java
+11 -6
View File
@@ -2,11 +2,9 @@ package io.github.skippyall.minions.gui;
import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.gui.SimpleGui;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.item.Items;
import net.minecraft.screen.GenericContainerScreenHandler;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
import net.minecraft.screen.slot.Slot;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
@@ -31,7 +29,7 @@ public class MinionGui {
gui.setSlot(4, new GuiElementBuilder()
.setItem(Items.REDSTONE)
.setName(Text.translatable("minions.gui.main.programming"))
.setCallback((i, clickType, slotActionType) -> {
.setCallback(() -> {
openProgrammingInventory(player, minion);
})
);
@@ -39,17 +37,24 @@ public class MinionGui {
gui.setSlot(3, new GuiElementBuilder()
.setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
.setName(Text.translatable("minions.gui.main.modules"))
.setCallback((i, clickType, slotActionType) -> {
.setCallback(() -> {
ModuleInventory.openModuleInventory(player, minion);
})
);
gui.setSlot(5, new GuiElementBuilder()
.setItem(Items.CHEST)
.setName(Text.translatable("minions.gui.main.inventory"))
.setCallback((i, clickType, slotActionType) -> {
.setCallback(() -> {
openMinionInventory(player, minion);
})
);
gui.setSlot(7, new GuiElementBuilder()
.setItem(Items.BARRIER)
.setName(Text.translatable("minions.gui.main.pickup"))
.setCallback(() -> {
minion.kill(minion.getServerWorld());
})
);
gui.open();
}
src/main/java/io/github/skippyall/minions/gui/ModuleInventory.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.github.skippyall.minions.gui;
import io.github.skippyall.minions.command.Command;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.module.ModuleItem;
import io.github.skippyall.minions.program.block.CodeBlock;
import net.minecraft.inventory.Inventories;
src/main/java/io/github/skippyall/minions/input/TextInput.java
+4 -1
View File
@@ -18,7 +18,10 @@ public class TextInput {
gui.setSlot(AnvilScreenHandler.OUTPUT_ID, new GuiElementBuilder()
.setItem(Items.EMERALD_BLOCK)
.setName(Text.literal("OK"))
.setCallback(() -> future.complete(gui.getInput()))
.setCallback(() -> {
gui.close();
future.complete(gui.getInput());
})
);
gui.setTitle(title);
gui.setDefaultInputValue(defaultText);
src/main/java/io/github/skippyall/minions/minion/MinionData.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import eu.pb4.polymer.core.api.other.PolymerComponent;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.component.ComponentType;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtOps;
src/main/java/io/github/skippyall/minions/minion/MinionItem.java
+18 -2
View File
@@ -2,7 +2,7 @@ package io.github.skippyall.minions.minion;
import eu.pb4.polymer.core.api.item.PolymerItem;
import eu.pb4.polymer.core.api.item.PolymerItemUtils;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.component.DataComponentTypes;
import net.minecraft.component.type.NbtComponent;
import net.minecraft.item.Item;
@@ -12,11 +12,14 @@ import net.minecraft.item.Items;
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.Text;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.Vec2f;
import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext;
import java.util.List;
import java.util.Optional;
public class MinionItem extends Item implements PolymerItem {
@@ -27,6 +30,11 @@ public class MinionItem extends Item implements PolymerItem {
this.canProgram = canProgram;
}
@Override
public @Nullable Identifier getPolymerItemModel(ItemStack stack, PacketContext context) {
return null;
}
@Override
public Item getPolymerItem(ItemStack itemStack, PacketContext player) {
return Items.ARMOR_STAND;
@@ -39,6 +47,14 @@ public class MinionItem extends Item implements PolymerItem {
return out;
}
@Override
public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
MinionData data = stack.get(MinionData.COMPONENT);
if(data != null) {
tooltip.add(Text.translatable("minions.minion_item.tooltip", data.name()));
}
}
@Override
public ActionResult useOnBlock(ItemUsageContext context) {
String contents = context.getStack().getName().getLiteralString();
@@ -56,7 +72,7 @@ public class MinionItem extends Item implements PolymerItem {
}
if (data.uuid() == null) {
MinionFakePlayer.createMinion(data, (ServerWorld) context.getWorld(), (ServerPlayerEntity) context.getPlayer(), canProgram, context.getBlockPos().toCenterPos().add(0,0.5,0), 0, 0);
MinionFakePlayer.createMinion(data, (ServerWorld) context.getWorld(), (ServerPlayerEntity) context.getPlayer(), canProgram, context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
}else {
data = data.withName(name);
MinionFakePlayer.spawnMinionAt(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
src/main/java/io/github/skippyall/minions/minion/MinionPersistentState.java
+2 -2
View File
@@ -1,6 +1,6 @@
package io.github.skippyall.minions.minion;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.nbt.NbtList;
@@ -47,7 +47,7 @@ public class MinionPersistentState extends PersistentState {
}
NbtList uuids = compound.getList("uuids", NbtElement.COMPOUND_TYPE);
for(NbtElement element : list) {
for(NbtElement element : uuids) {
instance.minionUuids.add(((NbtCompound) element).getUuid("uuid"));
}
return instance;
src/main/java/io/github/skippyall/minions/fakeplayer/ClientConnectionInterface.java → src/main/java/io/github/skippyall/minions/minion/fakeplayer/ClientConnectionInterface.java
+2 -1
View File
@@ -1,4 +1,5 @@
package io.github.skippyall.minions.fakeplayer;
//code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer;
import io.netty.channel.Channel;
src/main/java/io/github/skippyall/minions/fakeplayer/EntityPlayerActionPack.java → src/main/java/io/github/skippyall/minions/minion/fakeplayer/EntityPlayerActionPack.java
+2 -1
View File
@@ -1,4 +1,5 @@
package io.github.skippyall.minions.fakeplayer;
//partially code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer;
import java.util.EnumMap;
src/main/java/io/github/skippyall/minions/fakeplayer/FakeClientConnection.java → src/main/java/io/github/skippyall/minions/minion/fakeplayer/FakeClientConnection.java
+2 -2
View File
@@ -1,11 +1,11 @@
package io.github.skippyall.minions.fakeplayer;
//code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer;
import io.netty.channel.embedded.EmbeddedChannel;
import net.minecraft.network.ClientConnection;
import net.minecraft.network.NetworkSide;
import net.minecraft.network.NetworkState;
import net.minecraft.network.listener.PacketListener;
import net.minecraft.text.Text;
public class FakeClientConnection extends ClientConnection {
public FakeClientConnection(NetworkSide p)
src/main/java/io/github/skippyall/minions/fakeplayer/MinionFakePlayer.java → src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java
+26 -35
View File
@@ -1,4 +1,5 @@
package io.github.skippyall.minions.fakeplayer;
//partially code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer;
import com.mojang.authlib.GameProfile;
import io.github.skippyall.minions.Minions;
@@ -46,6 +47,8 @@ import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
public class MinionFakePlayer extends ServerPlayerEntity {
public Runnable fixStartingPosition = () -> {};
@@ -59,43 +62,26 @@ public class MinionFakePlayer extends ServerPlayerEntity {
private UUID skinUuid = null;
public static void createMinion(MinionData data, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, double yaw, double pitch) {
MinecraftServer server = level.getServer();
public static void createMinion(MinionData data, ServerWorld level, ServerPlayerEntity owner, boolean canProgram, Vec3d pos, Vec2f rot) {
spawnMinion(data, level, pos, rot,
(minion, skinProfile) -> {
if (skinProfile != null) {
minion.skinUuid = skinProfile.getId();
}
CompletableFuture<GameProfile> future;
if(data.skinUuid().isPresent()) {
future = MinionProfileUtils.getSkinOwnerProfile(server, data.skinUuid().get());
} else {
future = MinionProfileUtils.lookupSkinOwnerProfile(server, data.name());
}
future.thenAccept(skinProfile -> {
GameProfile profile = MinionProfileUtils.makeNewMinionProfile(null, data.name(), skinProfile);
Minions.addExecuteOnNextTick(() -> {
MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault());
if(skinProfile != null) {
instance.skinUuid = skinProfile.getId();
minion.programmable = canProgram;
},
minion -> {
MinionPersistentState.INSTANCE.addMinion(minion);
}
instance.programmable = canProgram;
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(), false));
instance.teleport(level, pos.x, pos.y, pos.z, Set.of(), (float) yaw, (float) pitch, true);
instance.setHealth(20.0F);
instance.unsetRemoved();
instance.getAttributeInstance(EntityAttributes.STEP_HEIGHT).setBaseValue(0.6F);
instance.interactionManager.changeGameMode(GameMode.SURVIVAL);
server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey());//instance.dimension);
server.getPlayerManager().sendToDimension(EntityPositionSyncS2CPacket.create(instance), level.getRegistryKey());//instance.dimension);
//instance.world.getChunkManager(). updatePosition(instance);
instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes)
instance.getAbilities().flying = false;
MinionPersistentState.INSTANCE.addMinion(instance);
});
});
);
}
public static void spawnMinionAt(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) {
spawnMinion(data, level, pos, rot, (minion, skinProfile) -> {}, minion -> {});
}
public static void spawnMinion(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot, BiConsumer<MinionFakePlayer, GameProfile> beforeSpawn, Consumer<MinionFakePlayer> afterSpawn) {
MinecraftServer server = level.getServer();
CompletableFuture<GameProfile> future;
@@ -109,6 +95,8 @@ public class MinionFakePlayer extends ServerPlayerEntity {
GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid(), data.name(), skinProfile);
Minions.addExecuteOnNextTick(() -> {
MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault());
beforeSpawn.accept(instance, skinProfile);
if(pos != null && rot != null) {
instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(pos.x, pos.y, pos.z, rot.x, rot.y);
}
@@ -120,12 +108,15 @@ public class MinionFakePlayer extends ServerPlayerEntity {
instance.setVelocity(0,0,0);
instance.setHealth(20.0F);
instance.unsetRemoved();
instance.getAttributeInstance(EntityAttributes.STEP_HEIGHT).setBaseValue(0.6F);
instance.interactionManager.changeGameMode(GameMode.SURVIVAL);
server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey());//instance.dimension);
server.getPlayerManager().sendToDimension(EntityPositionSyncS2CPacket.create(instance), level.getRegistryKey());//instance.dimension);
//instance.world.getChunkManager(). updatePosition(instance);
instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes)
instance.getAbilities().flying = false;
afterSpawn.accept(instance);
});
});
}
@@ -313,9 +304,9 @@ public class MinionFakePlayer extends ServerPlayerEntity {
}
@Override
protected void drop(ServerWorld world, DamageSource damageSource) {
public void drop(ServerWorld world, DamageSource damageSource) {
super.drop(world, damageSource);
dropStack(world, toItemStack());
dropStack(world, toItemStack()).setNeverDespawn();
}
private ItemStack toItemStack() {
src/main/java/io/github/skippyall/minions/fakeplayer/NetHandlerPlayServerFake.java → src/main/java/io/github/skippyall/minions/minion/fakeplayer/NetHandlerPlayServerFake.java
+2 -1
View File
@@ -1,4 +1,5 @@
package io.github.skippyall.minions.fakeplayer;
//code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer;
import net.minecraft.entity.player.PlayerPosition;
import net.minecraft.network.ClientConnection;
src/main/java/io/github/skippyall/minions/minion/fakeplayer/ServerPlayerInterface.java
+7
View File
@@ -0,0 +1,7 @@
//code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer;
public interface ServerPlayerInterface
{
EntityPlayerActionPack getActionPack();
}
src/main/java/io/github/skippyall/minions/fakeplayer/Tracer.java → src/main/java/io/github/skippyall/minions/minion/fakeplayer/Tracer.java
+2 -1
View File
@@ -1,4 +1,5 @@
package io.github.skippyall.minions.fakeplayer;
//code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer;
import java.util.Optional;
import java.util.function.Predicate;
src/main/java/io/github/skippyall/minions/mixins/ConnectionMixin.java
+2 -1
View File
@@ -1,6 +1,7 @@
//code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.mixins;
import io.github.skippyall.minions.fakeplayer.ClientConnectionInterface;
import io.github.skippyall.minions.minion.fakeplayer.ClientConnectionInterface;
import io.netty.channel.Channel;
import net.minecraft.network.ClientConnection;
import org.spongepowered.asm.mixin.Mixin;
src/main/java/io/github/skippyall/minions/mixins/MinecraftServerMixin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity;
import org.spongepowered.asm.mixin.Mixin;
src/main/java/io/github/skippyall/minions/mixins/MobEntityMixin.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.github.skippyall.minions.mixins;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.module.MobSpawningModule;
import net.minecraft.entity.Entity;
import net.minecraft.entity.mob.MobEntity;
src/main/java/io/github/skippyall/minions/mixins/PlayerListEntryS2CPacket$EntryMixin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.sugar.Local;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import org.spongepowered.asm.mixin.Mixin;
src/main/java/io/github/skippyall/minions/mixins/PlayerListMixin.java
+3 -2
View File
@@ -1,3 +1,4 @@
//partially code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.ModifyReceiver;
@@ -5,8 +6,8 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Local;
import com.mojang.authlib.GameProfile;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.fakeplayer.NetHandlerPlayServerFake;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.NetHandlerPlayServerFake;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
src/main/java/io/github/skippyall/minions/mixins/ServerPlayNetworkHandlerMixin.java
+1 -1
View File
@@ -2,7 +2,7 @@ package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.server.PlayerManager;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
src/main/java/io/github/skippyall/minions/mixins/ServerPlayerMixin.java
+2 -2
View File
@@ -1,8 +1,8 @@
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 io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.minion.fakeplayer.ServerPlayerInterface;
import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity;
src/main/java/io/github/skippyall/minions/mixins/SleepManagerMixin.java
+1 -1
View File
@@ -2,7 +2,7 @@ package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.SleepManager;
import org.spongepowered.asm.mixin.Mixin;
src/main/java/io/github/skippyall/minions/mixins/SpawnHelperMixin.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.github.skippyall.minions.mixins;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.module.MobSpawningModule;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.predicate.entity.EntityPredicates;
src/main/java/io/github/skippyall/minions/module/ActionModules.java
+4 -3
View File
@@ -3,8 +3,8 @@ package io.github.skippyall.minions.module;
import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.gui.SimpleGui;
import io.github.skippyall.minions.command.CommandExecutor;
import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.input.TextInput;
import net.minecraft.item.Items;
import net.minecraft.screen.ScreenHandlerType;
@@ -51,11 +51,12 @@ public class ActionModules {
.setName(Text.translatable("minions.command.action.interval", actionName))
.setCallback(() -> executeInterval(actionType, player, minion))
);
gui.setSlot(3, new GuiElementBuilder()
gui.setSlot(4, new GuiElementBuilder()
.setItem(Items.BARRIER)
.setName(Text.translatable("minions.command.action.stop", actionName))
.setCallback(() -> executeStop(actionType, player, minion))
);
gui.open();
};
}
}
src/main/java/io/github/skippyall/minions/module/AttackModule.java
+33
View File
@@ -0,0 +1,33 @@
package io.github.skippyall.minions.module;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.command.SimpleCommand;
import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
import net.minecraft.item.Items;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import java.util.List;
import static io.github.skippyall.minions.module.Modules.register;
public class AttackModule {
public static final SimpleCommand ATTACK_COMMAND = new SimpleCommand(
Text.translatable("minions.command.attack.name"),
Text.translatable("minions.command.attack.description"),
Items.DIAMOND_PICKAXE,
ActionModules.detailSelectionExecutor(EntityPlayerActionPack.ActionType.ATTACK, Text.translatable("minions.command.attack.name"))
);
public static final SimpleModuleItem ATTACK_MODULE = register(
Identifier.of(Minions.MOD_ID, "attack_module"),
List.of(),
List.of(ATTACK_COMMAND),
Items.DIAMOND_PICKAXE
);
public static void registerMe() {
}
}
src/main/java/io/github/skippyall/minions/module/InteractModule.java
+15 -10
View File
@@ -2,6 +2,7 @@ package io.github.skippyall.minions.module;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.command.SimpleCommand;
import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
import net.minecraft.item.Items;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
@@ -11,18 +12,22 @@ import java.util.List;
import static io.github.skippyall.minions.module.Modules.register;
public class InteractModule {
/*public static final SimpleCommand INTERACT_COMMAND =
new SimpleCommand(
Text.translatable()
)
public static final SimpleCommand INTERACT_COMMAND = new SimpleCommand(
Text.translatable("minions.command.interact.name"),
Text.translatable("minions.command.interact.description"),
Items.LEVER,
ActionModules.detailSelectionExecutor(EntityPlayerActionPack.ActionType.USE, Text.translatable("minions.command.interact.name"))
);
public static final SimpleModuleItem INTERACT_MODULE = register(
Identifier.of(Minions.MOD_ID, "interact_module"),
new SimpleModuleItem(
List.of(),
List.of(),
Items.LEVER
)
);*/
List.of(),
List.of(INTERACT_COMMAND),
Items.LEVER
);
public static void registerMe() {
}
}
src/main/java/io/github/skippyall/minions/module/MobSpawningModule.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.github.skippyall.minions.module;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.item.Items;
import net.minecraft.util.Identifier;
src/main/java/io/github/skippyall/minions/module/Modules.java
+2
View File
@@ -17,6 +17,8 @@ public class Modules {
MountModule.registerMe();
MoveModule.registerMe();
MobSpawningModule.registerMe();
InteractModule.registerMe();
AttackModule.registerMe();
}
public static <T extends Item & ModuleItem> T register(Identifier id, T item) {
src/main/java/io/github/skippyall/minions/module/SimpleModuleItem.java
+3 -12
View File
@@ -1,24 +1,20 @@
package io.github.skippyall.minions.module;
import eu.pb4.polymer.core.api.item.PolymerItem;
import eu.pb4.polymer.core.api.item.SimplePolymerItem;
import io.github.skippyall.minions.command.Command;
import io.github.skippyall.minions.program.block.CodeBlock;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import xyz.nucleoid.packettweaker.PacketContext;
import java.util.List;
public class SimpleModuleItem extends Item implements PolymerItem, ModuleItem {
public class SimpleModuleItem extends SimplePolymerItem implements ModuleItem {
private final List<CodeBlock<?,?>> codeBlocks;
private final List<Command> commands;
private final Item vanillaItem;
public SimpleModuleItem(List<CodeBlock<?,?>> codeBlocks, List<Command> commands, Settings settings, Item vanillaItem) {
super(settings.maxCount(1));
super(settings.maxCount(1), vanillaItem);
this.codeBlocks = codeBlocks;
this.commands = commands;
this.vanillaItem = vanillaItem;
}
@Override
@@ -30,9 +26,4 @@ public class SimpleModuleItem extends Item implements PolymerItem, ModuleItem {
public List<Command> getCommands() {
return commands;
}
@Override
public Item getPolymerItem(ItemStack itemStack, PacketContext context) {
return vanillaItem;
}
}
src/main/java/io/github/skippyall/minions/networking/ClientToServerNetworking.java
-40
View File
@@ -1,40 +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.MinecraftClient;
import net.minecraft.client.network.ClientConfigurationNetworkHandler;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerConfigurationNetworkHandler;
import net.minecraft.util.Identifier;
public class ClientToServerNetworking {
/*public static final Identifier RL = Identifier.of(Minions.MOD_ID, "network");
@Environment(EnvType.CLIENT)
public static void sendJoinPacket(PlayerEntity player) {
PacketByteBuf pbf = new PacketByteBuf(Unpooled.buffer());
pbf.writeString("BN|Init|V0.1");
ClientConfigurationNetworking.send(RL, pbf);
}
@Environment(EnvType.CLIENT)
public static void onConfigurationInit(ClientConfigurationNetworkHandler handler, MinecraftClient client) {
sendJoinPacket(client.player);
}
@Environment(EnvType.SERVER)
public static void receive(MinecraftServer server, ServerConfigurationNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) {
String message = buf.readString();
if (!message.startsWith("BN|")) {
Minions.LOGGER.debug("Message with wrong format: " + message);
}
String[] parts = message.split("|");
}*/
}
src/main/java/io/github/skippyall/minions/networking/VersionChecker.java
-21
View File
@@ -1,21 +0,0 @@
package io.github.skippyall.minions.networking;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import net.minecraft.entity.player.PlayerEntity;
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(PlayerEntity p) {
return hasSupportedMod.contains(p.getUuid());
}
public static void resetPlayer(UUID uuid) {
hasSupportedMod.remove(uuid);
}
}
src/main/java/io/github/skippyall/minions/program/block/GoBlock.java
+3 -3
View File
@@ -1,8 +1,8 @@
package io.github.skippyall.minions.program.block;
import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.fakeplayer.ServerPlayerInterface;
import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.ServerPlayerInterface;
import io.github.skippyall.minions.program.runtime.MinionRuntime;
import io.github.skippyall.minions.program.runtime.ProgramRuntime;
import io.github.skippyall.minions.program.statement.Statement;
src/main/java/io/github/skippyall/minions/program/block/UseBlock.java
+2 -2
View File
@@ -1,7 +1,7 @@
package io.github.skippyall.minions.program.block;
import io.github.skippyall.minions.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.runtime.MinionRuntime;
import io.github.skippyall.minions.program.runtime.ProgramRuntime;
import io.github.skippyall.minions.program.statement.Statement;
src/main/java/io/github/skippyall/minions/program/runtime/MinionRuntime.java
+1 -5
View File
@@ -1,10 +1,6 @@
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;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
public class MinionRuntime extends ProgramRuntime {
private final MinionFakePlayer minion;
src/main/java/io/github/skippyall/minions/server/MinionsServer.java
-23
View File
@@ -1,23 +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.ServerConfigurationNetworkHandler;
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(ServerConfigurationNetworkHandler handler, MinecraftServer server) {
VersionChecker.resetPlayer(handler.getDebugProfile().getId());
}
});*/
}
}
src/main/resources/data/minions/lang/en_us.json
+16 -2
View File
@@ -7,6 +7,7 @@
"minions.gui.module_commands.title": "Commands",
"minions.gui.commands.title": "%s's Commands",
"minions.gui.modules.title": "%s's Modules",
"minions.command.input.int.fail": "Not an integer",
"minions.command.input.float.fail": "Not a number",
"minions.command.action.details": "Set how to %s",
@@ -15,6 +16,19 @@
"minions.command.action.interval": "%s every x seconds",
"minions.command.action.stop": "Stop %s",
"minions.command.action.interval.enter": "Enter an interval in seconds",
"minions.command.interact.name": "",
"minions.command.interact.description": ""
"minions.command.interact.name": "Interact",
"minions.command.interact.description": "Use and place blocks",
"minions.command.attack.name": "Attack",
"minions.command.attack.description": "Attack and mine blocks",
"item.minions.attack_module": "Attack Module",
"item.minions.interact_module": "Interact Module",
"item.minions.mob_spawning_module": "Mob Spawning Module",
"item.minions.mount_module": "Mount Module",
"item.minions.move_module": "Move Module",
"item.minions.minion": "Minion",
"item.minions.basic_upgrade_base": "Basic Upgrade Base",
"item.minions.advanced_upgrade_base": "Advanced Upgrade Base",
"minions.minion_item.tooltip": "Name: %s"
}
src/main/resources/data/minions/recipe/advanced_upgrade_base.json
+17
View File
@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"DND",
"NBN",
"DND"
],
"key": {
"D": "minecraft:diamond",
"N": "minecraft:netherite_scrap",
"B": "minions:basic_upgrade_base"
},
"result": {
"id": "minions:advanced_upgrade_base",
"count": 1
}
}
src/main/resources/data/minions/recipe/attack_module.json
+9
View File
@@ -0,0 +1,9 @@
{
"type": "minecraft:smithing_transform",
"base": "minions:advanced_upgrade_base",
"addition": "minecraft:diamond_pickaxe",
"template": "minecraft:netherite_upgrade_smithing_template",
"result": {
"id": "minions:attack_module"
}
}
src/main/resources/data/minions/recipe/basic_upgrade.json → src/main/resources/data/minions/recipe/basic_upgrade_base.json
+1 -1
View File
@@ -8,7 +8,7 @@
"key": {
"R": "minecraft:redstone_block",
"G": "minecraft:gold_ingot",
"D": "minecraft:diamond_block"
"D": "minecraft:diamond"
},
"result": {
"id": "minions:basic_upgrade_base",
src/main/resources/data/minions/recipe/interact_module.json
+9
View File
@@ -0,0 +1,9 @@
{
"type": "minecraft:smithing_transform",
"base": "minions:advanced_upgrade_base",
"addition": "minecraft:lever",
"template": "minecraft:netherite_upgrade_smithing_template",
"result": {
"id": "minions:interact_module"
}
}
src/main/resources/data/minions/recipe/minion.json
+2 -2
View File
@@ -3,13 +3,13 @@
"pattern": [
" H ",
"RAR",
" L "
" N "
],
"key": {
"H": "#minecraft:skulls",
"R": "minecraft:redstone_torch",
"A": "minecraft:armor_stand",
"L": "minecraft:lodestone"
"N": "minecraft:netherite_ingot"
},
"result": {
"id": "minions:minion",
src/main/resources/data/minions/recipe/mob_spawning_module.json
+9
View File
@@ -0,0 +1,9 @@
{
"type": "minecraft:smithing_transform",
"base": "minions:basic_upgrade_base",
"addition": "minecraft:rotten_flesh",
"template": "minecraft:netherite_upgrade_smithing_template",
"result": {
"id": "minions:mob_spawning_module"
}
}
src/main/resources/data/minions/recipe/mount_upgrade.json → src/main/resources/data/minions/recipe/mount_module.json
View File
src/main/resources/data/minions/recipe/move_upgrade.json → src/main/resources/data/minions/recipe/move_module.json
View File
src/main/resources/data/minions/tags/damage_type/minion_item_resists.json
+6
View File
@@ -0,0 +1,6 @@
{
"values": [
"#minecraft:is_fire",
"#minecraft:is_explosion"
]
}
src/main/resources/fabric.mod.json
-6
View File
@@ -12,14 +12,8 @@
"icon": "assets/minions/icon.png",
"environment": "*",
"entrypoints": {
"client": [
"io.github.skippyall.minions.client.MinionsClient"
],
"main": [
"io.github.skippyall.minions.Minions"
],
"server": [
"io.github.skippyall.minions.server.MinionsServer"
]
},
"mixins": [