resource assets

load assets from client directory
provide defaults from jar resources

Author: hub

.editorconfig

@@ -10,9 +10,14 @@ trim_trailing_whitespace = true
 [*.java]
 indent_size = 4
 
-[*.{json, toml, xml, yml}]
+[*.{json, toml, xml, yml, yaml}]
 indent_size = 2
 
+[*.sh]
+indent_size = 4
+
 [*.md]
-max_line_length = 420
 trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

.gitattributes

@@ -0,0 +1,10 @@
+* text=auto eol=lf
+
+*.gif binary
+*.png binary
+
+*.dll binary
+*.so binary
+
+*.jar binary
+*.zip binary

.github/dependabot.yml

@@ -1,34 +1,14 @@
 version: 2
 updates:
-
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
       interval: "daily"
-      time: "12:00"
-      timezone: "Europe/Berlin"
     assignees:
-      - "Krazzzzymonkey"
-      - "nothub"
-    reviewers:
-      - "Krazzzzymonkey"
-      - "nothub"
-    commit-message:
-      prefix: "gradle"
-      include: "scope"
-
+      - "Pr3roxDLC"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
-      time: "12:00"
-      timezone: "Europe/Berlin"
     assignees:
-      - "Krazzzzymonkey"
-      - "nothub"
-    reviewers:
-      - "Krazzzzymonkey"
-      - "nothub"
-    commit-message:
-      prefix: "github-actions"
-      include: "scope"
+      - "Pr3roxDLC"

.github/workflows/workflow.yaml

@@ -0,0 +1,21 @@
+name: '🚔'
+on:
+  push:
+    tags:
+      - 'v[0-9]*'
+jobs:
+  job:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          check-latest: true
+          cache: 'gradle'
+      - run: ./gradlew clean setupDecompWorkspace build --console plain --no-daemon --full-stacktrace
+      - uses: softprops/action-gh-release@v1
+        with:
+          body: 'Release generated at commit: ${{ github.sha }}'
+          files: 'build/libs/Catalyst-*-shadow.jar'

.gitignore

@@ -5,6 +5,7 @@
 
 # git
 !/**/.gitkeep
+!/.gitattributes
 !/.gitignore
 !/.gitmodules
 
