Sebastian Hartte
68a02ed64b
Updated to 1.16.2-rc2
2020-08-11 16:20:31 +02:00
Sebastian Hartte
89058448cf
Merged most recent master.
2020-08-06 00:46:20 +02:00
Sebastian Hartte
3c737d8d1e
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/client/gui/AEBaseScreen.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/ProgressBar.java
# src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
# src/main/java/appeng/client/gui/widgets/ToggleButton.java
# src/main/java/appeng/container/slot/PlayerInvSlot.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/client/gui/widgets/OptionalFluidSlotWidget.java
# src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
# src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java
# src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java
2020-08-05 23:40:58 +02:00
shartte
8617dc8340
Plane Connection Refactor ( #4556 )
...
* Refactors all plane parts to use a common helper for
calculating connections to adjacent planes.
Also fixes problems with updating these connections on neighbor updates.
* Fix conflicting GuiSync ID.
* Slightly refactor PlaneConnectionHelper, and fix an issue where the bounding box was calculated incorrectly by using the wrong up-direction.
2020-08-05 17:45:33 +02:00
shartte
9bc844738c
Fixes #4547 : Name clash between ITooltip#getWidth, ITooltip#getHeight and Vanilla Widget methods leads to missing methods at runtime, since the implementing methods will be remapped to SRG names, while referees of the interface will try to call the renamed methods by their name in the interface, leading to an AbstractMethodError. ( #4557 )
2020-08-05 16:33:44 +02:00
yueh
8f0e408772
Fixes NPE on empty tooltips ( #4546 )
2020-08-03 20:57:10 +02:00
yueh
259d932946
Fixes 4529: Updated IPart to match new ICapabilityProvider ( #4534 )
2020-08-01 21:01:19 +02:00
Sebastian Hartte
a6fb17b008
Formatting Fixes
2020-08-01 17:24:48 +02:00
Sebastian Hartte
1b31185cdb
Ported to 1.16.2-pre
2020-08-01 17:14:12 +02:00
Sebastian Hartte
3802eace7a
Use StringTextComponent.EMPTY
2020-07-28 20:24:07 +02:00
yueh
b3b7547325
Updated mappings to 20200723-1.16.1 ( #4514 )
...
* Limit to 1 gradle worker
2020-07-28 18:33:28 +02:00
yueh
0beab559a6
Fix formatting
2020-07-28 11:44:57 +02:00
yueh
a65be62cd1
Organize and clean imports
2020-07-28 10:29:57 +02:00
Sebastian Hartte
84e6aaa122
Compiles again.
2020-07-27 23:50:28 +02:00
Sebastian Hartte
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
Sebastian Hartte
49296915c9
Post merge fixes.
2020-07-27 19:12:16 +02:00
Sebastian Hartte
0fdc46b358
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
yueh
56ecda5173
1.16 port
2020-07-27 11:21:50 +02:00
shartte
59e40ccbd9
Fixes mouse handling for right-clicks to clear the search box and middle-click for crafting. ( #4505 )
2020-07-26 16:30:53 +02:00
Sebastian Hartte
9fcfbf31be
Lots of fixes
2020-07-23 02:38:32 +02:00
Sebastian Hartte
1933b4b10d
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java
# src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
# src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.java
# src/main/java/appeng/client/gui/widgets/NumberBox.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
# src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
2020-07-20 20:19:42 +02:00
Sebastian Hartte
590e435ad6
Formatting fixes
2020-07-19 23:51:57 +02:00
Sebastian Hartte
8d92a51e4f
Formatting fixes
2020-07-19 23:50:47 +02:00
Sebastian Hartte
4322910614
Added labels that specify the unit of power (AE) and the unit of fluid (mB) for the level emitters.
2020-07-19 23:50:18 +02:00
Sebastian Hartte
ebe589a714
Ported the other number entry dialogs over to the shared widget.
2020-07-19 23:25:11 +02:00
Sebastian Hartte
6187e6a7bb
Started refactoring number entry dialogs to use shared code.
2020-07-19 20:04:08 +02:00
Sebastian Hartte
0367b35ce0
Never return null from Widget#getMessage since the
...
narrator will always dereference it, leading to a crash.
2020-07-19 12:04:15 +02:00
Sebastian Hartte
19802b96e8
Rendering/Model Fixes
2020-07-18 18:44:10 +02:00
Sebastian Hartte
1e20cd8c08
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# build.gradle
# gradle.properties
# src/api/java/appeng/api/config/Upgrades.java
# src/api/java/appeng/api/recipes/ResolverResult.java
# src/main/java/appeng/block/AEBaseBlockItemChargeable.java
# src/main/java/appeng/block/crafting/CraftingStorageItem.java
# src/main/java/appeng/block/misc/ChargerBlock.java
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/block/storage/ChestBlock.java
# src/main/java/appeng/block/storage/DriveSlotCellType.java
# src/main/java/appeng/capabilities/Capabilities.java
# src/main/java/appeng/client/me/ItemRepo.java
# src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
# src/main/java/appeng/client/render/effects/ChargedOreFX.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/LightningArcFX.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/spatial/SpatialPylonRendering.java
# src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
# src/main/java/appeng/container/AEBaseContainer.java
# src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
# src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
# src/main/java/appeng/container/implementations/PatternTermContainer.java
# src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/AEItemGroup.java
# src/main/java/appeng/core/Api.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/definitions/ApiBlocks.java
# src/main/java/appeng/core/api/definitions/ApiParts.java
# src/main/java/appeng/core/features/registries/MovableTileRegistry.java
# src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
# src/main/java/appeng/core/features/registries/WirelessRegistry.java
# src/main/java/appeng/core/features/registries/WorldGenRegistry.java
# src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java
# src/main/java/appeng/core/sync/BasePacketHandler.java
# src/main/java/appeng/core/sync/packets/ClickPacket.java
# src/main/java/appeng/core/sync/packets/PatternSlotPacket.java
# src/main/java/appeng/crafting/CraftingTreeProcess.java
# src/main/java/appeng/debug/ReplicatorCardItem.java
# src/main/java/appeng/entity/ChargedQuartzEntity.java
# src/main/java/appeng/entity/SingularityEntity.java
# src/main/java/appeng/entity/TinyTNTPrimedEntity.java
# src/main/java/appeng/fluids/helper/DualityFluidInterface.java
# src/main/java/appeng/fluids/helper/FluidCellConfig.java
# src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java
# src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java
# src/main/java/appeng/forge/data/providers/IAE2DataProvider.java
# src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java
# src/main/java/appeng/helpers/CraftingPatternDetails.java
# src/main/java/appeng/helpers/DualityInterface.java
# src/main/java/appeng/helpers/WirelessTerminalGuiObject.java
# src/main/java/appeng/hooks/IBlockTool.java
# src/main/java/appeng/hooks/TickHandler.java
# src/main/java/appeng/integration/modules/jei/CondenserCategory.java
# src/main/java/appeng/integration/modules/jei/JEIPlugin.java
# src/main/java/appeng/items/misc/EncodedPatternItem.java
# src/main/java/appeng/items/parts/FacadeItem.java
# src/main/java/appeng/items/parts/PartItem.java
# src/main/java/appeng/items/storage/AbstractStorageCell.java
# src/main/java/appeng/items/storage/CreativeStorageCellItem.java
# src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
# src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
# src/main/java/appeng/items/tools/powered/MatterCannonItem.java
# src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
# src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java
# src/main/java/appeng/parts/PartPlacement.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java
# src/main/java/appeng/parts/reporting/PatternTerminalPart.java
# src/main/java/appeng/spatial/CachedPlane.java
# src/main/java/appeng/spatial/StorageChunkGenerator.java
# src/main/java/appeng/spatial/StorageHelper.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/crafting/CraftingStorageBlockEntity.java
# src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java
# src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
# src/main/java/appeng/tile/misc/ChargerBlockEntity.java
# src/main/java/appeng/tile/misc/CondenserBlockEntity.java
# src/main/java/appeng/tile/misc/InscriberBlockEntity.java
# src/main/java/appeng/tile/misc/InscriberRecipes.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/storage/ChestBlockEntity.java
# src/main/java/appeng/tile/storage/DriveBlockEntity.java
# src/main/java/appeng/util/Platform.java
# src/main/java/team/chisel/ctm/api/IFacade.java
# src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
# src/unported/java/appeng/client/render/FacadeItemModel.java
# src/unported/java/appeng/client/render/model/DriveBakedModel.java
# src/unported/java/appeng/client/render/model/DriveModel.java
# src/unported/java/appeng/core/PluginLoader.java
2020-07-18 01:45:43 +02:00
yueh
0d43ca15be
Removed AEApi
...
Moved all internal access to the internal `Api` class using a new static
getter.
2020-07-11 19:40:34 +02:00
yueh
235fc2e81f
Removed superfluous IAEStack methods
2020-07-07 12:12:48 +02:00
Sebastian Hartte
9220ca0048
Added HWYLA
2020-07-05 16:50:39 +02:00
Sebastian Hartte
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
Sebastian Hartte
5982f094ec
ME Chest
2020-07-02 22:34:21 +02:00
Sebastian Hartte
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
Sebastian Hartte
f2e3d81fd7
Working in part placement
2020-07-01 21:27:37 +02:00
yueh
d79d284690
Fix formatting
2020-06-29 22:17:25 +02:00
Sebastian Hartte
3337eb9ae3
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# build.gradle
# core/src/main/java/appeng/block/AEBaseBlock.java
# core/src/main/java/appeng/block/misc/TinyTNTBlock.java
# core/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java
# core/src/main/java/appeng/fluids/util/AEFluidStack.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/api/definitions/ApiItems.java
# src/main/java/appeng/debug/EnergyGeneratorBlockEntity.java
# src/main/java/appeng/entity/TinyTNTPrimedEntity.java
# src/main/java/appeng/tile/storage/DriveBlockEntity.java
2020-06-29 21:35:34 +02:00
Sebastian Hartte
ca104912d6
More fixes
2020-06-29 21:23:50 +02:00
Sebastian Hartte
f943106419
Fix serialization of 0-amount fluidstacks which is required for properly updating an ME inventory where an existing fluid stack should be fully removed. (I.e. Taking out the last amount of a given fluid via a terminal).
2020-06-29 17:13:04 +02:00
Sebastian Hartte
57fa5576af
Fix rendering of the dummy fluid item (i.e. in cell workbenches, fluid terminals are unaffected).
2020-06-29 15:32:49 +02:00
Sebastian Hartte
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
Sebastian Hartte
f5412152a4
Utils ported
2020-06-28 15:47:44 +02:00
Sebastian Hartte
46955643b9
Utils ported
2020-06-28 13:28:14 +02:00
Sebastian Hartte
fee5b7fdfc
Utils ported
2020-06-28 03:41:44 +02:00
Sebastian Hartte
37ce6b262e
Fabric port in progress
2020-06-28 00:45:33 +02:00
Sebastian Hartte
b79cd732b2
Fabric port in progress
2020-06-27 23:25:38 +02:00
Sebastian Hartte
80fbb58d4f
API compiles
2020-06-27 18:09:44 +02:00
Sebastian Hartte
ba71a82288
Migrations
2020-06-27 16:18:20 +02:00
yueh
cb62d3a706
Refactored how cell state is exposed ( #4422 )
...
Replaced fuzzy ints with a well defined enum
Moved API related cell interfaces to a new subpackage
Introduced a new client helper method to register a cell texture for a storage channel
Added a method to obtain the storage channel for a drive or chest slot
Added a new cell state for cells with stored items but neither types nor completely full
2020-06-22 22:18:41 +02:00