f3c44c64c2
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# build.gradle
# gradle.properties
# src/api/java/appeng/api/util/DimensionalCoord.java
# src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
# src/main/java/appeng/bootstrap/BlockDefinitionBuilder.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/CraftConfirmScreen.java
# src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.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/NumberEntryWidget.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.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/SettingToggleButton.java
# src/main/java/appeng/client/gui/widgets/TabButton.java
# src/main/java/appeng/client/render/DelegateBakedModel.java
# src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
# src/main/java/appeng/client/render/FacadeBakedItemModel.java
# src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
# src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java
# src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java
# src/main/java/appeng/client/render/model/BiometricCardBakedModel.java
# src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java
# src/main/java/appeng/client/render/model/GlassBakedModel.java
# src/main/java/appeng/client/render/model/MemoryCardBakedModel.java
# src/main/java/appeng/client/render/model/SkyCompassBakedModel.java
# src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java
# src/main/java/appeng/container/AEBaseContainer.java
# src/main/java/appeng/container/ContainerLocator.java
# src/main/java/appeng/container/guisync/SyncData.java
# src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
# src/main/java/appeng/container/implementations/CondenserContainer.java
# src/main/java/appeng/container/implementations/ContainerHelper.java
# src/main/java/appeng/container/implementations/CraftConfirmContainer.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/CraftingCPURecord.java
# src/main/java/appeng/container/implementations/CraftingStatusContainer.java
# src/main/java/appeng/container/implementations/IOPortContainer.java
# src/main/java/appeng/container/implementations/InscriberContainer.java
# src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/MEMonitorableContainer.java
# src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
# src/main/java/appeng/container/implementations/PatternTermContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
# src/main/java/appeng/container/implementations/SpatialIOPortContainer.java
# src/main/java/appeng/container/implementations/VibrationChamberContainer.java
# src/main/java/appeng/container/implementations/WirelessTermContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/AppEngBootstrap.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/definitions/ApiItems.java
# src/main/java/appeng/core/features/registries/WorldGenRegistry.java
# src/main/java/appeng/core/sync/network/NetworkHandler.java
# src/main/java/appeng/core/worlddata/WorldData.java
# src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java
# src/main/java/appeng/debug/ChunkLoaderBlockEntity.java
# src/main/java/appeng/debug/ReplicatorCardItem.java
# src/main/java/appeng/entity/GrowingCrystalEntity.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
# src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
# src/main/java/appeng/fluids/container/FluidInterfaceContainer.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/fluids/container/FluidTerminalContainer.java
# src/main/java/appeng/fluids/util/AEFluidInventory.java
# src/main/java/appeng/items/misc/CrystalSeedItem.java
# src/main/java/appeng/items/misc/CrystalSeedRendering.java
# src/main/java/appeng/items/storage/SpatialStorageCellItem.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/mixins/feature/ConfiguredFeaturesAccessor.java
# src/main/java/appeng/mixins/spatial/BiomesMixin.java
# src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java
# src/main/java/appeng/mixins/spatial/EntityMixin.java
# src/main/java/appeng/mixins/spatial/SkyRenderMixin.java
# src/main/java/appeng/mixins/structure/BiomeAccessor.java
# src/main/java/appeng/mixins/structure/GenerationSettingsAccessor.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/automation/PlaneBakedModel.java
# src/main/java/appeng/server/subcommands/SpatialStorageCommand.java
# src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
# src/main/java/appeng/server/subcommands/TestOreGenCommand.java
# src/main/java/appeng/spatial/SpatialStorageBiome.java
# src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
# src/main/java/appeng/spatial/SpatialStorageDimensionIds.java
# src/main/java/appeng/spatial/SpatialStorageHelper.java
# src/main/java/appeng/util/Platform.java
# src/main/java/appeng/worldgen/BiomeModifier.java
# src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
# src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java
# src/main/resources/assets/appliedenergistics2/textures/guis/states.png
2020-09-20 14:11:22 +02:00
971a9d22e8
Improvements to the usability of the number entry widgets (Priority, Level Emitter, Craft Amount): ( #4737 )
...
- Fixed tab order
- Introduced focus state for corner buttons
- Allowed the player to enter any text, but add validation that only persist it if it is a valid number
- Enter will now confirm these dialogs and return to the previous dialog
- The text field is automatically focused and its contents are selected
2020-09-19 16:27:29 +02:00
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
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
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
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
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
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
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
fee5b7fdfc
Utils ported
2020-06-28 03:41:44 +02:00
b79cd732b2
Fabric port in progress
2020-06-27 23:25:38 +02:00
80fbb58d4f
API compiles
2020-06-27 18:09:44 +02:00
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
26bb08ddb5
Post-Rename Formatting Fixes
2020-06-22 13:25:38 +02:00
b4471b1abb
The Great Renamening of 2020
2020-06-22 13:21:23 +02:00
Sebastian Hartte