Merge remote-tracking branch 'origin/master' into fabric-1.16

# Conflicts: # gradle.properties # gradle/wrapper/gradle-wrapper.jar # gradle/wrapper/gradle-wrapper.properties # src/api/java/appeng/api/features/IWorldGen.java # src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java # src/api/java/appeng/api/parts/IPart.java # src/api/java/appeng/api/storage/ISpatialDimension.java # src/api/java/appeng/api/util/DimensionalCoord.java # src/datagen/java/appeng/data/providers/IAE2DataProvider.java # src/main/java/appeng/block/AEBaseBlockItemChargeable.java # src/main/java/appeng/block/misc/ChargerBlock.java # src/main/java/appeng/block/misc/QuartzFixtureBlock.java # src/main/java/appeng/block/networking/CableBusBlock.java # src/main/java/appeng/block/networking/CableBusColor.java # src/main/java/appeng/block/networking/ControllerBlock.java # src/main/java/appeng/block/networking/WirelessBlock.java # src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java # src/main/java/appeng/block/paint/PaintSplotchesModel.java # src/main/java/appeng/block/qnb/QnbFormedBakedModel.java # src/main/java/appeng/block/qnb/QnbFormedModel.java # src/main/java/appeng/block/spatial/MatrixFrameBlock.java # src/main/java/appeng/block/storage/ChestBlock.java # src/main/java/appeng/block/storage/DriveSlotState.java # src/main/java/appeng/client/gui/AEBaseMEScreen.java # src/main/java/appeng/client/gui/AEBaseScreen.java # src/main/java/appeng/client/gui/implementations/AESubScreen.java # src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java # src/main/java/appeng/client/gui/implementations/ChestScreen.java # src/main/java/appeng/client/gui/implementations/CondenserScreen.java # src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java # src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java # src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java # src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java # src/main/java/appeng/client/gui/implementations/CraftingTermScreen.java # src/main/java/appeng/client/gui/implementations/DriveScreen.java # src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java # src/main/java/appeng/client/gui/implementations/GrinderScreen.java # src/main/java/appeng/client/gui/implementations/IOPortScreen.java # src/main/java/appeng/client/gui/implementations/InscriberScreen.java # src/main/java/appeng/client/gui/implementations/InterfaceScreen.java # src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java # src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java # src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java # src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java # src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java # src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java # src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java # src/main/java/appeng/client/gui/implementations/PatternTermScreen.java # src/main/java/appeng/client/gui/implementations/PriorityScreen.java # src/main/java/appeng/client/gui/implementations/QNBScreen.java # src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java # src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java # src/main/java/appeng/client/gui/implementations/SkyChestScreen.java # src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java # src/main/java/appeng/client/gui/implementations/StorageBusScreen.java # src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java # src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java # src/main/java/appeng/client/gui/implementations/WirelessScreen.java # src/main/java/appeng/client/gui/widgets/AETextField.java # src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java # src/main/java/appeng/client/gui/widgets/ITooltip.java # src/main/java/appeng/client/gui/widgets/IconButton.java # src/main/java/appeng/client/gui/widgets/NumberBox.java # src/main/java/appeng/client/gui/widgets/ProgressBar.java # src/main/java/appeng/client/gui/widgets/TabButton.java # src/main/java/appeng/client/gui/widgets/ToggleButton.java # src/main/java/appeng/client/render/ColorableTileBlockColor.java # src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java # src/main/java/appeng/client/render/FacadeItemModel.java # src/main/java/appeng/client/render/FacingToRotation.java # src/main/java/appeng/client/render/SpatialSkyRender.java # src/main/java/appeng/client/render/StackSizeRenderer.java # src/main/java/appeng/client/render/StaticBlockColor.java # src/main/java/appeng/client/render/TesrRenderHelper.java # src/main/java/appeng/client/render/cablebus/CableBuilder.java # src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java # src/main/java/appeng/client/render/cablebus/CableBusModel.java # src/main/java/appeng/client/render/cablebus/CableBusRenderState.java # src/main/java/appeng/client/render/cablebus/CableCoreType.java # src/main/java/appeng/client/render/cablebus/CubeBuilder.java # src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java # src/main/java/appeng/client/render/cablebus/FacadeBuilder.java # src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java # src/main/java/appeng/client/render/cablebus/QuadRotator.java # src/main/java/appeng/client/render/cablebus/SmartCableTextures.java # src/main/java/appeng/client/render/crafting/CraftingCubeModel.java # src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java # src/main/java/appeng/client/render/crafting/EncodedPatternModel.java # src/main/java/appeng/client/render/effects/CraftingFx.java # src/main/java/appeng/client/render/effects/EnergyFx.java # src/main/java/appeng/client/render/effects/LightningArcParticleData.java # src/main/java/appeng/client/render/effects/LightningFX.java # src/main/java/appeng/client/render/effects/MatterCannonFX.java # src/main/java/appeng/client/render/effects/VibrantFX.java # src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java # src/main/java/appeng/client/render/model/BiometricCardModel.java # src/main/java/appeng/client/render/model/ColorApplicatorModel.java # src/main/java/appeng/client/render/model/DriveBakedModel.java # src/main/java/appeng/client/render/model/DriveModel.java # src/main/java/appeng/client/render/model/GlassBakedModel.java # src/main/java/appeng/client/render/model/GlassModel.java # src/main/java/appeng/client/render/model/MatrixVertexTransformer.java # src/main/java/appeng/client/render/model/MemoryCardModel.java # src/main/java/appeng/client/render/model/RenderHelper.java # src/main/java/appeng/client/render/model/SkyCompassBakedModel.java # src/main/java/appeng/client/render/model/SkyCompassModel.java # src/main/java/appeng/client/render/renderable/ItemRenderable.java # src/main/java/appeng/client/render/spatial/SpatialPylonModel.java # src/main/java/appeng/client/render/tesr/CellLedRenderer.java # src/main/java/appeng/client/render/tesr/CrankTESR.java # src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java # src/main/java/appeng/client/render/tesr/InscriberTESR.java # src/main/java/appeng/client/render/tesr/SkyChestTESR.java # src/main/java/appeng/container/implementations/PatternTermContainer.java # src/main/java/appeng/core/AEConfig.java # src/main/java/appeng/core/AppEng.java # src/main/java/appeng/core/Registration.java # src/main/java/appeng/core/features/registries/MovableTileRegistry.java # src/main/java/appeng/core/features/registries/WorldGenRegistry.java # src/main/java/appeng/core/localization/GuiText.java # src/main/java/appeng/core/sync/BasePacket.java # src/main/java/appeng/core/sync/network/NetworkHandler.java # src/main/java/appeng/core/sync/network/TargetPoint.java # src/main/java/appeng/core/sync/packets/ClickPacket.java # src/main/java/appeng/core/sync/packets/ConfigValuePacket.java # src/main/java/appeng/core/worlddata/WorldData.java # src/main/java/appeng/crafting/CraftingTreeProcess.java # src/main/java/appeng/datagen/AE2DataGenerators.java # src/main/java/appeng/datagen/providers/IAE2DataProvider.java # src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java # src/main/java/appeng/datagen/providers/recipes/SlabStairRecipes.java # src/main/java/appeng/debug/ChunkLoaderBlockEntity.java # src/main/java/appeng/debug/DebugPartPlacerItem.java # src/main/java/appeng/debug/ReplicatorCardItem.java # src/main/java/appeng/entity/TinyTNTPrimedEntity.java # src/main/java/appeng/entity/TinyTNTPrimedRenderer.java # src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java # src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java # src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java # src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java # src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java # src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java # src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java # src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java # src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java # src/main/java/appeng/fluids/parts/FluidInterfacePart.java # src/main/java/appeng/fluids/parts/FluidStorageBusPart.java # src/main/java/appeng/fluids/parts/SharedFluidBusPart.java # src/main/java/appeng/forge/data/providers/IAE2DataProvider.java # src/main/java/appeng/helpers/AEMaterials.java # src/main/java/appeng/helpers/CraftingPatternDetails.java # src/main/java/appeng/helpers/DualityInterface.java # src/main/java/appeng/helpers/Splotch.java # src/main/java/appeng/integration/modules/jei/CondenserCategory.java # src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java # src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java # src/main/java/appeng/integration/modules/theoneprobe/part/PowerStateInfoProvider.java # src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java # src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java # src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java # src/main/java/appeng/integration/modules/waila/part/PartAccessor.java # src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java # src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java # src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java # src/main/java/appeng/items/misc/EncodedPatternItem.java # src/main/java/appeng/items/parts/FacadeItem.java # src/main/java/appeng/items/storage/SpatialStorageCellItem.java # src/main/java/appeng/items/tools/BiometricCardItem.java # src/main/java/appeng/items/tools/MemoryCardItem.java # src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java # src/main/java/appeng/items/tools/powered/MatterCannonItem.java # src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java # src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java # src/main/java/appeng/me/cluster/MBCalculator.java # src/main/java/appeng/me/cluster/implementations/QuantumCluster.java # src/main/java/appeng/parts/AEBasePart.java # src/main/java/appeng/parts/CableBusContainer.java # src/main/java/appeng/parts/ICableBusContainer.java # src/main/java/appeng/parts/NullCableBusContainer.java # src/main/java/appeng/parts/PartPlacement.java # src/main/java/appeng/parts/automation/AnnihilationPlanePart.java # src/main/java/appeng/parts/automation/ExportBusPart.java # src/main/java/appeng/parts/automation/FormationPlanePart.java # src/main/java/appeng/parts/automation/ImportBusPart.java # src/main/java/appeng/parts/automation/PlaneModel.java # src/main/java/appeng/parts/misc/CableAnchorPart.java # src/main/java/appeng/parts/misc/InterfacePart.java # src/main/java/appeng/parts/misc/StorageBusPart.java # src/main/java/appeng/parts/p2p/P2PTunnelPart.java # src/main/java/appeng/parts/reporting/AbstractMonitorPart.java # src/main/java/appeng/parts/reporting/AbstractReportingPart.java # src/main/java/appeng/parts/reporting/AbstractTerminalPart.java # src/main/java/appeng/parts/reporting/ConversionMonitorPart.java # src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java # src/main/java/appeng/parts/reporting/PatternTerminalPart.java # src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java # src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java # src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java # src/main/java/appeng/server/subcommands/TestOreGenCommand.java # src/main/java/appeng/services/CompassService.java # src/main/java/appeng/spatial/SpatialDimensionManager.java # src/main/java/appeng/spatial/StorageCellDimension.java # src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java # src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java # src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java # src/main/java/appeng/tile/AEBaseBlockEntity.java # src/main/java/appeng/tile/AEBaseInvTileEntity.java # src/main/java/appeng/tile/crafting/CraftingBlockEntity.java # src/main/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java # src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java # src/main/java/appeng/tile/grid/AENetworkBlockEntity.java # src/main/java/appeng/tile/grid/AENetworkInvBlockEntity.java # src/main/java/appeng/tile/grid/AENetworkPowerBlockEntity.java # src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java # src/main/java/appeng/tile/misc/CondenserBlockEntity.java # src/main/java/appeng/tile/misc/InscriberBlockEntity.java # src/main/java/appeng/tile/misc/InterfaceBlockEntity.java # src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java # src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java # src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java # src/main/java/appeng/tile/networking/CableBusBlockEntity.java # src/main/java/appeng/tile/networking/EnergyCellBlockEntity.java # src/main/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java # src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java # src/main/java/appeng/tile/storage/ChestBlockEntity.java # src/main/java/appeng/tile/storage/DriveBlockEntity.java # src/main/java/appeng/tile/storage/IOPortBlockEntity.java # src/main/java/appeng/util/Platform.java # src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java # src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java # src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java # src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java # src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java # src/unported/java/appeng/client/ClientHelper.java # src/unported/java/appeng/client/render/DummyFluidItemModel.java # src/unported/java/appeng/client/render/model/UVLModelLoader.java
2020-07-27 19:07:35 +02:00
parent c7980907ed 56ecda5173
commit 0fdc46b358
33 changed files with 967 additions and 236 deletions
@@ -18,7 +18,12 @@

 package appeng.me.cluster.implementations;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;

 import com.google.common.collect.ImmutableList;
