Skip to content

Commit

Permalink
Merge pull request #548 from Nxer/fix
Browse files Browse the repository at this point in the history 
fix Lightning Spire logic
  • Loading branch information
@Nxer
Nxer authored Jul 22, 2024
2 parents ce3b375 + c5028d6 commit ae21478
Show file tree
Hide file tree
Showing 7 changed files with 168 additions and 81 deletions.
211 changes: 136 additions & 75 deletions src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GTCM_LightningSpire.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,18 @@
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;

import org.jetbrains.annotations.NotNull;

import com.Nxer.TwistSpaceTechnology.common.machine.multiMachineClasses.TT_MultiMachineBase_EM;
import com.Nxer.TwistSpaceTechnology.common.misc.CheckRecipeResults.CheckRecipeResults;
import com.Nxer.TwistSpaceTechnology.common.misc.MachineShutDownReasons.SimpleShutDownReasons;
import com.Nxer.TwistSpaceTechnology.util.TextEnums;
import com.Nxer.TwistSpaceTechnology.util.TextLocalization;
import com.Nxer.TwistSpaceTechnology.util.rewrites.TST_ItemID;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
Expand Down Expand Up @@ -62,7 +67,6 @@
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.minecraft.FluidUtils;

public class GTCM_LightningSpire extends TT_MultiMachineBase_EM implements IConstructable, ISurvivalConstructable {

Expand All @@ -81,7 +85,7 @@ public GTCM_LightningSpire(String name) {
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GTCM_LightningSpire(this.mName);
}
// region end
// endregion

// region Structure
private static final String STRUCTURE_PIECE_MAIN = "STRUCTURE_PIECE_MAIN_LR";
Expand Down Expand Up @@ -138,7 +142,9 @@ public IStructureDefinition<GTCM_LightningSpire> getStructure_EM() {
@Override
public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
repairMachine();
return structureCheck_EM(STRUCTURE_PIECE_MAIN, hOffset, vOffset, dOffset);
if (!structureCheck_EM(STRUCTURE_PIECE_MAIN, hOffset, vOffset, dOffset)) return false;
setLightningPosition(getBaseMetaTileEntity().getFrontFacing());
return true;
}

@Override
Expand All @@ -160,9 +166,12 @@ public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBu
false,
true);
}
// region end
// endregion end

// region Process
public static final int CRYOTHEUM_CONSUMPTION = 128;
protected static Fluid MOLTEN_IRON;
protected static Fluid CRYOTHEUM;
List<ItemStack> mStored = new ArrayList<>();
private final int MAXRODS = 512;
private long tStored;
Expand All @@ -174,6 +183,19 @@ public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBu
private int aY;
private int aZ;

@Override
public void onFirstTick_EM(IGregTechTileEntity aBaseMetaTileEntity) {
if (aBaseMetaTileEntity.isServerSide()) {
if (null == MOLTEN_IRON) {
MOLTEN_IRON = Materials.Iron.getMolten(1)
.getFluid();
}
if (null == CRYOTHEUM) {
CRYOTHEUM = FluidRegistry.getFluid("cryotheum");
}
}
}

private void setLightningPosition(ForgeDirection face) {
aY = this.getBaseMetaTileEntity()
.getYCoord() + 21;
Expand Down Expand Up @@ -205,124 +227,156 @@ private void setLightningPosition(ForgeDirection face) {
}
}

protected void lightOnWorld() {
World world = getBaseMetaTileEntity().getWorld();
world.addWeatherEffect(new EntityLightningBolt(world, aX, aY, aZ));
}

