From a534e865f196f4e5811b77a6ebf25c11c5e8b0f2 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Wed, 25 Oct 2023 15:02:32 +0200 Subject: [PATCH] engine fixes --- .../tfmg/blocks/engines/small/EngineBackBlockEntity.java | 9 +++++---- .../tfmg/blocks/engines/small/EngineBlock.java | 7 ++++--- .../engines/small/gasoline/GasolineEngineGenerator.java | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackBlockEntity.java index c24c2206..a8805d9c 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackBlockEntity.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.blocks.engines.small; -import com.drmangotea.createindustry.content.oil.exhaust.ExhaustBlock; -import com.drmangotea.createindustry.registry.CIFluids; + +import com.drmangotea.tfmg.registry.TFMGFluids; import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; @@ -13,6 +13,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; +import net.minecraft.world.level.block.DirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; @@ -133,7 +134,7 @@ import java.util.Optional; return new SmartFluidTank(1000, this::onFluidStackChanged){ @Override public boolean isFluidValid(FluidStack stack) { - return stack.getFluid().isSame(CIFluids.CARBON_DIOXIDE.getSource()); + return stack.getFluid().isSame(TFMGFluids.CARBON_DIOXIDE.getSource()); } }; } @@ -142,7 +143,7 @@ import java.util.Optional; sendData(); } public BlockEntity getFrontPart(){ - Direction direction = this.getBlockState().getValue(ExhaustBlock.FACING); + Direction direction = this.getBlockState().getValue(DirectionalBlock.FACING); if(direction == Direction.UP) return level.getBlockEntity(this.getBlockPos().above()); diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBlock.java index 93561cf4..3abcdfbd 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBlock.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBlock.java @@ -1,7 +1,8 @@ package com.drmangotea.tfmg.blocks.engines.small; -import com.drmangotea.createindustry.registry.CIShapes; + +import com.drmangotea.tfmg.registry.TFMGShapes; import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -34,9 +35,9 @@ abstract public class EngineBlock extends DirectionalKineticBlock { public VoxelShape getShape(BlockState pState, BlockGetter worldIn, BlockPos pos, CollisionContext context) { if(pState.getValue(FACING).getAxis()==Axis.Y) { - return CIShapes.ENGINE_VERTICAL.get(pState.getValue(FACING)); + return TFMGShapes.ENGINE_VERTICAL.get(pState.getValue(FACING)); }else - return CIShapes.ENGINE.get(pState.getValue(FACING)); + return TFMGShapes.ENGINE.get(pState.getValue(FACING)); } diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineGenerator.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineGenerator.java index c0b80203..58f41ced 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineGenerator.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineGenerator.java @@ -1,6 +1,7 @@ package com.drmangotea.tfmg.blocks.engines.small.gasoline; -import com.drmangotea.createindustry.content.blocks.engines.EngineBlock; + +import com.drmangotea.tfmg.blocks.engines.small.EngineBlock; import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext;