FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-11 22:45:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update mappings.

Browse source
This commit is contained in:
modmuss50 2022-02-16 18:14:59 +00:00
parent 682a9b7c63
commit 55dca1a4f3
14 changed files with 24 additions and 24 deletions
fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification
DynamicRegistryManagerImplMixin.javaMinecraftServerMixin.java
fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry
FuelRegistryImpl.java
fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server
MainMixin.java
fabric-mining-level-api-v1/src/main/java/net/fabricmc/fabric/impl/mininglevel
MiningLevelManagerImpl.java
fabric-registry-sync-v0/src
main/java/net/fabricmc/fabric/mixin/registry/sync
MixinBootstrap.javaMixinDynamicRegistryManager.javaMixinMinecraftServer.java
client
MixinMinecraftClient.java
testmod/java/net/fabricmc/fabric/test/registry/sync
RegistrySyncTest.java
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader
LifecycledResourceManagerImplMixin.javaSimpleResourceReloadMixin.java
fabric-structure-api-v1/src/main/java/net/fabricmc/fabric/mixin/structure
DynamicRegistryManagerMixin.java
gradle.properties

2
fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/DynamicRegistryManagerImplMixin.java
View file

@ -27,7 +27,7 @@ import net.fabricmc.fabric.impl.biome.modification.BiomeModificationMarker;
* This Mixin allows us to keep backup copies of biomes for
* {@link net.fabricmc.fabric.impl.biome.modification.BiomeModificationImpl} on a per-DynamicRegistryManager basis.
*/
@Mixin(DynamicRegistryManager.class_6891.class)
@Mixin(DynamicRegistryManager.ImmutableImpl.class)
public class DynamicRegistryManagerImplMixin implements BiomeModificationMarker {
@Unique
private boolean modified;

2
fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/MinecraftServerMixin.java
View file

@ -35,7 +35,7 @@ public abstract class MinecraftServerMixin {
private SaveProperties saveProperties;
@Shadow
public abstract DynamicRegistryManager.class_6890 getRegistryManager();
public abstract DynamicRegistryManager.Immutable getRegistryManager();
@Inject(method = "<init>", at = @At(value = "RETURN"))
private void finalizeWorldGen(CallbackInfo ci) {

2
fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FuelRegistryImpl.java
View file

@ -114,7 +114,7 @@ public final class FuelRegistryImpl implements FuelRegistry {
int time = tagCookTimes.getInt(tag);
if (time <= 0) {
for (RegistryEntry<Item> key : Registry.ITEM.method_40286(tag)) {
for (RegistryEntry<Item> key : Registry.ITEM.iterateEntries(tag)) {
final Item item = key.value();
map.remove(item);
}

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

@ -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.class_6890 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, class_6904 lv2, DynamicRegistryManager.Immutable lv3, SaveProperties saveProperties) {
if (FabricGameTestHelper.ENABLED) {
FabricGameTestHelper.runHeadlessServer(session, resourcePackManager);
info.cancel(); // Do not progress in starting the normal dedicated server

2
fabric-mining-level-api-v1/src/main/java/net/fabricmc/fabric/impl/mininglevel/MiningLevelManagerImpl.java
View file

@ -46,7 +46,7 @@ public final class MiningLevelManagerImpl {
int miningLevel = MiningLevels.HAND;
// Handle #fabric:needs_tool_level_N
for (TagKey<Block> tagId : state.method_40144().toList()) {
for (TagKey<Block> tagId : state.streamTags().toList()) {
if (!tagId.id().getNamespace().equals(TOOL_TAG_NAMESPACE)) {
continue;
}

2
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinBootstrap.java
View file

@ -62,7 +62,7 @@ public class MixinBootstrap {
RegistrySyncManager.bootstrapRegistries();
}
@Redirect(method = "initialize", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/registry/Registry;method_40292()V"))
@Redirect(method = "initialize", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/registry/Registry;freezeRegistries()V"))
private static void skipFreeze() {
// Don't freeze
}

8
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinDynamicRegistryManager.java
View file

@ -29,8 +29,8 @@ import net.fabricmc.fabric.impl.registry.sync.DynamicRegistrySync;
@Mixin(DynamicRegistryManager.class)
public interface MixinDynamicRegistryManager {
@Inject(method = "method_40314", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/dynamic/EntryLoader$Impl;<init>()V"), locals = LocalCapture.CAPTURE_FAILHARD)
private static void onCreateImpl(CallbackInfoReturnable<DynamicRegistryManager.class_6893> cir, DynamicRegistryManager.class_6893 registryManager) {
@Inject(method = "createAndLoad", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/dynamic/EntryLoader$Impl;<init>()V"), locals = LocalCapture.CAPTURE_FAILHARD)
private static void onCreateImpl(CallbackInfoReturnable<DynamicRegistryManager.Mutable> cir, DynamicRegistryManager.Mutable registryManager) {
DynamicRegistrySetupCallback.EVENT.invoker().onRegistrySetup(registryManager);
}
@ -38,8 +38,8 @@ public interface MixinDynamicRegistryManager {
* Ensures that any registrations made into {@link net.minecraft.util.registry.BuiltinRegistries} after
* {@link DynamicRegistryManager} has been class-loaded are still propagated.
*/
@Inject(method = "method_40327()Lnet/minecraft/util/registry/DynamicRegistryManager$class_6890;", at = @At(value = "RETURN"))
private static void setupBuiltInSync(CallbackInfoReturnable<DynamicRegistryManager.class_6890> cir) {
@Inject(method = "method_40327", at = @At(value = "RETURN"))
private static void setupBuiltInSync(CallbackInfoReturnable<DynamicRegistryManager.Immutable> cir) {
DynamicRegistrySync.setupSync(cir.getReturnValue());
}
}

2
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinMinecraftServer.java
View file

@ -40,7 +40,7 @@ public class MixinMinecraftServer {
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER) {
// Freeze the registries on the server
FABRIC_LOGGER.debug("Freezing registries");
Registry.method_40292();
Registry.freezeRegistries();
}
}
}

2
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/client/MixinMinecraftClient.java
View file

@ -50,6 +50,6 @@ public class MixinMinecraftClient {
private void onStart(CallbackInfo ci) {
// Freeze the registries on the client
FABRIC_LOGGER.debug("Freezing registries");
Registry.method_40292();
Registry.freezeRegistries();
}
}

4
fabric-registry-sync-v0/src/testmod/java/net/fabricmc/fabric/test/registry/sync/RegistrySyncTest.java
View file

@ -145,13 +145,13 @@ public class RegistrySyncTest implements ModInitializer {
// Force-Initialize the dynamic registry manager, doing this in a Mod initializer would cause
// further registrations into BuiltInRegistries to _NOT_ propagate into DynamicRegistryManager.BUILTIN
checkFeature(DynamicRegistryManager.method_40314(), f1Id);
checkFeature(DynamicRegistryManager.createAndLoad(), f1Id);
ConfiguredFeature<DefaultFeatureConfig, ?> cf2 = new ConfiguredFeature<>(Feature.DESERT_WELL, DefaultFeatureConfig.INSTANCE);
Identifier f2Id = new Identifier("registry_sync", "f2");
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, f2Id, cf2);
DynamicRegistryManager impl2 = DynamicRegistryManager.method_40314();
DynamicRegistryManager impl2 = DynamicRegistryManager.createAndLoad();
checkFeature(impl2, f1Id);
checkFeature(impl2, f2Id);
}

4
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/LifecycledResourceManagerImplMixin.java
View file

@ -24,13 +24,13 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.class_6861;
import net.minecraft.resource.LifecycledResourceManagerImpl;
import net.minecraft.resource.ResourcePack;
import net.minecraft.resource.ResourceType;
import net.fabricmc.fabric.impl.resource.loader.FabricLifecycledResourceManager;
@Mixin(class_6861.class)
@Mixin(LifecycledResourceManagerImpl.class)
public class LifecycledResourceManagerImplMixin implements FabricLifecycledResourceManager {
@Unique
private ResourceType fabric_ResourceType;

6
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/SimpleResourceReloadMixin.java
View file

@ -44,21 +44,21 @@ public class SimpleResourceReloadMixin {
@Unique
private static final ThreadLocal<ResourceType> fabric_resourceType = new ThreadLocal<>();
@Inject(method = "method_40087", at = @At("HEAD"))
@Inject(method = "start", at = @At("HEAD"))
private static void method_40087(ResourceManager resourceManager, List<ResourceReloader> list, Executor executor, Executor executor2, CompletableFuture<Unit> completableFuture, boolean bl, CallbackInfoReturnable<ResourceReload> cir) {
if (resourceManager instanceof FabricLifecycledResourceManager flrm) {
fabric_resourceType.set(flrm.fabric_getResourceType());
}
}
@ModifyArg(method = "method_40087", index = 1, at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/SimpleResourceReload;create(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/resource/SimpleResourceReload;"))
@ModifyArg(method = "start", index = 1, at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/SimpleResourceReload;create(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/resource/SimpleResourceReload;"))
private static List<ResourceReloader> sortSimple(List<ResourceReloader> reloaders) {
List<ResourceReloader> sorted = ResourceManagerHelperImpl.sort(fabric_resourceType.get(), reloaders);
fabric_resourceType.set(null);
return sorted;
}
@Redirect(method = "method_40087", at = @At(value = "NEW", target = "Lnet/minecraft/resource/ProfiledResourceReload;<init>"))
@Redirect(method = "start", at = @At(value = "NEW", target = "Lnet/minecraft/resource/ProfiledResourceReload;<init>"))
private static ProfiledResourceReload sortProfiled(ResourceManager manager, List<ResourceReloader> reloaders, Executor prepareExecutor, Executor applyExecutor, CompletableFuture<Unit> initialStage) {
List<ResourceReloader> sorted = ResourceManagerHelperImpl.sort(fabric_resourceType.get(), reloaders);
fabric_resourceType.set(null);

8
fabric-structure-api-v1/src/main/java/net/fabricmc/fabric/mixin/structure/DynamicRegistryManagerMixin.java
View file

@ -24,8 +24,8 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import net.minecraft.class_6900;
import net.minecraft.structure.pool.StructurePool;
import net.minecraft.util.dynamic.RegistryLoader;
import net.minecraft.util.registry.DynamicRegistryManager;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryKey;
@ -35,12 +35,12 @@ import net.fabricmc.fabric.impl.structure.FabricStructurePoolImpl;
@Mixin(DynamicRegistryManager.class)
public interface DynamicRegistryManagerMixin {
@Inject(method = "load(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6900$class_6901;Lnet/minecraft/util/registry/DynamicRegistryManager$Info;)V", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
private static <E> void load(DynamicOps<JsonElement> dynamicOps, class_6900.class_6901 arg, DynamicRegistryManager.Info<E> info, CallbackInfo ci) {
@Inject(method = "load(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/util/dynamic/RegistryLoader$LoaderAccess;Lnet/minecraft/util/registry/DynamicRegistryManager$Info;)V", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
private static <E> void load(DynamicOps<JsonElement> dynamicOps, RegistryLoader.LoaderAccess arg, DynamicRegistryManager.Info<E> info, CallbackInfo ci) {
RegistryKey<? extends Registry<E>> registryKey = info.registry();
if (registryKey.equals(Registry.STRUCTURE_POOL_KEY)) {
for (E registryEntry : arg.access().get(registryKey)) {
for (E registryEntry : arg.dynamicRegistryManager().get(registryKey)) {
if (registryEntry instanceof StructurePool pool) {
StructurePoolAddCallback.EVENT.invoker().onAdd(new FabricStructurePoolImpl(pool));
}

2
gradle.properties
View file

@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2560M
version=0.47.1
minecraft_version=22w06a
yarn_version=+build.8
yarn_version=+build.13
loader_version=0.13.2
prerelease=true