FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-08 21:14:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions5

1.18.2-pre3

Browse source 
Just mappings.
This commit is contained in:
modmuss50 2022-02-23 16:35:32 +00:00
parent ebd24f870f
commit 2540745460
5 changed files with 18 additions and 18 deletions
fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension
VoidChunkGenerator.java
fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server
MainMixin.java
fabric-lifecycle-events-v1/src/main
java/net/fabricmc/fabric/mixin/event/lifecycle
MinecraftServerMixin.java
resources
fabric-lifecycle-events-v1.accesswidener
gradle.properties

4
fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java
View file

@ -25,7 +25,7 @@ import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.block.BlockState;
import net.minecraft.class_7059;
import net.minecraft.structure.StructureSet;
import net.minecraft.util.dynamic.RegistryOps;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry;
@ -54,7 +54,7 @@ public class VoidChunkGenerator extends ChunkGenerator {
private final Registry<Biome> biomeRegistry;
public VoidChunkGenerator(Registry<class_7059> registry, Registry<Biome> biomeRegistry) {
public VoidChunkGenerator(Registry<StructureSet> registry, Registry<Biome> biomeRegistry) {
super(registry, Optional.empty(), new FixedBiomeSource(biomeRegistry.getOrCreateEntry(BiomeKeys.PLAINS)));
this.biomeRegistry = biomeRegistry;
}

4
fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java
View file

@ -32,9 +32,9 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import net.minecraft.class_6904;
import net.minecraft.resource.ResourcePackManager;
import net.minecraft.server.Main;
import net.minecraft.server.SaveLoader;
import net.minecraft.server.dedicated.EulaReader;
import net.minecraft.server.dedicated.ServerPropertiesLoader;
import net.minecraft.util.UserCache;
@ -53,7 +53,7 @@ public class MainMixin {
}
@Inject(method = "main", cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;startServer(Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer;"))
private static void main(String[] args, CallbackInfo info, OptionParser optionParser, OptionSpec optionSpec, OptionSpec optionSpec2, OptionSpec optionSpec3, OptionSpec optionSpec4, OptionSpec optionSpec5, OptionSpec optionSpec6, OptionSpec optionSpec7, OptionSpec optionSpec8, OptionSpec optionSpec9, OptionSpec optionSpec10, OptionSpec optionSpec11, OptionSpec optionSpec12, OptionSpec optionSpec13, OptionSpec optionSpec14, OptionSpec optionSpec15, OptionSet optionSet, Path path, ServerPropertiesLoader serverPropertiesLoader, Path path2, EulaReader eulaReader, File file, YggdrasilAuthenticationService yggdrasilAuthenticationService, MinecraftSessionService minecraftSessionService, GameProfileRepository gameProfileRepository, UserCache userCache, String string, LevelStorage levelStorage, LevelStorage.Session session, LevelSummary levelSummary, boolean bl, ResourcePackManager resourcePackManager, class_6904 lv2, DynamicRegistryManager.Immutable lv3, SaveProperties saveProperties) {
private static void main(String[] args, CallbackInfo info, OptionParser optionParser, OptionSpec optionSpec, OptionSpec optionSpec2, OptionSpec optionSpec3, OptionSpec optionSpec4, OptionSpec optionSpec5, OptionSpec optionSpec6, OptionSpec optionSpec7, OptionSpec optionSpec8, OptionSpec optionSpec9, OptionSpec optionSpec10, OptionSpec optionSpec11, OptionSpec optionSpec12, OptionSpec optionSpec13, OptionSpec optionSpec14, OptionSpec optionSpec15, OptionSet optionSet, Path path, ServerPropertiesLoader serverPropertiesLoader, Path path2, EulaReader eulaReader, File file, YggdrasilAuthenticationService yggdrasilAuthenticationService, MinecraftSessionService minecraftSessionService, GameProfileRepository gameProfileRepository, UserCache userCache, String string, LevelStorage levelStorage, LevelStorage.Session session, LevelSummary levelSummary, boolean bl, ResourcePackManager resourcePackManager, SaveLoader lv2, DynamicRegistryManager.Immutable lv3, SaveProperties saveProperties) {
if (FabricGameTestHelper.ENABLED) {
FabricGameTestHelper.runHeadlessServer(session, resourcePackManager);
info.cancel(); // Do not progress in starting the normal dedicated server

6
fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java
View file

@ -41,7 +41,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
@Mixin(MinecraftServer.class)
public abstract class MinecraftServerMixin {
@Shadow
private MinecraftServer.class_6897 serverResourceManager;
private MinecraftServer.ResourceManagerHolder resourceManagerHolder;
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;setupServer()Z"), method = "runServer")
private void beforeSetupServer(CallbackInfo info) {
@ -90,14 +90,14 @@ public abstract class MinecraftServerMixin {
@Inject(method = "reloadResources", at = @At("HEAD"))
private void startResourceReload(Collection<String> collection, CallbackInfoReturnable<CompletableFuture<Void>> cir) {
ServerLifecycleEvents.START_DATA_PACK_RELOAD.invoker().startDataPackReload((MinecraftServer) (Object) this, this.serverResourceManager.resourceManager());
ServerLifecycleEvents.START_DATA_PACK_RELOAD.invoker().startDataPackReload((MinecraftServer) (Object) this, this.resourceManagerHolder.resourceManager());
}
@Inject(method = "reloadResources", at = @At("TAIL"))
private void endResourceReload(Collection<String> collection, CallbackInfoReturnable<CompletableFuture<Void>> cir) {
cir.getReturnValue().handleAsync((value, throwable) -> {
// Hook into fail
ServerLifecycleEvents.END_DATA_PACK_RELOAD.invoker().endDataPackReload((MinecraftServer) (Object) this, this.serverResourceManager.resourceManager(), throwable == null);
ServerLifecycleEvents.END_DATA_PACK_RELOAD.invoker().endDataPackReload((MinecraftServer) (Object) this, this.resourceManagerHolder.resourceManager(), throwable == null);
return value;
}, (MinecraftServer) (Object) this);
}

2
fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.accesswidener
View file

@ -1,3 +1,3 @@
accessWidener v2 named
accessible class net/minecraft/server/MinecraftServer$class_6897
accessible class net/minecraft/server/MinecraftServer$ResourceManagerHolder

20
gradle.properties
View file

@ -1,7 +1,7 @@
org.gradle.jvmargs=-Xmx2560M
version=0.47.6
minecraft_version=1.18.2-pre2
version=0.47.7
minecraft_version=1.18.2-pre3
yarn_version=+build.1
loader_version=0.13.2
@ -9,26 +9,26 @@ prerelease=true
# Do not manually update, use the bumpversions task:
fabric-api-base-version=0.4.3
fabric-api-lookup-api-v1-version=1.5.5
fabric-api-lookup-api-v1-version=1.5.6
fabric-biome-api-v1-version=8.0.1
fabric-blockrenderlayer-v1-version=1.1.11
fabric-command-api-v1-version=1.1.8
fabric-commands-v0-version=0.2.7
fabric-containers-v0-version=0.1.20
fabric-content-registries-v0-version=2.0.2
fabric-content-registries-v0-version=2.0.3
fabric-crash-report-info-v1-version=0.1.10
fabric-data-generation-api-v1-version=2.0.3
fabric-dimensions-v1-version=2.1.15
fabric-data-generation-api-v1-version=2.0.4
fabric-dimensions-v1-version=2.1.16
fabric-entity-events-v1-version=1.4.7
fabric-events-interaction-v0-version=0.4.18
fabric-events-lifecycle-v0-version=0.2.11
fabric-events-lifecycle-v0-version=0.2.12
fabric-game-rule-api-v1-version=1.0.12
fabric-gametest-api-v1-version=1.0.12
fabric-gametest-api-v1-version=1.0.13
fabric-item-api-v1-version=1.3.2
fabric-item-groups-v0-version=0.3.8
fabric-key-binding-api-v1-version=1.0.11
fabric-keybindings-v0-version=0.2.9
fabric-lifecycle-events-v1-version=2.0.0
fabric-lifecycle-events-v1-version=2.0.1
fabric-loot-tables-v1-version=1.0.10
fabric-mining-level-api-v1-version=2.0.2
fabric-models-v0-version=0.3.5
@ -50,4 +50,4 @@ fabric-screen-api-v1-version=1.0.9
fabric-screen-handler-api-v1-version=1.1.13
fabric-structure-api-v1-version=3.0.1
fabric-textures-v0-version=1.0.11
fabric-transfer-api-v1-version=1.5.11
fabric-transfer-api-v1-version=1.5.12