a bunch more 1.20.4 work

Author: Ellpeck

src/main/java/de/ellpeck/naturesaura/Helper.java

@@ -15,6 +15,8 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerPlayer;
@@ -42,12 +44,9 @@
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
-import net.neoforged.neoforge.common.capabilities.Capability;
-import net.neoforged.neoforge.common.util.LazyOptional;
+import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.items.IItemHandler;
-import net.neoforged.neoforge.registries.ForgeRegistries;
-import net.neoforged.neoforge.registries.IForgeRegistry;
-import net.neoforged.neoforge.common.capabilities.ICapabilityProvider;
+import net.neoforged.neoforge.items.IItemHandlerModifiable;
 import top.theillusivec4.curios.api.CuriosApi;
 import top.theillusivec4.curios.api.SlotResult;
 
@@ -167,7 +166,7 @@ public static void renderWeirdBox(VertexConsumer buffer, double x, double y, dou
     public static InteractionResult putStackOnTile(Player player, InteractionHand hand, BlockPos pos, int slot, boolean sound) {
         var tile = player.level().getBlockEntity(pos);
         if (tile instanceof BlockEntityImpl) {
-            var handler = ((BlockEntityImpl) tile).getItemHandler();
+            var handler = (IItemHandlerModifiable) tile.getLevel().getCapability(Capabilities.ItemHandler.BLOCK, tile.getBlockPos(), tile.getBlockState(), tile, null);
             if (handler != null) {
                 var handStack = player.getItemInHand(hand);
                 if (!handStack.isEmpty()) {
@@ -230,7 +229,7 @@ public static boolean rechargeAuraItem(ItemStack stack, IAuraContainer container
 
     public static BlockState getStateFromString(String raw) {
         var split = raw.split("\\[");
-        var block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0]));
+        var block = BuiltInRegistries.BLOCK.get(new ResourceLocation(split[0]));
         if (block != null) {
             var state = block.defaultBlockState();
             if (split.length > 1) {
@@ -261,7 +260,7 @@ private static <T extends Comparable<T>> BlockState findProperty(BlockState stat
     public static void addAdvancement(Player player, ResourceLocation advancement, String criterion) {
         if (!(player instanceof ServerPlayer playerMp))
             return;
-        var adv = playerMp.level().getServer().getAdvancements().getAdvancement(advancement);
+        var adv = playerMp.level().getServer().getAdvancements().get(advancement);
         if (adv != null)
             playerMp.getAdvancements().award(adv, criterion);
     }
@@ -295,17 +294,17 @@ public static AABB aabb(Vec3 pos) {
     }
 
     // This is how @ObjectHolder SHOULD work...
-    public static <T> void populateObjectHolders(Class<?> clazz, IForgeRegistry<T> registry) {
+    public static <T> void populateObjectHolders(Class<?> clazz, Registry<T> registry) {
         for (var entry : clazz.getFields()) {
             if (!Modifier.isStatic(entry.getModifiers()))
                 continue;
             var location = new ResourceLocation(NaturesAura.MOD_ID, entry.getName().toLowerCase(Locale.ROOT));
             if (!registry.containsKey(location)) {
-                NaturesAura.LOGGER.fatal("Couldn't find entry named " + location + " in registry " + registry.getRegistryName());
+                NaturesAura.LOGGER.fatal("Couldn't find entry named " + location + " in registry");
                 continue;
             }
             try {
-                entry.set(null, registry.getValue(location));
+                entry.set(null, registry.get(location));
             } catch (IllegalAccessException e) {
                 NaturesAura.LOGGER.error(e);
             }

src/main/java/de/ellpeck/naturesaura/InternalHooks.java

@@ -8,6 +8,7 @@
 import de.ellpeck.naturesaura.misc.LevelData;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.Tuple;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
@@ -37,9 +38,9 @@ public boolean insertAuraIntoPlayer(Player player, int amount, boolean simulate)
     private boolean auraPlayerInteraction(Player player, int amount, boolean extract, boolean simulate) {
         if (extract && player.isCreative())
             return true;
-        var stack = Helper.getEquippedItem(s -> s.getCapability(NaturesAuraAPI.CAP_AURA_CONTAINER).isPresent(), player, false);
+        var stack = Helper.getEquippedItem(s -> s.getCapability(NaturesAuraAPI.AURA_CONTAINER_CAPABILITY) != null, player, false);
         if (!stack.isEmpty()) {
-            var container = stack.getCapability(NaturesAuraAPI.CAP_AURA_CONTAINER).orElse(null);
+            var container = stack.getCapability(NaturesAuraAPI.AURA_CONTAINER_CAPABILITY);
             if (extract) {
                 return container.drainAura(amount, simulate) > 0;
             } else {
@@ -182,4 +183,20 @@ public BlockPos getHighestAuraDrainSpot(Level level, BlockPos pos, int radius, B
         return highest;
     }
 
+    @Override
+    public ILevelData getLevelData(Level level) {
+        if (level instanceof ServerLevel server) {
+            var ret = server.getDataStorage().computeIfAbsent(LevelData.FACTORY, "level_data");
+            if (ret.level == null)
+                ret.level = level;
+            return ret;
+        } else {
+            if (LevelData.client == null || LevelData.client.level != level) {
+                LevelData.client = new LevelData();
+                LevelData.client.level = level;
+            }
+            return LevelData.client;
+        }
+    }
+
 }

src/main/java/de/ellpeck/naturesaura/ModConfig.java

@@ -5,10 +5,10 @@
 import de.ellpeck.naturesaura.api.misc.WeightedOre;
 import de.ellpeck.naturesaura.chunk.effect.OreSpawnEffect;
 import de.ellpeck.naturesaura.chunk.effect.PlantBoostEffect;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.neoforge.common.ModConfigSpec;
 import net.neoforged.neoforge.common.ModConfigSpec.ConfigValue;
-import net.neoforged.neoforge.registries.ForgeRegistries;
 
 import java.util.Collections;
 import java.util.List;
@@ -239,23 +239,24 @@ public void apply() {
         }
 
         try {
-            for (String s : this.plantBoostExceptions.get())
-                PlantBoostEffect.EXCEPTIONS.add(Objects.requireNonNull(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(s))));
+            for (var s : this.plantBoostExceptions.get())
+                PlantBoostEffect.EXCEPTIONS.add(Objects.requireNonNull(BuiltInRegistries.BLOCK.get(new ResourceLocation(s))));
         } catch (Exception e) {
             NaturesAura.LOGGER.warn("Error parsing plantBoostExceptions", e);
 
         }
 
         try {
-            for (String s : this.additionalProjectiles.get()) {
+            for (var s : this.additionalProjectiles.get()) {
                 var split = s.split("->");
                 var name = new ResourceLocation(split[0]);
-                var type = Objects.requireNonNull(ForgeRegistries.ENTITY_TYPES.getValue(name));
+                var type = Objects.requireNonNull(BuiltInRegistries.ENTITY_TYPE.get(name));
                 var amount = Integer.parseInt(split[1]);
                 NaturesAuraAPI.PROJECTILE_GENERATIONS.put(type, amount);
             }
         } catch (Exception e) {
             NaturesAura.LOGGER.warn("Error parsing additionalProjectiles", e);
         }
     }
+
 }

src/main/java/de/ellpeck/naturesaura/NaturesAura.java

@@ -6,18 +6,17 @@
 import de.ellpeck.naturesaura.chunk.effect.DrainSpotEffects;
 import de.ellpeck.naturesaura.compat.Compat;
 import de.ellpeck.naturesaura.events.CommonEvents;
-import de.ellpeck.naturesaura.packet.PacketHandler;
 import de.ellpeck.naturesaura.proxy.ClientProxy;
 import de.ellpeck.naturesaura.proxy.IProxy;
 import de.ellpeck.naturesaura.proxy.ServerProxy;
 import de.ellpeck.naturesaura.recipes.ModRecipes;
-import net.neoforged.neoforge.common.ModConfigSpec;
-import net.neoforged.neoforge.common.NeoForge;
-import net.neoforged.fml.DistExecutor;
+import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.neoforge.common.ModConfigSpec;
+import net.neoforged.neoforge.common.NeoForge;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -29,13 +28,13 @@ public final class NaturesAura {
 
     public static final Logger LOGGER = LogManager.getLogger(NaturesAura.MOD_NAME);
     public static NaturesAura instance;
-    // this causes a classloading issue if it's not wrapped like this
-    @SuppressWarnings("Convert2MethodRef")
-    public static IProxy proxy = DistExecutor.unsafeRunForDist(() -> () -> new ClientProxy(), () -> () -> new ServerProxy());
+    public static IProxy proxy;
 
-    public NaturesAura() {
+    public NaturesAura(IEventBus eventBus) {
         NaturesAura.instance = this;
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
+        NaturesAura.proxy = FMLEnvironment.dist.isClient() ? new ClientProxy() : new ServerProxy();
+
+        eventBus.addListener(this::setup);
 
         var builder = new ModConfigSpec.Builder();
         ModConfig.instance = new ModConfig(builder);
@@ -50,7 +49,6 @@ public void setup(FMLCommonSetupEvent event) {
 
     private void preInit(FMLCommonSetupEvent event) {
         Compat.setup(event);
-        PacketHandler.init();
         new Multiblocks();
 
         NeoForge.EVENT_BUS.register(new CommonEvents());

src/main/java/de/ellpeck/naturesaura/api/NaturesAuraAPI.java

@@ -23,10 +23,8 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
-import net.neoforged.neoforge.common.capabilities.*;
-import net.neoforged.neoforge.common.capabilities.CapabilityToken;
-import net.neoforged.neoforge.common.capabilities.Capability;
-import net.neoforged.neoforge.common.capabilities.CapabilityManager;
+import net.neoforged.neoforge.attachment.AttachmentType;
+import net.neoforged.neoforge.capabilities.ItemCapability;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.ArrayList;
@@ -86,23 +84,15 @@ public final class NaturesAuraAPI {
     /**
      * The capability for any item or block that stores Aura in the form of an {@link IAuraContainer}
      */
-    public static final Capability<IAuraContainer> CAP_AURA_CONTAINER = CapabilityManager.get(new CapabilityToken<>() {
-    });
+    public static final ItemCapability<IAuraContainer, Void> AURA_CONTAINER_CAPABILITY = ItemCapability.createVoid(new ResourceLocation(NaturesAuraAPI.MOD_ID, "aura_container"), IAuraContainer.class);
     /**
      * The capability for any item that can be recharged from an Aura storage container like the Aura Cache in the form of {@link IAuraRecharge} by a player holding it in their hand
      */
-    public static final Capability<IAuraRecharge> CAP_AURA_RECHARGE = CapabilityManager.get(new CapabilityToken<>() {
-    });
+    public static final ItemCapability<IAuraRecharge, Void> AURA_RECHARGE_CAPABILITY = ItemCapability.createVoid(new ResourceLocation(NaturesAuraAPI.MOD_ID, "aura_recharge"), IAuraRecharge.class);
     /**
      * The capability that any chunk in a level has to store Aura in it. As this is only applicable to chunks and all chunks in the level automatically get assigned this capability, using it directly is not necessary for addon developers. To retrieve this capability from any chunk, use the helper method {@link IAuraChunk#getAuraChunk(net.minecraft.world.level.Level, BlockPos)}.
      */
-    public static final Capability<IAuraChunk> CAP_AURA_CHUNK = CapabilityManager.get(new CapabilityToken<>() {
-    });
-    /**
-     * The capability that any level has to store Nature's Aura specific data in it. To retrieve this capability from any level, use the helper methods {@link ILevelData#getLevelData(net.minecraft.world.level.Level)} or {@link ILevelData#getOverworldData(net.minecraft.world.level.Level)}.
-     */
-    public static final Capability<ILevelData> CAP_LEVEL_DATA = CapabilityManager.get(new CapabilityToken<>() {
-    });
+    public static final AttachmentType<IAuraChunk> AURA_CHUNK_ATTACHMENT = AttachmentType.serializable(() -> (IAuraChunk) null).build();
     private static final IInternalHooks INSTANCE;
 
     static {
@@ -260,6 +250,9 @@ public interface IInternalHooks {
          * @see IAuraChunk#getHighestSpot(Level, BlockPos, int, BlockPos)
          */
         BlockPos getHighestAuraDrainSpot(Level level, BlockPos pos, int radius, BlockPos defaultSpot);
+
+        ILevelData getLevelData(Level level);
+
     }
 
 }

src/main/java/de/ellpeck/naturesaura/api/aura/chunk/IAuraChunk.java

@@ -33,7 +33,7 @@ public interface IAuraChunk extends INBTSerializable<CompoundTag> {
      */
     static IAuraChunk getAuraChunk(Level level, BlockPos pos) {
         var chunk = (LevelChunk) level.getChunk(pos);
-        return chunk.getCapability(NaturesAuraAPI.CAP_AURA_CHUNK, null).orElse(null);
+        return chunk.getData(NaturesAuraAPI.AURA_CHUNK_ATTACHMENT);
     }
 
     /**
@@ -159,4 +159,5 @@ static BlockPos getHighestSpot(Level level, BlockPos pos, int radius, BlockPos d
     IAuraType getType();
 
     void markDirty();
+
 }

src/main/java/de/ellpeck/naturesaura/api/misc/ILevelData.java

@@ -1,16 +1,13 @@
 package de.ellpeck.naturesaura.api.misc;
 
 import de.ellpeck.naturesaura.api.NaturesAuraAPI;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.Level;
-import net.neoforged.neoforge.common.util.INBTSerializable;
 import net.neoforged.neoforge.items.IItemHandlerModifiable;
-import net.neoforged.neoforge.common.capabilities.ICapabilityProvider;
 
-public interface ILevelData extends ICapabilityProvider, INBTSerializable<CompoundTag> {
+public interface ILevelData {
 
     static ILevelData getLevelData(Level level) {
-        return level.getCapability(NaturesAuraAPI.CAP_LEVEL_DATA, null).orElse(null);
+        return NaturesAuraAPI.instance().getLevelData(level);
     }
 
     static ILevelData getOverworldData(Level level) {
@@ -22,4 +19,5 @@ static ILevelData getOverworldData(Level level) {
     IItemHandlerModifiable getEnderStorage(String name);
 
     boolean isEnderStorageLocked(String name);
+
 }

src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java

@@ -129,11 +129,11 @@ public List<ItemStack> getDrops(BlockState state, LootParams.Builder builder) {
     }
 
     @Override
-    public void playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) {
+    public BlockState playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) {
         var tile = level.getBlockEntity(pos);
         if (tile instanceof BlockEntityImpl impl)
             impl.dropInventory();
-        super.playerWillDestroy(level, pos, state, player);
+        return super.playerWillDestroy(level, pos, state, player);
     }
 
     @Override
@@ -181,4 +181,5 @@ private BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
             throw new IllegalStateException("Cannot construct block entity from class " + this.tileClass, e);
         }
     }
+
 }

src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java

@@ -33,7 +33,6 @@
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.AnvilUpdateEvent;
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.neoforge.network.NetworkHooks;
 
 import javax.annotation.Nullable;
 import java.util.List;
@@ -92,7 +91,7 @@ public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Play
             var tile = levelIn.getBlockEntity(pos);
             if (tile instanceof BlockEntityEnderCrate crate && crate.canOpen() && crate.canUseRightNow(2500)) {
                 crate.drainAura(2500);
-                NetworkHooks.openScreen((ServerPlayer) player, crate, pos);
+                player.openMenu(crate, pos);
             }
         }
         return InteractionResult.SUCCESS;
@@ -132,4 +131,5 @@ public void generateCustomBlockState(BlockStateGenerator generator) {
     public void registerTESR() {
         BlockEntityRenderers.register(ModBlockEntities.ENDER_CRATE, RenderEnderCrate::new);
     }
+
 }

src/main/java/de/ellpeck/naturesaura/blocks/BlockFlowerPot.java

@@ -5,9 +5,9 @@
 import de.ellpeck.naturesaura.reg.IModItem;
 import de.ellpeck.naturesaura.reg.INoItemBlock;
 import de.ellpeck.naturesaura.reg.ModRegistry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FlowerPotBlock;
-import net.neoforged.neoforge.registries.ForgeRegistries;
 
 import java.util.function.Supplier;
 
@@ -20,12 +20,12 @@ public BlockFlowerPot(Supplier<FlowerPotBlock> emptyPot, Supplier<? extends Bloc
 
     @Override
     public void generateCustomBlockState(BlockStateGenerator generator) {
-        generator.simpleBlock(this, generator.models().withExistingParent(this.getBaseName(), "block/flower_pot_cross").texture("plant", "block/" + ForgeRegistries.BLOCKS.getKey(this.getContent()).getPath()).renderType("cutout"));
+        generator.simpleBlock(this, generator.models().withExistingParent(this.getBaseName(), "block/flower_pot_cross").texture("plant", "block/" + BuiltInRegistries.BLOCK.getKey(this.getPotted()).getPath()).renderType("cutout"));
     }
 
     @Override
     public String getBaseName() {
-        return "potted_" + ForgeRegistries.BLOCKS.getKey(this.getContent()).getPath();
+        return "potted_" + BuiltInRegistries.BLOCK.getKey(this.getPotted()).getPath();
     }
 
 }

src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java

@@ -42,7 +42,7 @@ public final class Multiblocks {
                         // try-catch to prevent blocks that need to have been placed crashing here
                         try {
                             var stack = new ItemStack(state.getBlock());
-                            return !stack.isEmpty() && level.getRecipeManager().getRecipesFor(ModRecipes.TREE_RITUAL_TYPE, null, level).stream().anyMatch(r -> r.saplingType.test(stack));
+                            return !stack.isEmpty() && level.getRecipeManager().getRecipesFor(ModRecipes.TREE_RITUAL_TYPE, null, level).stream().anyMatch(r -> r.value().saplingType.test(stack));
                         } catch (Exception e) {
                             return false;
                         }
@@ -99,4 +99,5 @@ public final class Multiblocks {
             'R', Blocks.REDSTONE_BLOCK,
             '0', ModBlocks.RF_CONVERTER,
             ' ', Matcher.any());
+
 }