Commit Graph

1749 Commits

Author SHA1 Message Date
yueh 0f11c1e0a4 Hide debug tools from JEI when disabled via config (#4439) 2020-07-01 14:29:43 +02:00
yueh 77b544ce4f Refactored drive state sync
Removed blinking state for now
2020-07-01 14:22:07 +02:00
Sebastian Hartte 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
Sebastian Hartte 996d387525 More moves 2020-07-01 01:39:50 +02:00
Sebastian Hartte 1cda087c03 Merge remote-tracking branch 'origin/master' into fabric-1.16 2020-07-01 01:31:20 +02:00
Sebastian Hartte 007c7ceb56 Moved more parts of ME over 2020-07-01 01:04:53 +02:00
Sebastian Hartte 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
Sebastian Hartte 400fcdb633 Formatting fix 2020-07-01 00:50:37 +02:00
Sebastian Hartte fba157a707 Removed unused ItemPredicate 2020-07-01 00:44:48 +02:00
Sebastian Hartte 538965e74a Crash when someone tries to overwrite existing grid cache implementations. 2020-07-01 00:44:48 +02:00
Sebastian Hartte 8d8d3dd2d7 Minor refactoring.
Replaced use of reflection with use of functional factory interface (API change).
2020-06-30 18:58:30 +02:00
Sebastian Hartte d17f8cec92 Removed unused fields. 2020-06-30 18:39:34 +02:00
Sebastian Hartte d0acc9ccf1 Removed reliance of TickTracker on implementation detail to generate additional crash information. 2020-06-30 18:34:36 +02:00
yueh 17b919a171 Mark CableBusBlock as variableOpacity. 2020-06-30 15:37:34 +02:00
Sebastian Hartte 529d03fa9e Added Quartz Tools and Quartz Knife Recipes 2020-06-30 15:33:53 +02:00
Sebastian Hartte c0a4762ffc Fixed TNT and basic networking. 2020-06-30 11:30:04 +02:00
Sebastian Hartte eaf2873649 Render all sides of the cell models regardless of cullface. 2020-06-29 22:39:34 +02:00
yueh 66d00a4600 Use our own TransparencyState.
ObfuscationReflectionHelper is a massive performance issue.
2020-06-29 22:17:39 +02:00
yueh d79d284690 Fix formatting 2020-06-29 22:17:25 +02:00
Sebastian Hartte 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
Sebastian Hartte ca104912d6 More fixes 2020-06-29 21:23:50 +02:00
Sebastian Hartte 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
Sebastian Hartte d5491549eb Fixes TinyTNT not being primable with flint & steel. 2020-06-29 21:01:30 +02:00
Sebastian Hartte 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
Sebastian Hartte 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
Sebastian Hartte 346e58ff25 Remove duplicate registration of disassembly recipes. 2020-06-29 02:58:52 +02:00
Sebastian Hartte 0d63f560d3 More moves and compilation fixes 2020-06-29 02:15:31 +02:00
Sebastian Hartte 312abce956 Removed unused interface. 2020-06-28 23:58:36 +02:00
Sebastian Hartte 6379cfe3a2 Removed unused interface. 2020-06-28 23:57:19 +02:00
yueh 208cd70725 Readded cullface to drive model.
Also fixed a debug machine
2020-06-28 20:59:51 +02:00
yueh 130fc74768 Render cells in offline drives as offline. 2020-06-28 20:01:22 +02:00
yueh 6bbea481b8 Grid connections to the front of a drive are no longer valid. 2020-06-28 19:35:19 +02:00
yueh 55d7ac82e5 Removed no channels pathing.
Also use default values for features without a config option
2020-06-28 19:19:05 +02:00
Sebastian Hartte 3df93fc66d Moving 2020-06-28 16:18:11 +02:00
Sebastian Hartte f5412152a4 Utils ported 2020-06-28 15:47:44 +02:00
Sebastian Hartte 46955643b9 Utils ported 2020-06-28 13:28:14 +02:00
Sebastian Hartte fee5b7fdfc Utils ported 2020-06-28 03:41:44 +02:00
Sebastian Hartte 7c28a71e10 Moving code around 2020-06-28 00:51:00 +02:00
Sebastian Hartte 7f049e099d Moving code around 2020-06-28 00:48:21 +02:00
Sebastian Hartte 37ce6b262e Fabric port in progress 2020-06-28 00:45:33 +02:00
Sebastian Hartte b79cd732b2 Fabric port in progress 2020-06-27 23:25:38 +02:00
Sebastian Hartte 80fbb58d4f API compiles 2020-06-27 18:09:44 +02:00
Sebastian Hartte ba71a82288 Migrations 2020-06-27 16:18:20 +02:00
yueh fe8bebe1c3 Fix The One Probe integration crash when not present 2020-06-25 21:54:44 +02:00
yueh d8928070fd Removed superfluous conditional recipes (#4433)
If needed, a global flag to disable all AE2 recipes will be added later.
2020-06-25 21:33:41 +02:00
yueh fd1dd982c1 Fill the crater with water in case there is some adjacent water (#4430)
* Fill the crater with water in case there is some adjacent water
* Removed whitelist/blacklist tags
2020-06-25 20:52:25 +02:00
yueh d7a09f70ef Removed features from config which are no longer possible (#4431) 2020-06-25 20:51:51 +02:00
yueh deaddb8e82 Updated drive model (#4432) 2020-06-25 20:51:34 +02:00
Sebastian Hartte 4e3eb89f84 Improved Meteorite Testcommand 2020-06-23 11:58:43 +02:00
yueh 3e56311f2f Fixes fallout selection (#4429) 2020-06-22 23:09:15 +02:00