idk anymore 3

2023-10-28 22:44:13 +02:00
parent 6077e7543c
commit 77d95d2f4e
6 changed files with 225 additions and 35 deletions
--- a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java
+++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java
@@ -1,6 +1,9 @@
 package com.drmangotea.tfmg.blocks.engines.diesel;


+import com.drmangotea.tfmg.CreateTFMG;
+import com.drmangotea.tfmg.blocks.engines.diesel.engine_expansion.DieselEngineExpansionBlockEntity;
+import com.drmangotea.tfmg.registry.TFMGBlockEntities;
 import com.drmangotea.tfmg.registry.TFMGBlocks;
 import com.drmangotea.tfmg.registry.TFMGFluids;
 import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlockEntity;
@@ -10,6 +13,7 @@ import com.simibubi.create.content.kinetics.base.IRotate;
 import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
 import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity;
+import com.simibubi.create.content.kinetics.steamEngine.SteamEngineBlock;
 import com.simibubi.create.content.kinetics.steamEngine.SteamEngineValueBox;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
@@ -26,9 +30,12 @@ import net.minecraft.core.Direction.AxisDirection;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.block.Blocks;
+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;
+import net.minecraft.world.level.block.state.properties.AttachFace;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.phys.AABB;
 import net.minecraftforge.api.distmarker.Dist;
@@ -47,6 +54,9 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Optional;

+import static com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineBlock.FACE;
+import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING;
+
 public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation {

 	protected ScrollOptionBehaviour<WindmillBearingBlockEntity.RotationDirection> movementDirection;
@@ -58,11 +68,14 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 	protected FluidTank exhaustTank;

 	protected FluidTank airTank;
-	private boolean contentsChanged;
+
 	private int consumptionTimer=0;
 	public float engineStrength = 0;
 	private Couple<FluidTank> tanks;

+	public BlockPos expansionPos;
+
+	public DieselEngineExpansionBlockEntity expansionBE;


 	protected LazyOptional<CombinedTankWrapper> fluidCapability;
@@ -75,7 +88,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo



-		contentsChanged = true;
+
 		fuelTank = createInventory(TFMGFluids.DIESEL.getSource(),false);


@@ -114,9 +127,32 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 	@Override
 	public void tick() {
 		super.tick();
+		Direction direction;



+			if(getBlockState().getValue(FACE)==AttachFace.WALL)
+				expansionPos = this.getBlockPos().relative(getBlockState().getValue(FACING).getOpposite());
+		if(getBlockState().getValue(FACE)==AttachFace.CEILING)
+			expansionPos = this.getBlockPos().above();
+		if(getBlockState().getValue(FACE)==AttachFace.FLOOR)
+			expansionPos = this.getBlockPos().below();
+
+
+
+
+		if(expansionBE == null){
+			if(level.getBlockEntity(expansionPos) instanceof DieselEngineExpansionBlockEntity
+			){
+				//if(direction==level.getBlockEntity(expansionPos).getBlockState().getValue(DirectionalBlock.FACING)) {
+					expansionBE = (DieselEngineExpansionBlockEntity) level.getBlockEntity(expansionPos);
+				//}else expansionBE = null;
+			}else expansionBE = null;
+		}
+		if(expansionBE!=null)
+			if(!(expansionBE instanceof DieselEngineExpansionBlockEntity))
+				expansionBE = null;
+
 		PoweredShaftBlockEntity shaft = getShaft();

 		if ( shaft == null) {
@@ -135,8 +171,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 				shaft.update(worldPosition, 0, 0);
 			return;
 		}
-		if(!level.isClientSide)
-			engineProcess();
+
 		boolean verticalTarget = false;
 		BlockState shaftState = shaft.getBlockState();
 		Axis targetAxis = Axis.X;
@@ -151,7 +186,9 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 		if (facing.getAxis() == Axis.Y)
 			facing = blockState.getValue(DieselEngineBlock.FACING);

-
+		if(!level.isClientSide)
+			if(getShaft() != null)
+				engineProcess(targetAxis,verticalTarget);

 		int conveyedSpeedLevel =
 			engineStrength == 0 ? 1 : verticalTarget ? 1 : (int) GeneratingKineticBlockEntity.convertToDirection(1, facing)*2;
@@ -168,7 +205,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 			conveyedSpeedLevel *= -1;
 		}

-		shaft.update(worldPosition, conveyedSpeedLevel, engineStrength);
+		shaft.update(worldPosition,  conveyedSpeedLevel, engineStrength);
 		DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::makeSound);
 	}
 	@OnlyIn(Dist.CLIENT)
