5da5315a5b
Post-merge fixes. Reformat. Optimize Imports.
2020-09-20 14:47:25 +02:00
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
b1feeca41c
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
6c544f2211
Reformatted, and ported back some enhancements from the Forge version.
2020-08-15 02:51:03 +02:00
68a02ed64b
Updated to 1.16.2-rc2
2020-08-11 16:20:31 +02:00
184fe8c1fc
Fix items being lost when trying to stack items in the player inventory.
2020-08-03 22:29:03 +02:00
62bbc32763
Minor cleanup.
2020-08-03 20:31:30 +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
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
46955643b9
Utils ported
2020-06-28 13:28:14 +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
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
fe215f0a91
Code Cleanup
2020-06-19 16:09:06 +02:00
5225ea426b
pick 97420a31d The big reformat of 2020
2020-06-16 21:45:35 +02:00
194fa38b9f
When shift-clicking items into a container, and the same item is already in the target slot while its capacity is full, do not needlessly trigger an inventory change. This resets the progress of blocks like the inscriber.
2020-06-14 11:28:32 +02:00
23b6e195ac
Revert using internal API
2020-06-07 17:21:20 +02:00
46b1d1ffdc
GUI Rendering and various fixes
2020-06-07 03:29:57 +02:00
ff042a394b
All GUI compile errors fixed, switched to excludes over includes in gradle build and lots, LOTS of more fixes.
2020-06-06 21:16:05 +02:00
c402390282
Compiles again.
2020-06-04 19:58:58 +02:00
7747804385
More Container / GUI fixes
2020-06-02 11:40:36 +02:00
fc300745cd
Container-Stuff
2020-06-02 02:33:05 +02:00
9f63859769
Work on GUIs (specifically to get SkyChest GUI)
2020-06-02 02:14:09 +02:00
adfc2577ed
Connected Glass
2020-06-01 13:13:18 +02:00
5cdeff01be
Custom Model Loader
2020-06-01 04:02:37 +02:00
16d6d55d7f
1.15 port
2020-05-18 14:02:45 +02:00
d88f550eb0
Switch to new IItemHandler ( #3669 )
2018-10-04 20:39:06 +02:00
a2091d10fe
Code cleanup
...
Added missing this, annotations, etc.
2018-08-30 20:33:08 +02:00
5d26b98ab8
Fluid cleanup and performance improvements ( #3581 )
...
Use custom gui widget with custom synchronization for rendering fake fluid slots.
2018-07-04 19:12:12 +02:00
0ef854ca4b
Fixes interface shift-clicking to generate correct onChangeInventory events ( #3544 )
2018-06-19 23:23:38 +02:00
9481c9a7d7
Fixes #3428 : Invalidate container when the corresponding TE no longer exists. ( #3433 )
2018-03-22 13:52:07 +01:00
3749742231
Fix handling of ItemStacks using getShareTag or Capabilites ( #3171 )
...
Temporary fix, ideally we would have a way to reference the original ItemStack so we don't need to send the full NBT data to the client.
2017-10-26 17:59:55 +02:00
f80f623ccf
Fix AESharedItemStack#compareNBT to get consistent ordering. ( #3169 )
2017-10-20 23:25:18 +02:00
4f07b63b13
API cleanups ( #3155 )
...
* Remove obsolete api and fix some warning
* Move MEMonitorHandler to internal code and fix some warnings
* Rename exceptions to conform to naming scheme
2017-10-14 14:15:28 +02:00
6e81f698c0
Refactored StorageChannel enum into an interface ( #3138 )
...
This replaces the static enum with a more dynamic interface providing
factory methods for handling network storage.
2017-10-08 17:59:30 +02:00
1e15b23506
Rework AEItemStack ( #3091 )
...
* Use itemstack as itemdef
* HIGH_TAG/LOW_TAG should be compared both directions
* Remove getTagCompound
* Make Itemlist implementation independent
* Cache item id for performance reasons
* Add preconditions to saveguard against external meddling
* Chache itemDamage
* Remove IAEStackSearchKey for now, rename getDisplayStack
2017-09-30 17:18:30 +02:00
970630a90d
Refactored the BaseActionSource ( #3063 )
...
* Refactored the BaseActionSource
It now uses an interface `IActionSource` instead of a concrete class and further
subclasses.
Instead of relying on a specific class for a certain action type, it now
uses methods with Optional as return values to determine a player or
machine issuing an action. Refer to the JavaDocs for the exact behaviour.
* `IActionHost` no longer extends `IGridHost`
It never used the additional functionality and if needed the `IGridNode`
will also provide a reference to the corresponding `IGridHost`.
Due to most crafting related GUIs being hardcoded to `IGridHost`,
they no longer work when `IActionHost` is not extending it. Actually
`IActionHost` is the better solution for it, as it prevents us from looking
the grid up via the `IGridHost` and potentially finding a wrong grid.
* Interfaces now only lock the currently worked slot.
This allows `DualityInterface#onChangeInventory` to update slots of the same interface, should they be the source for a requested item and therefore updating their working set accordingly to queue further crafting requests for unfulfilled stack requirements.
2017-09-12 11:39:00 +02:00
375e1efb15
We don't need the showCraftingLabel flag, as IAEStack is perfectly fine with 0 size stacks. ( #3071 )
...
Adjust rendering code to use ItemStack with size 1 where required.
2017-09-09 12:58:22 +02:00
04d2b06c0d
Ignore MOVE_REGION when clicking on crafting slots ( #3032 )
...
Exclude crafting slots from list of slots to move on space click.
Fixes #3031
2017-08-15 15:07:42 +02:00
52d28fabe3
Use IItemHandler instead of IInventory internally ( #2971 )
...
* Use IItemHandler instead of IInventory internally
2017-07-28 22:04:32 +02:00
7de90ed0ae
Finally use Java7 <>
2017-07-20 21:21:45 +02:00
621910df91
Format sourcecode
2017-07-20 21:17:10 +02:00
780ce89ac3
Internal change to fix Named Inventories. This change will not affect the reobfed version (much).
2017-07-03 05:54:25 +02:00
Sebastian Hartte