Remap fabric

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/EntityTypeTemplate.java

@@ -15,6 +15,6 @@ public class EntityTypeTemplate implements ObjectTemplate<EntityType<?>> {
 
     @Override
     public EntityType<?> get() {
-        return Registries.ENTITY_TYPE.get(id);
+        return Registries.ENTITY_TYPE.getEntry(id);
     }
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java

@@ -15,6 +15,6 @@ public class VillagerTypeTemplate implements ObjectTemplate<VillagerType> {
 
     @Override
     public VillagerType get() {
-        return Registries.VILLAGER_TYPE.get(id);
+        return Registries.VILLAGER_TYPE.getEntry(id);
     }
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/MinecraftChunkGeneratorWrapper.java

@@ -97,7 +97,7 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
     public void populateEntities(ChunkRegion region) {
         if(!this.settings.value().mobGenerationDisabled()) {
             ChunkPos chunkPos = region.getCenterPos();
-            RegistryEntry<Biome> registryEntry = region.getBiome(chunkPos.getStartPos().withY(region.getTopY() - 1));
+            RegistryEntry<Biome> registryEntry = region.getBiome(chunkPos.getStartPos().withY(region.getTopYInclusive() - 1));
             ChunkRandom chunkRandom = new ChunkRandom(new CheckedRandom(RandomSeed.getSeed()));
             chunkRandom.setPopulationSeed(region.getSeed(), chunkPos.getStartX(), chunkPos.getStartZ());
             SpawnHelper.populateEntities(region, registryEntry, chunkPos, chunkRandom);
@@ -179,7 +179,7 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
         WorldProperties properties = MinecraftAdapter.adapt(height, SeedHack.getSeed(noiseConfig.getMultiNoiseSampler()));
         BiomeProvider biomeProvider = pack.getBiomeProvider();
         int min = height.getBottomY();
-        for(int y = height.getTopY() - 1; y >= min; y--) {
+        for(int y = height.getTopYInclusive() - 1; y >= min; y--) {
             if(heightmap
                 .getBlockPredicate()
                 .test((BlockState) delegate.getBlock(properties, x, y, z, biomeProvider))) return y + 1;
@@ -192,14 +192,14 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
         BlockState[] array = new BlockState[height.getHeight()];
         WorldProperties properties = MinecraftAdapter.adapt(height, SeedHack.getSeed(noiseConfig.getMultiNoiseSampler()));
         BiomeProvider biomeProvider = pack.getBiomeProvider();
-        for(int y = height.getTopY() - 1; y >= height.getBottomY(); y--) {
+        for(int y = height.getTopYInclusive() - 1; y >= height.getBottomY(); y--) {
             array[y - height.getBottomY()] = (BlockState) delegate.getBlock(properties, x, y, z, biomeProvider);
         }
         return new VerticalBlockSample(height.getBottomY(), array);
     }
 
     @Override
-    public void getDebugHudText(List<String> text, NoiseConfig noiseConfig, BlockPos pos) {
+    public void appendDebugHudText(List<String> text, NoiseConfig noiseConfig, BlockPos pos) {
 
     }
 

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftItemHandle.java

@@ -49,8 +49,8 @@ public class MinecraftItemHandle implements ItemHandle {
                 }
 
                 @Override
-                public <T> Optional<Impl<T>> getOptionalWrapper(RegistryKey<? extends Registry<? extends T>> registryRef) {
+                public <T> Optional<Impl<T>> getOptional(RegistryKey<? extends Registry<? extends T>> registryRef) {
-                    return Optional.of(CommonPlatform.get().getServer().getRegistryManager().getWrapperOrThrow(registryRef));
+                    return Optional.of(CommonPlatform.get().getServer().getRegistryManager().getOrThrow(registryRef));
                 }
             }).parse(new StringReader(data)).getItem();
         } catch(CommandSyntaxException e) {
@@ -60,7 +60,7 @@ public class MinecraftItemHandle implements ItemHandle {
 
     @Override
     public Enchantment getEnchantment(String id) {
-        return (Enchantment) (Object) (CommonPlatform.get().enchantmentRegistry().get(Identifier.tryParse(id)));
+        return (Enchantment) (Object) (CommonPlatform.get().enchantmentRegistry().getEntry(Identifier.tryParse(id)));
     }
 
     @Override

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/handle/MinecraftWorldHandle.java

@@ -76,6 +76,6 @@ public class MinecraftWorldHandle implements WorldHandle {
         if(!id.contains(":")) throw new IllegalArgumentException("Invalid entity identifier " + id);
         Identifier identifier = Identifier.tryParse(id);
         if(identifier == null) identifier = Identifier.tryParse(id);
-        return (EntityType) Registries.ENTITY_TYPE.get(identifier);
+        return (EntityType) Registries.ENTITY_TYPE.getEntry(identifier);
     }
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java

@@ -54,7 +54,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity {
     public abstract void setEntityType(net.minecraft.entity.EntityType<?> entityType, Random random);
 
     public EntityType terra$getSpawnedType() {
-        return (EntityType) Registries.ENTITY_TYPE.get(
+        return (EntityType) Registries.ENTITY_TYPE.getEntry(
             Identifier.tryParse(((MobSpawnerLogicAccessor) getLogic()).getSpawnEntry().getNbt().getString("id")));
     }
 

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/data/ProtoChunkMixin.java

@@ -48,6 +48,6 @@ public abstract class ProtoChunkMixin {
     }
 
     public int terra$getMaxHeight() {
-        return getHeightLimitView().getTopY();
+        return getHeightLimitView().getTopYInclusive();
     }
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/inventory/item/ItemStackMixin.java

@@ -19,7 +19,7 @@ package com.dfsek.terra.mod.mixin.implementations.terra.inventory.item;
 
 import net.minecraft.component.ComponentChanges;
 import net.minecraft.component.ComponentMap;
-import net.minecraft.component.ComponentMapImpl;
+import net.minecraft.component.MergedComponentMap;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Implements;
@@ -37,7 +37,7 @@ import com.dfsek.terra.api.inventory.item.ItemMeta;
 public abstract class ItemStackMixin {
     @Shadow
     @Final
-    private ComponentMapImpl components;
+    private MergedComponentMap components;
 
     @Shadow
     public abstract int getCount();

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/world/ChunkRegionMixin.java

@@ -99,7 +99,7 @@ public abstract class ChunkRegionMixin {
     }
 
     public int terraWorld$getMaxHeight() {
-        return world.getTopY();
+        return world.getTopYInclusive();
     }
 
     @Intrinsic(displace = true)

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/lifecycle/DataPackContentsMixin.java

@@ -29,9 +29,9 @@ public class DataPackContentsMixin {
     @Inject(method = "refresh()V", at = @At("RETURN"))
     private void injectReload(CallbackInfo ci) {
         DynamicRegistryManager.Immutable dynamicRegistryManager = this.reloadableRegistries.getRegistryManager();
-        TagUtil.registerWorldPresetTags(dynamicRegistryManager.get(RegistryKeys.WORLD_PRESET));
+        TagUtil.registerWorldPresetTags(dynamicRegistryManager.getOrThrow(RegistryKeys.WORLD_PRESET));
 
-        Registry<Biome> biomeRegistry = dynamicRegistryManager.get(RegistryKeys.BIOME);
+        Registry<Biome> biomeRegistry = dynamicRegistryManager.getOrThrow(RegistryKeys.BIOME);
         TagUtil.registerBiomeTags(biomeRegistry);
         MinecraftUtil.registerFlora(biomeRegistry);
     }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftAdapter.java

@@ -39,7 +39,7 @@ public final class MinecraftAdapter {
 
             @Override
             public int getMaxHeight() {
-                return height.getTopY();
+                return height.getTopYInclusive();
             }
 
             @Override

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java

@@ -46,7 +46,7 @@ public final class MinecraftUtil {
     }
 
     public static <T> Optional<RegistryEntry<T>> getEntry(Registry<T> registry, Identifier identifier) {
-        return registry.getOrEmpty(identifier)
+        return registry.getOptionalValue(identifier)
             .flatMap(registry::getKey)
             .flatMap(registry::getEntry);
     }
@@ -67,9 +67,9 @@ public final class MinecraftUtil {
         logger.info("Injecting flora into Terra biomes...");
         TERRA_BIOME_MAP
             .forEach((vb, terraBiomes) ->
-                biomes.getOrEmpty(vb)
+                biomes.getOptionalValue(vb)
                     .ifPresentOrElse(vanilla -> terraBiomes
-                            .forEach(tb -> biomes.getOrEmpty(tb)
+                            .forEach(tb -> biomes.getOptionalValue(tb)
                                 .ifPresentOrElse(
                                     terra -> {
                                         List<ConfiguredFeature<?, ?>> flowerFeatures = List.copyOf(

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/TagUtil.java

@@ -25,7 +25,7 @@ public final class TagUtil {
 
     private static <T> Map<TagKey<T>, List<RegistryEntry<T>>> tagsToMutableMap(Registry<T> registry) {
         return registry
-            .streamTagsAndEntries()
+            .streamTags()
             .collect(HashMap::new,
                 (map, pair) ->
                     map.put(pair.getFirst(), new ArrayList<>(pair.getSecond().stream().toList())),

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java

@@ -72,7 +72,7 @@ public abstract class LifecyclePlatform extends ModPlatform {
 
 
         if(server != null) {
-            BiomeUtil.registerBiomes(server.getRegistryManager().get(RegistryKeys.BIOME));
+            BiomeUtil.registerBiomes(server.getRegistryManager().getOrThrow(RegistryKeys.BIOME));
             server.reloadResources(server.getDataPackManager().getEnabledIds()).exceptionally(throwable -> {
                 LOGGER.warn("Failed to execute reload", throwable);
                 return null;

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/SaveLoadingMixin.java

@@ -24,7 +24,7 @@ public class SaveLoadingMixin {
         index = 1
     )
     private static DynamicRegistryManager grabManager(DynamicRegistryManager registryManager) {
-        MinecraftUtil.registerFlora(registryManager.get(RegistryKeys.BIOME));
+        MinecraftUtil.registerFlora(registryManager.getOrThrow(RegistryKeys.BIOME));
         return registryManager;
     }
 }