Merge remote-tracking branch 'origin/master' into fabric/master

src/main/java/appeng/core/AppEngBootstrap.java

@@ -1,5 +1,6 @@
 package appeng.core;
 
+import appeng.mixins.structure.StructureFeatureAccessor;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.registry.BuiltinRegistries;
@@ -16,7 +17,6 @@ import net.minecraft.world.gen.feature.OreFeatureConfig;
 import appeng.api.features.AEFeature;
 import appeng.mixins.feature.ConfiguredFeaturesAccessor;
 import appeng.mixins.structure.ConfiguredStructureFeaturesAccessor;
-import appeng.mixins.structure.StructureFeatureAccessor;
 import appeng.spatial.SpatialStorageChunkGenerator;
 import appeng.spatial.SpatialStorageDimensionIds;
 import appeng.worldgen.BiomeModifier;

src/main/java/appeng/core/features/registries/MovableTileRegistry.java

@@ -18,21 +18,25 @@
 
 package appeng.core.features.registries;
 
-import java.util.*;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.tag.BlockTags;
-import net.minecraft.tag.Tag;
-import net.minecraft.util.Identifier;
-
 import appeng.api.exceptions.AppEngException;
 import appeng.api.movable.IMovableHandler;
 import appeng.api.movable.IMovableRegistry;
 import appeng.api.movable.IMovableTile;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
+import appeng.mixins.tags.BlockTagsAccessor;
 import appeng.spatial.DefaultSpatialHandler;
+import net.minecraft.block.Block;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.tag.Tag;
+import net.minecraft.util.Identifier;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class MovableTileRegistry implements IMovableRegistry {
 
@@ -46,12 +50,12 @@ public class MovableTileRegistry implements IMovableRegistry {
     private final List<IMovableHandler> handlers = new ArrayList<>();
     private final DefaultSpatialHandler dsh = new DefaultSpatialHandler();
     private final IMovableHandler nullHandler = new DefaultSpatialHandler();
-    private final Tag<Block> blockTagWhiteList;
-    private final Tag<Block> blockTagBlackList;
+    private final Tag.Identified<Block> blockTagWhiteList;
+    private final Tag.Identified<Block> blockTagBlackList;
 
     public MovableTileRegistry() {
-        this.blockTagWhiteList = BlockTags.getTagGroup().getTagOrEmpty(TAG_WHITELIST);
-        this.blockTagBlackList = BlockTags.getTagGroup().getTagOrEmpty(TAG_BLACKLIST);
+        this.blockTagWhiteList = BlockTagsAccessor.register(TAG_WHITELIST.toString());
+        this.blockTagBlackList = BlockTagsAccessor.register(TAG_BLACKLIST.toString());
     }
 
     @Override

src/main/java/appeng/items/parts/FacadeItem.java

@@ -18,6 +18,7 @@
 
 package appeng.items.parts;
 
+import appeng.mixins.tags.BlockTagsAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.api.EnvironmentInterface;
@@ -57,7 +58,8 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte
     /**
      * Block tag used to explicitly whitelist blocks for use in facades.
      */
-    private static final Identifier TAG_WHITELISTED = new Identifier(AppEng.MOD_ID, "whitelisted/facades");
+    private static final Tag.Identified<Block> BLOCK_WHITELIST = BlockTagsAccessor
+            .register(AppEng.makeId("whitelisted/facades").toString());
 
     private static final String NBT_ITEM_ID = "item";
 
@@ -104,8 +106,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte
         BlockState blockState = block.getDefaultState();
 
         final boolean areTileEntitiesEnabled = AEConfig.instance().isFeatureEnabled(AEFeature.TILE_ENTITY_FACADES);
-        Tag<Block> whitelistTag = BlockTags.getTagGroup().getTagOrEmpty(TAG_WHITELISTED);
-        final boolean isWhiteListed = block.isIn(whitelistTag);
+        final boolean isWhiteListed = BLOCK_WHITELIST.contains(block);
         final boolean isModel = blockState.getRenderType() == BlockRenderType.MODEL;
 
         final BlockState defaultState = block.getDefaultState();

src/main/java/appeng/mixins/spatial/DimensionOptionMixin.java

@@ -35,4 +35,4 @@ public class DimensionOptionMixin {
         return dimensions;
     }
 
-}
+}