@@ -22,8 +23,6 @@
 
 # misc
 !/.github/**
-!/.binscure/**
 !/scripts/**
-!/*.md
 !/.editorconfig
-!/LICENSE
+!/README.md

LICENSE.md

@@ -1,3 +1,5 @@
+import org.gradle.process.internal.ExecException
+
 buildscript {
     repositories {
         //jcenter()
@@ -20,7 +22,28 @@ apply plugin: "org.jetbrains.gradle.plugin.idea-ext"
 
 group = project.mod_group
 archivesBaseName = project.mod_name
-version = project.mod_version
+version = { ->
+    def pattern = 'v[0-9]*'
+    def fallback = 'indev'
+    def result = new ByteArrayOutputStream()
+    try {
+        exec {
+            commandLine 'git', 'describe', '--tags', '--abbrev=0', '--match', pattern
+            ignoreExitValue = true
+            standardOutput = result
+            // void stderr
+            errorOutput = new OutputStream() {
+                @Override
+                void write(int b) throws IOException {}
+            }
+        }
+    } catch (ExecException ignored) {
+        ignored.printStackTrace()
+        println 'No git tag found with format \'' + pattern + '\', using fallback version identifier \'' + fallback + '\'.'
+        return fallback
+    }
+    return result.toString().trim().replaceFirst('v', '')
+}()
 
 sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
@@ -46,7 +69,7 @@ minecraft {
 
     replaceIn "com/krazzzzymonkey/catalyst/Main.java"
     replace "@modid@", project.mod_id
-    replace "@version@", project.mod_version
+    replace "@version@", project.version
     replace "@name@", project.mod_name
 }
 
@@ -169,13 +192,12 @@ jar {
 
 task loaderJar(type: Jar, dependsOn: shadowJar) {
     from(zipTree(shadowJar.archivePath)) {
-        include "assets/minecraft/catalyst/mainmenu/config.json"
         include "com/krazzzzymonkey/**"
         include "mixins.catalyst.json"
         include "mixins.catalyst.refmap.json"
     }
     baseName = project.mod_name
-    version = project.mod_version
+    version = project.version
     classifier = "loader"
     manifest = jar.manifest
 }

build.gradle

@@ -4,7 +4,6 @@ org.gradle.daemon=false
 mod_group=com.krazzzzymonkey.catalyst
 mod_id=catalyst
 mod_name=Catalyst
-mod_version=1.10.2
 
 forge_version=1.12.2-14.23.5.2847
 mcp_version=stable_39

gradle.properties

@@ -1,7 +1,5 @@
 package com.krazzzzymonkey.catalyst;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
 import com.krazzzzymonkey.catalyst.configuration.Config;
 import com.krazzzzymonkey.catalyst.configuration.ConfigurationLoader;
 import com.krazzzzymonkey.catalyst.events.ClientEvents;
@@ -11,8 +9,6 @@
 import com.krazzzzymonkey.catalyst.managers.accountManager.AccountManager;
 import com.krazzzzymonkey.catalyst.managers.accountManager.Standards;
 import com.krazzzzymonkey.catalyst.managers.accountManager.config.ConfigValues;
-import com.krazzzzymonkey.catalyst.utils.AssetUtils;
-import com.krazzzzymonkey.catalyst.managers.TimerManager;
 import com.krazzzzymonkey.catalyst.utils.font.CFontRenderer;
 import com.krazzzzymonkey.catalyst.utils.visual.ColorUtils;
 import net.minecraftforge.common.MinecraftForge;
@@ -30,7 +26,8 @@
 import org.lwjgl.opengl.Display;
 
 import java.awt.*;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 
 import static com.krazzzzymonkey.catalyst.managers.FileManager.CATALYST_DIR;
 
@@ -53,8 +50,6 @@ public static void syncConfig() {
     public static final String VERSION = "@version@";
     public static int initCount = 0;
     public static ModuleManager moduleManager;
-    public static FileManager fileManager;
-    public static Thread assetThread;
     public static FontManager fontManager;
 
     public static CFontRenderer fontRenderer;
@@ -78,7 +73,6 @@ public static void syncConfig() {
     public void preInit(FMLPreInitializationEvent E) throws IOException {
 
 
-        assetThread = new AssetUtils().getThread();
         logger.info("   ____      _        _           _      ____ _ _            _  ");
         logger.info("  / ___|__ _| |_ __ _| |_   _ ___| |_   / ___| (_) ___ _ __ | |_ ");
         logger.info(" | |   / _` | __/ _` | | | | / __| __| | |   | | |/ _ \\ '_ \\| __|");
@@ -120,38 +114,28 @@ public void preInit(FMLPreInitializationEvent E) throws IOException {
         altConfig = new Configuration(E.getSuggestedConfigurationFile());
         altConfig.load();
         syncConfig();
-        if (!E.getModMetadata().version.equals("${version}"))//Dev environment needs to use a local list, to avoid issues
-            Standards.updateFolder();
-        else
-            logger.info("Dev environment detected!");
     }
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent E) throws IOException {
-        try {
-            assetThread.join();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
         if (initCount > 0) {
             return;
         }
         Standards.importAccounts();
         TimerManager.INSTANCE = new TimerManager();
         moduleManager = new ModuleManager();
+        FileManager.init();
         luaManager = new LuaManager();
-        fileManager = new FileManager();
         fontRenderer = new CFontRenderer(new Font(FontManager.font, Font.PLAIN, 20), true, true);
         smallFontRenderer = new CFontRenderer(new Font(FontManager.font, Font.PLAIN, 15), true, true);
         AccountManager.init();
 
-
         initCount++;
     }
 
     @EventHandler
     public void postInit(FMLPostInitializationEvent E){
-        File file = new File(System.getProperty("user.home") + File.separator + "Catalyst" + File.separator + "assets" + File.separator + "gui" + File.separator + "watermark.png");
+        File file = FileManager.getAssetFile("gui" + File.separator + "watermark.png");
 
         Display.setTitle(NAME + " " + VERSION);