Merge pull request #949 from DragonsPlusMinecraft/1.21.1-PonderFluidTankCrash-fix

Fix ponder crashes when calling FluidTankBlockEntity#getControllerBE

Author: mrh0

src/main/java/com/mrh0/createaddition/index/CAPonders.java

@@ -1,15 +1,19 @@
 package com.mrh0.createaddition.index;
 
 import com.mrh0.createaddition.CreateAddition;
+import com.mrh0.createaddition.ponder.DebugScenes;
 import com.mrh0.createaddition.ponder.PonderScenes;
 import com.simibubi.create.AllBlocks;
 
+import com.simibubi.create.AllItems;
 import com.simibubi.create.infrastructure.ponder.AllCreatePonderTags;
 import com.tterrag.registrate.util.entry.ItemProviderEntry;
 import net.createmod.ponder.api.registration.PonderSceneRegistrationHelper;
 import net.createmod.ponder.api.registration.PonderTagRegistrationHelper;
 import net.minecraft.resources.ResourceLocation;
 import com.tterrag.registrate.util.entry.RegistryEntry;
+import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.neoforge.data.loading.DatagenModLoader;
 
 public class CAPonders {
 	public static final ResourceLocation ELECTRIC = CreateAddition.asResource("electric");
@@ -63,5 +67,8 @@ public static void registerScenes(PonderSceneRegistrationHelper<ResourceLocation
 
 		if(CreateAddition.CC_ACTIVE)
 			HELPER.addStoryBoard(CABlocks.ELECTRIC_MOTOR, "cc_electric_motor", PonderScenes::ccMotor, AllCreatePonderTags.KINETIC_SOURCES, ELECTRIC);
+
+		if(!FMLEnvironment.production && !DatagenModLoader.isRunningDataGen())
+			HELPER.addStoryBoard(AllItems.WRENCH,"debug/fluidtank", DebugScenes::controllerBEDebug);
 	}
 }

src/main/java/com/mrh0/createaddition/ponder/CAPonderPlugin.java

@@ -34,11 +34,6 @@ public void registerSharedText(SharedTextRegistrationHelper helper) {
         // helper.registerSharedText("rpm8", "8 RPM");
     }
 
-    @Override
-    public void onPonderLevelRestore(PonderLevel ponderLevel) {
-        PonderWorldBlockEntityFix.fixControllerBlockEntities(ponderLevel);
-    }
-
     @Override
     public void indexExclusions(IndexExclusionHelper helper) {
         // helper.excludeBlockVariants(ValveHandleBlock.class, AllBlocks.COPPER_VALVE_HANDLE.get());

src/main/java/com/mrh0/createaddition/ponder/DebugScenes.java

@@ -0,0 +1,29 @@
+package com.mrh0.createaddition.ponder;
+
+import com.simibubi.create.AllFluids;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.foundation.ponder.CreateSceneBuilder;
+import net.createmod.ponder.api.scene.SceneBuilder;
+import net.createmod.ponder.api.scene.SceneBuildingUtil;
+import net.minecraft.core.Direction;
+import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.capability.IFluidHandler;
+
+public class DebugScenes {
+    public static void controllerBEDebug(SceneBuilder builder, SceneBuildingUtil util){
+        CreateSceneBuilder scene = new CreateSceneBuilder(builder);
+        scene.title("debug.fluidtank_controller_be_issue", "Debug Fluid Tank Controller BE");
+        scene.configureBasePlate(0, 0, 3);
+        scene.world().showSection(util.select().everywhere(), Direction.DOWN);
+
+        scene.world().modifyBlockEntity(util.grid().at(1, 1, 1), FluidTankBlockEntity.class,
+                be -> be.getControllerBE().getTankInventory().fill(new FluidStack(AllFluids.CHOCOLATE, 5000), IFluidHandler.FluidAction.EXECUTE));
+        scene.idle(20);
+        scene.world().modifyBlockEntity(util.grid().at(2, 2, 2), FluidTankBlockEntity.class,
+                be -> be.getControllerBE().getTankInventory().fill(new FluidStack(AllFluids.CHOCOLATE, 5000), IFluidHandler.FluidAction.EXECUTE));
+        scene.idle(20);
+        scene.world().modifyBlockEntity(util.grid().at(0, 3, 0), FluidTankBlockEntity.class,
+                be -> be.getControllerBE().getTankInventory().fill(new FluidStack(AllFluids.CHOCOLATE, 5000), IFluidHandler.FluidAction.EXECUTE));
+        scene.idle(20);
+    }
+}