 Sebastian Hartte
|
780f68952b
|
Added spotless back and reformatted
|
2020-07-27 20:07:27 +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
|
ebe589a714
|
Ported the other number entry dialogs over to the shared widget.
|
2020-07-19 23:25:11 +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 |
|
|
Sebastian Hartte
|
1478e4c378
|
Lots more moved
|
2020-07-04 21:03:30 +02:00 |
|
|
Sebastian Hartte
|
2642ced86b
|
Moving to source sets
|
2020-07-01 23:36:51 +02:00 |
|
|
Sebastian Hartte
|
0d63f560d3
|
More moves and compilation fixes
|
2020-06-29 02:15:31 +02:00 |
|
|
Sebastian Hartte
|
fee5b7fdfc
|
Utils ported
|
2020-06-28 03:41:44 +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
|
26bb08ddb5
|
Post-Rename Formatting Fixes
|
2020-06-22 13:25:38 +02:00 |
|
|
Sebastian Hartte
|
b4471b1abb
|
The Great Renamening of 2020
|
2020-06-22 13:21:23 +02:00 |
|
|
Sebastian Hartte
|
2f8cffdd93
|
Fix several bugs with fluids (null vs. EMPTY).
Fix IAEFluidStack NBT serialization.
Fix fluid export bus not exporting.
Fix fluid formation planes.
Fix fluid annihilation planes.
|
2020-06-20 00:45:47 +02:00 |
|
|
yueh
|
fe215f0a91
|
Code Cleanup
|
2020-06-19 16:09:06 +02:00 |
|
|
yueh
|
5225ea426b
|
pick 97420a31d The big reformat of 2020
|
2020-06-16 21:45:35 +02:00 |
|
|
Sebastian Hartte
|
0232e83196
|
Consolidated ContainerHelpers.
|
2020-06-14 21:36:37 +02:00 |
|
|
Sebastian Hartte
|
d43e8d19dd
|
Implements opening containers from items with and without a block context.
|
2020-06-14 21:23:55 +02:00 |
|
|
Sebastian Hartte
|
fd7ed5bbf0
|
GUI Refactoring and consolidation
|
2020-06-14 18:00:02 +02:00 |
|
|
yueh
|
23b6e195ac
|
Revert using internal API
|
2020-06-07 17:21:20 +02:00 |
|
|
Sebastian Hartte
|
70418b0bb2
|
GUI Registration
|
2020-06-06 21:54:09 +02:00 |
|
|
Sebastian Hartte
|
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 |
|
|
Sebastian Hartte
|
237463dd94
|
Lots of compile fixes
|
2020-06-04 03:02:48 +02:00 |
|
|
covers1624
|
3f5c299d09
|
More compile things
|
2020-06-02 15:12:30 +09:30 |
|
|
Sebastian Hartte
|
fc300745cd
|
Container-Stuff
|
2020-06-02 02:33:05 +02:00 |
|
|
Sebastian Hartte
|
5cdeff01be
|
Custom Model Loader
|
2020-06-01 04:02:37 +02:00 |
|
|
yueh
|
16d6d55d7f
|
1.15 port
|
2020-05-18 14:02:45 +02:00 |
|
|
yueh
|
eb389971a3
|
Fixes #3901: Ensure fluid terminal respects reported stacksizes. (#3902)
|
2019-01-15 12:52:00 +01:00 |
|
|
yueh
|
a2091d10fe
|
Code cleanup
Added missing this, annotations, etc.
|
2018-08-30 20:33:08 +02:00 |
|
|
fscan
|
d2250b115f
|
Fix poweredExtract/Insert and add simulate mode (#3597)
Fixes #3595
|
2018-07-08 18:16:29 +02:00 |
|
|
fscan
|
e5ab9df086
|
Add Fluid Formation/Annihilation Planes (#3591)
Fixes #3572
|
2018-07-08 16:54:22 +02:00 |
|
|
fscan
|
7cd8b72bb7
|
Add fluid level emitter (#3588)
Fixes #3571
|
2018-07-04 19:56:47 +02:00 |
|
|
fscan
|
2182b6e37c
|
Add fluid GUI to me chest, fixed some warnings while at it. (#3579)
Fixes #3555
|
2018-07-04 19:14:34 +02:00 |
|
|
fscan
|
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 |
|
|
yueh
|
dcf7de9000
|
Updated fluid interface GUI and other fluid related textures. (#3567)
|
2018-06-27 20:28:43 +02:00 |
|
|
yueh
|
87999dbf27
|
Moved FluidList to fluid package (#3568)
|
2018-06-27 20:28:29 +02:00 |
|
|
fscan
|
c2d18ce013
|
Added ME Fluid Interface (#3564)
* Fixed fluid storage bus json recipe
* Added part version and recipes
* Added rudimentary gui
|
2018-06-27 20:04:30 +02:00 |
|
|
yueh
|
046a27bf4c
|
Fixes #3560: Render the fluid stacksize for ME fluid slots. (#3562)
|
2018-06-24 17:22:07 +02:00 |
|
|
yueh
|
2c6e50d48a
|
Added fluid models (#3543)
|
2018-06-17 21:17:40 +02:00 |
|