c7980907ed
Facade Recipe integration and cleanups
2020-07-27 18:03:16 +02:00
56ecda5173
1.16 port
2020-07-27 11:21:50 +02:00
662dbca3e1
Fixes #4508 : Correctly construct the sparse lists. ( #4511 )
...
* Fixes #4508 : Correctly construct the sparse lists.
Also renamed all uncondensed getters to sparse and all condensed to the simple ones.
* Apply suggestions from code review
Co-authored-by: shartte <shartte@users.noreply.github.com >
* Streamlined collapsing the sparse lists
* Extracted helper to condense stacks
* Sort lists desc by stack size
Co-authored-by: shartte <shartte@users.noreply.github.com >
2020-07-27 11:21:06 +02:00
6cb6c21495
Mention spotlessApply.
2020-07-26 23:29:34 +02:00
79e9a3913a
Update README.md to reflect that the data generation needs to be run.
2020-07-26 23:29:01 +02:00
7e89317dd5
Fix substitutions not being correctly recognized. ( #4507 )
2020-07-26 22:25:18 +02:00
59e40ccbd9
Fixes mouse handling for right-clicks to clear the search box and middle-click for crafting. ( #4505 )
2020-07-26 16:30:53 +02:00
774f88ee90
Clear searchfield on rightclick ( #4503 )
2020-07-26 15:28:52 +02:00
0528879833
Moved datagens to appeng.datagen ( #4502 )
2020-07-26 15:28:18 +02:00
b6110e4f4a
Remove all maven repos except modmaven ( #4501 )
...
Also upgrades gradle to 4.10.3
2020-07-26 15:27:32 +02:00
5b82e59264
Removed superfluous crash enhancement ( #4498 )
2020-07-26 12:42:48 +02:00
3a4b171443
Fixes #4468 : Default to ae serverside ( #4496 )
2020-07-25 16:05:58 +02:00
8306f5bf0a
Port more stuff
2020-07-25 02:24:36 +02:00
2ac27fd9ce
Fixes patterns always returning a recipe. ( #4495 )
2020-07-24 22:39:38 +02:00
5bf05f6cb1
Port more stuff
2020-07-24 18:39:39 +02:00
d01aa28cdc
Use standard mechanics for damaging the quartz knife. ( #4494 )
2020-07-24 16:39:32 +02:00
9fcfbf31be
Lots of fixes
2020-07-23 02:38:32 +02:00
21aa5ce33b
Don't use PacketBuffer#readString since it's client-only. ( #4489 )
...
Fixes #4488
2020-07-22 10:22:28 +02:00
f7ef6eb772
Same method name as in superclass leads to ForgeGradle reobf problems. ( #4491 )
...
Fixes #4490
2020-07-22 10:22:00 +02:00
10037a9ac5
Correct link to CurseForge page
2020-07-21 18:39:48 +02:00
888de430ba
Also test for generated asset cache
2020-07-20 22:27:01 +02:00
83d661ab2a
Create sv_se.json ( #4485 )
2020-07-20 21:33:44 +02:00
1933b4b10d
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java
# src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
# src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.java
# src/main/java/appeng/client/gui/widgets/NumberBox.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
# src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
2020-07-20 20:19:42 +02:00
019f570331
Pattern Rendering and other Rendering
2020-07-20 20:13:20 +02:00
a537bcf0ee
Merge pull request #4486 from AppliedEnergistics/number-entry-dialogs
...
Number Entry Dialogs
2020-07-20 20:13:04 +02:00
590e435ad6
Formatting fixes
2020-07-19 23:51:57 +02:00
8d92a51e4f
Formatting fixes
2020-07-19 23:50:47 +02:00
4322910614
Added labels that specify the unit of power (AE) and the unit of fluid (mB) for the level emitters.
2020-07-19 23:50:18 +02:00
ebe589a714
Ported the other number entry dialogs over to the shared widget.
2020-07-19 23:25:11 +02:00
6187e6a7bb
Started refactoring number entry dialogs to use shared code.
2020-07-19 20:04:08 +02:00
d5f113eb35
Merge pull request #4484 from AppliedEnergistics/energy-grid-failfast
...
Guard Against Concurrent EnergyGrid Modifications
2020-07-19 17:56:22 +02:00
9ad5bb21c0
Merge pull request #4480 from AppliedEnergistics/mb-fixes
...
Fix more MultiBlock issues
2020-07-19 17:31:06 +02:00
1c88ea7b78
Fail faster when something modifies the list of energy providers/requesters while an extract/inject operation is ongoing, since this would lead to ConcurrentModificationExceptions later, without a way of tracking down what caused the modification in the first place.
2020-07-19 16:39:37 +02:00
5a976ebfae
Merge pull request #4483 from AppliedEnergistics/texture-cleanup
...
Texture Cleanup
2020-07-19 16:20:32 +02:00
b45669bb82
Removed several unchecked casts.
2020-07-19 16:01:19 +02:00
e52cc40dbf
JSON Formatting Fix
2020-07-19 16:00:01 +02:00
8a20d3c1d7
Consolidated fluid models to reuse the item counterparts with different textures.
2020-07-19 15:00:46 +02:00
749ebeb91d
Moved part textures from parts to part to be consistent with singular naming used in Minecraft (and for the model directory).
2020-07-19 14:14:18 +02:00
82586732e3
Removed unused crafting and fluid terminal models and associated textures.
...
Unified naming for textures used by the fluid terminal.
2020-07-19 14:09:57 +02:00
e023d83e62
Deleted unused matrix frame related documentation images.
2020-07-19 13:40:42 +02:00
de7cbc4949
Moved part-related textures from textures/item/part to textures/parts/ and adapted the level emitter item models to use the normal part texture.
2020-07-19 13:37:23 +02:00
71a91e51fb
Naming improvements
2020-07-19 13:16:50 +02:00
223163aa0a
Fixes #4330 : Avoid mutating the input stack ( #4481 )
2020-07-19 13:13:20 +02:00
bdd22093c3
Account for empty messages when drawing tooltips.
2020-07-19 12:05:26 +02:00
0367b35ce0
Never return null from Widget#getMessage since the
...
narrator will always dereference it, leading to a crash.
2020-07-19 12:04:15 +02:00
755ac12b8a
Fix SortedSet using compare for equals ( #4479 )
...
Fix SortedSet using compare for equals
2020-07-19 11:43:20 +02:00
d053c9b1bc
Post-Merge Fixes
2020-07-19 01:09:06 +02:00
be4fdfed85
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/block/spatial/SpatialPylonBlock.java
# src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/hooks/TickHandler.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java
# src/main/java/appeng/me/helpers/AENetworkProxy.java
# src/main/java/appeng/tile/networking/CableBusBlockEntity.java
# src/main/java/appeng/tile/networking/DenseEnergyCellBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
# src/main/java/appeng/util/Platform.java
2020-07-19 01:05:14 +02:00
e1f9e01404
Force cluster-rebuilds on the first detected change, if their bounds do not match.
...
Also use a client-side method to update connected textures
for crafting cubes if two previously distinct clusters are connected.
Refactored MBCalculator to use generics for type checks and remove more casts.
2020-07-19 00:16:33 +02:00
7121426fc9
Disable AO for the Spatial Pylon due to artifacts.
2020-07-19 00:12:35 +02:00
Sebastian Hartte