@@ -205,42 +242,112 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 		prevAngle = angle;
 	}

+	public int getConveyedSpeedLevel(float strength,Axis targetAxis, boolean verticalTarget){
+		Direction facing = SteamEngineBlock.getFacing(getBlockState());
+		PoweredShaftBlockEntity shaft = getShaft();
+		int conveyedSpeedLevel =
+				engineStrength == 0 ? 1 : verticalTarget ? 1 : (int) GeneratingKineticBlockEntity.convertToDirection(1, facing)*2;
+		if (targetAxis == Axis.Z)
+			conveyedSpeedLevel *= -1;
+		if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE)
+			conveyedSpeedLevel *= -1;


-	private void engineProcess() {
+		float shaftSpeed = shaft.getTheoreticalSpeed();
+		if (shaft.hasSource() && shaftSpeed != 0 && conveyedSpeedLevel != 0
+				&& (shaftSpeed > 0) != (conveyedSpeedLevel > 0)) {
+			movementDirection.setValue(1 - movementDirection.get()
+					.ordinal());
+			conveyedSpeedLevel *= -1;
+		}
+
+		return conveyedSpeedLevel;
+	}
+
+	private void engineProcess(Axis targetAxis, boolean verticalTarget) {
+		PoweredShaftBlockEntity shaft = getShaft();
 		if(tanks.get(true).isEmpty()||tanks.get(true).isEmpty()) {
 			engineStrength=0;
+
+			shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength);
 			return;
 		}
+
+		if(expansionBE != null){
+			if(airTank.isEmpty()&&expansionBE.airTank.isEmpty()){
+				engineStrength = 0;
+				shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength);
+				return;
+			}
+		}else
 		if(airTank.isEmpty()){
 			engineStrength = 0;
+			shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength);
 			return;
 		}

 		if(tanks.get(false).getFluidAmount()+5>1000) {
 			engineStrength = 0;
+			shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength);
 			return;
 		}
-		if(tanks.get(true).getFluid().getFluid().isSame(TFMGFluids.DIESEL.getSource())) {



-		if(consumptionTimer>=10) {
+
+		if(consumptionTimer>=5) {
 			//if(signal!=0)
-				fuelTank.setFluid(new FluidStack(TFMGFluids.DIESEL.getSource(),fuelTank.getFluidAmount()-1));
-			consumptionTimer=0;
+			int fuelModifier = 0;
+				if(expansionBE!=null)
+					if(!expansionBE.coolantTank.isEmpty())
+						fuelModifier = 1;
+
+
+				fuelTank.setFluid(new FluidStack(TFMGFluids.DIESEL.getSource(),fuelTank.getFluidAmount()-(2-fuelModifier)));
+
+
 		}
 				//airTank.drain(1, IFluidHandler.FluidAction.EXECUTE);
-
-				airTank.setFluid(new FluidStack(TFMGFluids.AIR.getSource(),airTank.getFluidAmount()-5));
-				exhaustTank.fill(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(),3), IFluidHandler.FluidAction.EXECUTE);
+			if(!airTank.isEmpty()) {
+				airTank.setFluid(new FluidStack(TFMGFluids.AIR.getSource(), airTank.getFluidAmount() - 5));
+			}else expansionBE.airTank.setFluid(new FluidStack(TFMGFluids.AIR.getSource(), expansionBE.airTank.getFluidAmount() - 5));
+			exhaustTank.fill(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(),3), IFluidHandler.FluidAction.EXECUTE);
 				//tanks.get(false).setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(), tanks.get(false).getFluidAmount()+1));

+
+
+		int strengthModifier = 0;
+
+		if(expansionBE !=null) {
+			if (!expansionBE.coolantTank.isEmpty()){
+				strengthModifier +=3;
+				if(consumptionTimer>5)
+					expansionBE.coolantTank.setFluid(new FluidStack(TFMGFluids.COOLING_FLUID.getSource(), expansionBE.coolantTank.getFluidAmount() - 1));
+			}
+			if (!expansionBE.lubricationOilTank.isEmpty()){
+				strengthModifier +=5;
+				if(consumptionTimer>5)
+					expansionBE.lubricationOilTank.setFluid(new FluidStack(TFMGFluids.LUBRICATION_OIL.getSource(), expansionBE.lubricationOilTank.getFluidAmount() - 1));
+
+			}
+		}
+
+		if(!(level.getBlockState(expansionPos).is(TFMGBlocks.DIESEL_ENGINE_EXPANSION.get()))){
+			strengthModifier =0;
+		}
+
+
+		if(consumptionTimer>5)
+			consumptionTimer=0;
+
 		consumptionTimer++;