@@ -36,9 +41,15 @@ import appeng.api.config.FuzzyMode;
 import appeng.api.config.PowerMultiplier;
 import appeng.api.crafting.ICraftingHelper;
 import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
-import appeng.api.networking.crafting.*;
+import appeng.api.networking.crafting.CraftingItemList;
+import appeng.api.networking.crafting.ICraftingCPU;
+import appeng.api.networking.crafting.ICraftingGrid;
+import appeng.api.networking.crafting.ICraftingJob;
+import appeng.api.networking.crafting.ICraftingLink;
+import appeng.api.networking.crafting.ICraftingMedium;
+import appeng.api.networking.crafting.ICraftingPatternDetails;
+import appeng.api.networking.crafting.ICraftingRequester;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.events.MENetworkCraftingCpuChange;
 import appeng.api.networking.security.IActionSource;
@@ -51,7 +62,11 @@ import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerNull;
 import appeng.core.AELog;
 import appeng.core.Api;
-import appeng.crafting.*;
+import appeng.crafting.CraftBranchFailure;
+import appeng.crafting.CraftingJob;
+import appeng.crafting.CraftingLink;
+import appeng.crafting.CraftingWatcher;
+import appeng.crafting.MECraftingInventory;
 import appeng.me.cache.CraftingGridCache;
 import appeng.me.cluster.IAECluster;
 import appeng.me.cluster.MBCalculator;
