R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.20-pre2

Browse Source
This commit is contained in:
embeddedt 2023-05-16 11:27:08 -04:00
parent b44739e33c
commit adbf61a06b
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java
View File

@ -42,14 +42,15 @@ public class ModernFixCommands {
ResourceLocation structureLocation = new ResourceLocation(found.getNamespace(), matcher.group(1)); ResourceLocation structureLocation = new ResourceLocation(found.getNamespace(), matcher.group(1));
try(InputStream resource = entry.getValue().open()) { try(InputStream resource = entry.getValue().open()) {
CachingStructureManager.readStructureTag(structureLocation, level.getServer().getFixerUpper(), resource); CachingStructureManager.readStructureTag(structureLocation, level.getServer().getFixerUpper(), resource);
context.getSource().sendSuccess(Component.literal("checked " + structureLocation + " (" + upgradedNum + "/" + structures.size() + ")"), false); Component msg = Component.literal("checked " + structureLocation + " (" + upgradedNum + "/" + structures.size() + ")");
context.getSource().sendSuccess(() -> msg, false);
} catch(Throwable e) { } catch(Throwable e) {
ModernFix.LOGGER.error("Couldn't upgrade structure " + found, e); ModernFix.LOGGER.error("Couldn't upgrade structure " + found, e);
context.getSource().sendFailure(Component.literal("error reading " + structureLocation + " (" + upgradedNum + "/" + structures.size() + ")")); context.getSource().sendFailure(Component.literal("error reading " + structureLocation + " (" + upgradedNum + "/" + structures.size() + ")"));
} }
} }
context.getSource().sendSuccess(Component.literal("All structures upgraded"), false); context.getSource().sendSuccess(() -> Component.literal("All structures upgraded"), false);
return 1; return 1;
})) }))

10
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java
View File

@ -3,19 +3,13 @@ package org.embeddedt.modernfix.common.mixin.perf.cache_strongholds;
import net.minecraft.core.Holder; import net.minecraft.core.Holder;
import net.minecraft.core.RegistryAccess; import net.minecraft.core.RegistryAccess;
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerChunkCache; import net.minecraft.server.level.ServerChunkCache;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.progress.ChunkProgressListener;
import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.util.profiling.ProfilerFiller;
import net.minecraft.world.level.CustomSpawner;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.chunk.ChunkGeneratorStructureState; import net.minecraft.world.level.chunk.ChunkGeneratorStructureState;
import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.level.dimension.DimensionType;
import net.minecraft.world.level.dimension.LevelStem;
import net.minecraft.world.level.storage.DimensionDataStorage; import net.minecraft.world.level.storage.DimensionDataStorage;
import net.minecraft.world.level.storage.LevelStorageSource;
import net.minecraft.world.level.storage.ServerLevelData;
import net.minecraft.world.level.storage.WritableLevelData; import net.minecraft.world.level.storage.WritableLevelData;
import org.embeddedt.modernfix.duck.IChunkGenerator; import org.embeddedt.modernfix.duck.IChunkGenerator;
import org.embeddedt.modernfix.duck.IServerLevel; import org.embeddedt.modernfix.duck.IServerLevel;
@ -28,8 +22,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.function.Supplier; import java.util.function.Supplier;
@Mixin(ServerLevel.class) @Mixin(ServerLevel.class)
@ -55,7 +47,7 @@ public abstract class ServerLevelMixin extends Level implements IServerLevel {
* Now start the stronghold generation process. * Now start the stronghold generation process.
*/ */
@Inject(method = "<init>", at = @At("TAIL")) @Inject(method = "<init>", at = @At("TAIL"))
private void ensureGeneration(MinecraftServer minecraftServer, Executor executor, LevelStorageSource.LevelStorageAccess arg, ServerLevelData arg2, ResourceKey<Level> arg3, LevelStem arg4, ChunkProgressListener arg5, boolean bl, long l, List<CustomSpawner> list, boolean bl2, CallbackInfo ci) { private void ensureGeneration(CallbackInfo ci) {
mfix$strongholdCache = this.getDataStorage().computeIfAbsent(StrongholdLocationCache::load, mfix$strongholdCache = this.getDataStorage().computeIfAbsent(StrongholdLocationCache::load,
StrongholdLocationCache::new, StrongholdLocationCache::new,
StrongholdLocationCache.getFileId(this.dimensionTypeRegistration())); StrongholdLocationCache.getFileId(this.dimensionTypeRegistration()));

4
gradle.properties
View File

@ -2,7 +2,7 @@
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
mod_id=modernfix mod_id=modernfix
minecraft_version=1.20-pre1 minecraft_version=1.20-pre2
enabled_platforms=fabric enabled_platforms=fabric
forge_version=1.19.4-45.0.22 forge_version=1.19.4-45.0.22
parchment_version=2023.03.12 parchment_version=2023.03.12
@ -14,7 +14,7 @@ kubejs_version=1902.6.0-build.142
rhino_version=1902.2.2-build.268 rhino_version=1902.2.2-build.268
fabric_loader_version=0.14.19 fabric_loader_version=0.14.19
fabric_api_version=0.80.3+1.20 fabric_api_version=0.81.2+1.20
continuity_version=3.0.0-beta.2+1.19.3 continuity_version=3.0.0-beta.2+1.19.3