Commit Graph

1749 Commits

Author SHA1 Message Date
Sebastian Hartte 4953509255 P2P Fluid Tunnel Fix 2020-07-13 17:45:40 +02:00
Sebastian Hartte 832d4bb527 REI search integration. 2020-07-13 13:11:32 +02:00
Sebastian Hartte 62b02d3faf REI integration 2020-07-13 13:02:11 +02:00
Sebastian Hartte 188f105730 Fix the alive check for the matter cannon. 2020-07-12 17:20:42 +02:00
Sebastian Hartte 006316603d Tags 2020-07-12 16:54:39 +02:00
yueh 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
yueh 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
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
yueh 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
yueh d9d491d51c Removed deprecated API parts (#4457) 2020-07-10 19:35:29 +02:00
Sebastian Hartte 1bd4bd00a8 Worldgen, Configs 2020-07-09 23:56:54 +02:00
Sebastian Hartte 2944873431 First Working Worldgen of Meteorites 2020-07-07 18:55:56 +02:00
yueh 1eaddef694 Fixes #4453: Avoid using clientside methods serverside. 2020-07-07 18:13:32 +02:00
yueh 235fc2e81f Removed superfluous IAEStack methods 2020-07-07 12:12:48 +02:00
Sebastian Hartte f8ee4bb1f2 Meteorite 2020-07-07 02:13:10 +02:00
Sebastian Hartte 5eece068ba Worldgen, Compass (temp) 2020-07-07 01:55:15 +02:00
Sebastian Hartte 9220ca0048 Added HWYLA 2020-07-05 16:50:39 +02:00
Sebastian Hartte 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
Sebastian Hartte ebbb5b1059 Removed unused storage dimension cap. 2020-07-05 12:22:06 +02:00
Sebastian Hartte 1478e4c378 Lots more moved 2020-07-04 21:03:30 +02:00
yueh 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
Sebastian Hartte b8aa810a5f Add equals(ItemStack) to IAEItemStack contract. 2020-07-03 14:32:48 +02:00
yueh 22facb9748 Don't tick debug energy tileentity clientside 2020-07-03 13:56:22 +02:00
yueh ef3cc8a0a0 Enables replicator card to place multiple instances at once. (#4447) 2020-07-03 13:04:12 +02:00
Sebastian Hartte 55b3dc0823 Removed unused class. 2020-07-02 23:22:40 +02:00
Sebastian Hartte 5982f094ec ME Chest 2020-07-02 22:34:21 +02:00
Sebastian Hartte eb93ffc8d8 Block Colors Registration,
fixing... schtuff.
2020-07-02 19:01:04 +02:00
Sebastian Hartte 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
shartte 9445fad5a6 Merge pull request #4446 from AppliedEnergistics/removed-part-type
Part type's gone!
2020-07-02 13:49:46 +02:00
Sebastian Hartte 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
Sebastian Hartte 295e720d37 Merged more parts 2020-07-02 12:19:41 +02:00
shartte 1a7bac1fcc Merge pull request #4438 from AppliedEnergistics/drive-state-sync
Refactored drive state sync
2020-07-02 12:18:40 +02:00
shartte 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
shartte a4f66c5923 Merge pull request #4444 from AppliedEnergistics/update-mappings
Update MCP mappings
2020-07-02 12:17:21 +02:00
Sebastian Hartte fe439bfb23 Part type's gone! 2020-07-02 12:05:34 +02:00
yueh 25da0b7357 Removed unused code from DriveLedTER 2020-07-02 11:37:59 +02:00
shartte a2344f52e1 Merge pull request #4445 from AppliedEnergistics/materials-rework
Changed AEGlassMaterial to Materials
2020-07-02 10:55:32 +02:00
Sebastian Hartte 75234415ac Cables work 2020-07-02 10:16:03 +02:00
yueh 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
shartte 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
Sebastian Hartte 26eeeb4c75 Fix player id logging. 2020-07-02 09:25:38 +02:00
Sebastian Hartte c7b1ab756b Fix WorldData initialization 2020-07-02 01:28:02 +02:00
Sebastian Hartte dd9346e53f Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts:
#	src/main/java/appeng/block/AEBaseBlockItem.java
#	src/main/java/appeng/core/AEConfig.java
#	src/main/java/appeng/parts/PartPlacement.java
2020-07-02 01:18:31 +02:00
Sebastian Hartte 3b4302583d Restore grid IGridProxyable 2020-07-02 01:13:26 +02:00
Sebastian Hartte f573b52b1b Be more lenient with the return value of BlockItem.tryPlace (it might be CONSUME in future versions). 2020-07-02 01:12:53 +02:00
Sebastian Hartte a1042384e3 Minor simplification of PartPlacement. 2020-07-02 01:09:17 +02:00
Sebastian Hartte 2642ced86b Moving to source sets 2020-07-01 23:36:51 +02:00
Sebastian Hartte f2e3d81fd7 Working in part placement 2020-07-01 21:27:37 +02:00
yueh 1ce82cc3b9 Update MCP mappings 2020-07-01 20:23:27 +02:00
yueh 7dffbf78ce Refactored CableBus to pass the direction directly. 2020-07-01 19:56:39 +02:00