Merge branch 'master' into master

.github/workflows/main.yml

@@ -0,0 +1,40 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+    - name: 上传 The Bruh
+      uses: actions/upload-artifact@v3
+      with:
+        name: artifacts
+        path: |
+           target/*.jar
+
+
+

src/main/java/dev/j3fftw/litexpansion/LiteXpansion.java

@@ -99,22 +99,22 @@ private void nerfCrap() {
         // Vanilla SF
         final SlimefunItem energizedPanel = SlimefunItem.getById("SOLAR_GENERATOR_4");
         if (energizedPanel != null) {
-            Reflections.setField(energizedPanel, "dayEnergy", 64);
-            Reflections.setField(energizedPanel, "nightEnergy", 32);
+            Reflections.setField(energizedPanel, "dayEnergy", 128);
+            Reflections.setField(energizedPanel, "nightEnergy", 64);
         }
 
         // InfinityExpansion - Halved all values and made infinite panel + infinity reactor much less
-        Reflections.setField(SlimefunItem.getById("ADVANCED_PANEL"), "generation", 75);
-        Reflections.setField(SlimefunItem.getById("CELESTIAL_PANEL"), "generation", 250);
-        Reflections.setField(SlimefunItem.getById("VOID_PANEL"), "generation", 1200);
-        Reflections.setField(SlimefunItem.getById("INFINITE_PANEL"), "generation", 20_000);
-        Reflections.setField(SlimefunItem.getById("INFINITY_REACTOR"), "gen", 50_000);
+        Reflections.setField(SlimefunItem.getById("ADVANCED_PANEL"), "generation", 120);
+        Reflections.setField(SlimefunItem.getById("CELESTIAL_PANEL"), "generation", 560);
+        Reflections.setField(SlimefunItem.getById("VOID_PANEL"), "generation", 2_250);
+        Reflections.setField(SlimefunItem.getById("INFINITE_PANEL"), "generation", 45_000);
+        Reflections.setField(SlimefunItem.getById("INFINITY_REACTOR"), "gen", 90_000);
 
         // SlimefunWarfare - Halved all values
         Reflections.setField(SlimefunItem.getById("ELEMENTAL_REACTOR"), "energyProducedPerTick", 8_192);
 
         // Galactifun
-        Reflections.setField(SlimefunItem.getById("FUSION_REACTOR"), "energyProducedPerTick", 8_192);
+        Reflections.setField(SlimefunItem.getById("FUSION_REACTOR"), "energyProducedPerTick", 16_384);
 
         // SupremeExpansion - just no...
         Reflections.setField(SlimefunItem.getById("SUPREME_SUPREME_GENERATOR"), "energy", 20_000);