Skip to content

Commit

Permalink
Merge branch 'refactor-al-recipes' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@serenibyss
serenibyss committed Feb 7, 2025
2 parents c751e25 + 44ac271 commit 27075c7
Show file tree
Hide file tree
Showing 16 changed files with 534 additions and 899 deletions.
180 changes: 71 additions & 109 deletions src/main/java/ggfab/mte/MTEAdvAssLine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@
import java.util.Set;
import java.util.stream.IntStream;

import javax.annotation.Nonnull;

import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagInt;
Expand Down Expand Up @@ -70,7 +71,6 @@
import ggfab.mui.ClickableTextWidget;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.VoidingMode;
import gregtech.api.interfaces.IHatchElement;
import gregtech.api.interfaces.ITexture;
Expand All @@ -89,6 +89,7 @@
import gregtech.api.render.TextureFactory;
import gregtech.api.util.AssemblyLineUtils;
import gregtech.api.util.GTRecipe;
import gregtech.api.util.GTRecipe.RecipeAssemblyLine;
import gregtech.api.util.GTUtility;
import gregtech.api.util.GTWaila;
import gregtech.api.util.IGTHatchAdder;
Expand All @@ -107,13 +108,15 @@
*/
public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine> implements ISurvivalConstructable {

private static final ItemStack NOT_CHECKED = new ItemStack(Blocks.dirt);
public static final double LASER_OVERCLOCK_PENALTY_FACTOR = ConfigurationHandler.laserOCPenaltyFactor;
private static final String STRUCTURE_PIECE_FIRST = "first";
private static final String STRUCTURE_PIECE_LATER = "later";
private static final String STRUCTURE_PIECE_LAST = "last";
public static final String TAG_KEY_CURRENT_STICK = "mCurrentStick";
public static final String TAG_KEY_CURRENT_RECIPE = "mCurrentRecipe";
public static final String TAG_KEY_RECIPE_HASH = "mRecipeHash";
public static final String TAG_KEY_PROGRESS_TIMES = "mProgressTimeArray";

private static final IStructureDefinition<MTEAdvAssLine> STRUCTURE_DEFINITION = StructureDefinition
.<MTEAdvAssLine>builder()
// @formatter:off
Expand Down Expand Up @@ -184,7 +187,6 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine>
.addElement('i', InputBus.newAny(16, 5, ForgeDirection.DOWN))
.addElement('o', OutputBus.newAny(16, 4, ForgeDirection.DOWN))
.build();
private ItemStack currentStick;
private GTRecipe.RecipeAssemblyLine currentRecipe;
private final Slice[] slices = IntStream.range(0, 16)
.mapToObj(Slice::new)
Expand Down Expand Up @@ -339,15 +341,13 @@ protected MultiblockTooltipBuilder createTooltip() {
return tt;
}

private void setCurrentRecipe(ItemStack stick, GTRecipe.RecipeAssemblyLine recipe) {
private void setCurrentRecipe(RecipeAssemblyLine recipe) {
currentRecipe = recipe;
currentStick = stick;
currentInputLength = recipe.mInputs.length;
}

private void clearCurrentRecipe() {
currentRecipe = null;
currentStick = null;
currentInputLength = -1;
currentRecipeParallel = 1;
stuck = false;
Expand All @@ -366,9 +366,9 @@ public void saveNBTData(NBTTagCompound aNBT) {
// we need to check for active here.
// if machine was turned off via soft mallet it will not call checkRecipe() on recipe end
// in that case we don't have a current recipe, so this should be ignored
if (getBaseMetaTileEntity().isActive() && GTUtility.isStackValid(currentStick)) {
aNBT.setTag(TAG_KEY_CURRENT_STICK, currentStick.writeToNBT(new NBTTagCompound()));
aNBT.setInteger("mRecipeHash", currentRecipe.getPersistentHash());
if (getBaseMetaTileEntity().isActive()) {
aNBT.setTag(TAG_KEY_CURRENT_RECIPE, AssemblyLineUtils.saveRecipe(currentRecipe));
aNBT.setInteger(TAG_KEY_RECIPE_HASH, currentRecipe.getPersistentHash());
aNBT.setIntArray(
TAG_KEY_PROGRESS_TIMES,
Arrays.stream(slices)
Expand All @@ -387,49 +387,56 @@ public void saveNBTData(NBTTagCompound aNBT) {
public void loadNBTData(NBTTagCompound aNBT) {
super.loadNBTData(aNBT);
lastStopReason = aNBT.getString("lastStop");
ItemStack loadedStack = null;
GTRecipe.RecipeAssemblyLine recipe = null;

if (aNBT.hasKey(TAG_KEY_PROGRESS_TIMES, Constants.NBT.TAG_INT_ARRAY)) {
int[] arr = aNBT.getIntArray(TAG_KEY_PROGRESS_TIMES);
for (int i = 0; i < slices.length; i++) {
if (i < arr.length) {
slices[i].progress = arr[i];
if (arr[i] == 0)
if (arr[i] == 0) {
// this will be synced to client by first MTE packet to client
stuck = true;
} else slices[i].reset();
}
} else {
slices[i].reset();
}
}
}
if (aNBT.hasKey(TAG_KEY_CURRENT_STICK, Constants.NBT.TAG_COMPOUND)) {
loadedStack = ItemStack.loadItemStackFromNBT(aNBT.getCompoundTag(TAG_KEY_CURRENT_STICK));
AssemblyLineUtils.LookupResult lookupResult = AssemblyLineUtils
.findAssemblyLineRecipeFromDataStick(loadedStack, false);
switch (lookupResult.getType()) {
case VALID_STACK_AND_VALID_HASH:
recipe = lookupResult.getRecipe();
stuck = aNBT.getBoolean("stuck");
inputVoltage = aNBT.getLong("inputV");
inputEUt = aNBT.getLong("inputEU");
baseEUt = aNBT.getLong("baseEU");
currentRecipeParallel = aNBT.getInteger("currentParallel");
if (inputVoltage <= 0 || inputEUt <= 0 || baseEUt >= 0) {
criticalStopMachine("ggfab.gui.advassline.shutdown.load.energy");
loadedStack = null;
recipe = null;
}
break;
case VALID_STACK_AND_VALID_RECIPE:
// recipe is there, but it has been changed. to prevent issues, abort the current recipe
// TODO finish the last recipe instead of aborting
default:
// recipe is gone. to prevent issues, abort the current recipe

RecipeAssemblyLine recipe = null;

if (aNBT.hasKey(TAG_KEY_CURRENT_RECIPE, Constants.NBT.TAG_COMPOUND)) {
recipe = AssemblyLineUtils
.assertSingleRecipe(AssemblyLineUtils.loadRecipe(aNBT.getCompoundTag(TAG_KEY_CURRENT_RECIPE)));
} else if (aNBT.hasKey(TAG_KEY_CURRENT_STICK, Constants.NBT.TAG_COMPOUND)) {
recipe = AssemblyLineUtils.assertSingleRecipe(
AssemblyLineUtils.findALRecipeFromDataStick(
ItemStack.loadItemStackFromNBT(aNBT.getCompoundTag(TAG_KEY_CURRENT_STICK))));
}

if (recipe != null) {
stuck = aNBT.getBoolean("stuck");
inputVoltage = aNBT.getLong("inputV");
inputEUt = aNBT.getLong("inputEU");
baseEUt = aNBT.getLong("baseEU");
currentRecipeParallel = aNBT.getInteger("currentParallel");
if (inputVoltage <= 0 || inputEUt <= 0 || baseEUt >= 0) {
criticalStopMachine("ggfab.gui.advassline.shutdown.load.energy");
recipe = null;
}
if (recipe != null && aNBT.hasKey(TAG_KEY_RECIPE_HASH, Constants.NBT.TAG_INT)) {
if (aNBT.getInteger(TAG_KEY_RECIPE_HASH) != recipe.getPersistentHash()) {
criticalStopMachine("ggfab.gui.advassline.shutdown.load.recipe");
loadedStack = null;
break;
recipe = null;
}
}
}
if (loadedStack == null || recipe == null) clearCurrentRecipe();
else setCurrentRecipe(loadedStack, recipe);

if (recipe == null) {
clearCurrentRecipe();
} else {
setCurrentRecipe(recipe);
}
}

/**
Expand Down Expand Up @@ -647,42 +654,6 @@ private FluidStack getInputHatchContent(int index) {
return inputHatch.getFillableStack();
}

private GTRecipe.RecipeAssemblyLine findRecipe(ItemStack tDataStick) {
AssemblyLineUtils.LookupResult tLookupResult = AssemblyLineUtils
.findAssemblyLineRecipeFromDataStick(tDataStick, false);

if (tLookupResult.getType() == AssemblyLineUtils.LookupResultType.INVALID_STICK) return null;

GTRecipe.RecipeAssemblyLine tRecipe = tLookupResult.getRecipe();
// Check if the recipe on the data stick is the current recipe for it's given output, if not we update it
// and continue to next.
if (tLookupResult.getType() != AssemblyLineUtils.LookupResultType.VALID_STACK_AND_VALID_HASH) {
tRecipe = AssemblyLineUtils.processDataStick(tDataStick);
if (tRecipe == null) {
return null;
}
}

// So here we check against the recipe found on the data stick.
// If we run into missing buses/hatches or bad inputs, we go to the next data stick.
// This check only happens if we have a valid up-to-date data stick.

// Check item Inputs align. For this we do not need to consider batch mode parallels yet, this will be done
// later on during recipe start.
if (!hasAllItems(tRecipe, 1)) return null;

// Check Fluid Inputs align. Again, do not consider parallels
if (!hasAllFluids(tRecipe, 1)) return null;

if (GTValues.D1) {
GT_FML_LOGGER.info("Check overclock");
}
if (GTValues.D1) {
GT_FML_LOGGER.info("Find available recipe");
}
return tRecipe;
}

private int maxParallelCalculatedByInputItems(GTRecipe.RecipeAssemblyLine tRecipe, int maxParallel) {
int aItemCount = tRecipe.mInputs.length;
if (mInputBusses.size() < aItemCount) return 0;
Expand All @@ -709,54 +680,45 @@ private boolean hasAllFluids(GTRecipe.RecipeAssemblyLine tRecipe, int parallel)
return maxParallelCalculatedByInputFluids(tRecipe, parallel) >= parallel;
}

/**
* @param state using bitmask, 1 for IntegratedCircuit, 2 for DataStick, 4 for DataOrb
*/
private boolean isCorrectDataItem(ItemStack aStack, int state) {
if ((state & 1) != 0 && ItemList.Circuit_Integrated.isStackEqual(aStack, true, true)) return true;
if ((state & 2) != 0 && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) return true;
return (state & 4) != 0 && ItemList.Tool_DataOrb.isStackEqual(aStack, false, true);
}

/**
* @param state using bitmask, 1 for IntegratedCircuit, 2 for DataStick, 4 for DataOrb
*/
public ArrayList<ItemStack> getDataItems(int state) {
ArrayList<ItemStack> rList = new ArrayList<>();
if (GTUtility.isStackValid(mInventory[1]) && isCorrectDataItem(mInventory[1], state)) {
rList.add(mInventory[1]);
}
for (MTEHatchDataAccess tHatch : validMTEList(mDataAccessHatches)) {
rList.addAll(tHatch.getInventoryItems(stack -> isCorrectDataItem(stack, state)));
}
return rList;
}

// this is only called when all slices have finished their work
// and the first slice cannot find a input/fluid cannot be found
// so we are safe to assume the old recipe no longer works
@Override
@NotNull
public CheckRecipeResult checkProcessing() {
public @Nonnull CheckRecipeResult checkProcessing() {
if (GTValues.D1) {
GT_FML_LOGGER.info("Start Adv ALine recipe check");
}
clearCurrentRecipe();
CheckRecipeResult result = CheckRecipeResultRegistry.NO_DATA_STICKS;
ArrayList<ItemStack> tDataStickList = getDataItems(2);
if (tDataStickList.isEmpty()) {

ArrayList<RecipeAssemblyLine> availableRecipes = new ArrayList<>();

for (MTEHatchDataAccess dataAccess : validMTEList(mDataAccessHatches)) {
availableRecipes.addAll(dataAccess.getAssemblyLineRecipes());
}

if (availableRecipes.isEmpty()) {
return result;
}

if (GTValues.D1) {
GT_FML_LOGGER.info("Stick accepted, " + tDataStickList.size() + " Data Sticks found");
GT_FML_LOGGER.info("Stick accepted, " + availableRecipes.size() + " Data Sticks found");
}

for (ItemStack stack : tDataStickList) {
GTRecipe.RecipeAssemblyLine recipe = findRecipe(stack);
if (recipe == null) {
for (RecipeAssemblyLine recipe : availableRecipes) {
// Check item Inputs align. For this we do not need to consider batch mode parallels yet, this will be done
// later on during recipe start.
if (!hasAllItems(recipe, 1)) {
if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
continue;
}

// Check Fluid Inputs align. Again, do not consider parallels
if (!hasAllFluids(recipe, 1)) {
if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
continue;
}

if (recipe.mEUt > inputVoltage) {
result = CheckRecipeResultRegistry.insufficientPower(recipe.mEUt);
continue;
Expand Down Expand Up @@ -853,7 +815,7 @@ public CheckRecipeResult checkProcessing() {
currentRecipeParallel = (int) (currentParallelBeforeBatchMode * batchMultiplierMax);
lEUt = calculator.getConsumption();
mMaxProgresstime = (int) (calculator.getDuration() * batchMultiplierMax) * recipe.mInputs.length;
setCurrentRecipe(stack, recipe);
setCurrentRecipe(recipe);
result = CheckRecipeResultRegistry.SUCCESSFUL;
break;
}
Expand Down
Loading

0 comments on commit 27075c7

Please sign in to comment.