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
15d4583c56
Working on Spatial Stuff.
2020-07-17 22:38:27 +02:00
e8b57c6dc5
Multiblocks sometimes can't be broken because during removal, ( #4469 )
...
they update their own block-state to display the disconnected
state, effectively reversing their own removal. This occurs
because the cached block state in the tile entity base class is
outdated and doesn't reflect the removal.
2020-07-17 22:35:49 +02:00
8142eb90a6
Added new Cell Rendering to ME Chest ( #4464 )
...
Moved cell models to origin 0,0,0.
Implemented a TER to render cell models/LED in the ME chest as they are rendered in the drive.
2020-07-17 20:37:07 +02:00
08abd4a770
Fixed formatting.
2020-07-17 20:26:17 +02:00
b8722dbbc0
Do not rely on exceptions for control flow, when the
...
cell has no fuzzy mode.
2020-07-17 19:51:59 +02:00
1ac6d5d967
Fixes creation of entangled singularities.
2020-07-17 15:27:03 +02:00
5c290789e0
Fixes #4467 : Private methods also need to be annotated with @OnlyIn(Dist.CLIENT)
...
if they use client-side classes.
2020-07-17 12:45:17 +02:00
0c5c23e9ff
Restored more P2P
2020-07-14 00:12:27 +02:00
4953509255
P2P Fluid Tunnel Fix
2020-07-13 17:45:40 +02:00
832d4bb527
REI search integration.
2020-07-13 13:11:32 +02:00
62b02d3faf
REI integration
2020-07-13 13:02:11 +02:00
188f105730
Fix the alive check for the matter cannon.
2020-07-12 17:20:42 +02:00
006316603d
Tags
2020-07-12 16:54:39 +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
06735f5c39
Rewrite drive model to support custom cell models ( #4459 )
...
* Rewrite driver model to support custom cell models
Each cell can now register a mapping Item -> ResourceLocation for a
custom cell model. Fallback will always be a 1k item cell.
2020-07-11 23:07:20 +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
d18eabe1fc
Restored the old PluginLoader as AddonLoader
...
Introduce a new `IAEAddon` interface, which has to be implemented and
annotated wit `@AEAddon` to obtain access to our public API.
2020-07-11 18:40:51 +02:00
d9d491d51c
Removed deprecated API parts ( #4457 )
2020-07-10 19:35:29 +02:00
1bd4bd00a8
Worldgen, Configs
2020-07-09 23:56:54 +02:00
2944873431
First Working Worldgen of Meteorites
2020-07-07 18:55:56 +02:00
1eaddef694
Fixes #4453 : Avoid using clientside methods serverside.
2020-07-07 18:13:32 +02:00
235fc2e81f
Removed superfluous IAEStack methods
2020-07-07 12:12:48 +02:00
f8ee4bb1f2
Meteorite
2020-07-07 02:13:10 +02:00
5eece068ba
Worldgen, Compass (temp)
2020-07-07 01:55:15 +02:00
9220ca0048
Added HWYLA
2020-07-05 16:50:39 +02:00
eb0e4289b3
Unify the client/server-side shared itemstack registry to avoid over-dependence on the current thread
...
when this class is used. Otherwise if a thread is not correctly detected to be part of the server or client
thread groups, a shared item stack from the wrong domain is returned.
2020-07-05 12:23:16 +02:00
ebbb5b1059
Removed unused storage dimension cap.
2020-07-05 12:22:06 +02:00
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
d4a1590b51
Added a blocktag for movable tile entities with spatial IO. ( #4448 )
...
`#spatial/whitelist` needs to be explicitly enabled through a config
value.
`#spatial/blacklist` will always be consider on top of the normal
blacklist.
2020-07-03 20:34:53 +02:00
b8aa810a5f
Add equals(ItemStack) to IAEItemStack contract.
2020-07-03 14:32:48 +02:00
22facb9748
Don't tick debug energy tileentity clientside
2020-07-03 13:56:22 +02:00
ef3cc8a0a0
Enables replicator card to place multiple instances at once. ( #4447 )
2020-07-03 13:04:12 +02:00
55b3dc0823
Removed unused class.
2020-07-02 23:22:40 +02:00
5982f094ec
ME Chest
2020-07-02 22:34:21 +02:00
eb93ffc8d8
Block Colors Registration,
...
fixing... schtuff.
2020-07-02 19:01:04 +02:00
7b21aa2b07
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/core/api/definitions/ApiParts.java
# src/unported/java/appeng/core/api/definitions/PartType.java
2020-07-02 13:50:28 +02:00
9445fad5a6
Merge pull request #4446 from AppliedEnergistics/removed-part-type
...
Part type's gone!
2020-07-02 13:49:46 +02:00
fee1c18afe
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# gradle.properties
# src/main/java/appeng/block/AEBaseBlock.java
# src/main/java/appeng/block/misc/QuartzFixtureBlock.java
# src/main/java/appeng/block/misc/TinyTNTBlock.java
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/helpers/AEMaterials.java
# src/unported/java/appeng/block/misc/ChargerBlock.java
# src/unported/java/appeng/block/networking/CreativeEnergyCellBlock.java
# src/unported/java/appeng/block/networking/EnergyCellBlock.java
# src/unported/java/appeng/block/networking/WirelessBlock.java
# src/unported/java/appeng/block/paint/PaintSplotchesBlock.java
# src/unported/java/appeng/block/qnb/QuantumLinkChamberBlock.java
# src/unported/java/appeng/block/spatial/SpatialPylonBlock.java
# src/unported/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
# src/unported/java/appeng/tile/storage/ChestBlockEntity.java
2020-07-02 12:26:38 +02:00
295e720d37
Merged more parts
2020-07-02 12:19:41 +02:00
1a7bac1fcc
Merge pull request #4438 from AppliedEnergistics/drive-state-sync
...
Refactored drive state sync
2020-07-02 12:18:40 +02:00
19dee8d339
Merge pull request #4443 from AppliedEnergistics/cable-bus-redstone-connections
...
Refactored CableBus to pass the direction directly.
2020-07-02 12:17:54 +02:00
a4f66c5923
Merge pull request #4444 from AppliedEnergistics/update-mappings
...
Update MCP mappings
2020-07-02 12:17:21 +02:00
fe439bfb23
Part type's gone!
2020-07-02 12:05:34 +02:00
25da0b7357
Removed unused code from DriveLedTER
2020-07-02 11:37:59 +02:00
a2344f52e1
Merge pull request #4445 from AppliedEnergistics/materials-rework
...
Changed AEGlassMaterial to Materials
2020-07-02 10:55:32 +02:00
75234415ac
Cables work
2020-07-02 10:16:03 +02:00
bafc65d3a8
Changed AEGlassMaterial to Materials
...
Preparation in case we need more to support custom non solid, non
opaque, or similar blocks.
Removed custom fullSize/opaque blocks in favour of Material
2020-07-02 09:57:47 +02:00
4e8296d3e7
Merge pull request #4442 from AppliedEnergistics/cleanups
...
Reduce Importance of PartType and Fix Upgrade Card Tooltip Grouping
2020-07-02 09:41:00 +02:00
26eeeb4c75
Fix player id logging.
2020-07-02 09:25:38 +02:00
Sebastian Hartte