Skip to content

Commit 30366d2

Browse files
committed
fix: gradle build failed
1 parent ff34d19 commit 30366d2

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.3.8' apply false
2+
id 'fabric-loom' version '1.10-SNAPSHOT' apply false
33
id 'maven-publish'
44
id 'com.replaymod.preprocess' version '20c7ec554a'
55
}

common.gradle

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ version = simple_version + '-' + project.minecraft_version
1212

1313
group = project.maven_group
1414

15+
println "mcVersion: " + project.mcVersion
1516
if (project.mcVersion >= 12005) {
1617
sourceCompatibility = JavaVersion.VERSION_21
1718
targetCompatibility = JavaVersion.VERSION_21
@@ -98,19 +99,6 @@ loom {
9899
}
99100
}
100101

101-
remapJar {
102-
remapperIsolation = true
103-
}
104-
105-
106-
java {
107-
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
108-
// if it is present.
109-
// If you remove this line, sources will not be generated.
110-
111-
//withSourcesJar()
112-
}
113-
114102

115103
jar {
116104
from("LICENSE") {

gradle.properties

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# Gradle Configurations
22
org.gradle.jvmargs=-Xmx3g
33
org.gradle.parallel=true
4-
org.gradle.workers.max=3
4+
org.gradle.workers.max=4
5+
systemProp.http.connectionTimeout=60000
6+
systemProp.https.connectionTimeout=60000
7+
systemProp.http.socketTimeout=60000
8+
systemProp.https.socketTimeout=60000
59

610
# Fabric Configurations
711
loader_version=0.16.14
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pluginManagement {
66
}
77
maven {
88
name = 'Jitpack'
9-
url = "https://jitpack.io"
9+
url = 'https://maven.fallenbreath.me/jitpack'
1010
}
1111
mavenCentral()
1212
gradlePluginPortal()

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,13 @@ public class OptCarpetSettings {
177177
)
178178
public static boolean optimizeFakePlayerSpawn = false;
179179

180+
//#if MC < 12100
180181
@Rule(
181182
desc = "Fix CCE Suppression crashes",
182183
category = {RuleCategory.BUGFIX, RuleCategory.EXPERIMENTAL}
183184
)
184185
public static boolean cceSuppressionCrashFix = false;
186+
//#endif
185187

186188
@Rule(
187189
desc = "Remove every armour which has `curse of binding` enchantment when player dead in wall (keepInventory must be true).",

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/cceSuppressionCrashFix/MinecraftServer_Mixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.github.optijava.opt_carpet_addition.mixins.rule.cceSuppressionCrashFix;
22

3+
//#if MC < 12100
34
import io.github.optijava.opt_carpet_addition.OptCarpetAddition;
45
import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
56
import io.github.optijava.opt_carpet_addition.logger.cceSuppressionCrashLogger.CCESuppressionCrashLogger;
@@ -43,3 +44,4 @@ public void injectTickWorlds(BooleanSupplier shouldKeepTicking, CallbackInfo ci,
4344
}
4445
}
4546
}
47+
//#endif

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/cceSuppressionCrashFix/ShulkerBoxBlock_Mixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.github.optijava.opt_carpet_addition.mixins.rule.cceSuppressionCrashFix;
22

3+
//#if MC < 12100
34
import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
45
import io.github.optijava.opt_carpet_addition.utils.exceptions.ThrowableCCESuppression;
56
import net.minecraft.block.BlockState;
@@ -35,3 +36,4 @@ public void injectGetComparatorOutput(BlockState state, World world, BlockPos po
3536
}
3637
}
3738
}
39+
//#endif

src/main/resources/opt-carpet-addition.mixins.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@
2828
//#endif
2929
//#endif
3030
"logger.HUDController_Mixin",
31+
//#if MC < 12100
3132
"rule.cceSuppressionCrashFix.MinecraftServer_Mixin",
3233
"rule.cceSuppressionCrashFix.ShulkerBoxBlock_Mixin",
34+
//#endif
3335
"rule.commandLogger.CommandManager_Mixin",
3436
"rule.disabledEnderManPickupGoal.EnderManEntity_Mixin",
3537
"rule.disabledEnderManPlaceBlockGoal.EndermanEntity_Mixin",

versions/1.21.5/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
game_versions=1.21.5
1313

1414
# Dependencies
15-
fabric_version=0.126.0+1.21.5
15+
fabric_version=0.127.0+1.21.5
1616
carpet_core_version=6347645
1717

0 commit comments

Comments
 (0)