Skip to content

Fix limestone & scoria generation #1835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: mc1.20.1/fabric/dev
Choose a base branch
from
+16 −3
Open

Fix limestone & scoria generation #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/main/java/com/simibubi/create/AllFluids.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
import com.tterrag.registrate.fabric.SimpleFlowableFluid;
import com.tterrag.registrate.util.entry.FluidEntry;

import io.github.fabricators_of_create.porting_lib.fluids.FluidInteractionRegistry;

import io.github.fabricators_of_create.porting_lib.fluids.FluidInteractionRegistry.InteractionInformation;
import io.github.fabricators_of_create.porting_lib.fluids.PortingLibFluids;

import net.createmod.catnip.data.Iterate;
import net.createmod.catnip.nbt.NBTHelper;
import net.minecraft.core.BlockPos;
Expand Down Expand Up @@ -165,7 +170,15 @@ public static void initRendering() {
}

public static void registerFluidInteractions() {
// fabric: no fluid interaction API, use legacy method
FluidInteractionRegistry.addInteraction(PortingLibFluids.LAVA_TYPE, new InteractionInformation(
((level, currentPos, relativePos, currentState) -> level.getFluidState(relativePos).getType().isSame(HONEY.get())),
AllPaletteStoneTypes.LIMESTONE.getBaseBlock().get().defaultBlockState()
));
FluidInteractionRegistry.addInteraction(PortingLibFluids.LAVA_TYPE, new InteractionInformation(
((level, currentPos, relativePos, currentState) -> level.getFluidState(relativePos).getType().isSame(CHOCOLATE.get())),
AllPaletteStoneTypes.SCORIA.getBaseBlock().get().defaultBlockState()
));

FluidPlaceBlockCallback.EVENT.register(AllFluids::whenFluidsMeet);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/simibubi/create/content/kinetics/drill/CobbleGenOptimisation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static BlockState determineOutput(ServerLevel level, BlockPos pos, Cobble
FluidState fluidState = config.statesAroundDrill.get(i)
.getFluidState();
FluidType fluidType = fluidState.getFluidType();
if (!fluidType.isAir() && interactions.get(fluidType) != null)
if (fluidType != null && !fluidType.isAir() && interactions.get(fluidType) != null)
presentFluidTypes.put(fluidType, Pair.of(Iterate.directions[i], fluidState));
}

Expand Down Expand Up @@ -93,7 +93,7 @@ public static BlockState determineOutput(ServerLevel level, BlockPos pos, Cobble
ServerLevel owLevel = level.getServer().getLevel(Level.OVERWORLD);
if (owLevel == null)
owLevel = level;

if (cachedLevel == null || cachedLevel.getLevel() != owLevel)
cachedLevel = new CobbleGenLevel(level);

Expand Down