5da5315a5b
Post-merge fixes. Reformat. Optimize Imports.
2020-09-20 14:47:25 +02:00
f3c44c64c2
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# build.gradle
# gradle.properties
# src/api/java/appeng/api/util/DimensionalCoord.java
# src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
# src/main/java/appeng/bootstrap/BlockDefinitionBuilder.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/CraftConfirmScreen.java
# src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
# src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.java
# src/main/java/appeng/client/gui/widgets/IconButton.java
# src/main/java/appeng/client/gui/widgets/NumberBox.java
# src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
# src/main/java/appeng/client/gui/widgets/TabButton.java
# src/main/java/appeng/client/render/DelegateBakedModel.java
# src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
# src/main/java/appeng/client/render/FacadeBakedItemModel.java
# src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
# src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java
# src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java
# src/main/java/appeng/client/render/model/BiometricCardBakedModel.java
# src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java
# src/main/java/appeng/client/render/model/GlassBakedModel.java
# src/main/java/appeng/client/render/model/MemoryCardBakedModel.java
# src/main/java/appeng/client/render/model/SkyCompassBakedModel.java
# src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java
# src/main/java/appeng/container/AEBaseContainer.java
# src/main/java/appeng/container/ContainerLocator.java
# src/main/java/appeng/container/guisync/SyncData.java
# src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
# src/main/java/appeng/container/implementations/CondenserContainer.java
# src/main/java/appeng/container/implementations/ContainerHelper.java
# src/main/java/appeng/container/implementations/CraftConfirmContainer.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/CraftingCPURecord.java
# src/main/java/appeng/container/implementations/CraftingStatusContainer.java
# src/main/java/appeng/container/implementations/IOPortContainer.java
# src/main/java/appeng/container/implementations/InscriberContainer.java
# src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/MEMonitorableContainer.java
# src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
# src/main/java/appeng/container/implementations/PatternTermContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
# src/main/java/appeng/container/implementations/SpatialIOPortContainer.java
# src/main/java/appeng/container/implementations/VibrationChamberContainer.java
# src/main/java/appeng/container/implementations/WirelessTermContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/AppEngBootstrap.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/definitions/ApiItems.java
# src/main/java/appeng/core/features/registries/WorldGenRegistry.java
# src/main/java/appeng/core/sync/network/NetworkHandler.java
# src/main/java/appeng/core/worlddata/WorldData.java
# src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java
# src/main/java/appeng/debug/ChunkLoaderBlockEntity.java
# src/main/java/appeng/debug/ReplicatorCardItem.java
# src/main/java/appeng/entity/GrowingCrystalEntity.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
# src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
# src/main/java/appeng/fluids/container/FluidInterfaceContainer.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/fluids/container/FluidTerminalContainer.java
# src/main/java/appeng/fluids/util/AEFluidInventory.java
# src/main/java/appeng/items/misc/CrystalSeedItem.java
# src/main/java/appeng/items/misc/CrystalSeedRendering.java
# src/main/java/appeng/items/storage/SpatialStorageCellItem.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/mixins/feature/ConfiguredFeaturesAccessor.java
# src/main/java/appeng/mixins/spatial/BiomesMixin.java
# src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java
# src/main/java/appeng/mixins/spatial/EntityMixin.java
# src/main/java/appeng/mixins/spatial/SkyRenderMixin.java
# src/main/java/appeng/mixins/structure/BiomeAccessor.java
# src/main/java/appeng/mixins/structure/GenerationSettingsAccessor.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/automation/PlaneBakedModel.java
# src/main/java/appeng/server/subcommands/SpatialStorageCommand.java
# src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
# src/main/java/appeng/server/subcommands/TestOreGenCommand.java
# src/main/java/appeng/spatial/SpatialStorageBiome.java
# src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
# src/main/java/appeng/spatial/SpatialStorageDimensionIds.java
# src/main/java/appeng/spatial/SpatialStorageHelper.java
# src/main/java/appeng/util/Platform.java
# src/main/java/appeng/worldgen/BiomeModifier.java
# src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
# src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java
# src/main/resources/assets/appliedenergistics2/textures/guis/states.png
2020-09-20 14:11:22 +02:00
b8f48407cd
Fix tooltip rendering.
2020-09-20 01:06:53 +02:00
489b0f635e
Merge remote-tracking branch 'origin/8.0.x-1.16.1'
2020-09-20 00:42:52 +02:00
e6fb553a53
Fixes #4741 : Rework Crafting CPU cycling and extract commonalities into a separate class. ( #4742 )
...
Also Fixes:
- Enter key confirms the "Confirm Crafting" dialog again
- Right Mouse Button correctly cycles backwards through CPUs, while left mouse button forward
- Fixes an internal problem with syncing CPU names
- Naming of unnamed CPUs begins at #1 now
2020-09-20 00:26:34 +02:00
cacd824db3
Remove unused field indicating availability of client classes.
2020-09-19 18:20:11 +02:00
876bb52087
Update forge mappings to 20200916-1.16.2 ( #4749 )
2020-09-19 17:32:23 +02:00
1b4969c8e7
Formatting fixes.
2020-09-19 16:58:37 +02:00
f2427ee347
Fixes #4747 : The chunk unload event was triggering before the chunk was actually saved to disk, which means disconnecting grid connections at that point led to grid nodes not saving their data to the chunk.
2020-09-19 16:54:30 +02:00
4aa9c92a68
Fixes #4747 : Server unload event was destroying grids before the associated nodes were saved, leading to player ids not being saved correctly when quitting the server.
2020-09-19 16:49:44 +02:00
971a9d22e8
Improvements to the usability of the number entry widgets (Priority, Level Emitter, Craft Amount): ( #4737 )
...
- Fixed tab order
- Introduced focus state for corner buttons
- Allowed the player to enter any text, but add validation that only persist it if it is a valid number
- Enter will now confirm these dialogs and return to the previous dialog
- The text field is automatically focused and its contents are selected
2020-09-19 16:27:29 +02:00
b5a90357c0
Fix ME Chest attributes being exposed on the wrong side.
2020-09-19 13:59:09 +02:00
5be0adbc89
Fixed Mixins that were targeting the wrong class/methods.
2020-09-19 02:48:59 +02:00
d8e5f4fed5
Fixed formatating after migrating mappings.
2020-09-19 02:41:53 +02:00
47dfc19b7c
Renamed mixin after mapping update.
2020-09-19 02:40:51 +02:00
45f5851079
Updated versions, and mappings.
2020-09-19 02:40:35 +02:00
76efe6026d
Add an indicator that shows the number of active crafting jobs.
2020-09-18 21:34:42 +02:00
4e03cbd356
Simply build all branches
2020-09-18 10:32:06 +02:00
ce058b006c
Fixes #4748 : badly filtered inventory leads to crashes, also expose the ME storage again.
2020-09-18 03:11:33 +02:00
9005db6f1c
Fix yaml syntax
2020-09-17 21:42:20 +02:00
58afe755b8
Build PRs for all release branches ( #4746 )
2020-09-17 21:37:53 +02:00
f368f9dac2
Fixes #4697 : Show number of required items in condenser tooltips.
2020-09-17 14:33:43 +02:00
e5b45d51cc
Minor style fixes.
2020-09-17 11:43:29 +02:00
5a1d5356d1
Fixes #4733 : Fix a crash bug when an external machine tries draining fluids from a fluid interface without a filter. ( #4738 )
2020-09-16 23:13:18 +02:00
5aef82b9ef
Optimized Imports
2020-09-16 21:35:47 +02:00
483f93f977
Post-merge fixes and item generator fix.
2020-09-16 20:12:38 +02:00
1759f92164
Prevent FG from force-exiting the daemon if runData is used.
2020-09-16 19:51:22 +02:00
e50c13e570
Rolled back the memory change since it'll cause a daemon to launch even during a CI build.
2020-09-16 19:29:47 +02:00
c0575e11b0
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# build.gradle
# gradle.properties
# gradle/scripts/artifacts.gradle
# gradle/scripts/curseforge.gradle
# gradle/wrapper/gradle-wrapper.jar
# gradle/wrapper/gradle-wrapper.properties
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
# src/main/java/appeng/client/gui/widgets/Scrollbar.java
# src/main/java/appeng/core/sync/packets/JEIRecipePacket.java
# src/main/java/appeng/tile/AEBaseBlockEntity.java
# src/main/resources/META-INF/mods.toml
2020-09-16 18:57:15 +02:00
749dd35f88
Updated forge and increased memory for IDE-sync daemon.
2020-09-16 18:18:22 +02:00
ca79a377bd
Merge remote-tracking branch 'origin/8.0.x-1.16.1'
...
# Conflicts:
# gradle/scripts/dependencies.gradle
2020-09-16 17:49:59 +02:00
475c8ff5a1
Adapt the same sorting logic used for items stored in the network for items obtained from patterns, which fixes items from patterns not being able to be shift-clicked into new patterns.
2020-09-16 17:44:49 +02:00
5b3ccf26d0
Merge all gradle files ( #4732 )
...
* Merge all gradle files
The specific build files are now much smaller, so a single one is mostly acceptable now.
Also updates Gradle to 5.6.3
* Disable the Mixin annotation processor when importing this project into IntelliJ since it should only be needed to generate refmaps on an actual build.
* Removed Sonarqube and JaCoCo plugins.
Co-authored-by: Sebastian Hartte <sebastian@hartte.de >
2020-09-14 14:14:00 +02:00
e73dbe4891
Updated Forge / MC to 1.16.3
...
Keep Mappings
Allow higher range for MC + Forge versions
2020-09-14 02:02:59 +02:00
38244000c9
Fixes #4731 : Take the position where the user clicked the handle into account when calculating the new scrollbar position.
...
Also fixes: The scrollbar did not subtract the handle height when determining the available space for moving the handle, thus introducing drift the further down a user scrolled.
Also fixes: The scrollbar did not resize it's trackbar when the ME inventory screens were resized and the number of rows changed, same for craft confirm.
2020-09-13 23:12:59 +02:00
d87ff9d1e7
Formatting fixes.
2020-09-13 22:18:38 +02:00
4ba97ec899
Remove unnecessary debug prints, and rename methods.
2020-09-13 22:11:40 +02:00
0147e1ddfb
Fixes #4730 and also introduces repeat-pageup/pagedown when holding the mouse on the area above or below the scrollbar handle.
2020-09-13 22:09:47 +02:00
621d2ee715
Fixes #4728 : Mark all offloading threads as daemons ( #4729 )
2020-09-13 11:55:18 +02:00
31ecdfbe0a
Use the correct method to update an entities position forcefully.
2020-09-11 18:04:17 +02:00
f0bfbfec48
Should also actually _use_ the fixed invoker...
2020-09-11 17:25:39 +02:00
06a8843a65
Fix a Mixin bug that causes an Invoker conflict with Patchouli.
...
See https://github.com/SpongePowered/Mixin/issues/430
2020-09-11 17:20:20 +02:00
d07937fa93
Render Performance Improvements ( #4721 )
...
* Return a fixed bounding box for frustrum culling of AE tile entity renderers to prevent Forge from re-retrieving the TE from the world and calculating the collision box (very costly for cables).
* Changed dynamic cable bus lighting to be based on block states to improved rendering speed and fix optifine issues. (Potential fix for #4716 ).
2020-09-10 22:56:50 +02:00
65f58913a4
Make players assume ownership of networks when they place security stations onto unsecured ones ( #4714 )
...
* Fixes #4712 : When a security station is placed onto an unsecured network, the placer assumes ownership of the entire network. Otherwise the contiguous network would not necessarily reconnect in the same way when the chunk is reloaded due to differing player-ids throughout the network.
In addition, changes to the node's owner were not being persisted due to the host never being marked as dirty.
* Fix formatting
2020-09-10 22:34:16 +02:00
2bca23d75d
Rebuilt the recipe transfer after upstream changes.
2020-09-10 22:05:06 +02:00
b47543d166
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# gradle.properties
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/sync/packets/JEIRecipePacket.java
# src/main/java/appeng/entity/TinyTNTPrimedEntity.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
# src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
# src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java
# src/main/java/appeng/integration/modules/jei/JEIPlugin.java
# src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java
# src/main/java/appeng/mixins/structure/BiomeAccessor.java
# src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
2020-09-10 19:20:58 +02:00
a340925d98
Fix Wireless screen translated text.
2020-09-10 19:06:00 +02:00
b8e53adf40
Fixes #4719 : Take the entity size into account when spawning item entities ( #4720 )
2020-09-10 17:54:02 +02:00
44544c598f
Fixes #4253 : Just transfer the recipe id instead of every ingredient. ( #4689 )
...
* Fixes #4253 : Just transfer the recipe id instead of every ingredient.
* If possible handle any IRecipe for processing mode
* Improvements and support for AE2 facades.
* Switched to using JEI's displayed stacks (which means we can remove the shapeless variant).
Co-authored-by: Sebastian Hartte <sebastian@hartte.de >
2020-09-09 14:08:24 +02:00
0be7322c2c
Formatting Fixes.
2020-09-09 02:27:12 +02:00
Sebastian Hartte