lionarius/SkinRestorer
1
0
Fork 0
mirror of https://github.com/Suiranoil/SkinRestorer.git synced 2026-01-16 04:42:12 +00:00
Code Wiki Activity

Merge branch '1.19.4-multiloader' into 1.19.3-multiloader

Browse Source
This commit is contained in:
Lionarius
2025-08-17 19:06:37 +03:00
parent 7849aa9be2 2233f28c68
commit 24b956a91c
19 changed files with 87 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [2.4.3] - 2025-07-25
### Fixed
- Fixed crash on client when loading player head skin (fixes [#63](https://github.com/Suiranoil/SkinRestorer/issues/63) and [#64](https://github.com/Suiranoil/SkinRestorer/issues/64))
- Fixed server freeze when loading player head skin
## [2.4.2] - 2025-07-13
### Fixed
- Fix crash when head profile name is null (fixes [#60](https://github.com/Suiranoil/SkinRestorer/issues/60) and [#61](https://github.com/Suiranoil/SkinRestorer/issues/61))

3
CHANGELOG_LATEST.md
View File

@@ -1,2 +1,3 @@
### Fixed
- Fix crash when head profile name is null (fixes [#60](https://github.com/Suiranoil/SkinRestorer/issues/60) and [#61](https://github.com/Suiranoil/SkinRestorer/issues/61))
- Fixed crash on client when loading player head skin (fixes [#63](https://github.com/Suiranoil/SkinRestorer/issues/63) and [#64](https://github.com/Suiranoil/SkinRestorer/issues/64))
- Fixed server freeze when loading player head skin

8
buildSrc/src/main/groovy/multiloader-publish.gradle
View File

@@ -6,6 +6,14 @@ publishMods {
file = project.layout.buildDirectory.file("libs/${project.archivesBaseName}-${project.version}.jar").map { it.asFile }.getOrNull()
modLoaders.add(project.name)
if (project.hasProperty('additional_modloaders') && !additional_modloaders.isEmpty())
{
def loaders = additional_modloaders.split(',')
for (loader in loaders)
modLoaders.add(loader)
}
type = STABLE
version = project.version
displayName = "[${project.name.capitalize()}] ${mod_name} ${mod_version}"

14
common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
View File

@@ -19,6 +19,7 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.storage.LevelResource;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,6 +38,7 @@ public final class SkinRestorer {
private static Path configDir;
private static Config config;
private static TickedScheduler tickedScheduler;
private static MinecraftServer minecraftServer;
private SkinRestorer() {}
@@ -60,6 +62,10 @@ public final class SkinRestorer {
return SkinRestorer.tickedScheduler;
}
public static @Nullable MinecraftServer getMinecraftServer() {
return SkinRestorer.minecraftServer;
}
public static Optional<SkinProvider> getProvider(String name) {
return Optional.ofNullable(SkinRestorer.providersRegistry.get(name));
}
@@ -173,6 +179,14 @@ public final class SkinRestorer {
SkinRestorer.skinStorage = new SkinStorage(new SkinIO(worldSkinDirectory));
SkinRestorer.tickedScheduler = new TickedScheduler(server);
server.addTickable(SkinRestorer.tickedScheduler);
SkinRestorer.minecraftServer = server;
}
public static void onServerStopped(MinecraftServer server) {
SkinRestorer.skinStorage = null;
SkinRestorer.tickedScheduler = null;
SkinRestorer.minecraftServer = null;
}
public static void onCommandRegister(CommandDispatcher<CommandSourceStack> dispatcher) {

2
common/src/main/java/net/lionarius/skinrestorer/mixin/ChunkMapAccessor.java
View File

@@ -9,5 +9,5 @@ import org.spongepowered.asm.mixin.gen.Accessor;
public interface ChunkMapAccessor {
@Accessor
Int2ObjectMap<Object> getEntityMap();
Int2ObjectMap<TrackedEntityAccessorInvoker> getEntityMap();
}

14
common/src/main/java/net/lionarius/skinrestorer/mixin/GameProfileCacheAccessor.java Normal file
View File

@@ -0,0 +1,14 @@
package net.lionarius.skinrestorer.mixin;
import net.minecraft.server.players.GameProfileCache;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Map;
@Mixin(GameProfileCache.class)
public interface GameProfileCacheAccessor {
@Accessor
Map<String, GameProfileCache.GameProfileInfo> getProfilesByName();
}

7
common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java
View File

@@ -12,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Locale;
import java.util.Optional;
import java.util.function.Consumer;
@@ -30,7 +31,11 @@ public abstract class SkullBlockEntityMixin {
if (profile == null || profile.isComplete() || profile.getName() == null)
return;
var profileOpt = profileCache.get(profile.getName());
var profileOpt = Optional.<GameProfile>empty();
var gameProfileInfo = ((GameProfileCacheAccessor) profileCache).getProfilesByName().get(profile.getName().toLowerCase(Locale.ROOT));
if (gameProfileInfo != null)
profileOpt = Optional.of(gameProfileInfo.getProfile());
skinrestorer$replaceSkin(profileOpt, profileConsumer, ci);
}

4
common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java
View File

@@ -47,14 +47,14 @@ public final class PlayerUtils {
playerList.broadcastAll(new ClientboundPlayerInfoRemovePacket(List.of(player.getUUID())));
playerList.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(Collections.singleton(player)));
var trackedEntity = (TrackedEntityAccessorInvoker) ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId());
var trackedEntity = ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId());
if (trackedEntity != null) {
var seenBy = Set.copyOf(trackedEntity.getSeenBy());
for (var observerConnection : seenBy) {
var observer = observerConnection.getPlayer();
trackedEntity.invokeRemovePlayer(observer);
var trackedObserverEntity = (TrackedEntityAccessorInvoker) ((ChunkMapAccessor) chunkMap).getEntityMap().get(observer.getId());
var trackedObserverEntity = ((ChunkMapAccessor) chunkMap).getEntityMap().get(observer.getId());
if (trackedObserverEntity != null) {
trackedObserverEntity.invokeRemovePlayer(player);
trackedObserverEntity.invokeUpdatePlayer(player);

1
common/src/main/resources/META-INF/accesstransformer.cfg Normal file
View File

@@ -0,0 +1 @@
public net.minecraft.server.players.GameProfileCache$GameProfileInfo

3
common/src/main/resources/skinrestorer.accesswidener Normal file
View File

@@ -0,0 +1,3 @@
accessWidener v2 named
accessible class net/minecraft/server/players/GameProfileCache$GameProfileInfo

3
common/src/main/resources/skinrestorer.mixins.json
View File

@@ -10,7 +10,8 @@
"PlayerListMixin",
"ServerLoginPacketListenerImplMixin",
"TrackedEntityAccessorInvoker",
"SkullBlockEntityMixin"
"SkullBlockEntityMixin",
"GameProfileCacheAccessor"
],
"injectors": {
"defaultRequire": 1

2
fabric/gradle.properties
View File

@@ -1,2 +1,4 @@
# Fabric, see https://fabricmc.net/develop/ for new versions
fabric_loader_version=0.15.0
additional_modloaders=quilt

6
fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java
View File

@@ -15,4 +15,10 @@ public abstract class MinecraftServerMixin {
private void onServerStarted(CallbackInfo ci) {
SkinRestorer.Events.onServerStarted((MinecraftServer) (Object) this);
}
@Inject(method = "runServer",
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;onServerExit()V"))
private void onServerStopped(CallbackInfo ci) {
SkinRestorer.Events.onServerStopped((MinecraftServer) (Object) this);
}
}

1
fabric/src/main/resources/fabric.mod.json
View File

@@ -24,6 +24,7 @@
"${mod_id}.mixins.json",
"${mod_id}.fabric.mixins.json"
],
"accessWidener": "${mod_id}.accesswidener",
"depends": {
"fabricloader": ">=${fabric_loader_version}",
"minecraft": ">=${minecraft_version}",

6
forge/build.gradle
View File

@@ -33,7 +33,7 @@ minecraft {
// Automatically enable forge AccessTransformers if the file exists
// This location is hardcoded in Forge and can not be changed.
// https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123
def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
def at = project(":common").file('src/main/resources/META-INF/accesstransformer.cfg')
if (at.exists()) {
accessTransformer = at
}
@@ -88,3 +88,7 @@ sourceSets.each {
it.output.resourcesDir = dir
it.java.destinationDirectory = dir
}
tasks.named('processResources') {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}

6
forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java
View File

@@ -3,6 +3,7 @@ package net.lionarius.skinrestorer.forge;
import net.lionarius.skinrestorer.SkinRestorer;
import net.minecraftforge.event.RegisterCommandsEvent;
import net.minecraftforge.event.server.ServerStartedEvent;
import net.minecraftforge.event.server.ServerStoppedEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -23,4 +24,9 @@ public final class SkinRestorerForge {
public static void onServerStarted(ServerStartedEvent event) {
SkinRestorer.Events.onServerStarted(event.getServer());
}
@SubscribeEvent
public static void onServerStopped(ServerStoppedEvent event) {
SkinRestorer.Events.onServerStopped(event.getServer());
}
}

2
gradle.properties
View File

@@ -8,7 +8,7 @@ minecraft_version_list=1.19.3
minecraft_version_range=[1.19.3,1.19.4)
mod_id=skinrestorer
mod_name=SkinRestorer
mod_version=2.4.2
mod_version=2.4.3
mod_author=Lionarius
mod_homepage=https://modrinth.com/mod/skinrestorer
mod_sources=https://github.com/Suiranoil/SkinRestorer

4
neoforge/build.gradle
View File

@@ -12,9 +12,9 @@ neoForge {
version = neoforge_version
// Automatically enable neoforge AccessTransformers if the file exists
def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
def at = project(":common").file('src/main/resources/META-INF/accesstransformer.cfg')
if (at.exists()) {
minecraft.accessTransformers.file(at)
accessTransformers.from(at.absolutePath)
}
parchment {

6
neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java
View File

@@ -6,6 +6,7 @@ import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.event.RegisterCommandsEvent;
import net.neoforged.neoforge.event.server.ServerStartedEvent;
import net.neoforged.neoforge.event.server.ServerStoppedEvent;
@Mod(SkinRestorer.MOD_ID)
@Mod.EventBusSubscriber(modid = SkinRestorer.MOD_ID)
@@ -27,4 +28,9 @@ public final class SkinRestorerNeoForge {
public static void onServerStarted(ServerStartedEvent event) {
SkinRestorer.Events.onServerStarted(event.getServer());
}
@SubscribeEvent
public static void onServerStopped(ServerStoppedEvent event) {
SkinRestorer.Events.onServerStopped(event.getServer());
}
}