fix: small fixes

OptiJava · Jul 13, 2024 · 64fd93e · 64fd93e
1 parent d0619b5
commit 64fd93e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,5 @@ versions/1.19.3/.gradle
 versions/1.19.3/build
 versions/1.20.1/.gradle
 versions/1.20.1/build
+versions/1.20.4/.gradle
+versions/1.20.4/build
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Gradle Configurations
-org.gradle.jvmargs=-Xmx2560M
+org.gradle.jvmargs=-Xmx3g
 org.gradle.parallel=true
 
 # Fabric Configurations

diff --git a/...o/github/optijava/opt_carpet_addition/mixins/rule/commandLogger/CommandManager_Mixin.java b/...o/github/optijava/opt_carpet_addition/mixins/rule/commandLogger/CommandManager_Mixin.java
@@ -19,7 +19,7 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-//#if MC < 12000
+//#if MC <= 12001
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 //#endif
 
@@ -33,8 +33,10 @@ public class CommandManager_Mixin {
             method = "execute",
             at = @At("HEAD")
     )
-    //#if MC >= 12000
+    //#if MC >= 12004
     //$$ public void injectExecute(ParseResults<ServerCommandSource> parseResults, String command, CallbackInfo ci) {
+    //#elseif MC >= 12000
+    //$$ public void injectExecute(ParseResults<ServerCommandSource> parseResults, String command, CallbackInfoReturnable<Integer> cir) {
     //#elseif MC >= 11900
     //$$ public void injectExecute(ParseResults<ServerCommandSource> parseResults, String command, CallbackInfoReturnable<Integer> cir) {
     //#else

diff --git a/...n/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeBats/BatEntity_Mixin.java b/...n/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeBats/BatEntity_Mixin.java
@@ -21,7 +21,7 @@ public class BatEntity_Mixin {
             cancellable = true
     )
     //#if MC == 12001
-    //$$ private static void injectCanSpawn(EntityType<BatEntity> type, WorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random, CallbackInfoReturnable<Boolean> cir) {
+    //$$ private static void injectCanSpawn(EntityType<BatEntity> type, WorldAccess world, SpawnReason spawnReason, BlockPos pos, net.minecraft.util.math.random.Random random, CallbackInfoReturnable<Boolean> cir) {
     //#elseif MC >= 11900
     //$$ private static void injectCanSpawn(EntityType<BatEntity> type, WorldAccess world, SpawnReason spawnReason, BlockPos pos, net.minecraft.util.math.random.Random random, CallbackInfoReturnable<Boolean> cir) {
     //#else