-		engineStrength=40;
+		engineStrength=40+strengthModifier;
+			shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength);
+			sendData();
+			setChanged();
+

-	}

 	}

@@ -385,6 +492,12 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo



+		Lang.translate("goggles.blast_furnace.height", engineStrength)
+				.style(ChatFormatting.DARK_PURPLE)
+				.forGoggles(tooltip, 1);
+
+
+
 		//--Fluid Info--//
 		LazyOptional<IFluidHandler> handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
 		Optional<IFluidHandler> resolve = handler.resolve();
--- a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java
+++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java
@@ -134,7 +134,7 @@ public class DieselEngineInstance extends BlockEntityInstance<DieselEngineBlockE
 	public void updateLight() {

 		BlockPos inFront = pos.above(10);
-		relight(inFront, piston, linkage, connector);
+		relight(pos, piston, linkage, connector);
 	}

 	@Override
--- a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/engine_expansion/DieselEngineExpansionBlockEntity.java
+++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/engine_expansion/DieselEngineExpansionBlockEntity.java
@@ -6,9 +6,13 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
 import com.simibubi.create.foundation.fluid.SmartFluidTank;
+import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.foundation.utility.LangBuilder;
+import net.minecraft.ChatFormatting;
 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.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Fluid;
@@ -22,13 +26,14 @@ import net.minecraftforge.fluids.capability.templates.FluidTank;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.List;
+import java.util.Optional;

 public class DieselEngineExpansionBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation {

    protected LazyOptional<IFluidHandler> fluidCapability;
-    protected FluidTank coolantTank;
-    protected FluidTank lubricationOilTank;
-    protected FluidTank airTank;
+    public FluidTank coolantTank;
+    public FluidTank lubricationOilTank;
+    public FluidTank airTank;



@@ -98,4 +103,69 @@ public class DieselEngineExpansionBlockEntity extends SmartBlockEntity implement
            }
        };
    }
+
+
+    @Override
+    @SuppressWarnings("removal")
+    public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
+
+
+
+        //--Fluid Info--//
+        LazyOptional<IFluidHandler> handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
+        Optional<IFluidHandler> resolve = handler.resolve();
+        if (!resolve.isPresent())
+            return false;
+
+        IFluidHandler tank = resolve.get();
+        if (tank.getTanks() == 0)
+            return false;
+
+        LangBuilder mb = Lang.translate("generic.unit.millibuckets");
+        Lang.translate("goggles.diesel_engine_info")
+                .style(ChatFormatting.GRAY)
+                .forGoggles(tooltip);
+
+        boolean isEmpty = true;
+        for (int i = 0; i < tank.getTanks(); i++) {
+            FluidStack fluidStack = tank.getFluidInTank(i);
+            if (fluidStack.isEmpty())
+                continue;
+
+            Lang.fluidName(fluidStack)
+                    .style(ChatFormatting.GRAY)
+                    .forGoggles(tooltip, 1);
+
+            Lang.builder()
+                    .add(Lang.number(fluidStack.getAmount())
+                            .add(mb)
+                            .style(ChatFormatting.DARK_GREEN))
+                    .text(ChatFormatting.GRAY, " / ")
+                    .add(Lang.number(tank.getTankCapacity(i))
+                            .add(mb)
+                            .style(ChatFormatting.DARK_GRAY))
+                    .forGoggles(tooltip, 1);
+
+            isEmpty = false;
+        }
+
+        if (tank.getTanks() > 1) {
+            if (isEmpty)
+                tooltip.remove(tooltip.size() - 1);
+            return true;
+        }
+
+        if (!isEmpty)
+            return true;
+
+        Lang.translate("gui.goggles.fluid_container.capacity")
+                .add(Lang.number(tank.getTankCapacity(0))
+                        .add(mb)
+                        .style(ChatFormatting.DARK_GREEN))
+                .style(ChatFormatting.DARK_GRAY)
+                .forGoggles(tooltip, 1);
+
+
+        return true;
+    }
 }
