Skip to content
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
19 changes: 11 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.10.+'
id 'fabric-loom' version '1.11.+'
id 'maven-publish'
}

Expand Down Expand Up @@ -28,13 +28,13 @@ repositories {
maven { url 'https://maven.quiltmc.org/repository/release' }
}

sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21

archivesBaseName = project.archives_base_name
version = project.mod_version + "-" + project.minecraft_version + "+"
group = project.maven_group

base {
archivesName = project.archives_base_name
}

dependencies {
//to change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
Expand All @@ -47,13 +47,11 @@ dependencies {
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.
modImplementation include("eu.pb4:sgui:${project.sgui_version}")
modImplementation include("me.lucko:fabric-permissions-api:${project.permission_api_version}")

// modImplementation "dev.emi:trinkets:${project.trinkets_version}"
// modImplementation "com.github.apace100:apoli:${project.apoli_version}"

modImplementation "me.lucko:fabric-permissions-api:0.4.0"
include "me.lucko:fabric-permissions-api:0.4.0"

// Dev Mods - These can be commented/uncommented to test compatibility
//modLocalRuntime "maven.modrinth:cloth-config:9.0.94+fabric"
//modLocalRuntime "maven.modrinth:expanded-enderchest:1.0.0+1.19.3"
Expand All @@ -75,6 +73,11 @@ tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

jar {
from "LICENSE"
}
11 changes: 6 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/develop/
minecraft_version=1.21.6
yarn_mappings=1.21.6+build.1
loader_version=0.16.14
minecraft_version=1.21.9
yarn_mappings=1.21.9+build.1
loader_version=0.17.2
# Mod Properties
mod_version=1.4.17
maven_group=us.potatoboy
archives_base_name=InvView
# Dependencies
# check this on https://fabricmc.net/develop/
fabric_version=0.127.1+1.21.6
fabric_version=0.134.0+1.21.9
# trinkets_version=3.10.0
# apoli_version=2.12.0
sgui_version=1.10.0+1.21.6
sgui_version=1.11.0+1.21.9
permission_api_version=0.4.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/us/potatoboy/invview/ViewCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.screen.slot.Slot;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.PlayerConfigEntry;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.storage.NbtReadView;
import net.minecraft.storage.ReadView;
import net.minecraft.text.Text;
import net.minecraft.util.ErrorReporter;
Expand Down Expand Up @@ -162,15 +164,16 @@ public static int eChest(CommandContext<ServerCommandSource> context) throws Com

private static ServerPlayerEntity getRequestedPlayer(CommandContext<ServerCommandSource> context)
throws CommandSyntaxException {
GameProfile requestedProfile = GameProfileArgumentType.getProfileArgument(context, "target").iterator().next();
ServerPlayerEntity requestedPlayer = minecraftServer.getPlayerManager().getPlayer(requestedProfile.getName());
PlayerConfigEntry playerConfigEntry = GameProfileArgumentType.getProfileArgument(context, "target").iterator().next();
ServerPlayerEntity requestedPlayer = minecraftServer.getPlayerManager().getPlayer(playerConfigEntry.name());

// If player is not currently online
if (requestedPlayer == null) {
requestedPlayer = new ServerPlayerEntity(minecraftServer, minecraftServer.getOverworld(), requestedProfile,
requestedPlayer = new ServerPlayerEntity(minecraftServer, minecraftServer.getOverworld(), new GameProfile(playerConfigEntry.id(), playerConfigEntry.name()),
SyncedClientOptions.createDefault());
Optional<ReadView> readViewOpt = minecraftServer.getPlayerManager()
.loadPlayerData(requestedPlayer, new ErrorReporter.Logging(LogUtils.getLogger()));
.loadPlayerData(playerConfigEntry).map(playerData -> NbtReadView.create(new ErrorReporter.Logging(LogUtils.getLogger()), minecraftServer.getRegistryManager(), playerData));
readViewOpt.ifPresent(requestedPlayer::readData);

// Avoids player's dimension being reset to the overworld
if (readViewOpt.isPresent()) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"invview.mixins.json"
],
"depends": {
"fabricloader": ">=0.15.10",
"fabricloader": ">=0.17.0",
"fabric": "*",
"minecraft": ">=1.21.6"
"minecraft": ">=1.21.9"
}
}