update to 1.19

BlossomMods · Jun 11, 2022 · c1541b4 · c1541b4
1 parent 78a4aa0
commit c1541b4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,3 +10,6 @@ ij_continuation_indent_size = 8
 
 [*.{json,md}]
 indent_size = 2
+
+[*.properties]
+ij_properties_keep_blank_lines = true
diff --git a/build.gradle b/build.gradle
@@ -4,10 +4,11 @@ plugins {
     id 'maven-publish'
 }
 
-version = project.mod_version
+version = "${project.mod_version}+${project.minecraft_version}"
 group = project.maven_group
 
 repositories {
+    mavenLocal()
     maven {
         url "https://maven.pkg.github.com/BlossomMods/BlossomLib"
         credentials {

diff --git a/gradle.properties b/gradle.properties
@@ -8,9 +8,9 @@ archives_base_name=blossom-tpa
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.18.2
-yarn_mappings=build.3
-loader_version=0.14.3
+minecraft_version=1.19
+yarn_mappings=build.2
+loader_version=0.14.7
 
 # Dependencies
 blossomlib_version=1.2.0
diff --git a/src/main/java/dev/codedsakura/blossom/tpa/BlossomTpa.java b/src/main/java/dev/codedsakura/blossom/tpa/BlossomTpa.java
@@ -56,6 +56,9 @@ public void onInitialize() {
 
     private int runTpa(CommandContext<ServerCommandSource> ctx, boolean tpaHere) throws CommandSyntaxException {
         ServerPlayerEntity initiator = ctx.getSource().getPlayer();
+        if (initiator == null) {
+            throw ServerCommandSource.REQUIRES_PLAYER_EXCEPTION.create();
+        }
         ServerPlayerEntity receiver = EntityArgumentType.getPlayer(ctx, "target");
 
         if (initiator.equals(receiver)) {
@@ -124,7 +127,7 @@ private int resolveTpa(CommandContext<ServerCommandSource> ctx, ServerPlayerEnti
         return Command.SINGLE_SUCCESS;
     }
 
-    private int resolveTpaAuto(CommandContext<ServerCommandSource> ctx, ResolveState resolveState) throws CommandSyntaxException {
+    private int resolveTpaAuto(CommandContext<ServerCommandSource> ctx, ResolveState resolveState) {
         List<TpaRequest> candidates;
         if (resolveState == ResolveState.CANCEL) {
             ServerPlayerEntity initiator = ctx.getSource().getPlayer();
@@ -152,7 +155,7 @@ private int resolveTpaAuto(CommandContext<ServerCommandSource> ctx, ResolveState
     }
 
 
-    private int acceptTpaAuto(CommandContext<ServerCommandSource> ctx) throws CommandSyntaxException {
+    private int acceptTpaAuto(CommandContext<ServerCommandSource> ctx) {
         return resolveTpaAuto(ctx, ResolveState.ACCEPT);
     }
 
@@ -163,7 +166,7 @@ private int acceptTpaTarget(CommandContext<ServerCommandSource> ctx) throws Comm
     }
 
 
-    private int denyTpaAuto(CommandContext<ServerCommandSource> ctx) throws CommandSyntaxException {
+    private int denyTpaAuto(CommandContext<ServerCommandSource> ctx) {
         return resolveTpaAuto(ctx, ResolveState.DENY);
     }
 
@@ -174,7 +177,7 @@ private int denyTpaTarget(CommandContext<ServerCommandSource> ctx) throws Comman
     }
 
 
-    private int cancelTpaAuto(CommandContext<ServerCommandSource> ctx) throws CommandSyntaxException {
+    private int cancelTpaAuto(CommandContext<ServerCommandSource> ctx) {
         return resolveTpaAuto(ctx, ResolveState.CANCEL);
     }
 

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -22,7 +22,7 @@
   "mixins": [],
   "depends": {
     "fabricloader": ">=0.14.3",
-    "minecraft": "1.18.2",
+    "minecraft": "1.19.x",
     "blossom-lib": "^${blossomlib_version}"
   },
   "suggests": {