diff --git a/build.gradle b/build.gradle index 9d749c73..bb9fa4de 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,8 @@ dependencies { // tasmod dependencies embed "com.dselent:bigarraylist:1.6" embed "com.github.KaptainWutax:SeedUtils:b6a383113c" - + implementation "com.google.code.gson:gson:2.14.0" + // loom dependencies minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings ploceus.mcpMappings(project.mcp_channel, project.mcp_mcversion, project.mcp_build) diff --git a/src/main/java/com/minecrafttas/mctcommon/json/FineField.java b/src/main/java/com/minecrafttas/mctcommon/json/FineField.java new file mode 100644 index 00000000..ceaf20f2 --- /dev/null +++ b/src/main/java/com/minecrafttas/mctcommon/json/FineField.java @@ -0,0 +1,58 @@ +package com.minecrafttas.mctcommon.json; + +import com.google.gson.JsonElement; + +public class FineField { + + private final String name; + private final FineMode mode; + private final FineSerializer serializer; + private final FineDeserializer deserializer; + + public FineField(String name, FineMode mode) { + this.name = name; + this.mode = mode; + this.serializer = null; + this.deserializer = null; + } + + public FineField(String name, FineSerializer serializer, FineDeserializer deserializer) { + this.name = name; + this.mode = FineMode.CUSTOM; + this.serializer = serializer; + this.deserializer = deserializer; + } + + public static enum FineMode { + FINE, + EXCLUDED, + GSON, + CUSTOM; + } + + public String getName() { + return name; + } + + public FineMode getMode() { + return mode; + } + + public JsonElement serialize(Object obj, FineGson fgson) { + return serializer.serialize(obj, fgson); + } + + public Object deserialize(JsonElement element, FineGson fgson) { + return deserializer.deserialize(element, fgson); + } + + @FunctionalInterface + public static interface FineSerializer { + public JsonElement serialize(Object obj, FineGson fgson); + } + + @FunctionalInterface + public static interface FineDeserializer { + public Object deserialize(JsonElement element, FineGson fgson); + } +} diff --git a/src/main/java/com/minecrafttas/mctcommon/json/FineGson.java b/src/main/java/com/minecrafttas/mctcommon/json/FineGson.java new file mode 100644 index 00000000..02c7725f --- /dev/null +++ b/src/main/java/com/minecrafttas/mctcommon/json/FineGson.java @@ -0,0 +1,148 @@ +package com.minecrafttas.mctcommon.json; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.internal.ConstructorConstructor; +import com.google.gson.reflect.TypeToken; + +/** + * A fine grained gson replacement + * + * @author Scribble + */ +public class FineGson { + + private TypeAdapterMap typeAdapters = new TypeAdapterMap(); + + private final Gson gsonInstance; + + public FineGson(Gson gsonInstance) { + this.gsonInstance = gsonInstance; + } + + public void registerTypeAdapter(Class type) { + if (type.isAnnotationPresent(FineMultiTarget.class)) { + List> classes = Arrays.asList(type.getDeclaredClasses()); + for (Class clazz : classes) { + registerTypeAdapter(clazz); + } + } + if (type.isAnnotationPresent(FineTarget.class)) { + if (!FineTypeAdapter.class.isAssignableFrom(type)) { + throw new RuntimeException(String.format("Trying to register type adapter %s, but it doesn't extend FineTypeAdapter", type.getName())); + } + FineTarget fineTargetAnnotation = type.getAnnotation(FineTarget.class); + Class targetType = fineTargetAnnotation.value(); + FineTypeAdapter adapter; + + try { + adapter = (FineTypeAdapter) type.newInstance(); + } catch (InstantiationException | IllegalAccessException e) { + throw new RuntimeException(String.format("Failed to instantiate type adapter %s", type.getName()), e); + } + registerTypeAdapter(targetType, adapter); + } + } + + public void registerTypeAdapter(Class type, FineTypeAdapter adapter) { + typeAdapters.put(type, adapter); + } + + public JsonElement serialize(Object obj) { + if (obj == null) + return JsonNull.INSTANCE; + Class type = obj.getClass(); + return serialize(obj, type); + } + + public JsonElement serialize(Object obj, Class type) { + if (!typeAdapters.containsKey(type)) + return gsonInstance.toJsonTree(obj); + + FineTypeAdapter adapter = typeAdapters.get(type); + JsonElement out = adapter.serialize(obj, this, type); + + Class superclass = type.getSuperclass(); + if (superclass != Object.class) { + JsonObject superObject = serialize(obj, superclass).getAsJsonObject(); + JsonObject jsonObj = out.getAsJsonObject(); + for (Entry objects : superObject.entrySet()) { + jsonObj.add(objects.getKey(), objects.getValue()); + } + out = jsonObj; + } + + return out; + } + + public Object deserialize(JsonElement element, Class type) { + if (!typeAdapters.containsKey(type)) + return gsonInstance.fromJson(element, type); + Object obj = constructNew(type); + return deserialize(element, type, obj); + } + + public Object deserialize(JsonElement element, Class type, Object existing) { + if (!typeAdapters.containsKey(type)) + return gsonInstance.fromJson(element, type); + + FineTypeAdapter adapter = typeAdapters.get(type); + Object out = adapter.deserialize(element, type, this, existing); + + Class superclass = type.getSuperclass(); + if (superclass != Object.class) { + FineTypeAdapter superadapter = typeAdapters.get(superclass); + out = superadapter.deserialize(element, superclass, this, out); + } + return out; + } + + public Gson getGsonInstance() { + return gsonInstance; + } + + public Map, FineTypeAdapter> getTypeAdapters() { + return typeAdapters; + } + + private class TypeAdapterMap extends HashMap, FineTypeAdapter> { + + @Override + public boolean containsKey(Object key) { + return get(key) != null; + } + + @Override + public FineTypeAdapter get(Object key) { + Class classKey = (Class) key; + if (classKey.isAnonymousClass()) { + for (FineTypeAdapter adapter : values()) { + FineTarget fineTargetAnnotation = adapter.getClass().getAnnotation(FineTarget.class); + if (fineTargetAnnotation == null) + continue; + Class enclosingType = fineTargetAnnotation.enclosingclazz(); + Class superType = fineTargetAnnotation.superclazz(); + if (classKey.getEnclosingClass() == enclosingType && classKey.getSuperclass() == superType) + return adapter; + } + return null; + } + return super.get(key); + } + } + + public static T constructNew(Class clazz) { + ConstructorConstructor constructor = new ConstructorConstructor(Collections.emptyMap(), true, Collections.emptyList()); + TypeToken token = TypeToken.get(clazz); + return constructor.get(token, true).construct(); + } +} diff --git a/src/main/java/com/minecrafttas/mctcommon/json/FineMultiTarget.java b/src/main/java/com/minecrafttas/mctcommon/json/FineMultiTarget.java new file mode 100644 index 00000000..2743de3d --- /dev/null +++ b/src/main/java/com/minecrafttas/mctcommon/json/FineMultiTarget.java @@ -0,0 +1,13 @@ +package com.minecrafttas.mctcommon.json; + +import static java.lang.annotation.ElementType.TYPE; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface FineMultiTarget { + +} diff --git a/src/main/java/com/minecrafttas/mctcommon/json/FineTarget.java b/src/main/java/com/minecrafttas/mctcommon/json/FineTarget.java new file mode 100644 index 00000000..432bbdfc --- /dev/null +++ b/src/main/java/com/minecrafttas/mctcommon/json/FineTarget.java @@ -0,0 +1,17 @@ +package com.minecrafttas.mctcommon.json; + +import static java.lang.annotation.ElementType.TYPE; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface FineTarget { + Class value() default Object.class; + + Class superclazz() default Object.class; + + Class enclosingclazz() default Object.class; +} diff --git a/src/main/java/com/minecrafttas/mctcommon/json/FineTypeAdapter.java b/src/main/java/com/minecrafttas/mctcommon/json/FineTypeAdapter.java new file mode 100644 index 00000000..0515cdfe --- /dev/null +++ b/src/main/java/com/minecrafttas/mctcommon/json/FineTypeAdapter.java @@ -0,0 +1,158 @@ +package com.minecrafttas.mctcommon.json; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.minecrafttas.mctcommon.json.FineField.FineDeserializer; +import com.minecrafttas.mctcommon.json.FineField.FineMode; +import com.minecrafttas.mctcommon.json.FineField.FineSerializer; +import com.minecrafttas.tasmod.util.JsonUtils; + +public abstract class FineTypeAdapter { + + private final List fineFields = new ArrayList<>(); + + private final List additionalFields = new ArrayList<>(); + + public void register(String name, FineMode mode) { + register(new FineField(name, mode)); + } + + public void register(String name, FineSerializer customSerializer, FineDeserializer customDeserializer) { + register(new FineField(name, customSerializer, customDeserializer)); + } + + public void register(FineField field) { + this.fineFields.add(field); + } + + public void registerAdditional(String name, FineSerializer customSerializer, FineDeserializer customDeserializer) { + this.additionalFields.add(new FineField(name, customSerializer, customDeserializer)); + } + + public JsonElement serialize(Object obj, FineGson fineJson) throws RuntimeException { + Class clazz = obj.getClass(); + return serialize(obj, fineJson, clazz); + } + + public JsonElement serialize(Object obj, FineGson fineJson, Class clazz) throws RuntimeException { + JsonObject out = new JsonObject(); + + List clazzFields = getFieldList(clazz); + + if (clazzFields.size() != fineFields.size()) { + throw new RuntimeException(String.format("Can't serialize %s: The field count differs: %s!=%s", clazz.getSimpleName(), clazzFields.size(), fineFields.size())); + } + + for (int i = 0; i < clazzFields.size(); i++) { + Field field = clazzFields.get(i); + FineField fineField = fineFields.get(i); + + Object fieldValue = null; + try { + field.setAccessible(true); + fieldValue = field.get(obj); + } catch (IllegalArgumentException | IllegalAccessException e) { + e.printStackTrace(); + continue; + } + + String fieldName = fineField.getName(); + System.out.println(String.format("[%s|%s] Serializing field %s (%s)", obj.getClass().getSimpleName(), clazz.getSimpleName(), field.getName(), fieldName)); + switch (fineField.getMode()) { + case CUSTOM: + out.add(fieldName, fineField.serialize(fieldValue, fineJson)); + break; + case FINE: + out.add(fieldName, fineJson.serialize(fieldValue)); + break; + case GSON: + out.add(fieldName, fineJson.getGsonInstance().toJsonTree(fieldValue)); + break; + + case EXCLUDED: + default: + break; + } + } + + for (FineField fineField : additionalFields) { + out.add(fineField.getName(), fineField.serialize(null, fineJson)); + } + return out; + } + + public Object deserialize(JsonElement element, Class clazz, FineGson fineJson) { + Object existing = FineGson.constructNew(clazz); + return deserialize(element, clazz, fineJson, existing); + } + + public Object deserialize(JsonElement element, Class clazz, FineGson fineJson, Object obj) { + List clazzFields = getFieldList(clazz); + + if (clazzFields.size() != fineFields.size()) { + throw new RuntimeException(String.format("Can't deserialize %s: The field count differs: %s!=%s", clazz.getSimpleName(), clazzFields.size(), fineFields.size())); + } + + JsonObject elementObj = element.getAsJsonObject(); + + for (int i = 0; i < clazzFields.size(); i++) { + Field field = clazzFields.get(i); + field.setAccessible(true); + FineField fineField = fineFields.get(i); + String fieldName = fineField.getName(); + JsonElement fieldElement = elementObj.get(fieldName); + + System.out.println(String.format("[%s|%s] Deserializing field %s (%s)", obj.getClass().getSimpleName(), clazz.getSimpleName(), field.getName(), fieldName)); + Object fieldValue = null; + switch (fineField.getMode()) { + case CUSTOM: + fieldValue = fineField.deserialize(fieldElement, fineJson); + break; + case FINE: + fieldValue = fineJson.deserialize(fieldElement, field.getType()); + break; + case GSON: + fieldValue = fineJson.getGsonInstance().fromJson(fieldElement, field.getType()); + break; + + case EXCLUDED: + default: + break; + } + if (fieldValue != null) { + try { + field.set(obj, fieldValue); + } catch (IllegalArgumentException | IllegalAccessException e) { + e.printStackTrace(); + } + } + } + return obj; + } + + protected Object constructNew(Class clazz) { + return JsonUtils.constructNew(clazz); + } + + public static List getFieldListWithSuperclass(Class clazz) { + List fields = getFieldList(clazz); + Class superclazz = clazz.getSuperclass(); + if (superclazz != Object.class) + fields.addAll(getFieldListWithSuperclass(superclazz)); + + return fields; + } + + public static List getFieldList(Class clazz) { + List fields = new ArrayList<>(); + for (Field field : clazz.getDeclaredFields()) { + if (!field.getName().startsWith("this")) + fields.add(field); + } + return fields; + } +} diff --git a/src/main/java/com/minecrafttas/mctcommon/json/FineTypeAdapterGenerator.java b/src/main/java/com/minecrafttas/mctcommon/json/FineTypeAdapterGenerator.java new file mode 100644 index 00000000..d4d5157a --- /dev/null +++ b/src/main/java/com/minecrafttas/mctcommon/json/FineTypeAdapterGenerator.java @@ -0,0 +1,111 @@ +package com.minecrafttas.mctcommon.json; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +public class FineTypeAdapterGenerator { + + protected final String className; + + protected final String packagge; + + protected final List importLines = new ArrayList<>(); + protected final Set> classList = new LinkedHashSet<>(); + + public FineTypeAdapterGenerator(String className, String packagge) { + this.className = className; + this.packagge = packagge; + fillDefaultImports(); + } + + protected void fillDefaultImports() { + importLines.add("import com.minecrafttas.mctcommon.json.FineField.FineMode;"); + importLines.add("import com.minecrafttas.mctcommon.json.FineMultiTarget;"); + importLines.add("import com.minecrafttas.mctcommon.json.FineTarget;"); + importLines.add("import com.minecrafttas.mctcommon.json.FineTypeAdapter;"); + importLines.add(""); + } + + public List generate() { + List out = new ArrayList<>(); + out.add(String.format("package %s;", packagge)); + out.add(""); + out.addAll(importLines); + for (Class clazz : classList) { + out.addAll(buildClass(clazz, false)); + } + return out; + } + + public List generateMulti() { + List out = new ArrayList<>(); + out.add(String.format("package %s;", packagge)); + out.add(""); + out.addAll(importLines); + out.add("@FineMultiTarget"); + out.add(String.format("public class %s {", className)); + out.add(""); + for (Class clazz : classList) { + List classLines = buildClass(clazz, true); + classLines.forEach(e1 -> out.add("\t" + e1)); + } + out.add("}"); + return out; + } + + public void addClass(Class... classes) { + for (Class clazz : classes) { + addClass(clazz); + } + } + + public void addClass(T object) { + Class clazz = object.getClass(); + addClass(clazz); + } + + public void addClass(Class clazz) { + if (classList.contains(clazz)) + return; + +// if (clazz.getName().contains("$")) { +// return; +// } + + Class superclazz = clazz.getSuperclass(); + if (superclazz != Object.class) + addClass(superclazz); + + classList.add(clazz); + } + + private List buildClass(Class clazz, boolean isStatic) { + List out = new ArrayList<>(); + + String clazzName = clazz.getSimpleName(); + List fields = FineTypeAdapter.getFieldList(clazz); + + out.addAll(splitNewLine(String.format("" + + "@FineTarget(%s.class)\n" + + "public %sclass %sTypeAdapter extends FineTypeAdapter {\n" + + "\n" + + "\tpublic %sTypeAdapter() {", clazz.getName().replace("$", "."), isStatic ? "static " : "", clazzName, clazzName))); + + for (Field field : fields) { + out.add(String.format("\t\tregister(\"%s\", FineMode.FINE);", field.getName())); + } + + out.add("\t}"); + out.add("}"); + out.add(""); + return out; + } + + protected List splitNewLine(String text) { + return new ArrayList<>(Arrays.asList(text.split("\n"))); + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/TASmod.java b/src/main/java/com/minecrafttas/tasmod/TASmod.java index 3f05ad30..5f947540 100644 --- a/src/main/java/com/minecrafttas/tasmod/TASmod.java +++ b/src/main/java/com/minecrafttas/tasmod/TASmod.java @@ -1,6 +1,7 @@ package com.minecrafttas.tasmod; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import org.apache.logging.log4j.LogManager; @@ -13,6 +14,7 @@ import com.minecrafttas.mctcommon.events.EventServer.EventServerInit; import com.minecrafttas.mctcommon.events.EventServer.EventServerStart; import com.minecrafttas.mctcommon.events.EventServer.EventServerStop; +import com.minecrafttas.mctcommon.json.FineTypeAdapterGenerator; import com.minecrafttas.mctcommon.networking.PacketHandlerRegistry; import com.minecrafttas.mctcommon.networking.Server; import com.minecrafttas.tasmod.commands.CommandClearInputs; @@ -31,6 +33,7 @@ import com.minecrafttas.tasmod.handlers.PlayUntilHandler; import com.minecrafttas.tasmod.ktrng.GlobalRNG; import com.minecrafttas.tasmod.ktrng.builtin.MathRNG; +import com.minecrafttas.tasmod.ktrng.builtin.SquidRNG; import com.minecrafttas.tasmod.ktrng.builtin.WorldSeedRNG; import com.minecrafttas.tasmod.ktrng.events.KillTheRNGMonitor; import com.minecrafttas.tasmod.ktrng.handlers.UUIDHandler; @@ -42,10 +45,13 @@ import com.minecrafttas.tasmod.savestates.handlers.SavestateGuiHandlerServer; import com.minecrafttas.tasmod.savestates.handlers.SavestateResourcePackHandler; import com.minecrafttas.tasmod.savestates.storage.builtin.ClientMotionStorage; -import com.minecrafttas.tasmod.savestates.storage.builtin.EntityBatSpawnPositionStorage; -import com.minecrafttas.tasmod.savestates.storage.builtin.EntitySquidRotationStorage; -import com.minecrafttas.tasmod.savestates.storage.builtin.EntityTickTimersStorage; +import com.minecrafttas.tasmod.savestates.storage.builtin.EntityAiTaskStorage; +import com.minecrafttas.tasmod.savestates.storage.builtin.EntityStorage; import com.minecrafttas.tasmod.savestates.storage.builtin.KTRNGSeedStorage; +import com.minecrafttas.tasmod.savestates.storage.builtin.entity.BatSpawnPositionSubStorage; +import com.minecrafttas.tasmod.savestates.storage.builtin.entity.CreeperDetonateSubStorage; +import com.minecrafttas.tasmod.savestates.storage.builtin.entity.LivingTickTimersSubStorage; +import com.minecrafttas.tasmod.savestates.storage.builtin.entity.SquidRotationSubStorage; import com.minecrafttas.tasmod.tickratechanger.TickrateChangerServer; import com.minecrafttas.tasmod.ticksync.TickSyncServer; import com.minecrafttas.tasmod.util.LoggerMarkers; @@ -102,20 +108,22 @@ public class TASmod implements ModInitializer, EventServerStart, EventServerInit public static GlobalRNG globalRandomness; public static KTRNGSeedStorage seedStorage = new KTRNGSeedStorage(); - public static EntityTickTimersStorage entityTickTimers = new EntityTickTimersStorage(); - public static EntityBatSpawnPositionStorage entityBatSpawnPositionStorage = new EntityBatSpawnPositionStorage(); - public static EntitySquidRotationStorage entitySquidRotationStorage = new EntitySquidRotationStorage(); + public static EntityAiTaskStorage entityAiTaskStorage = new EntityAiTaskStorage(); public static MathRNG mathRandomness = new MathRNG(0); public static WorldSeedRNG worldSeedRandomness = new WorldSeedRNG(0); + public static SquidRNG squidRNG = new SquidRNG(0L); + public static KillTheRNGMonitor debugRand = new KillTheRNGMonitor(); public static UUIDHandler uuidHandler = new UUIDHandler(); public static Configuration config; + public static FineTypeAdapterGenerator generator = new FineTypeAdapterGenerator("EntityAITypeAdapters", "com.minecrafttas.tasmod.savestates.typeadapters"); + @Override public void onInitialize() { @@ -173,6 +181,7 @@ public void onServerStart(MinecraftServer server) { EventListenerRegistry.register(globalRandomness); } mathRandomness = new MathRNG(0); + squidRNG.setSeed(globalRandomness.getCurrentSeed() + 1000L); } @Override @@ -239,9 +248,17 @@ public void onServerStop(MinecraftServer mcserver) { private void registerSavestateStorage() { TASmodAPIRegistry.SAVESTATE_STORAGE.register(motionStorage); TASmodAPIRegistry.SAVESTATE_STORAGE.register(seedStorage); - TASmodAPIRegistry.SAVESTATE_STORAGE.register(entityTickTimers); - TASmodAPIRegistry.SAVESTATE_STORAGE.register(entityBatSpawnPositionStorage); - TASmodAPIRegistry.SAVESTATE_STORAGE.register(entitySquidRotationStorage); + //@formatter:off + TASmodAPIRegistry.SAVESTATE_STORAGE.register( + new EntityStorage( + new BatSpawnPositionSubStorage(), + new CreeperDetonateSubStorage(), + new SquidRotationSubStorage(), + new LivingTickTimersSubStorage() + ) + ); + //@formatter:on + TASmodAPIRegistry.SAVESTATE_STORAGE.register(entityAiTaskStorage); } public static MinecraftServer getServerInstance() { @@ -249,11 +266,19 @@ public static MinecraftServer getServerInstance() { } private void loadConfig(MinecraftServer server) { - Path configDir = server.getDataDirectory().toPath(); + Path configDir = server.getDataDirectory().toPath().resolve("config"); + + if (!Files.exists(configDir)) { + try { + Files.createDirectory(configDir); + } catch (IOException e) { + LOGGER.catching(e); + } + } ConfigurationRegistry SERVER_CONFIG_REGISTRY = new ConfigurationRegistry(); SERVER_CONFIG_REGISTRY.register(TASmodServerConfig.values()); - config = new Configuration("TASmod Server Configuration", configDir.resolve("tasmod.cfg"), SERVER_CONFIG_REGISTRY); + config = new Configuration("TASmod Server Configuration", configDir.resolve("tasmod_server.cfg"), SERVER_CONFIG_REGISTRY); config.load(); config.save(); diff --git a/src/main/java/com/minecrafttas/tasmod/TASmodClient.java b/src/main/java/com/minecrafttas/tasmod/TASmodClient.java index fca5e374..1d95a651 100644 --- a/src/main/java/com/minecrafttas/tasmod/TASmodClient.java +++ b/src/main/java/com/minecrafttas/tasmod/TASmodClient.java @@ -366,7 +366,7 @@ private void loadConfig(Minecraft mc) { LOGGER.catching(e); } } - config = new Configuration("TASmod configuration", configDir.resolve("tasmod.cfg"), CLIENT_CONFIG_REGISTRY); + config = new Configuration("TASmod configuration", configDir.resolve("tasmod_client.cfg"), CLIENT_CONFIG_REGISTRY); config.load(); config.save(); diff --git a/src/main/java/com/minecrafttas/tasmod/ktrng/builtin/SquidRNG.java b/src/main/java/com/minecrafttas/tasmod/ktrng/builtin/SquidRNG.java new file mode 100644 index 00000000..0eb6ba29 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/ktrng/builtin/SquidRNG.java @@ -0,0 +1,16 @@ +package com.minecrafttas.tasmod.ktrng.builtin; + +import com.minecrafttas.tasmod.ktrng.RandomBase; + +public class SquidRNG extends RandomBase { + + public SquidRNG(long l) { + super(l); + } + + @Override + public String getExtensionName() { + return "SquidRNG"; + } + +} diff --git a/src/main/java/com/minecrafttas/tasmod/mixin/killtherng/MixinEntitySquid.java b/src/main/java/com/minecrafttas/tasmod/mixin/killtherng/MixinEntitySquid.java index b719bd42..f0658676 100644 --- a/src/main/java/com/minecrafttas/tasmod/mixin/killtherng/MixinEntitySquid.java +++ b/src/main/java/com/minecrafttas/tasmod/mixin/killtherng/MixinEntitySquid.java @@ -6,6 +6,7 @@ import org.spongepowered.asm.mixin.injection.At; import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; +import com.minecrafttas.tasmod.TASmod; import net.minecraft.entity.passive.EntitySquid; @@ -14,6 +15,9 @@ public class MixinEntitySquid { @WrapWithCondition(method = "", at = @At(value = "INVOKE", target = "Ljava/util/Random;setSeed(J)V")) public boolean remove_setSeed(Random rand, long seed) { + if (TASmod.squidRNG.nextInt(1000) == 0) { + TASmod.LOGGER.error("SQUIDS ARE EVIL!!"); + } return false; } } diff --git a/src/main/java/com/minecrafttas/tasmod/mixin/savestates/TypeAdapterGenerator.java b/src/main/java/com/minecrafttas/tasmod/mixin/savestates/TypeAdapterGenerator.java new file mode 100644 index 00000000..b7700e8b --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/mixin/savestates/TypeAdapterGenerator.java @@ -0,0 +1,18 @@ +package com.minecrafttas.tasmod.mixin.savestates; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.entity.ai.EntityAIBase; + +@Mixin(EntityAIBase.class) +public class TypeAdapterGenerator { + @Inject(method = "", at = @At("RETURN")) + public void inject_aiBase(CallbackInfo ci) { +// EntityAIBase thisObj = (EntityAIBase) (Object) this; +// System.out.println(thisObj); +// TASmod.generator.addClass(thisObj.getClass()); + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/registries/TASmodKeybinds.java b/src/main/java/com/minecrafttas/tasmod/registries/TASmodKeybinds.java index d0a5c4a4..42f306c5 100644 --- a/src/main/java/com/minecrafttas/tasmod/registries/TASmodKeybinds.java +++ b/src/main/java/com/minecrafttas/tasmod/registries/TASmodKeybinds.java @@ -1,10 +1,16 @@ package com.minecrafttas.tasmod.registries; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; + import org.lwjgl.input.Keyboard; import com.minecrafttas.mctcommon.KeybindManager.IsKeyDownFunc; import com.minecrafttas.mctcommon.KeybindManager.Keybind; import com.minecrafttas.mctcommon.KeybindManager.KeybindID; +import com.minecrafttas.tasmod.TASmod; import com.minecrafttas.tasmod.TASmodClient; import com.minecrafttas.tasmod.networking.TASmodBufferBuilder; import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate; @@ -46,9 +52,14 @@ public enum TASmodKeybinds implements KeybindID { TASmodClient.virtual.CAMERA_ANGLE.updateNextCameraAngle(0, 45); }), TEST1("Various Testing", "TASmod", Keyboard.KEY_F12, () -> { + /* + * Yes, I am really generating TypeAdapter code here and replacing the class file. + * This is how we did it before AI kids. + */ + try { - TASmodClient.client.send(new TASmodBufferBuilder(TASmodPackets.PLAYBACK_STATE_TEMP_SAVESTATE).writeEnum(TASstate.RECORDING)); - } catch (Exception e) { + Files.write(Paths.get("../src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityAITypeAdapters.java"), TASmod.generator.generateMulti(), StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); + } catch (IOException e) { e.printStackTrace(); } }, VirtualKeybindings::isKeyDown), diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/SavestateStorageExtensionBase.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/SavestateStorageExtensionBase.java index 3e1b5b3a..3c70ebee 100644 --- a/src/main/java/com/minecrafttas/tasmod/savestates/storage/SavestateStorageExtensionBase.java +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/SavestateStorageExtensionBase.java @@ -15,12 +15,17 @@ public abstract class SavestateStorageExtensionBase implements Registerable { protected final Logger logger = TASmod.LOGGER; - protected final Gson json = JsonUtils.getJsonInstance(); + protected final Gson gsonInstance; public final Path fileName; - public SavestateStorageExtensionBase(String fileName) { + public SavestateStorageExtensionBase(String filename) { + this(filename, JsonUtils.getGsonInstance()); + } + + public SavestateStorageExtensionBase(String fileName, Gson gson) { this.fileName = Paths.get(fileName); + this.gsonInstance = gson; } public abstract JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave); diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/SavestateStorageExtensionRegistry.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/SavestateStorageExtensionRegistry.java index cdab59a6..ead636c2 100644 --- a/src/main/java/com/minecrafttas/tasmod/savestates/storage/SavestateStorageExtensionRegistry.java +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/SavestateStorageExtensionRegistry.java @@ -43,7 +43,7 @@ public void onServerSavestate(MinecraftServer server, SavestatePaths paths) { JsonObject dataToSave = storage.onSavestate(server, new JsonObject()); try { - JsonUtils.saveJson(dataPath, dataToSave); + JsonUtils.saveJson(dataPath, dataToSave, storage.gsonInstance); } catch (IOException e) { throw new SavestateException(e, "Can't save %s from %s extension", storage.fileName, storage.getExtensionName()); } @@ -71,7 +71,7 @@ private void load(SavestatePaths paths) { JsonObject loadedData; try { - loadedData = JsonUtils.loadJson(dataPath); + loadedData = JsonUtils.loadJson(dataPath, storage.gsonInstance); } catch (IOException e) { throw new LoadstateException(e, "Can't load %s in %s extension", storage.fileName, storage.getExtensionName()); } diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/ClientMotionStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/ClientMotionStorage.java index 81f89e55..a3938659 100644 --- a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/ClientMotionStorage.java +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/ClientMotionStorage.java @@ -74,7 +74,7 @@ public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) { if (player.getName().equals(server.getServerOwner())) { uuid = "singleplayer"; } - dataToSave.add(uuid, json.toJsonTree(data)); + dataToSave.add(uuid, gsonInstance.toJsonTree(data)); } catch (TimeoutException e) { throw new SavestateException(e, "Writing client motion for %s timed out!", player.getName()); @@ -92,7 +92,7 @@ public void onLoadstatePost(MinecraftServer server, JsonObject loadedData) { for (Entry motionDataJsonElement : loadedData.entrySet()) { String playerUUID = motionDataJsonElement.getKey(); - MotionData motionData = json.fromJson(motionDataJsonElement.getValue(), MotionData.class); + MotionData motionData = gsonInstance.fromJson(motionDataJsonElement.getValue(), MotionData.class); EntityPlayerMP player; if (playerUUID.equals("singleplayer")) { diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityAiTaskStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityAiTaskStorage.java new file mode 100644 index 00000000..1662ddb7 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityAiTaskStorage.java @@ -0,0 +1,233 @@ +package com.minecrafttas.tasmod.savestates.storage.builtin; + +import java.lang.reflect.Modifier; +import java.util.LinkedHashSet; +import java.util.Map.Entry; +import java.util.Set; +import java.util.UUID; + +import org.spongepowered.asm.mixin.Unique; + +import com.google.common.base.Predicate; +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.minecrafttas.mctcommon.json.FineGson; +import com.minecrafttas.tasmod.savestates.exceptions.SavestateException; +import com.minecrafttas.tasmod.savestates.storage.SavestateStorageExtensionBase; +import com.minecrafttas.tasmod.savestates.typeadapters.BlockPosTypeAdapterFactory; +import com.minecrafttas.tasmod.savestates.typeadapters.EntityAITypeAdapters; +import com.minecrafttas.tasmod.savestates.typeadapters.EntityClassTypeAdapterFactory; +import com.minecrafttas.tasmod.savestates.typeadapters.EntityLivingTypeAdapter; +import com.minecrafttas.tasmod.savestates.typeadapters.EntityTypeAdapterFactory; +import com.minecrafttas.tasmod.savestates.typeadapters.ItemTypeAdapter; +import com.minecrafttas.tasmod.savestates.typeadapters.WorldTypeAdapterFactory; +import com.minecrafttas.tasmod.savestates.typeadapters.util.ClassExclusionStrategy; +import com.minecrafttas.tasmod.util.JsonUtils; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.ai.EntityAITasks; +import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; +import net.minecraft.item.Item; +import net.minecraft.pathfinding.PathNavigate; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.WorldServer; + +public class EntityAiTaskStorage extends SavestateStorageExtensionBase { + + private final FineGson fgson; + + public EntityAiTaskStorage() { + //@formatter:off + super("entityAi.json", + new GsonBuilder() + .setPrettyPrinting() + .registerTypeAdapterFactory( + new EntityTypeAdapterFactory() + ) + .registerTypeAdapterFactory( + new WorldTypeAdapterFactory() + ) + .registerTypeAdapterFactory( + new EntityClassTypeAdapterFactory() + ) +// .registerTypeAdapter(EntityAINearestAttackableTarget.class, new EntityAINearestAttackableTargetTypeAdapter()) + .registerTypeAdapterFactory( + new BlockPosTypeAdapterFactory() + ) + .registerTypeAdapter(EntityLivingTypeAdapter.class, new EntityLivingTypeAdapter()) + .setExclusionStrategies(new ExclusionStrategy() { + + @Override + public boolean shouldSkipField(FieldAttributes f) { + return f.getAnnotation(Unique.class) != null; + } + + @Override + public boolean shouldSkipClass(Class c) { + return false; + } + }, + new ClassExclusionStrategy(Predicate.class), + new ClassExclusionStrategy(PathNavigate.class) +// new ClassExclusionStrategy(EntityLivingBase.class, EntityAINearestAttackableTarget.class) + ) + .create()); + //@formatter:on + + fgson = new FineGson(gsonInstance); + fgson.registerTypeAdapter(EntityAITypeAdapters.class); + fgson.registerTypeAdapter(Item.class, new ItemTypeAdapter()); + } + + @Override + public String getExtensionName() { + return "EntityAI"; + } + + @Override + public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) { + for (WorldServer worldServer : server.worlds) { + for (Entity entity : worldServer.loadedEntityList) { + if (!(entity instanceof EntityLiving)) + continue; + + JsonObject mainObject = new JsonObject(); + EntityLiving entityLiving = (EntityLiving) entity; + + mainObject.addProperty("type", entity.getClass().getSimpleName()); + + mainObject.addProperty("ticksExisted", entityLiving.ticksExisted); + mainObject.add("revengeTarget", gsonInstance.toJsonTree(entityLiving.revengeTarget)); + mainObject.addProperty("revengeTimer", entityLiving.revengeTimer); + mainObject.add("lastAttackedEntity", gsonInstance.toJsonTree(entityLiving.lastAttackedEntity)); + mainObject.add("attackTarget", gsonInstance.toJsonTree(entityLiving.attackTarget)); + + EntityAITasks tasks = entityLiving.tasks; + mainObject.add("tasks", serialiseAITasks(tasks)); + + EntityAITasks targetTasks = entityLiving.targetTasks; + mainObject.add("targetTasks", serialiseAITasks(targetTasks)); + + dataToSave.add(entity.getUniqueID().toString(), mainObject); + } + } + return dataToSave; + } + + private JsonObject serialiseAITasks(EntityAITasks tasks) { + JsonObject out = new JsonObject(); + out.add("taskEntries", serialiseAIEntries(tasks.taskEntries)); + out.add("executingTaskEntries", serialiseAIEntries(tasks.executingTaskEntries)); + return out; + } + + @SuppressWarnings("unchecked") + private JsonArray serialiseAIEntries(Set taskEntries) { + JsonArray serialisedEntries = new JsonArray(); + for (EntityAITasks.EntityAITaskEntry entry : taskEntries) { + JsonObject jsonAiTaskEntry = new JsonObject(); + Class clazz = entry.action.getClass(); + if (clazz.isAnonymousClass()) + clazz = (Class) clazz.getSuperclass(); + jsonAiTaskEntry.addProperty("priority", entry.priority); + jsonAiTaskEntry.addProperty("using", entry.using); + jsonAiTaskEntry.addProperty("class", clazz.getName()); + + try { + System.out.println(clazz.getName()); + jsonAiTaskEntry.add("action", fgson.serialize(entry.action)); + } catch (Exception e) { + throw new SavestateException(e, "Could not serialise AI Task %s", entry.action.getClass().getName()); + } + + serialisedEntries.add(jsonAiTaskEntry); + } + return serialisedEntries; + } + + @Override + public void onLoadstatePost(MinecraftServer server, JsonObject loadedData) { + for (Entry elements : loadedData.entrySet()) { + for (WorldServer worldServer : server.worlds) { + EntityLiving entityLiving = (EntityLiving) worldServer.getEntityFromUuid(UUID.fromString(elements.getKey())); + if (entityLiving == null) + continue; + + JsonObject mainObject = elements.getValue().getAsJsonObject(); + + entityLiving.ticksExisted = mainObject.get("ticksExisted").getAsInt(); + entityLiving.revengeTarget = (EntityLivingBase) gsonInstance.fromJson(mainObject.get("revengeTarget"), Entity.class); + entityLiving.revengeTimer = mainObject.get("revengeTimer").getAsInt(); + entityLiving.lastAttackedEntity = (EntityLivingBase) gsonInstance.fromJson(mainObject.get("lastAttackedEntity"), Entity.class); + entityLiving.attackTarget = (EntityLivingBase) gsonInstance.fromJson(mainObject.get("attackTarget"), Entity.class); + + deserialiseAITasks(entityLiving.tasks, mainObject.get("tasks").getAsJsonObject()); + deserialiseAITasks(entityLiving.targetTasks, mainObject.get("targetTasks").getAsJsonObject()); + } + } + } + + private void deserialiseAITasks(EntityAITasks tasks, JsonObject jsonTasks) { + tasks.taskEntries = deserialiseAIEntries(tasks.taskEntries, tasks, jsonTasks.get("taskEntries").getAsJsonArray()); + tasks.executingTaskEntries = deserialiseAIEntries(tasks.executingTaskEntries, tasks, jsonTasks.get("executingTaskEntries").getAsJsonArray()); + } + + private Set deserialiseAIEntries(Set taskEntries, EntityAITasks parent, JsonArray jsonEntries) { + Set out = new LinkedHashSet<>(); + + for (JsonElement jsonEntryElement : jsonEntries) { + JsonObject jsonEntry = jsonEntryElement.getAsJsonObject(); + + // Deserialise the type of the AI action +// System.out.println(jsonEntry.get("class").getAsString()); + Class clazz; + try { + clazz = Class.forName(jsonEntry.get("class").getAsString(), false, getClass().getClassLoader()).asSubclass(EntityAIBase.class); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + return out; + } + + boolean createNew = true; + boolean using = jsonEntry.get("using").getAsBoolean(); + for (EntityAITaskEntry vanillaEntry : taskEntries) { + EntityAIBase vanillaAction = vanillaEntry.action; + if (vanillaAction.getClass() != clazz) { + continue; + } + + createNew = false; + vanillaEntry.action = (EntityAIBase) fgson.deserialize(jsonEntry.get("action"), vanillaAction.getClass(), vanillaAction); + vanillaEntry.using = using; + out.add(vanillaEntry); + break; + } + + if (!createNew) { + continue; + } + int priority = jsonEntry.get("priority").getAsInt(); + + if (Modifier.isAbstract(clazz.getModifiers())) + continue; + EntityAIBase action = JsonUtils.constructNew(clazz); + try { + action = (EntityAIBase) fgson.deserialize(jsonEntry.get("action"), action.getClass(), action); + } catch (Exception e) { + e.printStackTrace(); + continue; + } + EntityAITaskEntry entry = parent.new EntityAITaskEntry(priority, action); + entry.using = using; + out.add(entry); + } + return out; + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityBatSpawnPositionStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityBatSpawnPositionStorage.java deleted file mode 100644 index 307376ea..00000000 --- a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityBatSpawnPositionStorage.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.minecrafttas.tasmod.savestates.storage.builtin; - -import java.util.UUID; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.minecrafttas.tasmod.savestates.storage.SavestateStorageExtensionBase; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.passive.EntityBat; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldServer; - -public class EntityBatSpawnPositionStorage extends SavestateStorageExtensionBase { - - public EntityBatSpawnPositionStorage() { - super("entityBatSpawnPosition.json"); - } - - @Override - public String getExtensionName() { - return "EntityBatSpawnPosition"; - } - - @Override - public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) { - for (WorldServer worldServer : server.worlds) { - for (Entity entity : worldServer.loadedEntityList) { - if (entity instanceof EntityBat) { - EntityBat bat = (EntityBat) entity; - BlockPos spawnPos = bat.spawnPosition; - if (spawnPos == null) - continue; - UUID entityUUID = entity.getUniqueID(); - dataToSave.addProperty(entityUUID.toString(), Long.toString(bat.spawnPosition.toLong())); - } - } - } - return dataToSave; - } - - @Override - public void onLoadstatePost(MinecraftServer server, JsonObject loadedData) { - if (loadedData == null) - return; - for (WorldServer worldServer : server.worlds) { - for (Entity entity : worldServer.loadedEntityList) { - if (entity instanceof EntityBat) { - EntityBat bat = (EntityBat) entity; - UUID entityUUID = entity.getUniqueID(); - JsonElement element = loadedData.get(entityUUID.toString()); - if (element == null) - continue; - BlockPos spawnPos = BlockPos.fromLong(element.getAsLong()); - bat.spawnPosition = spawnPos; - } - } - } - } -} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntitySquidRotationStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntitySquidRotationStorage.java deleted file mode 100644 index 0c9e7349..00000000 --- a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntitySquidRotationStorage.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.minecrafttas.tasmod.savestates.storage.builtin; - -import java.util.UUID; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.minecrafttas.tasmod.savestates.storage.SavestateStorageExtensionBase; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.passive.EntitySquid; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.WorldServer; - -/** - *

Stores squid rotation in the savestates - *

Did you know that the rotation of the squid can trigger an RNG call? Did you know Minecraft does not save this by default?
- * Well now you know and it's annoying. - * - * @author Scribble - */ -public class EntitySquidRotationStorage extends SavestateStorageExtensionBase { - - public EntitySquidRotationStorage() { - super("entitySquidRotation.json"); - } - - @Override - public String getExtensionName() { - return "EntitySquidRotation"; - } - - @Override - public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) { - for (WorldServer worldServer : server.worlds) { - for (Entity entity : worldServer.loadedEntityList) { - if (entity instanceof EntitySquid) { - EntitySquid squid = (EntitySquid) entity; - float rotation = squid.squidRotation; - UUID entityUUID = entity.getUniqueID(); - dataToSave.addProperty(entityUUID.toString(), Float.toString(rotation)); - } - } - } - return dataToSave; - } - - @Override - public void onLoadstatePost(MinecraftServer server, JsonObject loadedData) { - if (loadedData == null) - return; - for (WorldServer worldServer : server.worlds) { - for (Entity entity : worldServer.loadedEntityList) { - if (entity instanceof EntitySquid) { - EntitySquid squid = (EntitySquid) entity; - UUID entityUUID = entity.getUniqueID(); - JsonElement element = loadedData.get(entityUUID.toString()); - if (element == null) - continue; - float rotation = element.getAsFloat(); - squid.squidRotation = rotation; - } - } - } - } -} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityStorage.java new file mode 100644 index 00000000..816a885a --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityStorage.java @@ -0,0 +1,105 @@ +package com.minecrafttas.tasmod.savestates.storage.builtin; + +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; +import com.minecrafttas.tasmod.TASmod; +import com.minecrafttas.tasmod.savestates.storage.SavestateStorageExtensionBase; +import com.minecrafttas.tasmod.savestates.typeadapters.util.ClassExclusionStrategy; +import com.minecrafttas.tasmod.util.LoggerMarkers; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.ai.attributes.IAttributeInstance; +import net.minecraft.pathfinding.NodeProcessor; +import net.minecraft.pathfinding.PathFinder; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; + +public class EntityStorage extends SavestateStorageExtensionBase { + + private final List subStorages; + + public EntityStorage(EntitySubStorage... entitySubStorages) { + this(Arrays.asList(entitySubStorages)); + } + + public EntityStorage(List entitySubStorages) { + //@formatter:off + super("entity.json", new GsonBuilder().setPrettyPrinting().setExclusionStrategies( + new ClassExclusionStrategy(EntityLiving.class), + new ClassExclusionStrategy(World.class), + new ClassExclusionStrategy(IAttributeInstance.class), + new ClassExclusionStrategy(NodeProcessor.class), + new ClassExclusionStrategy(PathFinder.class) + ) +// .registerTypeAdapterFactory(new PathNavigateTypeAdapterFactory()) + .create()); + //@formatter:on + this.subStorages = entitySubStorages; + } + + @Override + public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) { + for (WorldServer worldServer : server.worlds) { + for (Entity entity : worldServer.loadedEntityList) { + UUID uuid = entity.getUniqueID(); + JsonObject subDataObject = new JsonObject(); + for (EntitySubStorage subStorage : subStorages) { + if (subStorage.getEntityClass().isAssignableFrom(entity.getClass())) { + JsonObject subDataToSave = new JsonObject(); + subDataToSave = subStorage.onSavestate(server, entity, subDataToSave, super.gsonInstance); + subDataObject.add(subStorage.getPropertyName(), subDataToSave); + } + } + dataToSave.add(uuid.toString(), subDataObject); + } + } + return dataToSave; + } + + @Override + public void onLoadstatePost(MinecraftServer server, JsonObject loadedData) { + if (loadedData == null) + return; + for (WorldServer worldServer : server.worlds) { + for (Entity entity : worldServer.loadedEntityList) { + UUID uuid = entity.getUniqueID(); + if (!loadedData.has(uuid.toString())) + continue; + + JsonObject subDataObject = loadedData.get(uuid.toString()).getAsJsonObject(); + for (EntitySubStorage subStorage : subStorages) { + if (!subDataObject.has(subStorage.getPropertyName())) { + TASmod.LOGGER.warn(LoggerMarkers.Savestate, "{} is not found in EntityStorage. Things might desync!", subStorage.getPropertyName()); + continue; + } + + if (subStorage.getEntityClass().isAssignableFrom(entity.getClass())) { + entity = subStorage.onLoadstatePost(server, entity, subDataObject.get(subStorage.getPropertyName()).getAsJsonObject(), super.gsonInstance); + } + } + } + } + } + + @Override + public String getExtensionName() { + return "EntityAIStorage"; + } + + public static interface EntitySubStorage { + public String getPropertyName(); + + public Class getEntityClass(); + + public JsonObject onSavestate(MinecraftServer server, Entity entity, JsonObject dataToSave, Gson gsonInstance); + + public Entity onLoadstatePost(MinecraftServer server, Entity entity, JsonObject loadedData, Gson gsonInstance); + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityTickTimersStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityTickTimersStorage.java deleted file mode 100644 index 7d356430..00000000 --- a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/EntityTickTimersStorage.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.minecrafttas.tasmod.savestates.storage.builtin; - -import java.util.UUID; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.minecrafttas.tasmod.savestates.storage.SavestateStorageExtensionBase; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAITasks; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.WorldServer; - -/** - * Stores the {@link EntityAITasks#tickCount} in a savestate. - * - * AI tasks are only updated every third tick and the tickCount keeps track of that. - * - * @author Scribble - */ -public class EntityTickTimersStorage extends SavestateStorageExtensionBase { - - public EntityTickTimersStorage() { - super("entityTickTimers.json"); - } - - @Override - public String getExtensionName() { - return "EntityTickTimers"; - } - - @Override - public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) { - for (WorldServer worldServer : server.worlds) { - for (Entity entity : worldServer.loadedEntityList) { - if (entity instanceof EntityLiving) { - UUID entityUUID = entity.getUniqueID(); - EntityLiving entityLiving = (EntityLiving) entity; - EntityLivingBase entityLivingBase = (EntityLivingBase) entity; - EntityAITasks tasks = entityLiving.tasks; - EntityAITasks targetTasks = entityLiving.targetTasks; - int tickCount = tasks.tickCount; - int tickCountTarget = targetTasks.tickCount; - int tickCountSound = entityLiving.livingSoundTime; - int tickIdle = entityLivingBase.idleTime; - JsonObject tickCountList = new JsonObject(); - tickCountList.addProperty("aitasks", tickCount); - tickCountList.addProperty("aitargetTasks", tickCountTarget); - tickCountList.addProperty("livingSoundTime", tickCountSound); - tickCountList.addProperty("idleTime", tickIdle); - dataToSave.add(entityUUID.toString(), tickCountList); - } - } - } - return dataToSave; - } - - @Override - public void onLoadstatePost(MinecraftServer server, JsonObject loadedData) { - if (loadedData == null) - return; - for (WorldServer worldServer : server.worlds) { - for (Entity entity : worldServer.loadedEntityList) { - UUID entityUUID = entity.getUniqueID(); - - JsonElement tickCountElement = loadedData.get(entityUUID.toString()); - if (tickCountElement == null) - continue; - JsonObject tickCountList = tickCountElement.getAsJsonObject(); - - int tickCount = tickCountList.get("aitasks").getAsInt(); - int tickCountTarget = tickCountList.get("aitargetTasks").getAsInt(); - int tickCountSound = tickCountList.get("livingSoundTime").getAsInt(); - int tickCountIdle = tickCountList.get("idleTime").getAsInt(); - - if (entity instanceof EntityLiving) { - EntityLiving entityLiving = (EntityLiving) entity; - EntityLivingBase entityLivingBase = (EntityLivingBase) entity; - EntityAITasks tasks = entityLiving.tasks; - EntityAITasks targetTasks = entityLiving.targetTasks; - tasks.tickCount = tickCount; - targetTasks.tickCount = tickCountTarget; - entityLiving.livingSoundTime = tickCountSound; - entityLivingBase.idleTime = tickCountIdle; - } - } - } - } -} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/BatSpawnPositionSubStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/BatSpawnPositionSubStorage.java new file mode 100644 index 00000000..afe2073f --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/BatSpawnPositionSubStorage.java @@ -0,0 +1,46 @@ +package com.minecrafttas.tasmod.savestates.storage.builtin.entity; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.minecrafttas.tasmod.savestates.storage.builtin.EntityStorage.EntitySubStorage; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.passive.EntityBat; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.math.BlockPos; + +public class BatSpawnPositionSubStorage implements EntitySubStorage { + + @Override + public String getPropertyName() { + return "batSpawnPositionStorage"; + } + + @Override + public Class getEntityClass() { + return EntityBat.class; + } + + @Override + public JsonObject onSavestate(MinecraftServer server, Entity entity, JsonObject dataToSave, Gson gsonInstance) { + EntityBat bat = (EntityBat) entity; + BlockPos spawnPos = bat.spawnPosition; + if (spawnPos == null) + return dataToSave; + + dataToSave.addProperty("spawnPos", Long.toString(bat.spawnPosition.toLong())); + return dataToSave; + } + + @Override + public Entity onLoadstatePost(MinecraftServer server, Entity entity, JsonObject loadedData, Gson gsonInstance) { + EntityBat bat = (EntityBat) entity; + JsonElement element = loadedData.get("spawnPos"); + if (element == null) + return bat; + BlockPos spawnPos = BlockPos.fromLong(element.getAsLong()); + bat.spawnPosition = spawnPos; + return bat; + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/CreeperDetonateSubStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/CreeperDetonateSubStorage.java new file mode 100644 index 00000000..7b9ae5a2 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/CreeperDetonateSubStorage.java @@ -0,0 +1,52 @@ +package com.minecrafttas.tasmod.savestates.storage.builtin.entity; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.minecrafttas.tasmod.savestates.storage.builtin.EntityStorage.EntitySubStorage; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.server.MinecraftServer; + +public class CreeperDetonateSubStorage implements EntitySubStorage { + + @Override + public String getPropertyName() { + return "creeperDetonate"; + } + + @Override + public Class getEntityClass() { + return EntityCreeper.class; + } + + @Override + public JsonObject onSavestate(MinecraftServer server, Entity entity, JsonObject dataToSave, Gson gsonInstance) { + EntityCreeper creeper = (EntityCreeper) entity; + dataToSave.addProperty("timeSinceIgnited", creeper.timeSinceIgnited); + dataToSave.addProperty("droppedSkulls", creeper.droppedSkulls); + dataToSave.addProperty("exploding", creeper.getCreeperState()); + return dataToSave; + } + + @Override + public Entity onLoadstatePost(MinecraftServer server, Entity entity, JsonObject loadedData, Gson gsonInstance) { + EntityCreeper creeper = (EntityCreeper) entity; + JsonElement boomTime = loadedData.get("timeSinceIgnited"); + JsonElement dropped = loadedData.get("droppedSkulls"); + JsonElement exploding = loadedData.get("exploding"); + + if (boomTime != null) + creeper.timeSinceIgnited = boomTime.getAsInt(); + + if (dropped != null) + creeper.droppedSkulls = dropped.getAsInt(); + + if (exploding != null) + creeper.setCreeperState(exploding.getAsInt()); + + return entity; + } + +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/LivingNavigatorSubStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/LivingNavigatorSubStorage.java new file mode 100644 index 00000000..5b116a32 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/LivingNavigatorSubStorage.java @@ -0,0 +1,52 @@ +package com.minecrafttas.tasmod.savestates.storage.builtin.entity; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.minecrafttas.tasmod.savestates.storage.builtin.EntityStorage.EntitySubStorage; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.pathfinding.PathNavigate; +import net.minecraft.server.MinecraftServer; + +public class LivingNavigatorSubStorage implements EntitySubStorage { + + @Override + public String getPropertyName() { + return "livingNavigator"; + } + + @Override + public Class getEntityClass() { + return EntityLiving.class; + } + + @Override + public JsonObject onSavestate(MinecraftServer server, Entity entity, JsonObject dataToSave, Gson gsonInstance) { + EntityLiving entityLiving = (EntityLiving) entity; + dataToSave.add("navigator", gsonInstance.toJsonTree(entityLiving.navigator)); + return dataToSave; + } + + @Override + public Entity onLoadstatePost(MinecraftServer server, Entity entity, JsonObject loadedData, Gson gsonInstance) { + EntityLiving entityLiving = (EntityLiving) entity; + JsonElement navigatorJson = loadedData.get("navigator"); + if (navigatorJson != null) { + PathNavigate dummyNavigator = entityLiving.createNavigator(entityLiving.world); + PathNavigate navigator = entityLiving.navigator; + navigator = gsonInstance.fromJson(navigatorJson, dummyNavigator.getClass()); + navigator.entity = dummyNavigator.entity; + navigator.world = dummyNavigator.world; + navigator.pathSearchRange = dummyNavigator.pathSearchRange; + navigator.pathFinder = dummyNavigator.pathFinder; + navigator.nodeProcessor = dummyNavigator.nodeProcessor; + + entityLiving.navigator = navigator; + } + + return entityLiving; + } + +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/LivingTickTimersSubStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/LivingTickTimersSubStorage.java new file mode 100644 index 00000000..4f50b1af --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/LivingTickTimersSubStorage.java @@ -0,0 +1,73 @@ +package com.minecrafttas.tasmod.savestates.storage.builtin.entity; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.minecrafttas.tasmod.savestates.storage.builtin.EntityStorage.EntitySubStorage; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.ai.EntityAITasks; +import net.minecraft.server.MinecraftServer; + +/** + * Stores the {@link EntityAITasks#tickCount} in a savestate. + * + * AI tasks are only updated every third tick and the tickCount keeps track of that. + * + * @author Scribble + */ +public class LivingTickTimersSubStorage implements EntitySubStorage { + + @Override + public String getPropertyName() { + return "tickTimers"; + } + + @Override + public Class getEntityClass() { + return EntityLiving.class; + } + + @Override + public JsonObject onSavestate(MinecraftServer server, Entity entity, JsonObject dataToSave, Gson gsonInstance) { + EntityLiving entityLiving = (EntityLiving) entity; + EntityLivingBase entityLivingBase = (EntityLivingBase) entity; + EntityAITasks tasks = entityLiving.tasks; + EntityAITasks targetTasks = entityLiving.targetTasks; + int tickCount = tasks.tickCount; + int tickCountTarget = targetTasks.tickCount; + int tickCountSound = entityLiving.livingSoundTime; + int tickIdle = entityLivingBase.idleTime; + dataToSave.addProperty("aitasks", tickCount); + dataToSave.addProperty("aitargetTasks", tickCountTarget); + dataToSave.addProperty("livingSoundTime", tickCountSound); + dataToSave.addProperty("idleTime", tickIdle); + return dataToSave; + } + + @Override + public Entity onLoadstatePost(MinecraftServer server, Entity entity, JsonObject loadedData, Gson gsonInstance) { + + JsonElement tickCount = loadedData.get("aitasks"); + JsonElement tickCountTarget = loadedData.get("aitargetTasks"); + JsonElement tickCountSound = loadedData.get("livingSoundTime"); + JsonElement tickCountIdle = loadedData.get("idleTime"); + + EntityLiving entityLiving = (EntityLiving) entity; + EntityLivingBase entityLivingBase = (EntityLivingBase) entity; + EntityAITasks tasks = entityLiving.tasks; + EntityAITasks targetTasks = entityLiving.targetTasks; + if (tickCount != null) + tasks.tickCount = tickCount.getAsInt(); + if (tickCountTarget != null) + targetTasks.tickCount = tickCountTarget.getAsInt(); + if (tickCountSound != null) + entityLiving.livingSoundTime = tickCountSound.getAsInt(); + if (tickCountIdle != null) + entityLivingBase.idleTime = tickCountIdle.getAsInt(); + + return entityLiving; + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/SquidRotationSubStorage.java b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/SquidRotationSubStorage.java new file mode 100644 index 00000000..0a768eec --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/entity/SquidRotationSubStorage.java @@ -0,0 +1,49 @@ +package com.minecrafttas.tasmod.savestates.storage.builtin.entity; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.minecrafttas.tasmod.savestates.storage.builtin.EntityStorage.EntitySubStorage; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.passive.EntitySquid; +import net.minecraft.server.MinecraftServer; + +/** + *

Stores squid rotation in the savestates + *

Did you know that the rotation of the squid can trigger an RNG call? Did you know Minecraft does not save this by default?
+ * Well now you know and it's annoying. + * + * @author Scribble + */ +public class SquidRotationSubStorage implements EntitySubStorage { + + @Override + public String getPropertyName() { + return "squidRotationStorage"; + } + + @Override + public Class getEntityClass() { + return EntitySquid.class; + } + + @Override + public JsonObject onSavestate(MinecraftServer server, Entity entity, JsonObject dataToSave, Gson gsonInstance) { + EntitySquid squid = (EntitySquid) entity; + float rotation = squid.squidRotation; + dataToSave.addProperty("rotation", Float.toString(rotation)); + return dataToSave; + } + + @Override + public Entity onLoadstatePost(MinecraftServer server, Entity entity, JsonObject loadedData, Gson gsonInstance) { + EntitySquid squid = (EntitySquid) entity; + JsonElement rotElement = loadedData.get("rotation"); + if (rotElement == null) + return squid; + float rotation = rotElement.getAsFloat(); + squid.squidRotation = rotation; + return squid; + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/BlockPosTypeAdapterFactory.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/BlockPosTypeAdapterFactory.java new file mode 100644 index 00000000..28cd48a7 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/BlockPosTypeAdapterFactory.java @@ -0,0 +1,41 @@ +package com.minecrafttas.tasmod.savestates.typeadapters; + +import java.io.IOException; + +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; + +import net.minecraft.util.math.BlockPos; + +public class BlockPosTypeAdapterFactory implements TypeAdapterFactory { + + @SuppressWarnings("unchecked") + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + Class rawType = (Class) type.getRawType(); + if (!BlockPos.class.isAssignableFrom(rawType)) + return null; + return new TypeAdapter() { + @Override + public void write(JsonWriter out, T value) throws IOException { + if (value == null) { + out.nullValue(); + } + + BlockPos val = (BlockPos) value; + out.value(val.toLong()); + } + + @Override + public T read(JsonReader in) throws IOException { + if (!in.hasNext()) + return null; + return (T) BlockPos.fromLong(in.nextLong()); + } + }; + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityAITypeAdapters.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityAITypeAdapters.java new file mode 100644 index 00000000..75420bd5 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityAITypeAdapters.java @@ -0,0 +1,710 @@ +package com.minecrafttas.tasmod.savestates.typeadapters; + +import java.util.HashSet; +import java.util.Set; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.minecrafttas.mctcommon.json.FineField.FineMode; +import com.minecrafttas.mctcommon.json.FineGson; +import com.minecrafttas.mctcommon.json.FineMultiTarget; +import com.minecrafttas.mctcommon.json.FineTarget; +import com.minecrafttas.mctcommon.json.FineTypeAdapter; + +import net.minecraft.entity.ai.EntityAIAttackMelee; +import net.minecraft.entity.monster.AbstractSkeleton; +import net.minecraft.item.Item; + +@FineMultiTarget +public class EntityAITypeAdapters { + + @FineTarget(net.minecraft.entity.ai.EntityAIBase.class) + public static class EntityAIBaseTypeAdapter extends FineTypeAdapter { + + public EntityAIBaseTypeAdapter() { + register("mutexBits", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIMoveTowardsRestriction.class) + public static class EntityAIMoveTowardsRestrictionTypeAdapter extends FineTypeAdapter { + + public EntityAIMoveTowardsRestrictionTypeAdapter() { + register("creature", FineMode.FINE); + register("movePosX", FineMode.FINE); + register("movePosY", FineMode.FINE); + register("movePosZ", FineMode.FINE); + register("movementSpeed", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIWander.class) + public static class EntityAIWanderTypeAdapter extends FineTypeAdapter { + + public EntityAIWanderTypeAdapter() { + register("entity", FineMode.FINE); + register("x", FineMode.FINE); + register("y", FineMode.FINE); + register("z", FineMode.FINE); + register("speed", FineMode.FINE); + register("executionChance", FineMode.FINE); + register("mustUpdate", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIWanderAvoidWater.class) + public static class EntityAIWanderAvoidWaterTypeAdapter extends FineTypeAdapter { + + public EntityAIWanderAvoidWaterTypeAdapter() { + register("probability", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIWatchClosest.class) + public static class EntityAIWatchClosestTypeAdapter extends FineTypeAdapter { + + public EntityAIWatchClosestTypeAdapter() { + register("entity", FineMode.FINE); + register("closestEntity", FineMode.FINE); + register("maxDistance", FineMode.FINE); + register("lookTime", FineMode.FINE); + register("chance", FineMode.FINE); + register("watchedClass", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAILookIdle.class) + public static class EntityAILookIdleTypeAdapter extends FineTypeAdapter { + + public EntityAILookIdleTypeAdapter() { + register("idleEntity", FineMode.FINE); + register("lookX", FineMode.FINE); + register("lookZ", FineMode.FINE); + register("idleTime", FineMode.FINE); + } + } + + @FineTarget(enclosingclazz = AbstractSkeleton.class, superclazz = EntityAIAttackMelee.class) + public static class AbstractSkeletonAITypeAdapter extends FineTypeAdapter { + + public AbstractSkeletonAITypeAdapter() { + register("world", FineMode.FINE); + register("attacker", FineMode.FINE); + register("attackTick", FineMode.FINE); + register("speedTowardsTarget", FineMode.FINE); + register("longMemory", FineMode.FINE); + register("path", FineMode.FINE); + register("delayCounter", FineMode.FINE); + register("targetX", FineMode.FINE); + register("targetY", FineMode.FINE); + register("targetZ", FineMode.FINE); + register("attackInterval", FineMode.FINE); + } + + @Override + public JsonElement serialize(Object obj, FineGson fineJson, Class clazz) throws RuntimeException { + return super.serialize(obj, fineJson, EntityAIAttackMelee.class); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAITarget.class) + public static class EntityAITargetTypeAdapter extends FineTypeAdapter { + + public EntityAITargetTypeAdapter() { + register("taskOwner", FineMode.FINE); + register("shouldCheckSight", FineMode.FINE); + register("nearbyOnly", FineMode.FINE); + register("targetSearchStatus", FineMode.FINE); + register("targetSearchDelay", FineMode.FINE); + register("targetUnseenTicks", FineMode.FINE); + register("target", FineMode.FINE); + register("unseenMemoryTicks", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIHurtByTarget.class) + public static class EntityAIHurtByTargetTypeAdapter extends FineTypeAdapter { + + public EntityAIHurtByTargetTypeAdapter() { + register("entityCallsForHelp", FineMode.FINE); + register("revengeTimerOld", FineMode.FINE); + register("excludedReinforcementTypes", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAINearestAttackableTarget.class) + public static class EntityAINearestAttackableTargetTypeAdapter extends FineTypeAdapter { + + public EntityAINearestAttackableTargetTypeAdapter() { + register("targetClass", FineMode.FINE); + register("targetChance", FineMode.FINE); + register("sorter", FineMode.FINE); + register("targetEntitySelector", FineMode.FINE); + register("targetEntity", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAISit.class) + public static class EntityAISitTypeAdapter extends FineTypeAdapter { + + public EntityAISitTypeAdapter() { + register("tameable", FineMode.FINE); + register("isSitting", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAITempt.class) + public static class EntityAITemptTypeAdapter extends FineTypeAdapter { + + public EntityAITemptTypeAdapter() { + register("temptedEntity", FineMode.FINE); + register("speed", FineMode.FINE); + register("targetX", FineMode.FINE); + register("targetY", FineMode.FINE); + register("targetZ", FineMode.FINE); + register("pitch", FineMode.FINE); + register("yaw", FineMode.FINE); + register("temptingPlayer", FineMode.FINE); + register("delayTemptCounter", FineMode.FINE); + register("isRunning", FineMode.FINE); + register("temptItem", (obj, fgson) -> { + JsonArray out = new JsonArray(); + @SuppressWarnings("unchecked") + Set in = (Set) obj; + for (Item item : in) { + out.add(fgson.serialize(item, Item.class)); + } + return out; + }, (elem, fgson) -> { + Set out = new HashSet<>(); + JsonArray in = elem.getAsJsonArray(); + for (JsonElement element : in) { + out.add((Item) fgson.deserialize(element, Item.class)); + } + return out; + }); + register("scaredByPlayerMovement", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAISwimming.class) + public static class EntityAISwimmingTypeAdapter extends FineTypeAdapter { + + public EntityAISwimmingTypeAdapter() { + register("entity", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIFollowOwner.class) + public static class EntityAIFollowOwnerTypeAdapter extends FineTypeAdapter { + + public EntityAIFollowOwnerTypeAdapter() { + register("tameable", FineMode.FINE); + register("owner", FineMode.FINE); + register("world", FineMode.FINE); + register("followSpeed", FineMode.FINE); + register("petPathfinder", FineMode.FINE); + register("timeToRecalcPath", FineMode.FINE); + register("maxDist", FineMode.FINE); + register("minDist", FineMode.FINE); + register("oldWaterCost", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIMoveToBlock.class) + public static class EntityAIMoveToBlockTypeAdapter extends FineTypeAdapter { + + public EntityAIMoveToBlockTypeAdapter() { + register("creature", FineMode.FINE); + register("movementSpeed", FineMode.FINE); + register("runDelay", FineMode.FINE); + register("timeoutCounter", FineMode.FINE); + register("maxStayTicks", FineMode.FINE); + register("destinationBlock", FineMode.FINE); + register("isAboveDestination", FineMode.FINE); + register("searchLength", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIOcelotSit.class) + public static class EntityAIOcelotSitTypeAdapter extends FineTypeAdapter { + + public EntityAIOcelotSitTypeAdapter() { + register("ocelot", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAILeapAtTarget.class) + public static class EntityAILeapAtTargetTypeAdapter extends FineTypeAdapter { + + public EntityAILeapAtTargetTypeAdapter() { + register("leaper", FineMode.FINE); + register("leapTarget", FineMode.FINE); + register("leapMotionY", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIOcelotAttack.class) + public static class EntityAIOcelotAttackTypeAdapter extends FineTypeAdapter { + + public EntityAIOcelotAttackTypeAdapter() { + register("world", FineMode.FINE); + register("entity", FineMode.FINE); + register("target", FineMode.FINE); + register("attackCountdown", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIMate.class) + public static class EntityAIMateTypeAdapter extends FineTypeAdapter { + + public EntityAIMateTypeAdapter() { + register("animal", FineMode.FINE); + register("mateClass", FineMode.FINE); + register("world", FineMode.FINE); + register("targetMate", FineMode.FINE); + register("spawnBabyDelay", FineMode.FINE); + register("moveSpeed", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAITargetNonTamed.class) + public static class EntityAITargetNonTamedTypeAdapter extends FineTypeAdapter { + + public EntityAITargetNonTamedTypeAdapter() { + register("tameable", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIAvoidEntity.class) + public static class EntityAIAvoidEntityTypeAdapter extends FineTypeAdapter { + + public EntityAIAvoidEntityTypeAdapter() { + register("canBeSeenSelector", FineMode.FINE); + register("entity", FineMode.FINE); + register("farSpeed", FineMode.FINE); + register("nearSpeed", FineMode.FINE); + register("closestLivingEntity", FineMode.FINE); + register("avoidDistance", FineMode.FINE); + register("path", FineMode.FINE); + register("navigation", FineMode.FINE); + register("classToAvoid", FineMode.FINE); + register("avoidTargetSelector", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAICreeperSwell.class) + public static class EntityAICreeperSwellTypeAdapter extends FineTypeAdapter { + + public EntityAICreeperSwellTypeAdapter() { + register("swellingCreeper", FineMode.FINE); + register("creeperAttackTarget", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIAttackMelee.class) + public static class EntityAIAttackMeleeTypeAdapter extends FineTypeAdapter { + + public EntityAIAttackMeleeTypeAdapter() { + register("world", FineMode.FINE); + register("attacker", FineMode.FINE); + register("attackTick", FineMode.FINE); + register("speedTowardsTarget", FineMode.FINE); + register("longMemory", FineMode.FINE); + register("path", FineMode.FINE); + register("delayCounter", FineMode.FINE); + register("targetX", FineMode.FINE); + register("targetY", FineMode.FINE); + register("targetZ", FineMode.FINE); + register("attackInterval", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIPanic.class) + public static class EntityAIPanicTypeAdapter extends FineTypeAdapter { + + public EntityAIPanicTypeAdapter() { + register("creature", FineMode.FINE); + register("speed", FineMode.FINE); + register("randPosX", FineMode.FINE); + register("randPosY", FineMode.FINE); + register("randPosZ", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIFollowParent.class) + public static class EntityAIFollowParentTypeAdapter extends FineTypeAdapter { + + public EntityAIFollowParentTypeAdapter() { + register("childAnimal", FineMode.FINE); + register("parentAnimal", FineMode.FINE); + register("moveSpeed", FineMode.FINE); + register("delayCounter", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIRunAroundLikeCrazy.class) + public static class EntityAIRunAroundLikeCrazyTypeAdapter extends FineTypeAdapter { + + public EntityAIRunAroundLikeCrazyTypeAdapter() { + register("horseHost", FineMode.FINE); + register("speed", FineMode.FINE); + register("targetX", FineMode.FINE); + register("targetY", FineMode.FINE); + register("targetZ", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIFindEntityNearestPlayer.class) + public static class EntityAIFindEntityNearestPlayerTypeAdapter extends FineTypeAdapter { + + public EntityAIFindEntityNearestPlayerTypeAdapter() { + register("LOGGER", FineMode.EXCLUDED); + register("entityLiving", FineMode.FINE); + register("predicate", FineMode.FINE); + register("sorter", FineMode.FINE); + register("entityTarget", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIZombieAttack.class) + public static class EntityAIZombieAttackTypeAdapter extends FineTypeAdapter { + + public EntityAIZombieAttackTypeAdapter() { + register("zombie", FineMode.FINE); + register("raiseArmTicks", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIMoveThroughVillage.class) + public static class EntityAIMoveThroughVillageTypeAdapter extends FineTypeAdapter { + + public EntityAIMoveThroughVillageTypeAdapter() { + register("entity", FineMode.FINE); + register("movementSpeed", FineMode.FINE); + register("path", FineMode.FINE); + register("doorInfo", FineMode.FINE); + register("isNocturnal", FineMode.FINE); + register("doorList", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIDoorInteract.class) + public static class EntityAIDoorInteractTypeAdapter extends FineTypeAdapter { + + public EntityAIDoorInteractTypeAdapter() { + register("entity", FineMode.FINE); + register("doorPosition", FineMode.FINE); + register("doorBlock", FineMode.FINE); + register("hasStoppedDoorInteraction", FineMode.FINE); + register("entityPositionX", FineMode.FINE); + register("entityPositionZ", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIBreakDoor.class) + public static class EntityAIBreakDoorTypeAdapter extends FineTypeAdapter { + + public EntityAIBreakDoorTypeAdapter() { + register("breakingTime", FineMode.FINE); + register("previousBreakProgress", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIMoveTowardsTarget.class) + public static class EntityAIMoveTowardsTargetTypeAdapter extends FineTypeAdapter { + + public EntityAIMoveTowardsTargetTypeAdapter() { + register("creature", FineMode.FINE); + register("targetEntity", FineMode.FINE); + register("movePosX", FineMode.FINE); + register("movePosY", FineMode.FINE); + register("movePosZ", FineMode.FINE); + register("speed", FineMode.FINE); + register("maxTargetDistance", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAILookAtVillager.class) + public static class EntityAILookAtVillagerTypeAdapter extends FineTypeAdapter { + + public EntityAILookAtVillagerTypeAdapter() { + register("ironGolem", FineMode.FINE); + register("villager", FineMode.FINE); + register("lookTime", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIDefendVillage.class) + public static class EntityAIDefendVillageTypeAdapter extends FineTypeAdapter { + + public EntityAIDefendVillageTypeAdapter() { + register("irongolem", FineMode.FINE); + register("villageAgressorTarget", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAILlamaFollowCaravan.class) + public static class EntityAILlamaFollowCaravanTypeAdapter extends FineTypeAdapter { + + public EntityAILlamaFollowCaravanTypeAdapter() { + register("llama", FineMode.FINE); + register("speedModifier", FineMode.FINE); + register("distCheckCounter", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIAttackRanged.class) + public static class EntityAIAttackRangedTypeAdapter extends FineTypeAdapter { + + public EntityAIAttackRangedTypeAdapter() { + register("entityHost", FineMode.FINE); + register("rangedAttackEntityHost", FineMode.EXCLUDED); + register("attackTarget", FineMode.FINE); + register("rangedAttackTime", FineMode.FINE); + register("entityMoveSpeed", FineMode.FINE); + register("seeTime", FineMode.FINE); + register("attackIntervalMin", FineMode.FINE); + register("maxRangedAttackTime", FineMode.FINE); + register("attackRadius", FineMode.FINE); + register("maxAttackDistance", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIFindEntityNearest.class) + public static class EntityAIFindEntityNearestTypeAdapter extends FineTypeAdapter { + + public EntityAIFindEntityNearestTypeAdapter() { + register("LOGGER", FineMode.EXCLUDED); + register("mob", FineMode.FINE); + register("predicate", FineMode.FINE); + register("sorter", FineMode.FINE); + register("target", FineMode.FINE); + register("classToCheck", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIFollowOwnerFlying.class) + public static class EntityAIFollowOwnerFlyingTypeAdapter extends FineTypeAdapter { + + public EntityAIFollowOwnerFlyingTypeAdapter() { + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIWanderAvoidWaterFlying.class) + public static class EntityAIWanderAvoidWaterFlyingTypeAdapter extends FineTypeAdapter { + + public EntityAIWanderAvoidWaterFlyingTypeAdapter() { + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAILandOnOwnersShoulder.class) + public static class EntityAILandOnOwnersShoulderTypeAdapter extends FineTypeAdapter { + + public EntityAILandOnOwnersShoulderTypeAdapter() { + register("entity", FineMode.FINE); + register("owner", FineMode.FINE); + register("isSittingOnShoulder", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIFollow.class) + public static class EntityAIFollowTypeAdapter extends FineTypeAdapter { + + public EntityAIFollowTypeAdapter() { + register("entity", FineMode.FINE); + register("followPredicate", FineMode.FINE); + register("followingEntity", FineMode.FINE); + register("speedModifier", FineMode.FINE); + register("navigation", FineMode.FINE); + register("timeToRecalcPath", FineMode.FINE); + register("stopDistance", FineMode.FINE); + register("oldWaterCost", FineMode.FINE); + register("areaSize", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIEatGrass.class) + public static class EntityAIEatGrassTypeAdapter extends FineTypeAdapter { + + public EntityAIEatGrassTypeAdapter() { + register("IS_TALL_GRASS", FineMode.FINE); + register("grassEaterEntity", FineMode.FINE); + register("entityWorld", FineMode.FINE); + register("eatingGrassTimer", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIRestrictSun.class) + public static class EntityAIRestrictSunTypeAdapter extends FineTypeAdapter { + + public EntityAIRestrictSunTypeAdapter() { + register("entity", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIFleeSun.class) + public static class EntityAIFleeSunTypeAdapter extends FineTypeAdapter { + + public EntityAIFleeSunTypeAdapter() { + register("creature", FineMode.FINE); + register("shelterX", FineMode.FINE); + register("shelterY", FineMode.FINE); + register("shelterZ", FineMode.FINE); + register("movementSpeed", FineMode.FINE); + register("world", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIAttackRangedBow.class) + public static class EntityAIAttackRangedBowTypeAdapter extends FineTypeAdapter { + + public EntityAIAttackRangedBowTypeAdapter() { + register("entity", FineMode.FINE); + register("moveSpeedAmp", FineMode.FINE); + register("attackCooldown", FineMode.FINE); + register("maxAttackDistance", FineMode.FINE); + register("attackTime", FineMode.FINE); + register("seeTime", FineMode.FINE); + register("strafingClockwise", FineMode.FINE); + register("strafingBackwards", FineMode.FINE); + register("strafingTime", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAISkeletonRiders.class) + public static class EntityAISkeletonRidersTypeAdapter extends FineTypeAdapter { + + public EntityAISkeletonRidersTypeAdapter() { + register("horse", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAITradePlayer.class) + public static class EntityAITradePlayerTypeAdapter extends FineTypeAdapter { + + public EntityAITradePlayerTypeAdapter() { + register("villager", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAILookAtTradePlayer.class) + public static class EntityAILookAtTradePlayerTypeAdapter extends FineTypeAdapter { + + public EntityAILookAtTradePlayerTypeAdapter() { + register("villager", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIMoveIndoors.class) + public static class EntityAIMoveIndoorsTypeAdapter extends FineTypeAdapter { + + public EntityAIMoveIndoorsTypeAdapter() { + register("entity", FineMode.FINE); + register("doorInfo", FineMode.FINE); + register("insidePosX", FineMode.FINE); + register("insidePosZ", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIRestrictOpenDoor.class) + public static class EntityAIRestrictOpenDoorTypeAdapter extends FineTypeAdapter { + + public EntityAIRestrictOpenDoorTypeAdapter() { + register("entity", FineMode.FINE); + register("frontDoor", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIOpenDoor.class) + public static class EntityAIOpenDoorTypeAdapter extends FineTypeAdapter { + + public EntityAIOpenDoorTypeAdapter() { + register("closeDoor", FineMode.FINE); + register("closeDoorTemporisation", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIVillagerMate.class) + public static class EntityAIVillagerMateTypeAdapter extends FineTypeAdapter { + + public EntityAIVillagerMateTypeAdapter() { + register("villager", FineMode.FINE); + register("mate", FineMode.FINE); + register("world", FineMode.FINE); + register("matingTimeout", FineMode.FINE); + register("village", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIFollowGolem.class) + public static class EntityAIFollowGolemTypeAdapter extends FineTypeAdapter { + + public EntityAIFollowGolemTypeAdapter() { + register("villager", FineMode.FINE); + register("ironGolem", FineMode.FINE); + register("takeGolemRoseTick", FineMode.FINE); + register("tookGolemRose", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIWatchClosest2.class) + public static class EntityAIWatchClosest2TypeAdapter extends FineTypeAdapter { + + public EntityAIWatchClosest2TypeAdapter() { + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIVillagerInteract.class) + public static class EntityAIVillagerInteractTypeAdapter extends FineTypeAdapter { + + public EntityAIVillagerInteractTypeAdapter() { + register("interactionDelay", FineMode.FINE); + register("villager", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIHarvestFarmland.class) + public static class EntityAIHarvestFarmlandTypeAdapter extends FineTypeAdapter { + + public EntityAIHarvestFarmlandTypeAdapter() { + register("villager", FineMode.FINE); + register("hasFarmItem", FineMode.FINE); + register("wantsToReapStuff", FineMode.FINE); + register("currentTask", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIBeg.class) + public static class EntityAIBegTypeAdapter extends FineTypeAdapter { + + public EntityAIBegTypeAdapter() { + register("wolf", FineMode.FINE); + register("player", FineMode.FINE); + register("world", FineMode.FINE); + register("minPlayerDistance", FineMode.FINE); + register("timeoutCounter", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIOwnerHurtByTarget.class) + public static class EntityAIOwnerHurtByTargetTypeAdapter extends FineTypeAdapter { + + public EntityAIOwnerHurtByTargetTypeAdapter() { + register("tameable", FineMode.FINE); + register("attacker", FineMode.FINE); + register("timestamp", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.entity.ai.EntityAIOwnerHurtTarget.class) + public static class EntityAIOwnerHurtTargetTypeAdapter extends FineTypeAdapter { + + public EntityAIOwnerHurtTargetTypeAdapter() { + register("tameable", FineMode.FINE); + register("attacker", FineMode.FINE); + register("timestamp", FineMode.FINE); + } + } + +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityClassTypeAdapterFactory.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityClassTypeAdapterFactory.java new file mode 100644 index 00000000..70a59ceb --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityClassTypeAdapterFactory.java @@ -0,0 +1,47 @@ +package com.minecrafttas.tasmod.savestates.typeadapters; + +import java.io.IOException; + +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; + +import net.minecraft.entity.Entity; + +public class EntityClassTypeAdapterFactory implements TypeAdapterFactory { + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + + Class rawType = (Class) type.getRawType(); + if (!Class.class.equals(rawType)) + return null; + + return new TypeAdapter() { + + @Override + public void write(JsonWriter out, T value) throws IOException { + Class clazz = (Class) value; + out.value(clazz.getTypeName()); + } + + @Override + public T read(JsonReader in) throws IOException { + if (!in.hasNext()) + return null; + String jsonString = in.nextString(); + Class out = null; + try { + out = Class.forName(jsonString, false, getClass().getClassLoader()).asSubclass(Entity.class); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + return (T) out; + } + }; + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityLivingTypeAdapter.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityLivingTypeAdapter.java new file mode 100644 index 00000000..80eb3a77 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityLivingTypeAdapter.java @@ -0,0 +1,82 @@ +package com.minecrafttas.tasmod.savestates.typeadapters; + +import java.io.IOException; +import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; +import com.google.gson.stream.JsonWriter; +import com.minecrafttas.tasmod.TASmod; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.WorldServer; + +public class EntityLivingTypeAdapter extends TypeAdapter { + + @Override + public void write(JsonWriter out, EntityLivingBase entity) throws IOException { + if (entity == null) { + out.nullValue(); + } else { + + /* + * Instead of storing the players UUID, we will store the index of the playerlist. + * This is because when sharing savestates, the players UUID will be different and thus crash Minecraft. + * + * TODO Make an option to map "Player0, Player1" etc. to specific playernames, so that this will be deterministic + */ + if (entity instanceof EntityPlayer) { + MinecraftServer server = TASmod.getServerInstance(); + int counter = 0; + for (EntityPlayerMP player : server.getPlayerList().getPlayers()) { + if (player.getUniqueID().equals(entity.getUniqueID())) { + out.value("Player" + counter); + return; + } + } + } + + out.value(entity.getUniqueID().toString()); + } + } + + @Override + public EntityLivingBase read(JsonReader reader) throws IOException { + if (reader.peek() == JsonToken.NULL) { + reader.nextNull(); + return null; + } else { + if (TASmod.getServerInstance() == null) + return null; + MinecraftServer server = TASmod.getServerInstance(); + String entityString = reader.nextString(); + Entity entity = null; + + /* + * Instead of storing the players UUID, we will store the index of the playerlist. + * This is because when sharing savestates, the players UUID will be different and thus crash Minecraft. + */ + Matcher matcher = Pattern.compile("Player(\\d+)").matcher(entityString); + if (matcher.find()) { + int counter = Integer.parseInt(matcher.group(1)); + entity = server.getPlayerList().getPlayers().get(counter); + } else { + UUID uuid = UUID.fromString(entityString); + for (WorldServer world : server.worlds) { + entity = world.getEntityFromUuid(uuid); + if (entity != null) + break; + } + } + + return (EntityLivingBase) entity; + } + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityTypeAdapterFactory.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityTypeAdapterFactory.java new file mode 100644 index 00000000..54139d4d --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/EntityTypeAdapterFactory.java @@ -0,0 +1,93 @@ +package com.minecrafttas.tasmod.savestates.typeadapters; + +import java.io.IOException; +import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; +import com.google.gson.stream.JsonWriter; +import com.minecrafttas.tasmod.TASmod; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.WorldServer; + +public class EntityTypeAdapterFactory implements TypeAdapterFactory { + + @SuppressWarnings("unchecked") + public TypeAdapter create(Gson gson, TypeToken type) { + Class rawType = (Class) type.getRawType(); + if (!Entity.class.isAssignableFrom(rawType)) + return null; + + return new TypeAdapter() { + + public void write(JsonWriter out, T value) throws IOException { + if (value == null) { + out.nullValue(); + } else { + Entity entity = (Entity) rawType.cast(value); + + /* + * Instead of storing the players UUID, we will store the index of the playerlist. + * This is because when sharing savestates, the players UUID will be different and thus crash Minecraft. + * + * TODO Make an option to map "Player0, Player1" etc. to specific playernames, so that this will be deterministic + */ + if (entity instanceof EntityPlayer) { + MinecraftServer server = TASmod.getServerInstance(); + int counter = 0; + for (EntityPlayerMP player : server.getPlayerList().getPlayers()) { + if (player.getUniqueID().equals(entity.getUniqueID())) { + out.value("Player" + counter); + return; + } + } + } + + out.value(entity.getUniqueID().toString()); + } + } + + public T read(JsonReader reader) throws IOException { + if (reader.peek() == JsonToken.NULL) { + reader.nextNull(); + return null; + } else { + if (TASmod.getServerInstance() == null) + return null; + MinecraftServer server = TASmod.getServerInstance(); + String entityString = reader.nextString(); + Entity entity = null; + + /* + * Instead of storing the players UUID, we will store the index of the playerlist. + * This is because when sharing savestates, the players UUID will be different and thus crash Minecraft. + */ + Matcher matcher = Pattern.compile("Player(\\d+)").matcher(entityString); + if (matcher.find()) { + int counter = Integer.parseInt(matcher.group(1)); + entity = server.getPlayerList().getPlayers().get(counter); + } else { + UUID uuid = UUID.fromString(entityString); + for (WorldServer world : server.worlds) { + entity = world.getEntityFromUuid(uuid); + if (entity != null) + break; + } + } + + return (T) entity; + } + } + }; + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/ItemTypeAdapter.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/ItemTypeAdapter.java new file mode 100644 index 00000000..729ee503 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/ItemTypeAdapter.java @@ -0,0 +1,24 @@ +package com.minecrafttas.tasmod.savestates.typeadapters; + +import com.google.gson.JsonElement; +import com.google.gson.JsonPrimitive; +import com.minecrafttas.mctcommon.json.FineGson; +import com.minecrafttas.mctcommon.json.FineTypeAdapter; + +import net.minecraft.item.Item; + +public class ItemTypeAdapter extends FineTypeAdapter { + + @Override + public JsonElement serialize(Object obj, FineGson fineJson, Class clazz) throws RuntimeException { + Item value = (Item) obj; + return new JsonPrimitive(Item.getIdFromItem(value)); + } + + @Override + public Object deserialize(JsonElement element, Class clazz, FineGson fineJson, Object existing) { + JsonPrimitive value = element.getAsJsonPrimitive(); + return Item.getItemById(value.getAsInt()); + } + +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/PathNavigateTypeAdapterFactory.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/PathNavigateTypeAdapterFactory.java new file mode 100644 index 00000000..75911a6e --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/PathNavigateTypeAdapterFactory.java @@ -0,0 +1,130 @@ +package com.minecrafttas.tasmod.savestates.typeadapters; + +public class PathNavigateTypeAdapterFactory { + +// @Override +// public JsonElement serialize(PathNavigate src, Type typeOfSrc, JsonSerializationContext context) { +// JsonObject out = new JsonObject(); +// out.addProperty("class", src.getClass().getSimpleName()); +// +// List fields = Arrays.asList(src.getClass().getDeclaredFields()); +// fields.addAll(Arrays.asList(src.getClass().getSuperclass().getDeclaredFields())); +// for (Field field : fields) { +// field.setAccessible(true); +// if (field.getType() == IAttributeInstance.class || field.getType() == PathFinder.class || field.getType() == NodeProcessor.class) { +// continue; +// } +// if (field.getType() == EntityLiving.class) { +// out.add("entity", context.serialize(src.entity)); +// continue; +// } +// if (field.getType() == World.class) { +// out.add("world", context.serialize(src.world)); +// continue; +// } +// try { +// out.add(field.getName(), context.serialize(field.get(src))); +// } catch (IllegalArgumentException | IllegalAccessException e) { +// e.printStackTrace(); +// } +// } +// return out; +// } +// +// @Override +// public PathNavigate deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { +// JsonObject jsonObj = json.getAsJsonObject(); +// +// Class clazz; +// try { +// clazz = Class.forName(jsonObj.get("class").getAsString(), false, getClass().getClassLoader()).asSubclass(PathNavigate.class); +// } catch (ClassNotFoundException e) { +// e.printStackTrace(); +// return null; +// } +// +// EntityLiving entity = context.deserialize(jsonObj.get("entity"), EntityLiving.class); +// World world = context.deserialize(jsonObj.get("world"), World.class); +// +// PathNavigate navigator; +// try { +// navigator = clazz.getConstructor(EntityLiving.class, World.class).newInstance(entity, world); +// } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) { +// e.printStackTrace(); +// return null; +// } +// +// List fields = Arrays.asList(navigator.getClass().getDeclaredFields()); +// fields.addAll(Arrays.asList(navigator.getClass().getSuperclass().getDeclaredFields())); +// for (Field field : fields) { +// field.setAccessible(true); +// if (field.getType() == IAttributeInstance.class || field.getType() == PathFinder.class || field.getType() == NodeProcessor.class || field.getType() == EntityLiving.class || field.getType() == World.class) { +// continue; +// } +// try { +// field.set(navigator, context.deserialize(jsonObj.get(field.getName()), field.getType())); +// } catch (IllegalArgumentException | IllegalAccessException | JsonParseException e) { +// e.printStackTrace(); +// continue; +// } +// } +// +// return navigator; +// } +// +// @SuppressWarnings("unchecked") +// @Override +// public TypeAdapter create(Gson gson, TypeToken type) { +// Class rawType = (Class) type.getRawType(); +// if (!World.class.isAssignableFrom(rawType)) +// return null; +// +// @SuppressWarnings("unused") +// final TypeAdapterFactory factory = this; +// +// return new TypeAdapter() { +// +// @Override +// public void write(JsonWriter outWriter, T value) throws IOException { +// JsonObject out = new JsonObject(); +// PathNavigate src = (PathNavigate) value; +// +// List fields = Arrays.asList(src.getClass().getDeclaredFields()); +// fields.addAll(Arrays.asList(src.getClass().getSuperclass().getDeclaredFields())); +// for (Field field : fields) { +// field.setAccessible(true); +// Class fieldClass = field.getType(); +// if (fieldClass == IAttributeInstance.class || fieldClass == PathFinder.class || fieldClass == NodeProcessor.class) { +// continue; +// } +// if (field.getType() == EntityLiving.class) { +// JsonElement tree = gson.getAdapter(new TypeToken() { +// }).toJsonTree(src.entity); +// out.add("entity", tree); +// continue; +// } +// if (field.getType() == World.class) { +// JsonElement tree = gson.getDelegateAdapter(factory, new TypeToken() { +// }).toJsonTree(src.world); +// out.add("world", tree); +// continue; +// } +// try { +// TypeAdapter adapter = gson.getDelegateAdapter(factory, TypeToken.get(fieldClass)); +// out.add(field.getName(), adapter.toJsonTree(field.get(src))); +// } catch (IllegalArgumentException | IllegalAccessException e) { +// e.printStackTrace(); +// } +// } +// } +// +// @Override +// public T read(JsonReader in) throws IOException { +// // TODO Auto-generated method stub +// return null; +// } +// +// }; +// } +// +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/PathNavigateTypeAdapters.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/PathNavigateTypeAdapters.java new file mode 100644 index 00000000..c70c518b --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/PathNavigateTypeAdapters.java @@ -0,0 +1,66 @@ +package com.minecrafttas.tasmod.savestates.typeadapters; + +import com.minecrafttas.mctcommon.json.FineField.FineMode; +import com.minecrafttas.mctcommon.json.FineMultiTarget; +import com.minecrafttas.mctcommon.json.FineTarget; +import com.minecrafttas.mctcommon.json.FineTypeAdapter; + +@FineMultiTarget +public class PathNavigateTypeAdapters { + + @FineTarget(net.minecraft.pathfinding.PathNavigate.class) + public static class PathNavigateTypeAdapter extends FineTypeAdapter { + + public PathNavigateTypeAdapter() { + register("entity", FineMode.FINE); + register("world", FineMode.FINE); + register("currentPath", FineMode.FINE); + register("speed", FineMode.FINE); + register("pathSearchRange", FineMode.FINE); + register("totalTicks", FineMode.FINE); + register("ticksAtLastPos", FineMode.FINE); + register("lastPosCheck", FineMode.FINE); + register("timeoutCachedNode", FineMode.FINE); + register("timeoutTimer", FineMode.FINE); + register("lastTimeoutCheck", FineMode.FINE); + register("timeoutLimit", FineMode.FINE); + register("maxDistanceToWaypoint", FineMode.FINE); + register("tryUpdatePath", FineMode.FINE); + register("lastTimeUpdated", FineMode.FINE); + register("nodeProcessor", FineMode.FINE); + register("targetPos", FineMode.FINE); + register("pathFinder", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.pathfinding.PathNavigateGround.class) + public static class PathNavigateGroundTypeAdapter extends FineTypeAdapter { + + public PathNavigateGroundTypeAdapter() { + register("shouldAvoidSun", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.pathfinding.PathNavigateClimber.class) + public static class PathNavigateClimberTypeAdapter extends FineTypeAdapter { + + public PathNavigateClimberTypeAdapter() { + register("targetPosition", FineMode.FINE); + } + } + + @FineTarget(net.minecraft.pathfinding.PathNavigateFlying.class) + public static class PathNavigateFlyingTypeAdapter extends FineTypeAdapter { + + public PathNavigateFlyingTypeAdapter() { + } + } + + @FineTarget(net.minecraft.pathfinding.PathNavigateSwimmer.class) + public static class PathNavigateSwimmerTypeAdapter extends FineTypeAdapter { + + public PathNavigateSwimmerTypeAdapter() { + } + } + +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/WorldTypeAdapterFactory.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/WorldTypeAdapterFactory.java new file mode 100644 index 00000000..2ac5a503 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/WorldTypeAdapterFactory.java @@ -0,0 +1,72 @@ +package com.minecrafttas.tasmod.savestates.typeadapters; + +import java.io.IOException; + +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; +import com.google.gson.stream.JsonWriter; +import com.minecrafttas.tasmod.TASmod; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; + +public class WorldTypeAdapterFactory implements TypeAdapterFactory { + + @SuppressWarnings("unchecked") + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + Class rawType = (Class) type.getRawType(); + if (!World.class.isAssignableFrom(rawType)) + return null; + + return new TypeAdapter() { + + public void write(JsonWriter out, T value) throws IOException { + if (value == null) { + out.nullValue(); + } else { + if (TASmod.getServerInstance() == null) + return; + MinecraftServer server = TASmod.getServerInstance(); + WorldServer world = (WorldServer) rawType.cast(value); + + Integer index = findIndex(server.worlds, world); + if (index == null) { + out.nullValue(); + return; + } + out.value(index); + } + } + + private Integer findIndex(WorldServer[] worlds, WorldServer world) { + int index = 0; + for (World otherWorld : worlds) { + if (otherWorld.equals(world)) + return index; + index++; + } + return null; + } + + public T read(JsonReader reader) throws IOException { + if (reader.peek() == JsonToken.NULL) { + reader.nextNull(); + return null; + } else { + if (TASmod.getServerInstance() == null) + return null; + int worldId = Integer.parseInt(reader.nextString()); + MinecraftServer server = TASmod.getServerInstance(); + + return (T) server.worlds[worldId]; + } + } + }; + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/util/ClassExclusionStrategy.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/util/ClassExclusionStrategy.java new file mode 100644 index 00000000..b5a08cd8 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/util/ClassExclusionStrategy.java @@ -0,0 +1,34 @@ +package com.minecrafttas.tasmod.savestates.typeadapters.util; + +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; + +public class ClassExclusionStrategy implements ExclusionStrategy { + + protected final Class clazz; + + protected final Class declaringClass; + + public ClassExclusionStrategy(Class clazz) { + this.clazz = clazz; + this.declaringClass = null; + } + + public ClassExclusionStrategy(Class clazz, Class declaringClass) { + this.clazz = clazz; + this.declaringClass = declaringClass; + } + + @Override + public boolean shouldSkipField(FieldAttributes f) { + if (declaringClass == null) + return false; + return declaringClass.equals(f.getDeclaringClass()); + } + + @Override + public boolean shouldSkipClass(Class clazz) { + return this.clazz.equals(clazz) || this.clazz.isAssignableFrom(clazz); + } + +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/util/StaggeredTypeAdapterFactory.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/util/StaggeredTypeAdapterFactory.java new file mode 100644 index 00000000..f52bb721 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/util/StaggeredTypeAdapterFactory.java @@ -0,0 +1,57 @@ +package com.minecrafttas.tasmod.savestates.typeadapters.util; + +import java.io.IOException; +import java.lang.reflect.Field; + +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; + +public class StaggeredTypeAdapterFactory implements TypeAdapterFactory { + + Class clazz; + OnWrite writeBehaviour; + OnRead readBehaviour; + + public StaggeredTypeAdapterFactory(Class clazz, OnWrite writeBehaviour, OnRead readBehaviour) { + this.clazz = clazz; + this.writeBehaviour = writeBehaviour; + this.readBehaviour = readBehaviour; + } + + @SuppressWarnings("unchecked") + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + Class rawType = (Class) type.getRawType(); + if (!clazz.isAssignableFrom(rawType)) + return null; + return new TypeAdapter() { + + @Override + public void write(JsonWriter out, T value) throws IOException { + + } + + @Override + public T read(JsonReader in) throws IOException { + return null; + } + + }; + } + + @FunctionalInterface + public interface OnWrite { + + public void apply(JsonWriter out, Field value, Gson gson); + } + + @FunctionalInterface + public static interface OnRead { + + public T apply(JsonReader in, T value, Gson gson); + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/util/TypeAdapterGenerator.java b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/util/TypeAdapterGenerator.java new file mode 100644 index 00000000..68a36709 --- /dev/null +++ b/src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/util/TypeAdapterGenerator.java @@ -0,0 +1,26 @@ +package com.minecrafttas.tasmod.savestates.typeadapters.util; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; + +import com.minecrafttas.mctcommon.json.FineTypeAdapterGenerator; + +import net.minecraft.pathfinding.PathNavigateClimber; +import net.minecraft.pathfinding.PathNavigateFlying; +import net.minecraft.pathfinding.PathNavigateGround; +import net.minecraft.pathfinding.PathNavigateSwimmer; + +public class TypeAdapterGenerator { + + public static void main(String[] args) { + FineTypeAdapterGenerator fgenerator = new FineTypeAdapterGenerator("PathNavigateTypeAdapters", "com.minecrafttas.tasmod.savestates.typeadapters"); + fgenerator.addClass(PathNavigateGround.class, PathNavigateClimber.class, PathNavigateFlying.class, PathNavigateSwimmer.class); + try { + Files.write(Paths.get("src/main/java/com/minecrafttas/tasmod/savestates/typeadapters/PathNavigateTypeAdapters.java"), fgenerator.generateMulti(), StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/minecrafttas/tasmod/util/JsonUtils.java b/src/main/java/com/minecrafttas/tasmod/util/JsonUtils.java index 33e5b22e..f676bfb1 100644 --- a/src/main/java/com/minecrafttas/tasmod/util/JsonUtils.java +++ b/src/main/java/com/minecrafttas/tasmod/util/JsonUtils.java @@ -3,31 +3,50 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Collections; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; +import com.google.gson.internal.ConstructorConstructor; +import com.google.gson.reflect.TypeToken; public class JsonUtils { - public static Gson getJsonInstance() { + public static Gson getGsonInstance() { return new GsonBuilder().setPrettyPrinting().create(); } public static void saveJson(Path savePath, JsonObject data) throws IOException { - saveJson(savePath, data, getJsonInstance()); + saveJson(savePath, data, getGsonInstance()); } - public static void saveJson(Path savePath, JsonObject data, Gson jsonInstance) throws IOException { - String out = jsonInstance.toJson(data); + public static void saveJson(Path savePath, JsonObject data, Gson gsonInstance) throws IOException { + String out = gsonInstance.toJson(data); Files.write(savePath, out.getBytes()); } public static JsonObject loadJson(Path loadPath) throws IOException { - return loadJson(loadPath, getJsonInstance()); + return loadJson(loadPath, getGsonInstance()); } - public static JsonObject loadJson(Path loadPath, Gson jsonInstance) throws IOException { - return jsonInstance.fromJson(new String(Files.readAllBytes(loadPath)), JsonObject.class); + public static JsonObject loadJson(Path loadPath, Gson gsonInstance) throws IOException { + return gsonInstance.fromJson(new String(Files.readAllBytes(loadPath)), JsonObject.class); + } + + public static JsonObject mergeJsonObjects(JsonObject json1, JsonObject json2) { + JsonObject merged = json1; + json2.keySet().forEach(key -> { + if (!merged.has(key)) { + merged.add(key, json2.get(key)); + } + }); + return merged; + } + + public static T constructNew(Class clazz) { + ConstructorConstructor constructor = new ConstructorConstructor(Collections.emptyMap(), true, Collections.emptyList()); + TypeToken token = TypeToken.get(clazz); + return constructor.get(token, true).construct(); } } diff --git a/src/main/resources/tasmod.accesswidener b/src/main/resources/tasmod.accesswidener index 47522fc7..2e7d0b3d 100644 --- a/src/main/resources/tasmod.accesswidener +++ b/src/main/resources/tasmod.accesswidener @@ -28,10 +28,40 @@ accessible field net/minecraft/client/settings/KeyBinding CATEGORY_ORDER Ljava/u accessible field net/minecraft/entity/Entity rand Ljava/util/Random; accessible field net/minecraft/world/World updateLCG I mutable field net/minecraft/world/World rand Ljava/util/Random; -accessible field net/minecraft/entity/EntityLiving tasks Lnet/minecraft/entity/ai/EntityAITasks; -accessible field net/minecraft/entity/EntityLiving targetTasks Lnet/minecraft/entity/ai/EntityAITasks; + +# EntityRNG accessible field net/minecraft/entity/ai/EntityAITasks tickCount I accessible field net/minecraft/entity/passive/EntityBat spawnPosition Lnet/minecraft/util/math/BlockPos; accessible field net/minecraft/entity/Entity nextEntityID I +accessible field net/minecraft/entity/EntityLivingBase revengeTarget Lnet/minecraft/entity/EntityLivingBase; +accessible field net/minecraft/entity/EntityLivingBase revengeTimer I +accessible field net/minecraft/entity/EntityLivingBase lastAttackedEntity Lnet/minecraft/entity/EntityLivingBase; accessible field net/minecraft/entity/EntityLivingBase idleTime I +accessible field net/minecraft/entity/EntityLiving attackTarget Lnet/minecraft/entity/EntityLivingBase; +accessible field net/minecraft/entity/monster/EntityCreeper timeSinceIgnited I +accessible field net/minecraft/entity/monster/EntityCreeper droppedSkulls I + +# EntityPathFinding +accessible method net/minecraft/entity/EntityLiving createNavigator (Lnet/minecraft/world/World;)Lnet/minecraft/pathfinding/PathNavigate; +accessible field net/minecraft/entity/EntityLiving navigator Lnet/minecraft/pathfinding/PathNavigate; +accessible field net/minecraft/pathfinding/PathNavigate entity Lnet/minecraft/entity/EntityLiving; +accessible field net/minecraft/pathfinding/PathNavigate world Lnet/minecraft/world/World; +accessible field net/minecraft/pathfinding/PathNavigate pathSearchRange Lnet/minecraft/entity/ai/attributes/IAttributeInstance; +mutable field net/minecraft/pathfinding/PathNavigate pathSearchRange Lnet/minecraft/entity/ai/attributes/IAttributeInstance; +accessible field net/minecraft/pathfinding/PathNavigate nodeProcessor Lnet/minecraft/pathfinding/NodeProcessor; +accessible field net/minecraft/pathfinding/PathNavigate pathFinder Lnet/minecraft/pathfinding/PathFinder; +mutable field net/minecraft/pathfinding/PathNavigate pathFinder Lnet/minecraft/pathfinding/PathFinder; + +# EntityAI +accessible field net/minecraft/entity/EntityLiving tasks Lnet/minecraft/entity/ai/EntityAITasks; +accessible field net/minecraft/entity/EntityLiving targetTasks Lnet/minecraft/entity/ai/EntityAITasks; + +accessible class net/minecraft/entity/ai/EntityAITasks$EntityAITaskEntry + +accessible field net/minecraft/entity/ai/EntityAITasks taskEntries Ljava/util/Set; +mutable field net/minecraft/entity/ai/EntityAITasks taskEntries Ljava/util/Set; + +mutable field net/minecraft/entity/ai/EntityAITasks$EntityAITaskEntry action Lnet/minecraft/entity/ai/EntityAIBase; +accessible field net/minecraft/entity/ai/EntityAITasks executingTaskEntries Ljava/util/Set; +mutable field net/minecraft/entity/ai/EntityAITasks executingTaskEntries Ljava/util/Set; \ No newline at end of file diff --git a/src/main/resources/tasmod.mixin.json b/src/main/resources/tasmod.mixin.json index 535688ab..a0b58261 100644 --- a/src/main/resources/tasmod.mixin.json +++ b/src/main/resources/tasmod.mixin.json @@ -16,6 +16,7 @@ "savestates.MixinChunkProviderServer", "savestates.MixinNetHandlerPlayServer", "savestates.MixinScoreboard", + "savestates.TypeAdapterGenerator", // Events "events.MixinEntityPlayerMP", diff --git a/src/test/java/mctcommon/json/FineGsonTest.java b/src/test/java/mctcommon/json/FineGsonTest.java new file mode 100644 index 00000000..d5550819 --- /dev/null +++ b/src/test/java/mctcommon/json/FineGsonTest.java @@ -0,0 +1,144 @@ +package mctcommon.json; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.HashSet; +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import com.minecrafttas.mctcommon.json.FineField.FineMode; +import com.minecrafttas.mctcommon.json.FineGson; +import com.minecrafttas.mctcommon.json.FineMultiTarget; +import com.minecrafttas.mctcommon.json.FineTarget; +import com.minecrafttas.mctcommon.json.FineTypeAdapter; + +class FineGsonTest { + + private class TestClass extends TestSuperClass { + private int index = 7; + private String lol = "Laughing out loud"; + private TestSubClass subClass = new TestSubClass(); + private boolean excluded = false; + + @Override + public boolean equals(Object obj) { + if (obj instanceof TestClass) { + TestClass other = (TestClass) obj; + return index == other.index && lol.equals(other.lol) && subClass.equals(other.subClass) && excluded == other.excluded && bot == other.bot && evil.equals(evil); + } + return super.equals(obj); + } + } + + private class TestSubClass { + private boolean isWater = true; + + @Override + public boolean equals(Object obj) { + if (obj instanceof TestSubClass) { + TestSubClass other = (TestSubClass) obj; + return isWater == other.isWater; + } + return super.equals(obj); + } + } + + private static class TestSuperClass { + protected long bot = 8999; + protected String evil = "Squids are evil!"; + } + + @FineMultiTarget + @FineTarget(TestClass.class) + public static class TestClassTypeAdapter extends FineTypeAdapter { + public TestClassTypeAdapter() { + register("index", FineMode.FINE); + register("lol", FineMode.GSON); + register("subClass", FineMode.FINE); + register("excluded", FineMode.EXCLUDED); + } + + @FineTarget(TestSuperClass.class) + public static class TestSuperClassAdapter extends FineTypeAdapter { + public TestSuperClassAdapter() { + register("bot", FineMode.FINE); + register("evil", (obj, fgson) -> new JsonPrimitive(((String) obj).toUpperCase()), (element, fgson) -> element.toString()); + } + } + + @FineTarget(TestSubClass.class) + public static class TestSubClassAdapter extends FineTypeAdapter { + public TestSubClassAdapter() { + register("isWater", FineMode.FINE); + } + } + } + + @Test + void testSerialization() { + TestClass test = new TestClass(); + + FineGson fgson = new FineGson(new GsonBuilder().setPrettyPrinting().create()); + fgson.registerTypeAdapter(TestClass.class, new TestClassTypeAdapter()); + fgson.registerTypeAdapter(TestSubClass.class, new mctcommon.json.FineGsonTest.TestClassTypeAdapter.TestSubClassAdapter()); + fgson.registerTypeAdapter(TestSuperClass.class, new mctcommon.json.FineGsonTest.TestClassTypeAdapter.TestSuperClassAdapter()); + + JsonObject actual = fgson.serialize(test).getAsJsonObject(); + + JsonObject expected = new JsonObject(); + expected.addProperty("index", 7); + expected.addProperty("lol", "Laughing out loud"); + JsonObject expectedSubClass = new JsonObject(); + expectedSubClass.addProperty("isWater", true); + expected.add("subClass", expectedSubClass); + expected.addProperty("bot", 8999); + expected.addProperty("evil", "SQUIDS ARE EVIL!"); + + assertEquals(expected, actual); + } + + @Test + void testDeserialization() { + JsonObject testObj = new JsonObject(); + testObj.addProperty("index", 5); + testObj.addProperty("lol", "Laughing quietly"); + JsonObject testObjSubClass = new JsonObject(); + testObjSubClass.addProperty("isWater", false); + testObj.add("subClass", testObjSubClass); + testObj.addProperty("bot", 9000); + testObj.addProperty("evil", "SQUIDS ARE STILL EVIL!"); + + FineGson fgson = new FineGson(new GsonBuilder().setPrettyPrinting().create()); + fgson.registerTypeAdapter(TestClass.class, new TestClassTypeAdapter()); + fgson.registerTypeAdapter(TestSubClass.class, new mctcommon.json.FineGsonTest.TestClassTypeAdapter.TestSubClassAdapter()); + fgson.registerTypeAdapter(TestSuperClass.class, new mctcommon.json.FineGsonTest.TestClassTypeAdapter.TestSuperClassAdapter()); + TestClass actual = (TestClass) fgson.deserialize(testObj, TestClass.class); + + TestClass expected = new TestClass(); + expected.index = 5; + expected.lol = "Laughing quietly"; + expected.subClass.isWater = false; + expected.bot = 9000; + expected.evil = "SQUIDS ARE STILL EVIL!"; + + assertEquals(expected, actual); + } + + @Test + void testAnnotationRegistration() { + FineGson fgson = new FineGson(new GsonBuilder().setPrettyPrinting().create()); + fgson.registerTypeAdapter(TestClassTypeAdapter.class); + Set> actual = fgson.getTypeAdapters().keySet(); + + Set> expected = new HashSet<>(); + expected.add(TestClass.class); + expected.add(TestSubClass.class); + expected.add(TestSuperClass.class); + + assertEquals(expected, actual); + } +} diff --git a/src/test/java/mctcommon/json/FineTypeAdapterGeneratorTest.java b/src/test/java/mctcommon/json/FineTypeAdapterGeneratorTest.java new file mode 100644 index 00000000..89b25212 --- /dev/null +++ b/src/test/java/mctcommon/json/FineTypeAdapterGeneratorTest.java @@ -0,0 +1,112 @@ +package mctcommon.json; + +import static org.junit.jupiter.api.Assertions.assertIterableEquals; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import com.minecrafttas.mctcommon.json.FineTypeAdapterGenerator; + +class FineTypeAdapterGeneratorTest { + + private class TestClass extends TestSuperClass { + private int index = 7; + private String lol = "Laughing out loud"; + private TestSubClass subClass = new TestSubClass(); + private boolean excluded = false; + + @Override + public boolean equals(Object obj) { + if (obj instanceof TestClass) { + TestClass other = (TestClass) obj; + return index == other.index && lol.equals(other.lol) && subClass.equals(other.subClass) && excluded == other.excluded && bot == other.bot && evil.equals(evil); + } + return super.equals(obj); + } + } + + private class TestSubClass { + private boolean isWater = true; + + @Override + public boolean equals(Object obj) { + if (obj instanceof TestSubClass) { + TestSubClass other = (TestSubClass) obj; + return isWater == other.isWater; + } + return super.equals(obj); + } + } + + private static class TestSuperClass { + protected long bot = 8999; + protected String evil = "Squids are evil!"; + } + + @Test + void testGenerateMulti() { + FineTypeAdapterGenerator generator = new FineTypeAdapterGenerator("GeneratedTypeAdapterTest", "typeadapter"); + generator.addClass(TestClass.class); + List actual = generator.generateMulti(); + List expected = Arrays.asList(String.format("package typeadapter;\n" + + "\n" + + "import com.minecrafttas.mctcommon.json.FineField.FineMode;\n" + + "import com.minecrafttas.mctcommon.json.FineMultiTarget;\n" + + "import com.minecrafttas.mctcommon.json.FineTarget;\n" + + "import com.minecrafttas.mctcommon.json.FineTypeAdapter;\n" + + "\n" + + "@FineMultiTarget\n" + + "public class GeneratedTypeAdapterTest {\n" + + "\n" + + " @FineTarget(mctcommon.json.FineTypeAdapterGeneratorTest.TestSuperClass.class)\n" + + " public static class TestSuperClassTypeAdapter extends FineTypeAdapter {\n" + + " \n" + + " public TestSuperClassTypeAdapter() {\n" + + " register(\"bot\", FineMode.FINE);\n" + + " register(\"evil\", FineMode.FINE);\n" + + " }\n" + + " }\n" + + " \n" + + " @FineTarget(mctcommon.json.FineTypeAdapterGeneratorTest.TestClass.class)\n" + + " public static class TestClassTypeAdapter extends FineTypeAdapter {\n" + + " \n" + + " public TestClassTypeAdapter() {\n" + + " register(\"index\", FineMode.FINE);\n" + + " register(\"lol\", FineMode.FINE);\n" + + " register(\"subClass\", FineMode.FINE);\n" + + " register(\"excluded\", FineMode.FINE);\n" + + " }\n" + + " }\n" + + " \n" + + "}").split("\n")); + assertIterableEquals(expected, actual); + } + + @Test + void testGenerateSingle() { + FineTypeAdapterGenerator generator = new FineTypeAdapterGenerator("GeneratedTypeAdapterTest", "typeadapter"); + generator.addClass(TestSubClass.class); + List actual = generator.generate(); + System.out.println(String.join("\n", actual)); + List expected = new ArrayList<>(Arrays.asList(String.format("package typeadapter;\n" + + "\n" + + "import com.minecrafttas.mctcommon.json.FineField.FineMode;\n" + + "import com.minecrafttas.mctcommon.json.FineMultiTarget;\n" + + "import com.minecrafttas.mctcommon.json.FineTarget;\n" + + "import com.minecrafttas.mctcommon.json.FineTypeAdapter;\n" + + "\n" + + "@FineTarget(mctcommon.json.FineTypeAdapterGeneratorTest.TestSubClass.class)\n" + + "public class TestSubClassTypeAdapter extends FineTypeAdapter {\n" + + "\n" + + " public TestSubClassTypeAdapter() {\n" + + " register(\"isWater\", FineMode.FINE);\n" + + " }\n" + + "}\n" + + "\n").split("\n"))); + expected.add(""); + assertIterableEquals(expected, actual); + } +}