Use RetroMCP, Add makefile, update README.md

.gitignore

@@ -1,52 +1,14 @@
-# Block folders that belong to MCP  
-jars/
-logs/
-reobf/
-temp/
-bin/
-
+# Block folders that belong to RetroMCP
 conf/
-docs/
-eclipse/
-runtime/
-notes.md
+jars/
+libraries/
+minecraft/
+minecraft_server/
+RetroMCP-Java-CLI.jar
 
 # AnnoyanceFix related stuff
-src/minecraft_server
-src/minecraft/net/minecraft/client
-src/minecraft/net/minecraft/isom
-src/minecraft/net/minecraft/src/*.java
-!src/minecraft/net/minecraft/src/BlockFence.java
-!src/minecraft/net/minecraft/src/BlockStairs.java
-!src/minecraft/net/minecraft/src/InventoryPlayerUtils.java
-!src/minecraft/net/minecraft/src/EntityBoat.java
-!src/minecraft/net/minecraft/src/mod_AnnoyanceFix.java
 AnnoyanceFix.zip
 
-# Allow server.properties
-!jars/server.properties
-
-# Block compiled Python
-*.pyc
-
-# Block downloaded files
-runtime/bin/pypy*
-!runtime/bin/
-
-# Block .idea folder
+# IDE stuff
 .idea/
-
-# Block python runtime.
-runtime/bin/python/
-
-# Block command file.
-runtime/command
-
-# Block scripts in the root folder except setup.* and createmod.*
-*.bat
-*.sh
-!createmod.sh
-!createmod.bat
-
-# Block .iml files 
 *.iml

Makefile

@@ -0,0 +1,71 @@
+RETRO_MCP_DL=https://github.com/MCPHackers/RetroMCP-Java/releases/latest/download/RetroMCP-Java-CLI.jar
+MODLOADER_DL=https://github.com/coffeenotfound/ModloaderFix-b1.7.3/releases/download/v1.0.0/ModLoader.Fix.b1.7.3-1.0.0.jar
+MOD_NAME=AnnoyanceFix
+
+tmp_dir=/tmp
+wget_flags=-q --show-progress
+retro_mcp_bin=RetroMCP-Java-CLI.jar
+vscode_config='{ \
+    "java.project.sourcePaths": ["src"], \
+    "java.project.referencedLibraries": [ \
+        "../libraries/**/*.jar" \
+    ] \
+}'
+
+
+.PHONY: default
+default: download applymodloader decompile applypatch
+
+# RetroMCP
+
+.PHONY: download
+download:
+	wget $(wget_flags) -O $(retro_mcp_bin) $(RETRO_MCP_DL)
+	wget $(wget_flags) -O $(tmp_dir)/modloader.jar $(MODLOADER_DL)
+	java -jar $(retro_mcp_bin) setup b1.7.3
+
+.PHONY: applymodloader
+applymodloader:
+	mkdir $(tmp_dir)/modloader
+	cd $(tmp_dir)/modloader && jar -xvf ../modloader.jar
+	mv jars/minecraft.jar $(tmp_dir)/modloader
+	cd $(tmp_dir)/modloader && jar -uf minecraft.jar *
+	mv $(tmp_dir)/modloader/minecraft.jar jars/
+
+.PHONY: decompile
+decompile:
+	java -jar $(retro_mcp_bin) decompile
+	java -jar $(retro_mcp_bin) updatemd5
+
+.PHONY: clean
+clean:
+	java -jar $(retro_mcp_bin) cleanup
+	# Clean working directory
+	rm -rf libraries $(MOD_NAME).zip $(retro_mcp_bin) $(tmp_dir)/modloader $(tmp_dir)/modloader.jar
+
+.PHONY: applypatch
+applypatch:
+	java -jar $(retro_mcp_bin) applypatch
+
+.PHONY: patch
+patch:
+	java -jar $(retro_mcp_bin) createpatch
+
+.PHONY: $(MOD_NAME).zip
+$(MOD_NAME).zip:
+	java -jar $(retro_mcp_bin) recompile
+	java -jar $(retro_mcp_bin) reobfuscate
+	rm -f $(MOD_NAME).zip
+	zip -r -j $(MOD_NAME).zip minecraft/reobf
+
+# VSCode
+
+.PHONY: vscode/setup
+vscode/setup:
+	rm minecraft/.project
+	mkdir minecraft/.vscode
+	echo $(vscode_config) > minecraft/.vscode/settings.json
+
+.PHONY: vscode/run
+vscode/run:
+	code minecraft

README.md

@@ -2,7 +2,7 @@
 
 _Now using modloader!_
 
-![image](https://i.imgur.com/TyufQHz.jpg)
+![modloader-banner](https://github.com/2zqa/AnnoyanceFix/assets/25235249/9ea27b70-5396-4b68-8bdf-9e044b2acfaf)
 
 Mod review of v1.4 by Modification Station/The Zyga (thanks!): https://www.youtube.com/watch?v=m8lX9jv9lhI
 
@@ -36,19 +36,10 @@ Got any suggestions on what I should add next? Feel free to let me know by [crea
 
 Thanks for considering contributing! To get started:
 
-1. Download 1.7.3-LTS (MCP fork): `https://github.com/ModificationStation/1.7.3-LTS/`
-2. Fork this repository
-3. Clone your own fork: `git clone https://github.com/<your_username>/AnnoyanceFix.git`
-4. Run setup from 1.7.3-LTS
-5. Add modloader classes to jars/bin/minecraft.jar
-6. Run decompile script with fixed class for Modloader
-7. Run updatemd5 script
-8. Copy all files _from_ 1.7.3-LTS _to_ the AnnoyanceFix folder, without overwriting anything
-9. Fix the errors in Eclipse (mostly replacing int with boolean)
-   * For example: `int j = this.furnaceBurnTime > 0;` to `boolean j = this.furnaceBurnTime > 0;`
-   * Remove the int in `int j2 = 4;` in RenderBlocks.java
-   * Warnings can be ignored
-10. Start modding :)
-11. Create a pull request when done
-
-TIP: Use the createmod script to automatically recompile, reobfuscate and create a zip for the mod.
+1. Fork this repository
+2. Clone your own fork: `git clone https://github.com/<your_username>/AnnoyanceFix.git`
+3. Run `make`
+4. Start modding :)
+5. Create a pull request when done
+
+TIP: Run `make AnnoyanceFix.zip` to automatically recompile, reobfuscate and create a zip for the mod.