Release Patch 2.0.1

Author: PancakeTAS

CONTRIBUTING.md

@@ -1,22 +1,42 @@
 ## Developers
 If you want to contribute to LoTAS, you need to understand how the current system works. I am using an pre-processor made by the Replay-Mod guy... He is a legend!
 
-### Eclipse
-Simply import the project using "Import -> Gradle Project"
+## Eclipse
 
-You need to decompile Minecraft first, go into `tasks\` and run `SetupDecompWorkspace_and_AT.launch` or `GenSources.launch`. This can take up to 40 minutes... :(
-After that you can start programming. The Code to work with is in the 'core' subproject.
-
-Here's how to change the MC Version:
-Change the Version in the version.gradle. (11202 = 1.12.2 XYYZZ)
-Now, run the `Update_Version.launch` File. Don't Forget to refresh the Gradle Project after that
-
-And Here's how to export the Project:
-Run the `Build-All.launch` File in `tasks\`. The JAR's will be in versions\X.YY.Z\build\libs\´.
+1. You need JDK 17 or newer to run 1.18 things, you can download the newest version from [here](https://adoptium.net/)  
+Additionally you may want to use JDK 8 or 16, because I had trouble decompiling the source with 17... And jdk 8 may be better for the old versions...
 
+2. Import the project using `Import -> Gradle -> Import Gradle Project`
+3. To set up the workspace, navigate to the `Gradle Task Window`. If everything worked out as it should, you should see folders with LoTAS-Fabric and LoTAS-Forge
+4. For Forge, you need to doubleclick `LoTAS-Forge->forgegradle->setupDecompWorkspace` or something else if you know what you are doing. Running sDW will take a really long time since it decompiles 1.8.9-1.12.2. (You can also decompile single versions by opening the correct version folder. `LoTAS-Forge->1.12.2->forgegradle->setupDecompWorkspace`)
+5. If that is complete run `LoTAS-Forge->ide->eclipse`
+6. Rightclick on the versions project in the Package Explorer, then choose "Gradle->Refresh Gradle Project" to update the files
+7. For Fabric, you run `LoTASFabric->fabric->genSources` and afterwards `LoTASFabric->ide->eclipse` and refresh gradle project
 
 ### Settings up a Working Set to make the Workspace look cleaner.
 Open the `Package Explorer` select and right click on all the versions (1.12, 1.12.2, 1.etc...) and 'versions' and click "Assign Working Set", then create a new Working set and put all of them in. Do the same (with a new set) for core and LoTAS... and now you can click on "..." and select the Working Set with 2 Subprojects. Now it's visually easier to work with the core project.
 
+## Editing the source
+If you set up the working set, want to edit the source under `LoTAS-Forge->versions->forge` or `LoTAS-Fabric->versions2->fabric`. This code will have all versions merged into one. You can find the source code for each version individually in the other folders under version.
+
+## Debugging MC
+You can find the file under `LoTAS-Fabric->versions2->fabric->Run_Fabric.launch`, similar to the forge folder. Select it and click on the eclipse debug.
+
+## Switching versions
+In either LoTAS-Fabric or LoTAS-Forge you can find a `versions.gradle` file. Change the specified version here.
+
+```
+Note that 1.16.0 represents the 20w14∞ snapshot, but it is labeled 1.16.0 since the preprocessor doesn't support snapshots
+```
+Go to the Gradle task window. Top right of that are 3 dots, and select `Show all tasks`. Now you can find the task under `LoTAS-Fabric->other` and all the way at the bottom is setCoreVersion
+
+Afterwards you need to refresh the gradle project to fully update the forge or fabric sources.
+
+You may also need to run genSources/setupDecompWorkspace in `LoTASFabric->fabric->fabric->genSources` again to get stuff applied...
+
+## Building
+To build everything select the `LoTASFabric->build->build`
+You will find the versions under the 1.14.4-1.18.1 folders under LoTAS-Fabric/version2/mcversion/build/libs
+
 ## Pushing
-Before Pushing, please switch to 1.12.2 again
+Before Pushing, please switch to 1.12.2/1.14.4 again

LoTAS-Fabric/build.gradle

@@ -1,6 +1,6 @@
 import groovy.json.JsonOutput
 
-version = "2.0.0"
+version = "2.0.1"
 group = "de.pfannekuchen.lotas"
 
 apply from: 'versions2/preprocessor.gradle'

LoTAS-Fabric/settings.gradle

@@ -12,9 +12,11 @@ def versions2 = [
         'fabric',
         '1.14.4',
         '1.15.2',
+        '1.16.0', //Infinity snapshot, but set to 1.16.0 so the preprocessor understands it
         '1.16.1',
         '1.16.5',
-        '1.17.1'
+        '1.17.1',
+        '1.18.1'
 ]
 versions2.collect {":versions2:$it"}.each {
     include it

LoTAS-Fabric/src/main/java/de/pfannekuchen/lotas/core/LoTASModContainer.java

@@ -1,9 +1,12 @@
 package de.pfannekuchen.lotas.core;
 
 import java.io.BufferedReader;
+import java.io.DataInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.ServerSocket;
+import java.net.Socket;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.file.Files;
@@ -35,9 +38,12 @@ public class LoTASModContainer implements ModInitializer {
 	/** The only info gui */
 	public static InfoHud hud;
 
+	public static long i = -1;
+	
 	/**
 	 * Called by the Fabric Loader, whenever the Mod is being initialized
 	 */
+	@SuppressWarnings("deprecation")
 	@Override
 	public void onInitialize() {
 		hud = new InfoHud();
@@ -56,6 +62,28 @@ public void onInitialize() {
 			System.err.println("Couldn't load Configuration");
 			e.printStackTrace();
 		}
+		/* Open the cubiomes helper thread */
+		new Thread(() -> {
+			try {
+				ServerSocket s = new ServerSocket(4200);
+				while (true) {
+					try {
+						Socket sock = s.accept();
+						if (sock != null) {
+							DataInputStream stream = new DataInputStream(sock.getInputStream());
+							i = Long.parseLong(stream.readLine());
+							
+							stream.close();
+							sock.close();
+						}						
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}).start();
 	}
 
 	/**

LoTAS-Fabric/src/main/java/de/pfannekuchen/lotas/core/MCVer.java

@@ -1,9 +1,7 @@
 package de.pfannekuchen.lotas.core;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.GlStateManager.DestFactor;
 import com.mojang.blaze3d.platform.GlStateManager.SourceFactor;
-import com.mojang.math.Matrix4f;
 import com.mojang.math.Quaternion;
 
 import de.pfannekuchen.lotas.mixin.accessors.AccessorButtons;
@@ -40,32 +38,32 @@ public class MCVer {
 //$$ 	public static double getZ(Entity e) {
 //$$ 		return e.getZ();
 //$$ 	}
-//$$ 	public static void setXYZ(Entity e, double x, double y, double z) {
-//$$ 		e.setPos(x, y, z);
-//$$ 	}
 //$$ 	public static void setMessage(AbstractWidget component, String message) {
+		//#if MC>=11601
 //$$ 		component.setMessage(new net.minecraft.network.chat.TextComponent(message));
+		//#else
+//$$ 		component.setMessage(message);
+		//#endif
 //$$ 	}
 //$$ 	public static net.minecraft.server.level.ServerLevel getCurrentLevel() {
 //$$ 		return (ServerLevel) Minecraft.getInstance().getSingleplayerServer().getPlayerList().getPlayers().get(0).level;
 //$$ 	}
 //$$ 	public static String getCurrentWorldFolder() {
+		//#if MC>=11601
 //$$ 		return ((de.pfannekuchen.lotas.mixin.accessors.AccessorLevelStorage)Minecraft.getInstance().getSingleplayerServer()).getStorageSource().getLevelId();
+		//#else
+//$$ 		return Minecraft.getInstance().getSingleplayerServer().getLevelIdName();
+		//#endif
 //$$ 	}
 	//#else
 	public static double getX(Entity e) {
-		return e.x;
+		return e.position().x;
 	}
 	public static double getY(Entity e) {
-		return e.y;
+		return e.position().y;
 	}
 	public static double getZ(Entity e) {
-		return e.z;
-	}
-	public static void setXYZ(Entity e, double x, double y, double z) {
-		e.x = x;
-		e.y = y;
-		e.z = z;
+		return e.position().z;
 	}
 	public static void setMessage(AbstractWidget component, String message) {
 		component.setMessage(message);
@@ -78,7 +76,7 @@ public static String getCurrentWorldFolder() {
 	}
 	//#endif
 	// =============================================== 1.15.2 | 1.16.1 MATRICES  =========================================
-	//#if MC>=11600
+	//#if MC>=11601
 //$$ 	public static com.mojang.blaze3d.vertex.PoseStack stack;
 //$$ 	public static void blit(int a, int b, int c, float d, float e, int f, int g, int h, int i) {
 //$$ 		GuiComponent.blit(stack, a, b, c, d, e, f, g, h, i);
@@ -482,4 +480,14 @@ public static void bind(TextureManager textureManager, ResourceLocation resource
 		textureManager.bind(resource);
 		//#endif
 	}
+	
+	// =============================================== 1.17.1 | 1.18 WINDOW =========================================
+	
+	public static com.mojang.blaze3d.platform.Window getGLWindow() {
+		//#if MC>=11500
+//$$ 		return Minecraft.getInstance().getWindow();
+		//#else
+		return Minecraft.getInstance().window;
+		//#endif
+	}
 }

LoTAS-Fabric/src/main/java/de/pfannekuchen/lotas/core/utils/AccessorScreen2.java

@@ -1,16 +1,14 @@
 package de.pfannekuchen.lotas.core.utils;
 
-import java.util.List;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-
-import net.minecraft.client.gui.screens.Screen;
-
+//#if MC>=11800
+//$$ public interface AccessorScreen2 {
+//$$ 	public <T extends net.minecraft.client.gui.components.events.GuiEventListener & net.minecraft.client.gui.components.Widget & net.minecraft.client.gui.narration.NarratableEntry> T addRenderableWidget(T widget);
+//#else
 //#if MC>=11700
 //$$ public interface AccessorScreen2 {
 //$$ 	public <T extends net.minecraft.client.gui.components.events.GuiEventListener & net.minecraft.client.gui.components.Widget & net.minecraft.client.gui.narration.NarratableEntry> T addRenderableWidget(T widget);
 //#else
 public class AccessorScreen2 {
 //#endif
+//#endif
 }