Merge branch '21.1/feature/pipelines' into 21.1/main

Author: robotgryphon

core/src/main/java/dev/compactmods/gander/core/utility/RaytraceHelper.java

@@ -1,8 +1,12 @@
 package dev.compactmods.gander.level;
 
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import net.neoforged.neoforge.client.model.data.ModelData;
+import net.neoforged.neoforge.client.model.data.ModelDataManager;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -65,35 +69,53 @@ public class VirtualLevel extends Level implements WorldGenLevel, TickingLevel {
 	private BoundingBox bounds;
 	private VirtualEntitySystem entities;
 	private final Holder<Biome> biome;
+    private final Consumer<VirtualLevel> onBlockUpdate;
+    private final ModelDataManager modelDataManager;
+
+    public VirtualLevel(RegistryAccess access, boolean isClientside) {
+        this(access, isClientside, newLevel -> {});
+    }
 
-	public VirtualLevel(RegistryAccess access, boolean isClientside) {
+	public VirtualLevel(RegistryAccess access, boolean isClientside, Consumer<VirtualLevel> onBlockUpdate) {
 		this(
 				VirtualLevelUtils.LEVEL_DATA, Level.OVERWORLD, access,
 				access.registryOrThrow(Registries.DIMENSION_TYPE).getHolderOrThrow(BuiltinDimensionTypes.OVERWORLD),
 				VirtualLevelUtils.PROFILER, isClientside, false,
-				0, 0);
+				0, 0, onBlockUpdate);
 	}
 
 	private VirtualLevel(WritableLevelData pLevelData, ResourceKey<Level> pDimension,
-						 RegistryAccess pRegistryAccess, Holder<DimensionType> pDimensionTypeRegistration,
-						 Supplier<ProfilerFiller> pProfiler, boolean pIsClientSide, boolean pIsDebug, long pBiomeZoomSeed,
-						 int pMaxChainedNeighborUpdates) {
+                         RegistryAccess pRegistryAccess, Holder<DimensionType> pDimensionTypeRegistration,
+                         Supplier<ProfilerFiller> pProfiler, boolean pIsClientSide, boolean pIsDebug, long pBiomeZoomSeed,
+                         int pMaxChainedNeighborUpdates, Consumer<VirtualLevel> onBlockUpdate) {
 		super(pLevelData, pDimension, pRegistryAccess, pDimensionTypeRegistration, pProfiler, pIsClientSide, pIsDebug,
 				pBiomeZoomSeed, pMaxChainedNeighborUpdates);
 		this.access = pRegistryAccess;
-		this.chunkSource = new VirtualChunkSource(this);
+        this.onBlockUpdate = onBlockUpdate;
+        this.chunkSource = new VirtualChunkSource(this);
 		this.blocks = new VirtualBlockSystem(this);
 		this.scoreboard = new Scoreboard();
 		this.bounds = BoundingBox.fromCorners(BlockPos.ZERO, BlockPos.ZERO);
 		this.entities = new VirtualEntitySystem();
 		this.biome = pRegistryAccess.registryOrThrow(Registries.BIOME).getHolderOrThrow(Biomes.PLAINS);
+        this.modelDataManager = new ModelDataManager(this);
 	}
 
 	public Holder<Biome> getBiome() {
 		return biome;
 	}
 
-	@Override
+    @Override
+    public ModelData getModelData(BlockPos pos) {
+        return modelDataManager.getAt(pos);
+    }
+
+    @Override
+    public @Nullable ModelDataManager getModelDataManager() {
+        return modelDataManager;
+    }
+
+    @Override
 	public PotionBrewing potionBrewing() {
 		// Minecraft, why?
 		return PotionBrewing.EMPTY;
@@ -273,6 +295,7 @@ public float getShade(Direction pDirection, boolean pShade) {
 
 	@Override
 	public void sendBlockUpdated(BlockPos pPos, BlockState pOldState, BlockState pNewState, int pFlags) {
+        this.onBlockUpdate.accept(this);
 	}
 
 	@Override
@@ -401,4 +424,9 @@ public int getMinBuildHeight() {
     public BoundingBox getBounds() {
         return bounds;
     }
+
+    public void refreshBlockEntityModels() {
+        blocks.blockAndFluidStorage().blockEntities()
+            .forEach(modelDataManager::requestRefresh);
+    }
 }

core/src/main/java/dev/compactmods/gander/core/utility/VecHelper.java

@@ -156,12 +156,6 @@ public boolean isUnsaved() {
 		return false;
 	}
 
-    // TODO: Is there some other overload for this?
-	/*@Override
-	public ChunkStatus getStatus() {
-		return ChunkStatus.LIGHT;
-	}*/
-
 	@Override
 	public void removeBlockEntity(BlockPos pos) {
 		virtualLevel.removeBlockEntity(pos);

levels/src/main/java/dev/compactmods/gander/level/VirtualLevel.java

@@ -8,8 +8,6 @@
 import net.minecraft.client.renderer.RenderType;
 import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
 
-import org.jetbrains.annotations.Nullable;
-
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
@@ -23,12 +21,6 @@ public class RenderTypes extends RenderStateShard {
         .stream()
         .collect(Collectors.toMap(RenderLevelStageEvent.Stage::fromRenderType, Function.identity()));
 
-    public static final Set<RenderLevelStageEvent.Stage> STATIC_GEOMETRY_STAGES = Set.of(
-        RenderLevelStageEvent.Stage.AFTER_SOLID_BLOCKS,
-        RenderLevelStageEvent.Stage.AFTER_CUTOUT_MIPPED_BLOCKS_BLOCKS,
-        RenderLevelStageEvent.Stage.AFTER_CUTOUT_BLOCKS
-    );
-
 	protected static final RenderStateShard.ShaderStateShard BLOCK_SHADER =
 			new RenderStateShard.ShaderStateShard(GameRenderer::getRendertypeTranslucentMovingBlockShader);
 
@@ -59,8 +51,4 @@ public static RenderType getFluid() {
 	private RenderTypes() {
 		super(null, null, null);
 	}
-
-    public static boolean isStaticGeometryStage(RenderLevelStageEvent.Stage stage) {
-        return STATIC_GEOMETRY_STAGES.contains(stage);
-    }
 }

levels/src/main/java/dev/compactmods/gander/level/chunk/VirtualChunk.java

@@ -81,15 +81,11 @@ private static void createBlockGeometry(Level level, BlockPos pos, PoseStack pos
         pose.pushPose();
         pose.translate(pos.getX(), pos.getY(), pos.getZ());
 
-        ModelData modelData = ModelData.EMPTY;
+        ModelData modelData;
         if (state.getRenderShape() == RenderShape.MODEL) {
             BakedModel model = dispatcher.getBlockModel(state);
 
-            if (state.hasBlockEntity()) {
-                BlockEntity blockEntity = level.getBlockEntity(pos);
-                modelData = blockEntity != null ? blockEntity.getModelData() : ModelData.EMPTY;
-            }
-
+            modelData = level.getModelData(pos);
             modelData = model.getModelData(level, pos, state, modelData);
 
             long seed = state.getSeed(pos);