f2e3d81fd7
Working in part placement
2020-07-01 21:27:37 +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
f943106419
Fix serialization of 0-amount fluidstacks which is required for properly updating an ME inventory where an existing fluid stack should be fully removed. (I.e. Taking out the last amount of a given fluid via a terminal).
2020-06-29 17:13:04 +02:00
57fa5576af
Fix rendering of the dummy fluid item (i.e. in cell workbenches, fluid terminals are unaffected).
2020-06-29 15:32:49 +02:00
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
f5412152a4
Utils ported
2020-06-28 15:47:44 +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
c4b5100283
Removal of lots of fixmes.
...
Removed InvTweaks sort order (mod indicates it wont update, suggested replacement cpw sorting mod only sorts by count and reg-id).
Reactivated dissassemble special recipe.
Removed leftovers from cable bus non-tesr tile.
Added JEI facade recipes back in.
Removed superflous datagen for quartz tools.
2020-06-22 02:32:19 +02:00
ee086366ed
Removed ConfigHost facade around AEConfig with explicit config options
...
Removed unused config options
2020-06-21 18:31:35 +02:00
bed724b1ce
Add fluid annihilation plane blacklist.
2020-06-20 00:56:59 +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
2458f9c890
Fix identity annihilation plane.
...
Added annihilation plane blacklist tags.
Moved to using loot-table item generation for annihilation plane.
Play fluid pickup sound rather than block break sound for fluid annihilation planes.
Do not play a second block break sound (the server already does).
2020-06-19 21:51:38 +02:00
ff65e3936a
Formatting fixes
2020-06-19 17:21:31 +02:00
a3284ffdab
Fix Fluid Terminal keyboard interaction with search field
2020-06-19 17:21:31 +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
0232e83196
Consolidated ContainerHelpers.
2020-06-14 21:36:37 +02:00
d43e8d19dd
Implements opening containers from items with and without a block context.
2020-06-14 21:23:55 +02:00
cbbb9d1ade
More warning fixes and cleanup.
2020-06-14 18:13:42 +02:00
fd7ed5bbf0
GUI Refactoring and consolidation
2020-06-14 18:00:02 +02:00
9b19f5b0e2
Enum-Ify ISortSource since it always uses the same enum types
...
Reactivate JEI integration
2020-06-14 14:30:41 +02:00
048c2d0b46
Fix item stack rendering and consolidate it for fluids+items.
2020-06-14 14:19:15 +02:00
2e41d44964
Fix default block properties.
2020-06-13 22:46:13 +02:00
e83429e1bb
Updated ids to better match vanilla conventions ( #4412 )
...
Also changed related textures, models and recipes.
2020-06-12 19:05:29 +02:00
d449ee47c4
Refactored AEStacks & ItemList ( #4406 )
...
Removed custom VarInt/VarLong solution.
Moved itemstack and fluidstack serialisation to their own NBT tag to avoid interference.
Removed now useless NBT sorting
Added NullItemList
2020-06-11 20:20:16 +02:00
bd16641638
Fixed formation planes.
2020-06-10 00:25:44 +02:00
97e065ea1f
Part models
2020-06-09 00:53:40 +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
70418b0bb2
GUI Registration
2020-06-06 21:54:09 +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
237463dd94
Lots of compile fixes
2020-06-04 03:02:48 +02:00
2de3a2ecee
Grindr, GUI, Container.
2020-06-02 22:52:35 +02:00
cf9ab8a13b
ActionResultType in onActivated
2020-06-02 19:15:23 +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
19cdea7eb5
Move from ByteBuf to PacketBuffer
2020-06-02 11:07:46 +09:30
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
077ff17078
More stuff ingame and showing up.
2020-06-01 01:01:32 +02:00
Sebastian Hartte