Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to 1.21.2 #7

Merged
merged 1 commit into from
Dec 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.github/
.gradle/
.idea/
build/
run/
Carpet-MCT-Addition_client.launch
Carpet-MCT-Addition_server.launch
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
// modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
modImplementation "carpet:fabric-carpet:1.21-${project.carpet_core_version}"
modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
}
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
org.gradle.jvmargs=-Xmx6G
# Fabric Properties
# check these on https://fabricmc.net/use or https://modmuss50.me/fabric.html
minecraft_version=1.21.1
yarn_mappings=1.21.1+build.3
loader_version=0.16.5
minecraft_version=1.21.2
yarn_mappings=1.21.2+build.1
loader_version=0.16.9
# check available versions on maven for the given minecraft version you are using
carpet_core_version=1.4.147+v240613
carpet_core_version=1.4.158+v241022
# Mod Properties
mod_version=0.1.1
maven_group=tech.mctown.cma
archives_base_name=carpet-mct-addition
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric
fabric_version=0.104.0+1.21.1
fabric_version=0.106.1+1.21.2
11 changes: 0 additions & 11 deletions java/tech/mctown/cma/CMAEntry.java

This file was deleted.

30 changes: 0 additions & 30 deletions java/tech/mctown/cma/CMAExtension.java

This file was deleted.

45 changes: 0 additions & 45 deletions java/tech/mctown/cma/CMASettings.java

This file was deleted.

31 changes: 0 additions & 31 deletions java/tech/mctown/cma/commands/DumpEntityCommand.java

This file was deleted.

25 changes: 0 additions & 25 deletions java/tech/mctown/cma/mixins/editableSign/SignBlockEntityMixin.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/tech/mctown/cma/CMALogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static void toGame(String message, MinecraftServer server) {
}

public static void toGame(String message, PlayerEntity player) {
player.sendMessage(Text.of(message));
player.sendMessage(Text.of(message),false);
}

public static void error(String s, Exception e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void activatesObserver(ItemUsageContext context, CallbackInfoReturnable<ActionRe
} catch (Exception e) {
CMALogger.toConsole("Failed to activate observer");
}
ci.setReturnValue(ActionResult.success(world.isClient()));
ci.setReturnValue(ActionResult.SUCCESS);
}
}
}
Expand Down