@@ -427,7 +442,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
        return null;
    }

-    private boolean canCraft(final ICraftingPatternDetails details, final IAEItemStack[] condensedInputs) {
+    private boolean canCraft(final ICraftingPatternDetails details, final Collection<IAEItemStack> condensedInputs) {
        for (IAEItemStack g : condensedInputs) {

            if (details.isCraftable()) {
@@ -555,7 +570,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {

            final ICraftingPatternDetails details = e.getKey();

-            if (this.canCraft(details, details.getCondensedInputs())) {
+            if (this.canCraft(details, details.getInputs())) {
                CraftingInventory ic = null;

                for (final ICraftingMedium m : cc.getMediums(e.getKey())) {
@@ -565,7 +580,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {

                    if (!m.isBusy()) {
                        if (ic == null) {
-                            final IAEItemStack[] input = details.getInputs();
+                            final IAEItemStack[] input = details.getSparseInputs();
                            double sum = 0;

                            for (final IAEItemStack anInput : input) {
@@ -661,7 +676,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
                            this.somethingChanged = true;
                            this.remainingOperations--;

-                            for (final IAEItemStack out : details.getCondensedOutputs()) {
+                            for (final IAEItemStack out : details.getOutputs()) {
                                this.postChange(out, this.machineSrc);
                                this.waitingFor.add(out.copy());
                                this.postCraftingStatusChange(out.copy());
@@ -894,7 +909,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
                break;
            case PENDING:
                for (final Entry<ICraftingPatternDetails, TaskProgress> t : this.tasks.entrySet()) {
-                    for (IAEItemStack ais : t.getKey().getCondensedOutputs()) {
+                    for (IAEItemStack ais : t.getKey().getOutputs()) {
                        ais = ais.copy();
                        ais.setStackSize(ais.getStackSize() * t.getValue().value);
                        list.add(ais);
@@ -913,7 +928,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
                }

                for (final Entry<ICraftingPatternDetails, TaskProgress> t : this.tasks.entrySet()) {
-                    for (IAEItemStack ais : t.getKey().getCondensedOutputs()) {
+                    for (IAEItemStack ais : t.getKey().getOutputs()) {
                        ais = ais.copy();
                        ais.setStackSize(ais.getStackSize() * t.getValue().value);
                        list.add(ais);
@@ -958,7 +973,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
                is.setStackSize(0);

                for (final Entry<ICraftingPatternDetails, TaskProgress> t : this.tasks.entrySet()) {
-                    for (final IAEItemStack ais : t.getKey().getCondensedOutputs()) {
+                    for (final IAEItemStack ais : t.getKey().getOutputs()) {
                        if (ais.equals(is)) {
                            is.setStackSize(is.getStackSize() + ais.getStackSize() * t.getValue().value);
                        }