Restructure project

RainbowVille · Jan 31, 2024 · 8ae6bef · 8ae6bef
1 parent 118d924
commit 8ae6bef
Show file tree

Hide file tree

Showing 148 changed files with 652 additions and 126 deletions.
diff --git a/.github/workflows/gradle-forge-1.12.yml → .github/workflows/gradle-forge-1.12.2.yml b/.github/workflows/gradle-forge-1.12.yml → .github/workflows/gradle-forge-1.12.2.yml
@@ -1,23 +1,23 @@
-name: Build 1.12
+name: Build 1.12.2
 
 on:
   workflow_dispatch:
   push:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.12/**'
+      - 'forge/fg-6.0/1.12.2/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.12.yml'
+      - '.github/workflows/gradle-forge-1.12.2.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.12/**'
+      - 'forge/fg-6.0/1.12.2/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.12.yml'
+      - '.github/workflows/gradle-forge-1.12.2.yml'
 
 jobs:
   build:
     uses: ./.github/workflows/fg-6.0.yml
     with:
-      version: 1.12
+      version: 1.12.2
       java-version: 8
diff --git a/.github/workflows/gradle-forge-1.13.yml → .github/workflows/gradle-forge-1.13.2.yml b/.github/workflows/gradle-forge-1.13.yml → .github/workflows/gradle-forge-1.13.2.yml
@@ -1,23 +1,23 @@
-name: Build 1.13
+name: Build 1.13.2
 
 on:
   workflow_dispatch:
   push:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.13/**'
+      - 'forge/fg-6.0/1.13.2/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.13.yml'
+      - '.github/workflows/gradle-forge-1.13.2.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.13/**'
+      - 'forge/fg-6.0/1.13.2/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.13.yml'
+      - '.github/workflows/gradle-forge-1.13.2.yml'
 
 jobs:
   build:
     uses: ./.github/workflows/fg-6.0.yml
     with:
-      version: 1.13
+      version: 1.13.2
       java-version: 8
diff --git a/.github/workflows/gradle-forge-1.14.yml → .github/workflows/gradle-forge-1.14.4.yml b/.github/workflows/gradle-forge-1.14.yml → .github/workflows/gradle-forge-1.14.4.yml
@@ -1,23 +1,23 @@
-name: Build 1.14
+name: Build 1.14.4
 
 on:
   workflow_dispatch:
   push:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.14/**'
+      - 'forge/fg-6.0/1.14.4/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.14.yml'
+      - '.github/workflows/gradle-forge-1.14.4.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.14/**'
+      - 'forge/fg-6.0/1.14.4/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.14.yml'
+      - '.github/workflows/gradle-forge-1.14.4.yml'
 
 jobs:
   build:
     uses: ./.github/workflows/fg-6.0.yml
     with:
-      version: 1.14
+      version: 1.14.4
       java-version: 8
diff --git a/.github/workflows/gradle-forge-1.15.yml → .github/workflows/gradle-forge-1.15.2.yml b/.github/workflows/gradle-forge-1.15.yml → .github/workflows/gradle-forge-1.15.2.yml
@@ -1,23 +1,23 @@
-name: Build 1.15
+name: Build 1.15.2
 
 on:
   workflow_dispatch:
   push:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.15/**'
+      - 'forge/fg-6.0/1.15.2/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.15.yml'
+      - '.github/workflows/gradle-forge-1.15.2.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.15/**'
+      - 'forge/fg-6.0/1.15.2/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.15.yml'
+      - '.github/workflows/gradle-forge-1.15.2.yml'
 
 jobs:
   build:
     uses: ./.github/workflows/fg-6.0.yml
     with:
-      version: 1.15
+      version: 1.15.2
       java-version: 8
diff --git a/.github/workflows/gradle-forge-1.16.5.yml b/.github/workflows/gradle-forge-1.16.5.yml
@@ -0,0 +1,23 @@
+name: Build 1.16.5
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main ]
+    paths:
+      - 'forge/fg-6.0/1.16.5/**'
+      - '.github/workflows/fg-6.0.yml'
+      - '.github/workflows/gradle-forge-1.16.5.yml'
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'forge/fg-6.0/1.16.5/**'
+      - '.github/workflows/fg-6.0.yml'
+      - '.github/workflows/gradle-forge-1.16.5.yml'
+
+jobs:
+  build:
+    uses: ./.github/workflows/fg-6.0.yml
+    with:
+      version: 1.16.5
+      java-version: 8
diff --git a/.github/workflows/gradle-forge-1.16.yml b/.github/workflows/gradle-forge-1.16.yml
diff --git a/.github/workflows/gradle-forge-1.17.yml → .github/workflows/gradle-forge-1.17.1.yml b/.github/workflows/gradle-forge-1.17.yml → .github/workflows/gradle-forge-1.17.1.yml
@@ -1,23 +1,23 @@
-name: Build 1.17
+name: Build 1.17.1
 
 on:
   workflow_dispatch:
   push:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.17/**'
+      - 'forge/fg-6.0/1.17.1/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.17.yml'
+      - '.github/workflows/gradle-forge-1.17.1.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.17/**'
+      - 'forge/fg-6.0/1.17.1/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.17.yml'
+      - '.github/workflows/gradle-forge-1.17.1.yml'
 
 jobs:
   build:
     uses: ./.github/workflows/fg-6.0.yml
     with:
-      version: 1.17
+      version: 1.17.1
       java-version: 16
diff --git a/.github/workflows/gradle-forge-1.18.yml → .github/workflows/gradle-forge-1.18.2.yml b/.github/workflows/gradle-forge-1.18.yml → .github/workflows/gradle-forge-1.18.2.yml
@@ -1,23 +1,23 @@
-name: Build 1.18
+name: Build 1.18.2
 
 on:
   workflow_dispatch:
   push:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.18/**'
+      - 'forge/fg-6.0/1.18.2/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.18.yml'
+      - '.github/workflows/gradle-forge-1.18.2.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.18/**'
+      - 'forge/fg-6.0/1.18.2/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.18.yml'
+      - '.github/workflows/gradle-forge-1.18.2.yml'
 
 jobs:
   build:
     uses: ./.github/workflows/fg-6.0.yml
     with:
-      version: 1.18
+      version: 1.18.2
       java-version: 17
diff --git a/.github/workflows/gradle-forge-1.19.yml → .github/workflows/gradle-forge-1.19.4.yml b/.github/workflows/gradle-forge-1.19.yml → .github/workflows/gradle-forge-1.19.4.yml
@@ -1,23 +1,23 @@
-name: Build 1.19
+name: Build 1.19.4
 
 on:
   workflow_dispatch:
   push:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.19/**'
+      - 'forge/fg-6.0/1.19.4/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.19.yml'
+      - '.github/workflows/gradle-forge-1.19.4.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.19/**'
+      - 'forge/fg-6.0/1.19.4/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.19.yml'
+      - '.github/workflows/gradle-forge-1.19.4.yml'
 
 jobs:
   build:
     uses: ./.github/workflows/fg-6.0.yml
     with:
-      version: 1.19
+      version: 1.19.4
       java-version: 17
diff --git a/.github/workflows/gradle-forge-1.20.yml → .github/workflows/gradle-forge-1.20.4.yml b/.github/workflows/gradle-forge-1.20.yml → .github/workflows/gradle-forge-1.20.4.yml
@@ -1,23 +1,23 @@
-name: Build 1.20
+name: Build 1.20.4
 
 on:
   workflow_dispatch:
   push:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.20/**'
+      - 'forge/fg-6.0/1.20.4/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.20.yml'
+      - '.github/workflows/gradle-forge-1.20.4.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'forge/fg-6.0/1.20/**'
+      - 'forge/fg-6.0/1.20.4/**'
       - '.github/workflows/fg-6.0.yml'
-      - '.github/workflows/gradle-forge-1.20.yml'
+      - '.github/workflows/gradle-forge-1.20.4.yml'
 
 jobs:
   build:
     uses: ./.github/workflows/fg-6.0.yml
     with:
-      version: 1.20
+      version: 1.20.4
       java-version: 17
diff --git a/.github/workflows/gradle-forge-1.8.yml → .github/workflows/gradle-forge-1.8.9.yml b/.github/workflows/gradle-forge-1.8.yml → .github/workflows/gradle-forge-1.8.9.yml
@@ -1,23 +1,23 @@
-name: Build 1.8
+name: Build 1.8.9
 
 on:
   workflow_dispatch:
   push:
     branches: [ main ]
     paths:
-      - 'forge/fg-2.1/1.8/**'
+      - 'forge/fg-2.1/1.8.9/**'
       - '.github/workflows/fg-2.1.yml'
-      - '.github/workflows/gradle-forge-1.8.yml'
+      - '.github/workflows/gradle-forge-1.8.9.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'forge/fg-2.1/1.8/**'
+      - 'forge/fg-2.1/1.8.9/**'
       - '.github/workflows/fg-2.1.yml'
-      - '.github/workflows/gradle-forge-1.8.yml'
+      - '.github/workflows/gradle-forge-1.8.9.yml'
 
 jobs:
   build:
     uses: ./.github/workflows/fg-2.1.yml
     with:
-      version: 1.8
+      version: 1.8.9
       java-version: 8
diff --git a/README.md b/README.md
@@ -2,16 +2,16 @@
 
 User Guide: https://www.minegasm.net/
 
-| Minecraft                 | Forge MDK    | JDK | FG  | Gradle | Status                                                                                                                                                                                  |
-|---------------------------|--------------|-----|-----|--------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **1.20**.1                | 47.1.0       | 17  | 6.0 | 8.1.1  | [![1.20](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.20.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.20.yml) |
-| **1.19**.4                | 45.1.0       | 17  | 6.0 | 8.1.1  | [![1.19](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.19.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.19.yml) |
-| **1.18**.2                | 40.2.0       | 17  | 6.0 | 8.1.1  | [![1.18](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.18.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.18.yml) |
-| **1.17**.1                | 37.1.1       | 16  | 6.0 | 8.1.1  | [![1.17](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.17.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.17.yml) |
-| **1.16**.5                | 36.2.34      | 8   | 6.0 | 8.1.1  | [![1.16](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.16.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.16.yml) |
-| **1.15**.2                | 31.2.57      | 8   | 6.0 | 8.1.1  | [![1.15](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.15.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.15.yml) |
-| **1.14**.4                | 28.2.26      | 8   | 6.0 | 8.1.1  | [![1.14](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.14.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.14.yml) |
-| **1.13**.2                | 25.0.223     | 8   | 6.0 | 8.1.1  | [![1.13](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.13.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.13.yml) |
-| **1.12**.2                | 14.23.5.2859 | 8   | 6.0 | 8.1.1  | [![1.12](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.12.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.12.yml) |
-| **1. 8**.9 <sup>WIP</sup> | 11.15.1.2318 | 8   | 2.1 | 4.10.3 | [![1.8](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.8.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.8.yml)    |
+| Minecraft                 | Forge MDK    | JDK | FG  | Gradle | Status                                                                                                                                                                                        |
+|---------------------------|--------------|-----|-----|--------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **1.20**.4                | 49.0.26      | 17  | 6.0 | 8.1.1  | [![1.20.4](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.20.4.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.20.4.yml) |
+| **1.19**.4                | 45.2.0       | 17  | 6.0 | 8.1.1  | [![1.19.4](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.19.4.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.19.4.yml) |
+| **1.18**.2                | 40.2.0       | 17  | 6.0 | 8.1.1  | [![1.18.2](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.18.2.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.18.2.yml) |
+| **1.17**.1                | 37.1.1       | 16  | 6.0 | 8.1.1  | [![1.17.1](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.17.1.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.17.1.yml) |
+| **1.16**.5                | 36.2.34      | 8   | 6.0 | 8.1.1  | [![1.16.5](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.16.5.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.16.5.yml) |
+| **1.15**.2                | 31.2.57      | 8   | 6.0 | 8.1.1  | [![1.15.2](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.15.2.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.15.2.yml) |
+| **1.14**.4                | 28.2.26      | 8   | 6.0 | 8.1.1  | [![1.14.4](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.14.4.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.14.4.yml) |
+| **1.13**.2                | 25.0.223     | 8   | 6.0 | 8.1.1  | [![1.13.2](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.13.2.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.13.2.yml) |
+| **1.12**.2                | 14.23.5.2859 | 8   | 6.0 | 8.1.1  | [![1.12.2](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.12.2.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.12.2.yml) |
+| **1. 8**.9 <sup>WIP</sup> | 11.15.1.2318 | 8   | 2.1 | 4.10.3 | [![1.8.9](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.8.9.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.8.9.yml)    |
 
diff --git a/forge/fg-2.1/1.8/build.gradle → forge/fg-2.1/1.8.9/build.gradle b/forge/fg-2.1/1.8/build.gradle → forge/fg-2.1/1.8.9/build.gradle
diff --git a/forge/fg-2.1/1.8.9/src/main/java/com/therainbowville/minegasm/Minegasm.java b/forge/fg-2.1/1.8.9/src/main/java/com/therainbowville/minegasm/Minegasm.java
@@ -0,0 +1,40 @@
+package com.therainbowville.minegasm;
+
+import com.therainbowville.minegasm.common.CommonProxy;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+
+@Mod(modid = Minegasm.MOD_ID, name = Minegasm.NAME, version = Minegasm.MODVERSION)
+public class Minegasm {
+    public static final String MOD_ID = "minegasm";
+    public static final String NAME = "Minegasm";
+    public static final String MODVERSION = "0.2.2";
+
+    @SidedProxy(clientSide = "com.therainbowville.minegasm.client.ClientProxy")
+    private static CommonProxy proxy;
+
+
+    @Mod.Instance
+    public static Minegasm instance;
+
+    @Mod.EventHandler
+    public void preInit(FMLPreInitializationEvent event)
+    {
+        proxy.preInit(event);
+    }
+
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent event)
+    {
+        proxy.init(event);
+    }
+
+    @Mod.EventHandler
+    public void postInit(FMLPostInitializationEvent event)
+    {
+        proxy.postInit(event);
+    }
+}