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
c7b1ab756b
Fix WorldData initialization
2020-07-02 01:28:02 +02:00
2dd2b5d034
Added test dependency back.
2020-07-02 01:18:40 +02:00
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
3b4302583d
Restore grid IGridProxyable
2020-07-02 01:13:26 +02:00
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
a1042384e3
Minor simplification of PartPlacement.
2020-07-02 01:09:17 +02:00
3dd9aa09d3
Fixed Gradle source sets.
2020-07-02 00:20:04 +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
1ce82cc3b9
Update MCP mappings
2020-07-01 20:23:27 +02:00
7dffbf78ce
Refactored CableBus to pass the direction directly.
2020-07-01 19:56:39 +02:00
0f11c1e0a4
Hide debug tools from JEI when disabled via config ( #4439 )
2020-07-01 14:29:43 +02:00
77b544ce4f
Refactored drive state sync
...
Removed blinking state for now
2020-07-01 14:22:07 +02:00
8e031ca8d6
Merge remote-tracking branch 'origin/cleanups' into fabric-1.16
...
# Conflicts:
# api/src/main/java/appeng/api/implementations/items/IItemGroup.java
# core/src/main/java/appeng/items/materials/MaterialItem.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/definitions/ApiParts.java
# src/main/java/appeng/items/parts/ColoredPartItem.java
# src/main/java/appeng/items/parts/PartItem.java
# src/main/java/appeng/items/parts/PartModelsHelper.java
# src/main/java/appeng/items/parts/PartType.java
# src/main/java/appeng/items/tools/powered/PortableCellItem.java
2020-07-01 01:41:54 +02:00
996d387525
More moves
2020-07-01 01:39:50 +02:00
1cda087c03
Merge remote-tracking branch 'origin/master' into fabric-1.16
2020-07-01 01:31:20 +02:00
007c7ceb56
Moved more parts of ME over
2020-07-01 01:04:53 +02:00
c67dba2f13
Removed reliance on PartType from code outside of Bootstrapping,
...
and restored ability to group different supported items on
Upgrade Card tooltips.
2020-07-01 00:56:17 +02:00
400fcdb633
Formatting fix
2020-07-01 00:50:37 +02:00
fba157a707
Removed unused ItemPredicate
2020-07-01 00:44:48 +02:00
538965e74a
Crash when someone tries to overwrite existing grid cache implementations.
2020-07-01 00:44:48 +02:00
0a56c724ed
Merge pull request #4441 from AppliedEnergistics/cleanups
...
Minor Cleanups / Refactoring
2020-07-01 00:30:25 +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
17b919a171
Mark CableBusBlock as variableOpacity.
2020-06-30 15:37:34 +02:00
529d03fa9e
Added Quartz Tools and Quartz Knife Recipes
2020-06-30 15:33:53 +02:00
c0a4762ffc
Fixed TNT and basic networking.
2020-06-30 11:30:04 +02:00
003ef8672c
Added cullface to drive cell models.
2020-06-30 10:27:22 +02:00
eaf2873649
Render all sides of the cell models regardless of cullface.
2020-06-29 22:39:34 +02:00
66d00a4600
Use our own TransparencyState.
...
ObfuscationReflectionHelper is a massive performance issue.
2020-06-29 22:17:39 +02:00
d79d284690
Fix formatting
2020-06-29 22:17:25 +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
7233b11284
Fix TinyTNT not spawning the correct entity client-side (and the renderer using the wrong shadow).
2020-06-29 21:14:58 +02:00
d5491549eb
Fixes TinyTNT not being primable with flint & steel.
2020-06-29 21:01:30 +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
346e58ff25
Remove duplicate registration of disassembly recipes.
2020-06-29 02:58:52 +02:00
42c2be5c05
Add version constraint on Forge.
2020-06-29 02:57:38 +02:00
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
312abce956
Removed unused interface.
2020-06-28 23:58:36 +02:00
6379cfe3a2
Removed unused interface.
2020-06-28 23:57:19 +02:00
208cd70725
Readded cullface to drive model.
...
Also fixed a debug machine
2020-06-28 20:59:51 +02:00
130fc74768
Render cells in offline drives as offline.
2020-06-28 20:01:22 +02:00
6bbea481b8
Grid connections to the front of a drive are no longer valid.
2020-06-28 19:35:19 +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
yueh