--- a/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java
+++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java
@@ -76,7 +76,7 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha
        super.tick();

    //if(!level.isClientSide) {
-        int production = ((int) maxShaftSpeed * ((diameter * diameter))) / 60;
+        int production = ((int) maxShaftSpeed * ((diameter * diameter))) / 40;
        if (tankInventory.getFluidAmount() + production <= tankInventory.getCapacity()) {
            //tankInventory.fill(new FluidStack(TFMGFluids.AIR.getSource(), production), IFluidHandler.FluidAction.EXECUTE);
            tankInventory.setFluid(new FluidStack(TFMGFluids.AIR.getSource(), production + tankInventory.getFluidAmount()));
--- a/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeInstance.java
+++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeInstance.java
@@ -12,6 +12,7 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
 import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 import com.simibubi.create.foundation.utility.AngleHelper;
+import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.util.Mth;
@@ -150,7 +151,6 @@ public class AirIntakeInstance extends KineticBlockEntityInstance<AirIntakeBlock



-
        PoseStack msFan = new PoseStack();
        TransformStack msrFan = TransformStack.cast(msFan);
        msrFan.translate(getInstancePosition());
@@ -182,21 +182,33 @@ public class AirIntakeInstance extends KineticBlockEntityInstance<AirIntakeBlock
            msrFanMedium.translate(0.5,0,0.5);
            msrFan.translate(1,0,1);
        }
+        //
+        float time = AnimationTickHolder.getRenderTime(world);
+        float speed = blockEntity.maxShaftSpeed * 2;
+        if (speed > 0)
+            speed = Mth.clamp(speed, 80, 64 * 20);
+        if (speed < 0)
+            speed = Mth.clamp(speed, -64 * 20, -80);
+        float angle = (time * speed * 3 / 10f) % 360;
+        //
+        angle = angle / 180f * (float) Math.PI;
        msrFan.centre();
        msrFanMedium.centre();
-        // msrFan.translateY(3);
-        //msrFan.translateY(5);
-        msrFan.rotate((double) blockEntity.angle,direction.getAxis());
-        msrFanMedium.rotate((double) blockEntity.angle,direction.getAxis());
-        //msrFan.translateY(-5);
-        //  msrFan.translateX(-1);
+        msrFan.rotate(direction,angle);
+        msrFanMedium.rotate(direction,angle);
        msrFan.unCentre();
        msrFanMedium.unCentre();




+        if(blockEntity.isUsedByController) {
+            //updateRotation(fan_medium, getFanSpeed());
+            fan_medium.setEmptyTransform();
+            fan.delete();
+            fan_large.setEmptyTransform();

+        }
        if(!blockEntity.isUsedByController) {
            if(blockEntity.diameter ==1) {
                  updateRotation(fan, getFanSpeed());
@@ -210,13 +222,7 @@ public class AirIntakeInstance extends KineticBlockEntityInstance<AirIntakeBlock
                fan_large.setEmptyTransform();

            }
-            if(blockEntity.isUsedByController) {
-                //updateRotation(fan_medium, getFanSpeed());
-                fan_medium.setEmptyTransform();
-                fan.delete();
-                fan_large.setEmptyTransform();

-            }
            if(blockEntity.diameter ==3) {

                fan_large.setTransform(msFan);
--- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java
+++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java
@@ -742,6 +742,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                    .properties(p -> p.color(MaterialColor.COLOR_GRAY))
                    .tag(AllTags.AllBlockTags.SAFE_NBT.tag)
                    .properties(BlockBehaviour.Properties::noOcclusion)
+                    .addLayer(() -> RenderType::cutoutMipped)
                    .transform(pickaxeOnly())
                    .blockstate(new EngineGenerator()::generate)
                    .transform(BlockStressDefaults.setCapacity(66.0))
@@ -773,7 +774,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                    .initialProperties(SharedProperties::copperMetal)
                    .transform(pickaxeOnly())
                    .blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.partialBaseModel(c, p)))
-                    .transform(BlockStressDefaults.setCapacity(15.0))
+                    .transform(BlockStressDefaults.setCapacity(16.0))
                    .transform(BlockStressDefaults.setGeneratorSpeed(DieselEngineBlock::getSpeedRange))
                    .item()
                    .transform(customItemModel())