@Override
@NotNull
public CheckRecipeResult checkProcessing_EM() {

if (OperatingMode == 0 && tRods > 0) {
List<FluidStack> tFluids = getStoredFluids();
// If no fluids input, return failed directly.
if (tFluids.isEmpty()) {
stopMachine(SimpleShutDownReasons.NoCorrectFluidInput);
return CheckRecipeResults.NoCorrectFluidInput;
}

int tCryotheum = 0;
List<FluidStack> cryotheums = new ArrayList<>();
int tMoltenIron = 0;
List<FluidStack> moltenIrons = new ArrayList<>();

// check fluids
for (FluidStack f : tFluids) {
if (null == f || f.amount < 1) continue;
if (f.getFluid() == CRYOTHEUM) {
tCryotheum += f.amount;
cryotheums.add(f);
} else if (f.getFluid() == MOLTEN_IRON) {
tMoltenIron += f.amount;
moltenIrons.add(f);
}
}

if (mRuntime % 256 == 0) {

List<FluidStack> tFluids = getStoredFluids();

World aWorld = this.getBaseMetaTileEntity()
.getWorld();

setLightningPosition(
this.getBaseMetaTileEntity()
.getFrontFacing());

for (FluidStack tFluid : tFluids) {
if (tFluid != null && tFluid.isFluidEqual(FluidUtils.getFluidStack("cryotheum", 1))) {
tCryotheum += tFluid.amount;
}
if (tFluid != null && tFluid.isFluidEqual(Materials.Iron.getMolten(1))) {
tMoltenIron += tFluid.amount;
int moltenIronConsumption = tRods * 72;
if (tCryotheum == CRYOTHEUM_CONSUMPTION && tMoltenIron == moltenIronConsumption) {
// consume cryotheum
int toConsume = CRYOTHEUM_CONSUMPTION;
for (FluidStack f : cryotheums) {
if (f.amount >= toConsume) {
f.amount -= toConsume;
break;
} else {
toConsume -= f.amount;
f.amount = 0;
}
}

if (tCryotheum == 128 && tMoltenIron == tRods * 72) {
depleteInput(FluidUtils.getFluidStack("cryotheum", 128));
depleteInput(Materials.Iron.getMolten(tMoltenIron));
tStored = Math.min(tStored + tProduct, tMaxStored);
aWorld.addWeatherEffect(new EntityLightningBolt(aWorld, aX, aY, aZ));
} else {
stopMachine();
return CheckRecipeResultRegistry.INTERNAL_ERROR;
// consume molten iron
toConsume = moltenIronConsumption;
for (FluidStack f : moltenIrons) {
if (f.amount >= toConsume) {
f.amount -= toConsume;
break;
} else {
toConsume -= f.amount;
f.amount = 0;
}
}
//

// add stored eu
tStored = Math.min(tStored + tProduct, tMaxStored);

// light animation
lightOnWorld();
} else {
// generating failed
stopMachine(SimpleShutDownReasons.NoCorrectFluidInput);
return CheckRecipeResults.NoCorrectFluidInput;
}
this.mEUt = 0;
this.mProgresstime = 1;
this.mMaxProgresstime = 1;

this.mMaxProgresstime = 256;
return CheckRecipeResultRegistry.GENERATING;
}

if (OperatingMode > 0) {
} else if (OperatingMode > 0) {

if (OperatingMode == 1 && tRods < MAXRODS) {
TST_ItemID LightningRod = TST_ItemID.createNoNBT(Machine_HV_LightningRod.get(1));
int canAdd = MAXRODS - tRods;
List<ItemStack> tInput = getStoredInputs();
if (tInput.isEmpty()) return CheckRecipeResultRegistry.NO_RECIPE;
for (ItemStack machine : tInput) {
if (machine.isItemEqual(Machine_HV_LightningRod.get(1))) {
if (MAXRODS - tRods >= 64) {
if (null == machine || machine.stackSize < 1) continue;
if (LightningRod.equalItemStack(machine)) {
if (canAdd > machine.stackSize) {
mStored.add(GT_Utility.copy(machine));
tRods += machine.stackSize;
canAdd -= machine.stackSize;
machine.stackSize = 0;
} else {
mStored.add(GT_Utility.copyAmount(MAXRODS - tRods, machine));
machine.stackSize -= MAXRODS - tRods;
machine.stackSize -= canAdd;
tRods = MAXRODS;
break;
}
}
}

tProduct = tRods * 28000000L;
tMaxStored = tRods * 280000000L;
this.mEUt = 0;
this.mMaxProgresstime = 1;
this.mMaxProgresstime = 20;
return CheckRecipeResultRegistry.SUCCESSFUL;
}

if (OperatingMode == 2 && tRods > 0 && tStored == 0) {
} else if (OperatingMode == 2 && tRods > 0 && tStored == 0) {
this.mOutputItems = mStored.toArray(new ItemStack[0]);
mStored.clear();
this.updateSlots();
tRods = 0;
tProduct = 0;
tMaxStored = 0;
this.mEUt = 0;
this.mMaxProgresstime = 1;
this.mMaxProgresstime = 20;
return CheckRecipeResultRegistry.SUCCESSFUL;
}
}
this.mEUt = 0;

return CheckRecipeResultRegistry.NO_RECIPE;
}

@Override
public boolean onRunningTick(ItemStack stack) {

// push eu to dynamo
for (GT_MetaTileEntity_Hatch_Dynamo eDynamo : super.mDynamoHatches) {
if (eDynamo == null || !eDynamo.isValid()) {
continue;
}
final long power = eDynamo.maxEUStore() - eDynamo.getEUVar();
if (tStored >= power) {
eDynamo.setEUVar(eDynamo.getEUVar() + power);
tStored -= power;
} else {
eDynamo.setEUVar(eDynamo.getEUVar() + tStored);
tStored = 0L;
if (tStored > 0) {
// push eu to dynamo
for (GT_MetaTileEntity_Hatch_Dynamo eDynamo : super.mDynamoHatches) {
if (eDynamo == null || !eDynamo.isValid()) {
continue;
}
final long power = eDynamo.maxEUStore() - eDynamo.getEUVar();
if (tStored >= power) {
eDynamo.setEUVar(eDynamo.getEUVar() + power);
tStored -= power;
} else {
eDynamo.setEUVar(eDynamo.getEUVar() + tStored);
tStored = 0L;
}
}
}

for (GT_MetaTileEntity_Hatch_DynamoMulti eDynamo : eDynamoMulti) {
if (eDynamo == null || !eDynamo.isValid()) {
continue;
}
final long power = eDynamo.maxEUStore() - eDynamo.getEUVar();
if (tStored >= power) {
eDynamo.setEUVar(eDynamo.getEUVar() + power);
tStored -= power;
} else {
eDynamo.setEUVar(eDynamo.getEUVar() + tStored);
tStored = 0L;
for (GT_MetaTileEntity_Hatch_DynamoMulti eDynamo : eDynamoMulti) {
if (eDynamo == null || !eDynamo.isValid()) {
continue;
}
final long power = eDynamo.maxEUStore() - eDynamo.getEUVar();
if (tStored >= power) {
eDynamo.setEUVar(eDynamo.getEUVar() + power);
tStored -= power;
} else {
eDynamo.setEUVar(eDynamo.getEUVar() + tStored);
tStored = 0L;
}
}
}
//

return true;
}

Expand Down Expand Up @@ -444,9 +498,16 @@ public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, f
this.OperatingMode = (this.OperatingMode + 1) % 3;
GT_Utility.sendChatToPlayer(
aPlayer,
StatCollector.translateToLocal(
"Lightning Spire is in" + (this.OperatingMode == 0 ? "Operate Mode"
: this.OperatingMode == 1 ? "Input Mode" : "Output Mode")));
// #tr LightningSpire.ModeMsg.0
// # Lightning Spire is in Operate Mode
// #zh_CN 闪电尖塔设置为发电模式
// #tr LightningSpire.ModeMsg.1
// # Lightning Spire is in Input Mode
// #zh_CN 闪电尖塔设置为输入模式
// #tr LightningSpire.ModeMsg.2
// # Lightning Spire is in Output Mode
// #zh_CN 闪电尖塔设置为输出模式
StatCollector.translateToLocal(TextEnums.tr("LightningSpire.ModeMsg." + OperatingMode)));
}
}

Expand Down
6 changes: 6 additions & 0 deletions ...java/com/Nxer/TwistSpaceTechnology/common/misc/CheckRecipeResults/CheckRecipeResults.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,10 @@ public final class CheckRecipeResults {
public static final CheckRecipeResult NoAnnihilationConstrainerInput = SimpleResultWithText
.ofFailure("CheckRecipeResult.NoAnnihilationConstrainerInput");

// #tr CheckRecipeResult.NoCorrectFluidInput
// # No Correct Fluid Input
// #zh_CN 没有正确的流体输入
public static final CheckRecipeResult NoCorrectFluidInput = SimpleResultWithText
.ofFailurePersistOnShutdown("CheckRecipeResult.NoCorrectFluidInput");

}
6 changes: 6 additions & 0 deletions ...m/Nxer/TwistSpaceTechnology/common/misc/MachineShutDownReasons/SimpleShutDownReasons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,10 @@ public final class SimpleShutDownReasons {
// #zh_CN 没有时空维护流体输入
public static final ShutDownReason NoSpaceTimeMaintenanceFluidInput = SimpleShutDownReason
.ofCritical("SimpleShutDownReasons.NoSpaceTimeMaintenanceFluidInput");

// #tr GT5U.gui.text.SimpleShutDownReasons.NoCorrectFluidInput
// # No Correct Fluid Input
// #zh_CN 没有正确的流体输入
public static final ShutDownReason NoCorrectFluidInput = SimpleShutDownReason
.ofCritical("SimpleShutDownReasons.NoCorrectFluidInput");
}
11 changes: 5 additions & 6 deletions src/main/java/com/Nxer/TwistSpaceTechnology/recipe/specialRecipe/DSPRecipePool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -736,12 +736,12 @@ public void loadRecipes() {

// region Strange Matter Aggregation
{
// spotless:off
GT_Values.RA.stdBuilder()
.itemInputs(
// first slot is the general input , amount is set by machine internal parameters
// #tr StrangeMatterAggregation.RecipeDescription.firstSlot
// # basic material, input from general input bus, actual amount is set by machine internal
// parameters
// # basic material, input from general input bus, actual amount is set by machine internal parameters
// #zh_CN 基础材料, 从通用输入总线输入, 实际数量与机器内部参数有关
addStringToStackName(
Antimatter.get(256),
Expand All @@ -762,8 +762,7 @@ public void loadRecipes() {
"// " + TextEnums.tr("StrangeMatterAggregation.RecipeDescription.thirdSlot")),
// fourth slot is consume same amount with output, can be saved by high tier structure
// #tr StrangeMatterAggregation.RecipeDescription.fourthSlot
// # auxiliary material, input from general input bus, consumed amount same as output amount,
// affected by structure
// # auxiliary material, input from general input bus, consumed amount same as output amount, affected by structure
// #zh_CN 辅助材料, 从通用输入总线输入, 消耗量等于产物数量, 受结构等级影响
addStringToStackName(
StellarConstructionFrameMaterial.get(1),
Expand Down Expand Up @@ -793,8 +792,7 @@ public void loadRecipes() {
Materials.Infinity.getMolten(Config.ByproductBaseAmount_T1_StrangeMatterAggregator),
ELEMENT.STANDALONE.HYPOGEN.getFluidStack(Config.ByproductBaseAmount_T1_StrangeMatterAggregator))
// #tr StrangeMatterAggregation.RecipeDescription.specialSlot
// # input from the right input bus, upgrades a portion of the product to T2 product, same ratio as the
// annihilation constrainer
// # input from the right input bus, upgrades a portion of the product to T2 product, same ratio as the annihilation constrainer
// #zh_CN 由右侧输入总线输入, 将一部分产物升级为2级产物, 比率与湮灭约束器相同
.special(
addStringToStackName(
Expand All @@ -804,6 +802,7 @@ public void loadRecipes() {
.eut(RECIPE_MAX)
.duration(20 * 120)
.addTo(GTCMRecipe.StrangeMatterAggregatorRecipes);
// spotless:on

GT_Values.RA.stdBuilder()
.itemInputs(
Expand Down
Loading

0 comments on commit ae21478

Please sign in to comment.