From a5f4726244cb6986f375d28b9f01ddc0f883e95f Mon Sep 17 00:00:00 2001
From: Bob <hbmmods@gmail.com>
Date: Tue, 23 Aug 2022 22:37:47 +0200
Subject: [PATCH] the magic of doing not a whole lot

---
 .../java/com/hbm/wiaj/GuiWorldInAJar.java     | 27 +++++++++++++------
 src/main/java/com/hbm/wiaj/JarScript.java     |  4 +++
 .../com/hbm/wiaj/actions/ActionRotate.java    |  4 +--
 .../com/hbm/wiaj/actors/ISpecialActor.java    | 10 +++++++
 .../wiaj/{ => actors}/ITileActorRenderer.java |  2 +-
 5 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/com/hbm/wiaj/actors/ISpecialActor.java
 rename src/main/java/com/hbm/wiaj/{ => actors}/ITileActorRenderer.java (74%)

diff --git a/src/main/java/com/hbm/wiaj/GuiWorldInAJar.java b/src/main/java/com/hbm/wiaj/GuiWorldInAJar.java
index 469befbc7..3b26be2ba 100644
--- a/src/main/java/com/hbm/wiaj/GuiWorldInAJar.java
+++ b/src/main/java/com/hbm/wiaj/GuiWorldInAJar.java
@@ -30,21 +30,19 @@ public class GuiWorldInAJar extends GuiScreen {
 		
 		testScript = new JarScript(world);
 		JarScene startingScene = new JarScene(testScript);
-		
-		for(int x = 0; x < 15; x++) {
-			for(int y = 0; y < 15; y++) {
+
+		for(int y = 0; y < 15; y++) {
+			for(int x = 0; x < 15; x++) {
 				for(int z = 0; z < 15; z++) {
 					
 					if(y == 14) {
 						startingScene.add(new ActionSetBlock(x, y, z, ModBlocks.glass_boron));
-						startingScene.add(new ActionWait(1));
 						continue;
 					}
 					
 					if(y > 0) {
 						if(x == 0 || x == 14 || z == 0 || z == 14) {
 							startingScene.add(new ActionSetBlock(x, y, z, ModBlocks.glass_boron));
-							startingScene.add(new ActionWait(1));
 							continue;
 						}
 					}
@@ -58,11 +56,15 @@ public class GuiWorldInAJar extends GuiScreen {
 					}
 				}
 			}
+			startingScene.add(new ActionWait(1));
 		}
 		
-		startingScene.add(new ActionWait(20));
+		startingScene.add(new ActionWait(10));
 
 		startingScene.add(new ActionSetBlock(2, 1, 2, ModBlocks.fallout, 0));
+		
+		startingScene.add(new ActionWait(10));
+		
 		startingScene.add(new ActionSetBlock(4, 1, 4, ModBlocks.conveyor, 2));
 		startingScene.add(new ActionSetBlock(4, 1, 5, ModBlocks.conveyor, 2));
 		startingScene.add(new ActionSetBlock(4, 1, 6, ModBlocks.conveyor, 2));
@@ -72,6 +74,8 @@ public class GuiWorldInAJar extends GuiScreen {
 		startingScene.add(new ActionSetBlock(4, 1, 10, ModBlocks.conveyor, 6));
 		startingScene.add(new ActionSetBlock(5, 1, 10, ModBlocks.conveyor, 4));
 		
+		startingScene.add(new ActionWait(10));
+		
 		startingScene.add(new ActionRotate(90, 0, 50));
 
 		JarScene brickScene = new JarScene(testScript);
@@ -82,10 +86,17 @@ public class GuiWorldInAJar extends GuiScreen {
 					brickScene.add(new ActionSetBlock(x, y, z, Blocks.brick_block));
 				}
 			}
-			brickScene.add(new ActionWait(10));
+			brickScene.add(new ActionWait(2));
 		}
 		
-		brickScene.add(new ActionRotate(-90, 0, 20));
+		brickScene.add(new ActionRotate(-90, 0, 10));
+		
+		brickScene.add(new ActionWait(20));
+		brickScene.add(new ActionRotate(45, 30, 10));
+		brickScene.add(new ActionWait(40));
+		brickScene.add(new ActionRotate(360, 0, 100));
+		brickScene.add(new ActionWait(40));
+		brickScene.add(new ActionRotate(-45, -30, 10));
 		
 		this.testScript.addScene(startingScene).addScene(brickScene);
 	}
diff --git a/src/main/java/com/hbm/wiaj/JarScript.java b/src/main/java/com/hbm/wiaj/JarScript.java
index de8e991bb..0e4404dd6 100644
--- a/src/main/java/com/hbm/wiaj/JarScript.java
+++ b/src/main/java/com/hbm/wiaj/JarScript.java
@@ -1,14 +1,18 @@
 package com.hbm.wiaj;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
+import com.hbm.wiaj.actors.ISpecialActor;
+
 import net.minecraft.util.MathHelper;
 
 public class JarScript {
 
 	public  WorldInAJar world;
 	private List<JarScene> scenes = new ArrayList();
+	private HashMap<Integer, ISpecialActor> actors = new HashMap();
 	private JarScene currentScene;
 	private int sceneNumber = 0;
 
diff --git a/src/main/java/com/hbm/wiaj/actions/ActionRotate.java b/src/main/java/com/hbm/wiaj/actions/ActionRotate.java
index efa02312f..f859e1164 100644
--- a/src/main/java/com/hbm/wiaj/actions/ActionRotate.java
+++ b/src/main/java/com/hbm/wiaj/actions/ActionRotate.java
@@ -10,8 +10,8 @@ public class ActionRotate implements IJarAction {
 	double velPitch;
 
 	public ActionRotate(double yaw, double pitch, int time) {
-		this.velYaw = yaw / time;
-		this.velPitch = pitch / time;
+		this.velYaw = yaw / (time + 1);
+		this.velPitch = pitch / (time + 1);
 		this.time = time;
 	}
 
diff --git a/src/main/java/com/hbm/wiaj/actors/ISpecialActor.java b/src/main/java/com/hbm/wiaj/actors/ISpecialActor.java
new file mode 100644
index 000000000..0c4e12a6c
--- /dev/null
+++ b/src/main/java/com/hbm/wiaj/actors/ISpecialActor.java
@@ -0,0 +1,10 @@
+package com.hbm.wiaj.actors;
+
+import com.hbm.wiaj.JarScene;
+
+public interface ISpecialActor {
+
+	public void draw();
+	public void updateActor(JarScene scene);
+	public void setActorData(Object... data);
+}
diff --git a/src/main/java/com/hbm/wiaj/ITileActorRenderer.java b/src/main/java/com/hbm/wiaj/actors/ITileActorRenderer.java
similarity index 74%
rename from src/main/java/com/hbm/wiaj/ITileActorRenderer.java
rename to src/main/java/com/hbm/wiaj/actors/ITileActorRenderer.java
index 0d3edbb35..26ba99f3e 100644
--- a/src/main/java/com/hbm/wiaj/ITileActorRenderer.java
+++ b/src/main/java/com/hbm/wiaj/actors/ITileActorRenderer.java
@@ -1,4 +1,4 @@
-package com.hbm.wiaj;
+package com.hbm.wiaj.actors;
 
 public interface ITileActorRenderer {