Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/main/java/net/limit/cubliminal/Cubliminal.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import net.limit.cubliminal.event.command.SanityCommand;
import net.limit.cubliminal.init.*;
import net.limit.cubliminal.event.noclip.NoclipDestination;
import net.limit.cubliminal.particle.CubliminalParticleTypes;
import net.limit.cubliminal.world.connection.ConnectionPlacementType;
import net.limit.cubliminal.world.connection.ConnectionRegistry;
import net.limit.cubliminal.world.room.RoomRegistry;
Expand Down Expand Up @@ -57,6 +58,9 @@ public void onInitialize() {
ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new ConnectionRegistry());

// Init Initers
CubliminalFluidTags.init();
CubliminalParticleTypes.init();
CubliminalFluids.initFluid();
Initer.initialise();

NoclipDestination.init();
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/net/limit/cubliminal/CubliminalClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientWorldEvents;
import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry;
import net.fabricmc.fabric.api.client.render.fluid.v1.SimpleFluidRenderHandler;
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
import net.limit.cubliminal.access.GameRendererAccessor;
import net.limit.cubliminal.block.fluid.CustomFluidBlock;
import net.limit.cubliminal.client.hud.SanityBarHudOverlay;
import net.limit.cubliminal.client.particle.CubliminalParticleManager;
import net.limit.cubliminal.client.render.FluxCapacitorRenderer;
import net.limit.cubliminal.client.render.ManilaGatewayRenderer;
import net.limit.cubliminal.client.render.UnlimitedStructureBlockRenderer;
Expand All @@ -24,6 +28,8 @@ public class CubliminalClient implements ClientModInitializer {

@Override
public void onInitializeClient() {
CubliminalParticleManager.init();

BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),
CubliminalBlocks.THE_LOBBY_GATEWAY_BLOCK,
CubliminalBlocks.EMERGENCY_EXIT_DOOR_0,
Expand All @@ -50,6 +56,19 @@ public void onInitializeClient() {
KeyInputHandler.registerKeyInputs();
EntityRendererRegistry.register(CubliminalEntities.SEAT_ENTITY, SeatRenderer::new);

for (CustomFluidBlock backroomFluidBlock : CustomFluidBlock.getAll()) {
FluidRenderHandlerRegistry.INSTANCE.register(
backroomFluidBlock.getFluid().getStill(),
backroomFluidBlock.getFluid().getFlowing(),
new SimpleFluidRenderHandler(
SimpleFluidRenderHandler.WATER_STILL,
SimpleFluidRenderHandler.WATER_FLOWING,
SimpleFluidRenderHandler.WATER_OVERLAY,
backroomFluidBlock.getColor(0)
)
);
}

// Init Initers
IniterClient.initialise();

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
package net.limit.cubliminal.block.entity;

import net.limit.cubliminal.block.state.pipeType.LargeHorizontalPipeTypes;
import net.limit.cubliminal.init.CubliminalBlockEntities;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.fluid.Fluid;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.network.listener.ClientPlayPacketListener;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
import net.minecraft.registry.Registries;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import org.jetbrains.annotations.Nullable;

public class PipeBlockEntity extends BlockEntity {
private Identifier fluidContainer;
private LargeHorizontalPipeTypes pipeVariety;
private int varietyID = 0;

public PipeBlockEntity(BlockPos pos, BlockState state) {
super(CubliminalBlockEntities.PIPE_BLOCK_ENTITY, pos, state);
}

public void setVarietyID(int id){
this.varietyID = id;
}

public void setPipeVariety(LargeHorizontalPipeTypes pipeVariety){
this.pipeVariety = pipeVariety;
}

public void setFluidContainer(Fluid fluid){
this.fluidContainer = Registries.FLUID.getId(fluid);
markDirty();
if (this.world != null && !this.world.isClient) {
this.world.updateListeners(pos, getCachedState(), getCachedState(), Block.NOTIFY_ALL);
}
}

public int getVarietyID(){
return this.varietyID;
}

public LargeHorizontalPipeTypes getPipeVariety(){
return this.pipeVariety;
}

public Fluid getFluidContainer(){
return Registries.FLUID.get(this.fluidContainer);
}

@Override
public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registries) {
super.readNbt(nbt, registries);
if (nbt.contains("fluid_container")){
this.fluidContainer = Identifier.of(nbt.getString("fluid_container"));
} else if (nbt.contains("variety")){
this.pipeVariety = LargeHorizontalPipeTypes.valueOf(nbt.getString("variety"));
} else if (nbt.contains("variety_id")){
this.varietyID = nbt.getInt("variety_id");
}
}

@Override
protected void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registries) {
super.writeNbt(nbt, registries);
if (this.fluidContainer != null){
nbt.putString("fluid_container",this.fluidContainer.toString());
} else if (this.pipeVariety != null){
nbt.putString("variety", this.pipeVariety.asString());
} else if (this.varietyID != 0){
nbt.putInt("variety_id", this.varietyID);
}
}

@Nullable
@Override
public Packet<ClientPlayPacketListener> toUpdatePacket() {
return BlockEntityUpdateS2CPacket.create(this);
}

@Override
public NbtCompound toInitialChunkDataNbt(RegistryWrapper.WrapperLookup registries) {
super.toInitialChunkDataNbt(registries);
NbtCompound nbt = new NbtCompound();
writeNbt(nbt, registries);
return nbt;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package net.limit.cubliminal.block.fluid;

import net.limit.cubliminal.init.CubliminalEffects;
import net.minecraft.block.AbstractBlock;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.fluid.FlowableFluid;
import net.minecraft.registry.Registries;

public class BlackSludgeFluidBlock extends CustomFluidBlock {
public BlackSludgeFluidBlock(FlowableFluid fluid, AbstractBlock.Settings settings, CustomFluidBlock.Settings fluidSettings) {
super(fluid, settings, fluidSettings);
}

@Override
protected StatusEffectInstance[] applyEffectsToEntities() {
super.applyEffectsToEntities();

return new StatusEffectInstance[]{
new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(CubliminalEffects.PARANOIA), 1800)
};
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package net.limit.cubliminal.block.fluid;

import net.minecraft.block.AbstractBlock;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.fluid.FlowableFluid;

public class ContaminatedWaterBlock extends CustomFluidBlock {
public ContaminatedWaterBlock(FlowableFluid fluid, AbstractBlock.Settings settings, CustomFluidBlock.Settings fluidSettings) {
super(fluid, settings, fluidSettings);
}

@Override
protected StatusEffectInstance[] applyEffectsToEntities() {
return new StatusEffectInstance[]{
new StatusEffectInstance(StatusEffects.NAUSEA, 600, 1),
new StatusEffectInstance(StatusEffects.POISON, 300, 1)
};
}
}
Loading