Update to Alpha8

- Fullrecord
- Credits in chat
- Input Container View
- Fixes

build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'org.spongepowered.mixin'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "Alpha7"
+version = "Alpha8"
 group = "de.scribble.lp.tastools" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "TASmod-1.12.2"
 
@@ -44,6 +44,8 @@ minecraft {
     mappings = "snapshot_20171003"
     makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
     replace '${version}':project.version,'${mcversion}':project.minecraft.version
+    clientRunArgs += "--mixin mixins.tasmod.json --tweakClass org.spongepowered.asm.launch.MixinTweaker"
+    serverRunArgs += "--mixin mixins.tasmod.json --tweakClass org.spongepowered.asm.launch.MixinTweaker"
 }
 repositories {
     mavenCentral()
@@ -67,7 +69,7 @@ dependencies {
     }
     compile 'org.msgpack:msgpack-core:0.8.16'
     compile 'org.msgpack:jackson-dataformat-msgpack:0.8.16'
-    compile files('libs/KillTheRNG-1.12.2-1.0-deobf.jar')
+    compile files('libs/KillTheRNG-1.12.2-1.3-deobf.jar')
     //compile files('libs/BigArrayList-1.3.jar')
     compile 'com.dselent:bigarraylist:1.0'
     // real examples
@@ -124,7 +126,7 @@ shadowJar {
     relocate 'com.fasterxml', 'de.scribble.lp.tasmod.repack.com.fasterxml'
     classifier "shadow"
     exclude 'dummyThing'
-    exclude 'de/scribble/lp/killtherng/', 'assets/killtherng/', 'mixins.killtherng.json'
+    exclude 'de/scribble/lp/killtherng/', 'assets/killtherng/', 'mixins.killtherng.json', 'kaptainwutax/', 'com/seedfinding/'
 
     afterEvaluate {
         from zipTree(reobfJar.jar)

src/main/java/de/pfannekuchen/infogui/gui/InfoHud.java

@@ -18,6 +18,7 @@
 import de.scribble.lp.killtherng.KillTheRNG;
 import de.scribble.lp.tasmod.ClientProxy;
 import de.scribble.lp.tasmod.TASmod;
+import de.scribble.lp.tasmod.mixin.accessors.AccessorWorld;
 import de.scribble.lp.tasmod.monitoring.DesyncMonitoring;
 import de.scribble.lp.tasmod.tickratechanger.TickrateChangerClient;
 import de.scribble.lp.tasmod.ticksync.TickSync;
@@ -216,7 +217,7 @@ public boolean checkInit() {
 			if (configuration.getProperty(title + "_x", "err").equals("err")) setDefaults(title, y);
 			lists.add(new InfoLabel(title, Integer.parseInt(configuration.getProperty(title + "_x")), Integer.parseInt(configuration.getProperty(title + "_y")), Boolean.parseBoolean(configuration.getProperty(title + "_visible")), Boolean.parseBoolean(configuration.getProperty(title + "_rect")), () -> {
 				if (Minecraft.getMinecraft().currentScreen == this) return "Tickrate";
-				return String.format("Tickrate: %s", TickrateChangerClient.TICKS_PER_SECOND);
+				return String.format("Tickrate: %s", TickrateChangerClient.ticksPerSecond);
 			}));
 
 			title = "position";
@@ -248,7 +249,7 @@ public boolean checkInit() {
 			if (configuration.getProperty(title + "_x", "err").equals("err")) setDefaults(title, y);
 			lists.add(new InfoLabel(title, Integer.parseInt(configuration.getProperty(title + "_x")), Integer.parseInt(configuration.getProperty(title + "_y")), Boolean.parseBoolean(configuration.getProperty(title + "_visible")), Boolean.parseBoolean(configuration.getProperty(title + "_rect")), () -> {
 				if (Minecraft.getMinecraft().currentScreen == this) return "Worldseed";
-				return "World Seed: " + Minecraft.getMinecraft().world.worldInfo.getSeed();
+				return "World Seed: " + ((AccessorWorld) Minecraft.getMinecraft().world).worldInfo().getSeed();
 			}));
 
 			y += 14;
@@ -310,6 +311,9 @@ public boolean checkInit() {
 				}else if(state==TASstate.RECORDING){
 					out="Recording";
 					format=ChatFormatting.RED;
+				}else if(state==TASstate.PAUSED) {
+					out="Paused";
+					format=ChatFormatting.YELLOW;
 				}else if(state==TASstate.NONE) {
 					out="";
 				}
@@ -372,14 +376,6 @@ public boolean checkInit() {
 				return dMonitor.getX()+" "+ dMonitor.getY()+" "+dMonitor.getZ();
 			}));
 
-			title = "Lagging";
-			y += 14;
-			if (configuration.getProperty(title + "_x", "err").equals("err")) setDefaults(title, y);
-			lists.add(new InfoLabel(title, Integer.parseInt(configuration.getProperty(title + "_x")), Integer.parseInt(configuration.getProperty(title + "_y")), Boolean.parseBoolean(configuration.getProperty(title + "_visible")), Boolean.parseBoolean(configuration.getProperty(title + "_rect")), () -> {
-				if (Minecraft.getMinecraft().currentScreen == this) return "Ticksync Lag";
-				return "Lagging: "+(TickSync.isLagging?ChatFormatting.RED+"YES":"No");
-			}));
-
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/de/pfannekuchen/tasmod/events/AimAssistEvents.java

@@ -26,7 +26,7 @@ public void blockOverlay(DrawBlockHighlightEvent ev) {
 		Minecraft mc = Minecraft.getMinecraft();
 
 		if (mc.world == null) return;
-		if (TickrateChangerClient.TICKS_PER_SECOND == 0) {
+		if (TickrateChangerClient.ticksPerSecond == 0) {
 			PlayerPositionCalculator.calculateNextPosition(mc, mc.player);
 			ev.setCanceled(true);
 		}

src/main/java/de/pfannekuchen/tasmod/utils/PlayerPositionCalculator.java

@@ -4,6 +4,8 @@
 
 import de.pfannekuchen.tasmod.events.CameraInterpolationEvents;
 import de.scribble.lp.tasmod.ClientProxy;
+import de.scribble.lp.tasmod.mixin.accessors.AccessorEntity;
+import de.scribble.lp.tasmod.mixin.accessors.AccessorRunStuff;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFence;
 import net.minecraft.block.BlockFenceGate;
@@ -316,7 +318,7 @@ else if (!source.isSneaking() && source.height != 1.65F)
         }
 
 
-        float partialTicks = Minecraft.getMinecraft().timer.renderPartialTicks;
+        float partialTicks = ((AccessorRunStuff) Minecraft.getMinecraft()).timer().renderPartialTicks;
         if (partialTicks == 1.0F)
         {
             vec3d = new Vec3d(posX, posY + (double)fF, posZ);
@@ -333,13 +335,13 @@ else if (!source.isSneaking() && source.height != 1.65F)
 
         if (partialTicks == 1.0F)
         {
-            vec3d1 = source.getVectorForRotation(CameraInterpolationEvents.rotationPitch, source.rotationYawHead);
+            vec3d1 = ((AccessorEntity) source).invokeGetVectorForRotation(CameraInterpolationEvents.rotationPitch, source.rotationYawHead);
         }
         else
         {
             float f2 = CameraInterpolationEvents.rotationPitch;
             float f1 = CameraInterpolationEvents.rotationYaw + 180f;
-            vec3d1 = source.getVectorForRotation(f2, f1);
+            vec3d1 = ((AccessorEntity) source).invokeGetVectorForRotation(f2, f1);
         }
 
         Vec3d vec3d2 = vec3d.addVector(vec3d1.x * mc.playerController.getBlockReachDistance(), vec3d1.y * mc.playerController.getBlockReachDistance(), vec3d1.z * mc.playerController.getBlockReachDistance());

src/main/java/de/pfannekuchen/tasmod/utils/TrajectoriesCalculator.java

@@ -1,5 +1,6 @@
 package de.pfannekuchen.tasmod.utils;
 
+import de.scribble.lp.tasmod.mixin.accessors.AccessorRunStuff;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.item.ItemBow;
@@ -23,15 +24,15 @@ public static Vec3d calculate() {
 
 		// calculate starting position
 		double arrowPosX = player.lastTickPosX
-			+ (player.posX - player.lastTickPosX) * Minecraft.getMinecraft().timer.renderPartialTicks
+			+ (player.posX - player.lastTickPosX) * ((AccessorRunStuff) Minecraft.getMinecraft()).timer().renderPartialTicks
 			- Math.cos((float)Math.toRadians(player.rotationYaw)) * 0.16F;
 		double arrowPosY = player.lastTickPosY
 			+ (player.posY - player.lastTickPosY)
-				* Minecraft.getMinecraft().timer.renderPartialTicks
+				* ((AccessorRunStuff) Minecraft.getMinecraft()).timer().renderPartialTicks
 			+ player.getEyeHeight() - 0.1;
 		double arrowPosZ = player.lastTickPosZ
 			+ (player.posZ - player.lastTickPosZ)
-				* Minecraft.getMinecraft().timer.renderPartialTicks
+				* ((AccessorRunStuff) Minecraft.getMinecraft()).timer().renderPartialTicks
 			- Math.sin((float)Math.toRadians(player.rotationYaw)) * 0.16F;
 
 		// calculate starting motion

src/main/java/de/scribble/lp/tasmod/ClientProxy.java

@@ -47,7 +47,7 @@ public class ClientProxy extends CommonProxy {
 
 	public static KeyBinding bufferViewKey = new KeyBinding("Buffer View", Keyboard.KEY_NUMPAD0, "TASmod");
 
-	public static VirtualInput virtual = new VirtualInput();
+	public static VirtualInput virtual;
 
 	public static ContainerSerialiser serialiser = new ContainerSerialiser();
 
@@ -66,10 +66,21 @@ public void preInit(FMLPreInitializationEvent ev) {
 		config = new Configuration(ev.getSuggestedConfigurationFile());
 		Config.reloadClientConfig(config);
 
+		config.load();
+		String fileOnStart=config.get("General", "fileToLoad", "").getString();
+		config.get("General", "fileToLoad", "").set("");
+		config.save();
+
+		if(fileOnStart.isEmpty()) {
+			fileOnStart=null;
+		}
+		virtual=new VirtualInput(fileOnStart);
+
 		super.preInit(ev);
 	}
 
 	public void init(FMLInitializationEvent ev) {
+
 		hud = new InfoHud();
 		shieldDownloader = new ShieldDownloader();
 

src/main/java/de/scribble/lp/tasmod/CommonProxy.java

@@ -3,35 +3,45 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import de.scribble.lp.tasmod.commands.changestates.RequestStatePacket;
-import de.scribble.lp.tasmod.commands.changestates.RequestStatePacketHandler;
-import de.scribble.lp.tasmod.commands.changestates.SyncStatePacket;
-import de.scribble.lp.tasmod.commands.changestates.SyncStatePacketHandler;
 import de.scribble.lp.tasmod.commands.clearinputs.ClearInputsPacket;
-import de.scribble.lp.tasmod.commands.clearinputs.ClearInputsPacketHandler;
+import de.scribble.lp.tasmod.commands.clearinputs.ClearInputsPacket.ClearInputsPacketHandler;
 import de.scribble.lp.tasmod.commands.folder.FolderPacket;
-import de.scribble.lp.tasmod.commands.folder.FolderPacketHandler;
+import de.scribble.lp.tasmod.commands.folder.FolderPacket.FolderPacketHandler;
+import de.scribble.lp.tasmod.commands.fullplay.FullPlayPacket;
+import de.scribble.lp.tasmod.commands.fullplay.FullPlayPacket.FullPlayPacketHandler;
+import de.scribble.lp.tasmod.commands.fullrecord.FullRecordPacket;
+import de.scribble.lp.tasmod.commands.fullrecord.FullRecordPacket.FullRecordPacketHandler;
 import de.scribble.lp.tasmod.commands.loadtas.LoadTASPacket;
-import de.scribble.lp.tasmod.commands.loadtas.LoadTASPacketHandler;
+import de.scribble.lp.tasmod.commands.loadtas.LoadTASPacket.LoadTASPacketHandler;
+import de.scribble.lp.tasmod.commands.restartandplay.RestartAndPlayPacket;
+import de.scribble.lp.tasmod.commands.restartandplay.RestartAndPlayPacket.RestartAndPlayPacketHandler;
 import de.scribble.lp.tasmod.commands.savetas.SaveTASPacket;
-import de.scribble.lp.tasmod.commands.savetas.SaveTASPacketHandler;
+import de.scribble.lp.tasmod.commands.savetas.SaveTASPacket.SaveTASPacketHandler;
 import de.scribble.lp.tasmod.inputcontainer.InputContainer;
 import de.scribble.lp.tasmod.savestates.client.InputSavestatesPacket;
-import de.scribble.lp.tasmod.savestates.client.InputSavestatesPacketHandler;
+import de.scribble.lp.tasmod.savestates.client.InputSavestatesPacket.InputSavestatesPacketHandler;
 import de.scribble.lp.tasmod.savestates.server.LoadstatePacket;
-import de.scribble.lp.tasmod.savestates.server.LoadstatePacketHandler;
+import de.scribble.lp.tasmod.savestates.server.LoadstatePacket.LoadstatePacketHandler;
 import de.scribble.lp.tasmod.savestates.server.SavestatePacket;
-import de.scribble.lp.tasmod.savestates.server.SavestatePacketHandler;
+import de.scribble.lp.tasmod.savestates.server.SavestatePacket.SavestatePacketHandler;
 import de.scribble.lp.tasmod.savestates.server.motion.MotionPacket;
-import de.scribble.lp.tasmod.savestates.server.motion.MotionPacketHandler;
+import de.scribble.lp.tasmod.savestates.server.motion.MotionPacket.MotionPacketHandler;
 import de.scribble.lp.tasmod.savestates.server.motion.RequestMotionPacket;
-import de.scribble.lp.tasmod.savestates.server.motion.RequestMotionPacketHandler;
+import de.scribble.lp.tasmod.savestates.server.motion.RequestMotionPacket.RequestMotionPacketHandler;
 import de.scribble.lp.tasmod.savestates.server.playerloading.SavestatePlayerLoadingPacket;
-import de.scribble.lp.tasmod.savestates.server.playerloading.SavestatePlayerLoadingPacketHandler;
-import de.scribble.lp.tasmod.tickratechanger.TickratePacket;
-import de.scribble.lp.tasmod.tickratechanger.TickratePacketHandler;
+import de.scribble.lp.tasmod.savestates.server.playerloading.SavestatePlayerLoadingPacket.SavestatePlayerLoadingPacketHandler;
+import de.scribble.lp.tasmod.tickratechanger.AdvanceTickratePacket;
+import de.scribble.lp.tasmod.tickratechanger.AdvanceTickratePacket.AdvanceTickratePacketHandler;
+import de.scribble.lp.tasmod.tickratechanger.ChangeTickratePacket;
+import de.scribble.lp.tasmod.tickratechanger.ChangeTickratePacket.ChangeTickratePacketHandler;
+import de.scribble.lp.tasmod.tickratechanger.PauseTickratePacket;
+import de.scribble.lp.tasmod.tickratechanger.PauseTickratePacket.PauseTickratePacketHandler;
 import de.scribble.lp.tasmod.ticksync.TickSyncPackage;
-import de.scribble.lp.tasmod.ticksync.TickSyncPacketHandler;
+import de.scribble.lp.tasmod.ticksync.TickSyncPackage.TickSyncPacketHandler;
+import de.scribble.lp.tasmod.util.changestates.RequestStatePacket;
+import de.scribble.lp.tasmod.util.changestates.RequestStatePacket.RequestStatePacketHandler;
+import de.scribble.lp.tasmod.util.changestates.SyncStatePacket;
+import de.scribble.lp.tasmod.util.changestates.SyncStatePacket.SyncStatePacketHandler;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -46,9 +56,16 @@ public class CommonProxy {
 	public void preInit(FMLPreInitializationEvent ev) {
 		NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel("tasmod");
 		int i = -1;
+
 		// Tickrate
-		NETWORK.registerMessage(TickratePacketHandler.class, TickratePacket.class, i++, Side.SERVER);
-		NETWORK.registerMessage(TickratePacketHandler.class, TickratePacket.class, i++, Side.CLIENT);
+		NETWORK.registerMessage(ChangeTickratePacketHandler.class, ChangeTickratePacket.class, i++, Side.SERVER);
+		NETWORK.registerMessage(ChangeTickratePacketHandler.class, ChangeTickratePacket.class, i++, Side.CLIENT);
+
+		NETWORK.registerMessage(AdvanceTickratePacketHandler.class, AdvanceTickratePacket.class, i++, Side.SERVER);
+		NETWORK.registerMessage(AdvanceTickratePacketHandler.class, AdvanceTickratePacket.class, i++, Side.CLIENT);
+
+		NETWORK.registerMessage(PauseTickratePacketHandler.class, PauseTickratePacket.class, i++, Side.SERVER);
+		NETWORK.registerMessage(PauseTickratePacketHandler.class, PauseTickratePacket.class, i++, Side.CLIENT);
 
 		// Ticksync
 		NETWORK.registerMessage(TickSyncPacketHandler.class, TickSyncPackage.class, i++, Side.CLIENT);
@@ -87,6 +104,13 @@ public void preInit(FMLPreInitializationEvent ev) {
 		NETWORK.registerMessage(FolderPacketHandler.class, FolderPacket.class, i++, Side.CLIENT);
 		NETWORK.registerMessage(InputContainer.TeleportPlayerPacketHandler.class, InputContainer.TeleportPlayerPacket.class, i++, Side.SERVER);
 
+		// Fullrecord
+		NETWORK.registerMessage(FullRecordPacketHandler.class, FullRecordPacket.class, i++, Side.CLIENT);
+		// Fullplay
+		NETWORK.registerMessage(FullPlayPacketHandler.class, FullPlayPacket.class, i++, Side.CLIENT);
+		// RestartAndPlay
+		NETWORK.registerMessage(RestartAndPlayPacketHandler.class, RestartAndPlayPacket.class, i++, Side.CLIENT);
+
 	}
 
 	public void init(FMLInitializationEvent ev) {

src/main/java/de/scribble/lp/tasmod/InfoGui.java

@@ -5,7 +5,6 @@
 import com.mojang.realmsclient.gui.ChatFormatting;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
@@ -50,7 +49,7 @@ public void drawStuff(RenderGameOverlayEvent.Post event) {
 //			new Gui().drawString(mc.fontRenderer, "EntitySeed: "+ EntityRandom.currentSeed, 16, 130, 0xFFFFFF); // Current Pointer location
 //			new Gui().drawString(mc.fontRenderer, "ItemSeed: "+ ItemRandom.currentSeed, 16, 140, 0xFFFFFF); // Current Pointer location
 //			
-			EntityPlayerSP player=Minecraft.getMinecraft().player;
+//			EntityPlayerSP player=Minecraft.getMinecraft().player;
 
 			if (Display.isActive()) {
 				String out1 = "";