Skip to content

Commit

Permalink
large DT compat with gt 2.8.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@TechLord22
TechLord22 committed Jul 6, 2024
1 parent 8bc35ec commit 9dee95f
Show file tree
Hide file tree
Showing 2 changed files with 220 additions and 27 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,7 @@
* Compat with GTCEu 2.8.9
* Now respects GTCEu's casings per craft config (#68)
* No longer requires Gregification to automatically support the "electric_sieve" recipemap (#65)

## v1.2.10

* Fixed errors JEI preview for the Large Fractionating Distillery
243 changes: 216 additions & 27 deletions ...ultiblocks/common/metatileentities/multiblock/standard/MetaTileEntityLargeDistillery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,69 @@

import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;

import net.minecraft.block.state.IBlockState;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.IItemHandlerModifiable;

import org.jetbrains.annotations.NotNull;

import com.cleanroommc.modularui.utils.FluidTankHandler;

import gregtech.api.capability.IMultipleTankHandler;
import gregtech.api.capability.impl.FluidTankList;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart;
import gregtech.api.metatileentity.multiblock.IMultiblockPart;
import gregtech.api.metatileentity.multiblock.MultiblockAbility;
import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
import gregtech.api.pattern.BlockPattern;
import gregtech.api.pattern.FactoryBlockPattern;
import gregtech.api.pattern.PatternMatchContext;
import gregtech.api.pattern.TraceabilityPredicate;
import gregtech.api.recipes.Recipe;
import gregtech.api.recipes.RecipeMap;
import gregtech.api.recipes.RecipeMaps;
import gregtech.api.util.*;
import gregtech.client.renderer.ICubeRenderer;
import gregtech.client.renderer.texture.cube.OrientedOverlayRenderer;
import gregtech.common.ConfigHolder;
import gregtech.common.blocks.BlockBoilerCasing;
import gregtech.common.blocks.MetaBlocks;
import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiFluidHatch;
import gregtech.common.metatileentities.multi.multiblockpart.appeng.MetaTileEntityMEOutputHatch;
import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockPart;
import gregtech.core.sound.GTSoundEvents;

import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic;
import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility;
import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController;
import gregicality.multiblocks.api.render.GCYMTextures;
import gregicality.multiblocks.api.utils.GCYMLog;
import gregicality.multiblocks.common.block.GCYMMetaBlocks;
import gregicality.multiblocks.common.block.blocks.BlockLargeMultiblockCasing;

public class MetaTileEntityLargeDistillery extends GCYMRecipeMapMultiblockController { // todo structure needs fixing
import it.unimi.dsi.fastutil.objects.ObjectArrayList;

/**
* Requires an unfortunate amount of copy-pasted logic from
* {@link gregtech.common.metatileentities.multi.electric.MetaTileEntityDistillationTower}
*/
public class MetaTileEntityLargeDistillery extends GCYMRecipeMapMultiblockController {

protected int layerCount;
protected List<IFluidHandler> orderedFluidOutputs;

public MetaTileEntityLargeDistillery(ResourceLocation metaTileEntityId) {
super(metaTileEntityId, new RecipeMap[] { RecipeMaps.DISTILLATION_RECIPES, RecipeMaps.DISTILLERY_RECIPES });
this.recipeMapWorkable = new LargeDistilleryRecipeLogic(this);
}

@Override
Expand All @@ -50,14 +76,110 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHol

@Override
protected Function<BlockPos, Integer> multiblockPartSorter() {
return UP.getSorter(getFrontFacing(), getUpwardsFacing(), isFlipped());
return RelativeDirection.UP.getSorter(getFrontFacing(), getUpwardsFacing(), isFlipped());
}

/**
* Whether this multi can be rotated or face upwards. <br>
* There will be <i>consequences</i> if this returns true. Go override {@link #determineOrderedFluidOutputs()}
*/
@Override
public boolean allowsExtendedFacing() {
return false;
}

@Override
protected void addDisplayText(List<ITextComponent> textList) {
if (isStructureFormed()) {
FluidStack stackInTank = importFluids.drain(Integer.MAX_VALUE, false);
if (stackInTank != null && stackInTank.amount > 0) {
ITextComponent fluidName = TextComponentUtil.setColor(GTUtility.getFluidTranslation(stackInTank),
TextFormatting.AQUA);
textList.add(TextComponentUtil.translationWithColor(
TextFormatting.GRAY,
"gregtech.multiblock.distillation_tower.distilling_fluid",
fluidName));
}
}
super.addDisplayText(textList);
}

@Override
protected void formStructure(PatternMatchContext context) {
super.formStructure(context);
if (!usesAdvHatchLogic() || this.structurePattern == null) return;
this.layerCount = determineLayerCount(this.structurePattern);
this.orderedFluidOutputs = determineOrderedFluidOutputs();
}

protected boolean usesAdvHatchLogic() {
return getCurrentRecipeMap() == RecipeMaps.DISTILLATION_RECIPES;
}

/**
* Needs to be overriden for multiblocks that have different assemblies than the standard distillation tower.
*
* @param structurePattern the structure pattern
* @return the number of layers that <b>could</b> hold output hatches
*/
protected int determineLayerCount(@NotNull BlockPattern structurePattern) {
return structurePattern.formedRepetitionCount[1] + 1;
}

/**
* Needs to be overriden for multiblocks that have different assemblies than the standard distillation tower.
*
* @return the fluid hatches of the multiblock, in order, with null entries for layers that do not have hatches.
*/
protected List<IFluidHandler> determineOrderedFluidOutputs() {
List<MetaTileEntityMultiblockPart> fluidExportParts = this.getMultiblockParts().stream()
.filter(iMultiblockPart -> iMultiblockPart instanceof IMultiblockAbilityPart<?>abilityPart &&
abilityPart.getAbility() == MultiblockAbility.EXPORT_FLUIDS &&
abilityPart instanceof MetaTileEntityMultiblockPart)
.map(iMultiblockPart -> (MetaTileEntityMultiblockPart) iMultiblockPart)
.collect(Collectors.toList());
// the fluidExportParts should come sorted in smallest Y first, largest Y last.
List<IFluidHandler> orderedHandlerList = new ObjectArrayList<>();
int firstY = this.getPos().getY() + 1;
int exportIndex = 0;
for (int y = firstY; y < firstY + this.layerCount; y++) {
if (fluidExportParts.size() <= exportIndex) {
orderedHandlerList.add(null);
continue;
}
MetaTileEntityMultiblockPart part = fluidExportParts.get(exportIndex);
if (part.getPos().getY() == y) {
List<IFluidTank> hatchTanks = new ObjectArrayList<>();
// noinspection unchecked
((IMultiblockAbilityPart<IFluidTank>) part).registerAbilities(hatchTanks);
if (hatchTanks.size() == 1)
orderedHandlerList.add(FluidTankHandler.getTankFluidHandler(hatchTanks.get(0)));
else orderedHandlerList.add(new FluidTankList(false, hatchTanks));
exportIndex++;
} else if (part.getPos().getY() > y) {
orderedHandlerList.add(null);
} else {
GCYMLog.logger.error(
"The Distillation Tower at {} had a fluid export hatch with an unexpected Y position.",
this.getPos());
this.invalidateStructure();
return new ObjectArrayList<>();
}
}
return orderedHandlerList;
}

@Override
public void invalidateStructure() {
super.invalidateStructure();
this.layerCount = 0;
this.orderedFluidOutputs = null;
}

@Override
protected @NotNull BlockPattern createStructurePattern() {
TraceabilityPredicate casingPredicate = states(getCasingState()).setMinGlobalLimited(40); // Different
// characters use
// common constraints
// Different characters use common constraints
TraceabilityPredicate casingPredicate = states(getCasingState()).setMinGlobalLimited(40);
TraceabilityPredicate maintenancePredicate = this.hasMaintenanceMechanics() &&
ConfigHolder.machines.enableMaintenance ?
abilities(MultiblockAbility.MAINTENANCE_HATCH).setMinGlobalLimited(1).setMaxGlobalLimited(1) :
Expand All @@ -75,11 +197,10 @@ protected Function<BlockPos, Integer> multiblockPartSorter() {
.or(abilities(GCYMMultiblockAbility.PARALLEL_HATCH).setMaxGlobalLimited(1).setPreviewCount(1))
.or(maintenancePredicate))
.where('X', casingPredicate
.or(metaTileEntities(MultiblockAbility.REGISTRY.get(MultiblockAbility.EXPORT_FLUIDS).stream()
.filter(mte -> !(mte instanceof MetaTileEntityMultiFluidHatch) &&
!(mte instanceof MetaTileEntityMEOutputHatch))
.toArray(MetaTileEntity[]::new))
.setMinLayerLimited(1).setMaxLayerLimited(1)))
.or(abilities(MultiblockAbility.EXPORT_FLUIDS)
.setMinLayerLimited(1) // TODO parallel logic doesn't support hatch omission without
// global voiding enabled
.setMaxLayerLimited(1, 1)))
.where('Z', casingPredicate)
.where('P', states(getCasingState2()))
.where('C', abilities(MultiblockAbility.MUFFLER_HATCH))
Expand All @@ -89,6 +210,11 @@ protected Function<BlockPos, Integer> multiblockPartSorter() {
.build();
}

@Override
protected boolean allowSameFluidFillForOutputs() {
return !usesAdvHatchLogic();
}

private static IBlockState getCasingState() {
return GCYMMetaBlocks.LARGE_MULTIBLOCK_CASING.getState(BlockLargeMultiblockCasing.CasingType.WATERTIGHT_CASING);
}
Expand All @@ -103,24 +229,20 @@ public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) {
}

@Override
protected void addDisplayText(List<ITextComponent> textList) {
super.addDisplayText(textList);
if (isStructureFormed()) {
FluidStack stackInTank = importFluids.drain(Integer.MAX_VALUE, false);
if (stackInTank != null && stackInTank.amount > 0) {
TextComponentTranslation fluidName = new TextComponentTranslation(
stackInTank.getFluid().getUnlocalizedName(stackInTank));
textList.add(new TextComponentTranslation("gregtech.multiblock.distillation_tower.distilling_fluid",
fluidName));
}
}
public SoundEvent getBreakdownSound() {
return GTSoundEvents.BREAKDOWN_ELECTRICAL;
}

@Override
protected @NotNull OrientedOverlayRenderer getFrontOverlay() {
return GCYMTextures.LARGE_DISTILLERY_OVERLAY;
}

@Override
public int getFluidOutputLimit() {
return this.layerCount;
}

@Override
public boolean hasMufflerMechanics() {
return true;
Expand All @@ -131,8 +253,75 @@ public boolean isTiered() {
return false;
}

@Override
public boolean allowsExtendedFacing() {
return false;
private class LargeDistilleryRecipeLogic extends GCYMMultiblockRecipeLogic {

public LargeDistilleryRecipeLogic(RecipeMapMultiblockController tileEntity) {
super(tileEntity);
}

protected boolean applyFluidToOutputs(@NotNull List<FluidStack> fluids, boolean doFill) {
boolean valid = true;
for (int i = 0; i < fluids.size(); i++) {
IFluidHandler handler = orderedFluidOutputs.get(i);
// void if no hatch is found on that fluid's layer
// this is considered trimming and thus ignores canVoid
if (handler == null) continue;
int accepted = handler.fill(fluids.get(i), doFill);
if (accepted != fluids.get(i).amount) valid = false;
if (!doFill && !valid) break;
}
return valid;
}

@Override
protected void outputRecipeOutputs() {
if (usesAdvHatchLogic()) {
GTTransferUtils.addItemsToItemHandler(getOutputInventory(), false, itemOutputs);
this.applyFluidToOutputs(fluidOutputs, true);
} else {
super.outputRecipeOutputs();
}
}

@Override
protected boolean setupAndConsumeRecipeInputs(@NotNull Recipe recipe,
@NotNull IItemHandlerModifiable importInventory,
@NotNull IMultipleTankHandler importFluids) {
if (!usesAdvHatchLogic()) {
return super.setupAndConsumeRecipeInputs(recipe, importInventory, importFluids);
}

this.overclockResults = calculateOverclock(recipe);

modifyOverclockPost(overclockResults, recipe.getRecipePropertyStorage());

if (!hasEnoughPower(overclockResults)) {
return false;
}

IItemHandlerModifiable exportInventory = getOutputInventory();

// We have already trimmed outputs and chanced outputs at this time
// Attempt to merge all outputs + chanced outputs into the output bus, to prevent voiding chanced outputs
if (!metaTileEntity.canVoidRecipeItemOutputs() &&
!GTTransferUtils.addItemsToItemHandler(exportInventory, true, recipe.getAllItemOutputs())) {
this.isOutputsFull = true;
return false;
}

// Perform layerwise fluid checks
if (!metaTileEntity.canVoidRecipeFluidOutputs() &&
!this.applyFluidToOutputs(recipe.getAllFluidOutputs(), false)) {
this.isOutputsFull = true;
return false;
}

this.isOutputsFull = false;
if (recipe.matches(true, importInventory, importFluids)) {
this.metaTileEntity.addNotifiedInput(importInventory);
return true;
}
return false;
}
}
}

0 comments on commit 9dee95f

Please sign in to comment.