414b01bddb
Merge branch 'master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/block/storage/SkyChestBlock.java
# src/main/java/appeng/client/render/tesr/SkyChestTESR.java
# src/main/java/appeng/core/api/ApiPart.java
# src/main/java/appeng/core/api/definitions/ApiItems.java
# src/main/java/appeng/core/sync/packets/PartPlacementPacket.java
# src/main/java/appeng/parts/PartPlacement.java
# src/unported/java/appeng/client/ClientHelper.java
# src/unported/java/appeng/core/CommonHelper.java
# src/unported/java/appeng/server/ServerHelper.java
2020-08-03 15:15:14 +02:00
1801302d8f
Fix SkyStone chest model issues that I had introduced back in 1.8. ( #4542 )
...
This makes the chest 1 pixel higher to restore the look it had in 1.7.
Since the skystone chest's texture is a grungy mess, only the most
obvious texture problems were fixed, while for the skystone block chest,
the look should be close to what it was now.
Also introduces caching for the skystone chest's block shape.
2020-08-03 14:46:23 +02:00
3a12fa4843
Minor cleanup.
2020-08-03 13:05:23 +02:00
a97ebaf40d
Server can at least begin to launch now.
2020-08-02 15:45:59 +02:00
9ce4a65203
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/block/misc/ChargerBlock.java
# src/main/java/appeng/core/api/definitions/ApiBlocks.java
2020-08-02 15:15:39 +02:00
088627aedf
Remove client-only methods from ChargerBlock which could potentially create synthetic lambda methods that reference client-only classes (and are not stripped).
2020-08-02 15:13:20 +02:00
d66986df85
Fix cell models not being loaded. ( #4528 )
2020-08-01 12:59:05 +02:00
84e6aaa122
Compiles again.
2020-07-27 23:50:28 +02:00
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
56ecda5173
1.16 port
2020-07-27 11:21:50 +02:00
019f570331
Pattern Rendering and other Rendering
2020-07-20 20:13:20 +02:00
d053c9b1bc
Post-Merge Fixes
2020-07-19 01:09:06 +02:00
19802b96e8
Rendering/Model Fixes
2020-07-18 18:44:10 +02:00
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
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
006316603d
Tags
2020-07-12 16:54:39 +02:00
5eece068ba
Worldgen, Compass (temp)
2020-07-07 01:55:15 +02:00
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
1a7bac1fcc
Merge pull request #4438 from AppliedEnergistics/drive-state-sync
...
Refactored drive state sync
2020-07-02 12:18:40 +02:00
25da0b7357
Removed unused code from DriveLedTER
2020-07-02 11:37:59 +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
77b544ce4f
Refactored drive state sync
...
Removed blinking state for now
2020-07-01 14:22:07 +02:00
1cda087c03
Merge remote-tracking branch 'origin/master' into fabric-1.16
2020-07-01 01:31:20 +02:00
66d00a4600
Use our own TransparencyState.
...
ObfuscationReflectionHelper is a massive performance issue.
2020-06-29 22:17:39 +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
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
130fc74768
Render cells in offline drives as offline.
2020-06-28 20:01:22 +02:00
f5412152a4
Utils ported
2020-06-28 15:47:44 +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
deaddb8e82
Updated drive model ( #4432 )
2020-06-25 20:51:34 +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
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
a23b35ed63
Remove broken and unused import statement
2020-06-16 11:50:18 +02:00
d50dcc31fa
Working on drive design.
...
Several particle crash fixes.
2020-06-15 22:20:29 +02:00
f5a56682dd
Improved TESR rendering for inscriber again:
...
- Use storage block tag to determine if the larger transform should be used to show it in the inscriber.
- Use an easing function to retract the stamp
2020-06-14 13:40:22 +02:00
2003506fd1
Simplified Inscriber TESR.
2020-06-14 12:56:23 +02:00
9599a31893
Removed Inscriber Recipe Registry
...
Fixed Inscriber TESR rendering and added a small easing function
2020-06-14 11:27:24 +02:00
1c7a28c606
More Rendering Fixes
2020-06-07 15:57:07 +02:00
d0b8a5f33f
Working on Inscriber TESR
2020-06-05 00:58:11 +02:00
c402390282
Compiles again.
2020-06-04 19:58:58 +02:00
237463dd94
Lots of compile fixes
2020-06-04 03:02:48 +02:00
Sebastian Hartte