merge

Argent-Matter · Oct 25, 2023 · 5c084ff · 5c084ff
2 parents 66044ef + cc61fd0
commit 5c084ff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/common/src/main/java/argent_matter/gcyr/client/particle/DysonBeamParticle.java b/common/src/main/java/argent_matter/gcyr/client/particle/DysonBeamParticle.java
@@ -7,8 +7,9 @@
 public class DysonBeamParticle extends SimpleAnimatedParticle {
     protected DysonBeamParticle(ClientLevel level, double x, double y, double z, SpriteSet sprites) {
         super(level, x, y, z, sprites, 0.0f);
-        this.quadSize *= 4.0f;
+        this.quadSize = 1.0f;
         this.lifetime = 100;
+        this.setSize(4.0f, 4.0f);
         this.setSpriteFromAge(sprites);
     }
 

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -33,6 +33,6 @@
   "depends": {
     "fabricloader": ">=0.14.20",
     "minecraft": ">=1.19.2",
-    "gtceu": ">=1.0.13.b"
+    "gtceu": "*"
   }
 }
diff --git a/forge/src/main/java/argent_matter/gcyr/common/data/forge/GCyRKeyMappingsImpl.java b/forge/src/main/java/argent_matter/gcyr/common/data/forge/GCyRKeyMappingsImpl.java
@@ -13,7 +13,7 @@ public static void initPlatform() {
 
     }
 
-    @SubscribeEvent
+    //@SubscribeEvent
     public static void event(RegisterKeyMappingsEvent event) {
         event.register(GCyRKeyMappings.START_ROCKET);
     }

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -67,6 +67,6 @@ issueTrackerURL="https://github.com/argent-matter/gcyr/issues"
    [[dependencies.gcyr]]
       modId="gtceu"
       mandatory=true
-      versionRange="[1.0.13.b,)"
+      versionRange="[1.0.13.c,)"
       ordering="AFTER"
       side="BOTH"