19802b96e8
Rendering/Model Fixes
2020-07-18 18:44:10 +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
9bb23bcac8
Refactored crafting patterns ( #4458 )
...
* Deduplicate crafting patterns internals
This should save a bit memory for duplicate patterns as well as speed up
loading new patterns on reloading chunks.
* Encode recipe id in pattern
* Use the recipe id directly for looking it up
* Slightly refactored how patterns encode whether they are crafting patterns or not.
* Renamed PatternHelper.
* Added APIs to encode patterns. (#4463 )
* Removed ICraftingPatternItem.
* Renamed isCrafting to isCraftable
Co-authored-by: shartte <shartte@users.noreply.github.com >
2020-07-12 16:21:30 +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
d9d491d51c
Removed deprecated API parts ( #4457 )
2020-07-10 19:35:29 +02:00
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
3b4302583d
Restore grid IGridProxyable
2020-07-02 01:13:26 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
f2e3d81fd7
Working in part placement
2020-07-01 21:27:37 +02:00
007c7ceb56
Moved more parts of ME over
2020-07-01 01:04:53 +02:00
8d8d3dd2d7
Minor refactoring.
...
Replaced use of reflection with use of functional factory interface (API change).
2020-06-30 18:58:30 +02:00
d17f8cec92
Removed unused fields.
2020-06-30 18:39:34 +02:00
d0acc9ccf1
Removed reliance of TickTracker on implementation detail to generate additional crash information.
2020-06-30 18:34:36 +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
ca104912d6
More fixes
2020-06-29 21:23:50 +02:00
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
55d7ac82e5
Removed no channels pathing.
...
Also use default values for features without a config option
2020-06-28 19:19:05 +02:00
46955643b9
Utils ported
2020-06-28 13:28:14 +02:00
fee5b7fdfc
Utils ported
2020-06-28 03:41:44 +02:00
37ce6b262e
Fabric port in progress
2020-06-28 00:45:33 +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
ba71a82288
Migrations
2020-06-27 16:18:20 +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
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
5225ea426b
pick 97420a31d The big reformat of 2020
2020-06-16 21:45:35 +02:00
4759a6d204
Fixed several tooltips (i.e. Encoded Pattern) losing parts of the text due to TextComponent.shallowCopy not keeping attached siblings.
2020-06-16 17:38:10 +02:00
3cb9695026
Increase network energy buffer to 800 AE
2020-06-14 14:25:30 +02:00
ae69ad6d8a
Fixes #4388 : Ensure correct ticking priority order ( #4410 )
2020-06-11 20:21:17 +02:00
23b6e195ac
Revert using internal API
2020-06-07 17:21:20 +02:00
c411a800f6
Work on server data and registries.
2020-06-05 19:03:29 +02:00
d0b8a5f33f
Working on Inscriber TESR
2020-06-05 00:58:11 +02:00
c402390282
Compiles again.
2020-06-04 19:58:58 +02:00
237463dd94
Lots of compile fixes
2020-06-04 03:02:48 +02:00
58afa6539f
Add data generation. ( #4399 )
...
Recipe and other Data Generators
2020-06-02 23:13:49 +02:00
7747804385
More Container / GUI fixes
2020-06-02 11:40:36 +02:00
3f5c299d09
More compile things
2020-06-02 15:12:30 +09:30
d4c9e5c490
More Renames
2020-06-02 02:38:10 +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
5cdeff01be
Custom Model Loader
2020-06-01 04:02:37 +02:00
ec3b464655
Some additional fixes from other branch.
2020-05-31 16:13:07 +02:00
16d6d55d7f
1.15 port
2020-05-18 14:02:45 +02:00
41a4518c5b
Fixes #4005 : Persist cell after cleanup. ( #4009 )
2019-04-21 22:30:45 +02:00
a847a01d8a
Feature #3832 : Made onRequestChange() less ambiguous ( #3833 )
2018-12-23 22:41:52 +01:00
7daad58607
Fixes #3742 : Do not use storableInStorageCell() to identify generic c… ( #3743 )
...
Annotated IStorageCell with Nonnull where appropriate.
2018-09-28 17:38:08 +02:00
fdcba13369
Power off a network in case it losses its local buffer. ( #3703 )
...
This better indicates power issue with dynamic consumption like
extracting/inserting items into a network. E.g. the terminals will
shutdown, no light/channel/etc indicators.
Due to the networks trying to extract from the largest possible energy
storage first, the network buffer will be used as last option after
energy cells or controllers.
Potentially needs evaluation in case of adhoc networks with a high
transfer rate locally. Increasing the local buffer might be an idea or
have it scale with the amount of local gridnodes. As long as it does not
invalidates energy cells.
2018-09-02 14:00:15 +02:00
a2091d10fe
Code cleanup
...
Added missing this, annotations, etc.
2018-08-30 20:33:08 +02:00
Sebastian Hartte