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
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
a521e827db
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/core/api/definitions/ApiItems.java
2020-09-09 02:25:15 +02:00
bcee2ec427
Slightly increased the height of the item hitbox for crystals to make their pickup by annihilation planes less "clippy".
2020-09-09 02:23:58 +02:00
17648633fe
Merge fixes.
2020-09-09 02:23:14 +02:00
fcbebd4ffc
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# gradle.properties
# src/api/java/appeng/api/implementations/items/IGrowableCrystal.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/api/definitions/ApiBlocks.java
# src/main/java/appeng/core/features/registries/LocatableRegistry.java
# src/main/java/appeng/decorative/solid/QuartzGlassBlock.java
# src/main/java/appeng/decorative/solid/SkyStoneBlock.java
# src/main/java/appeng/entity/GrowingCrystalEntity.java
# src/main/java/appeng/fluids/parts/FluidImportBusPart.java
# src/main/java/appeng/items/misc/CrystalSeedItem.java
# src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/parts/CableBusContainer.java
# src/main/java/appeng/tile/AEBaseBlockEntity.java
2020-09-09 01:41:49 +02:00
9e41d543f5
Merge remote-tracking branch 'origin/8.0.x-1.16.1'
2020-09-09 00:59:58 +02:00
81cc0b804d
Fixes #4699 : AE's glass should only hide it's sides adjacent to other AE glass.
...
Also disables spawn on AE's glass same as Vanilla glass.
2020-09-09 00:58:14 +02:00
e1fc9908b3
Fixes #4693 : Fix color applicator not working on cable-buses.
2020-09-09 00:51:45 +02:00
9ed1535477
Fixes #4661 : Do not update a tile entity when it's in an unloaded chunk (i.e. during chunk unloading) ( #4708 )
2020-09-08 22:28:30 +02:00
1ef345d4a4
Formatting fixes.
2020-09-08 22:24:27 +02:00
ff7d1b9719
Fixes #4704 : QNB is not finding a registered QNB because it believes the chunk to be unloaded.
...
Also adds debug logging to the locatable registry to better debug this issues in the future.
2020-09-08 22:20:33 +02:00
88c9370e4f
Crystal Growth Refactor ( #4702 )
...
* Refactored crystal in-world purification:
- Removed iterative formula
- Set the default growth factor to 1 rather than 0.5 to simplify settings
- Made the growth-tick-progress-per-tick a configuration setting for 0-6 accelerators
- Unfinished seeds now slowly sink when ejected by an annihilation plane or other system (emulates a player throwing it in)
- Instead of checking for "isLiquid", we now check for a new tag (appliedenergistics2:crystal_purification_medium) to check if the crystal is submerged in an allowed fluid for growth, defaults to #minecraft:water.
* Removed configuration options for changing how accelerators work,
replaced with improved fluid tag option with a clamped multiplier [1,10].
2020-09-08 18:10:45 +02:00
f2aae3ef0f
Added a global Voxelshape cache for cable bus voxel shapes, since combining voxel shapes turns out to be an extremely expensive process (i.e. 1.7s for 10000x5 shapes).
2020-09-08 17:56:02 +02:00
12739f1e66
Remove unneeded cable-bus inventory-model, which caused the part models to be loaded twice leading to unnecessary memory-usage.
2020-09-08 17:53:14 +02:00
81d2170ada
Implemented a cache with maximum quad-count it will cache for the cable bus, ( #4670 )
...
which also fixes concurrent access to the hashmap.
(cherry picked from commit b756d68be1
2020-09-08 14:28:08 +02:00
0f469e9df6
Bumped Forge version.
2020-09-07 23:34:56 +02:00
0f34f09b32
Remove object-scanning subscriptions and remove unused test-file.
2020-09-06 20:59:37 +02:00
8e54a8fed9
Fixes a problem where tile entities would become unremovable (well, one more of these at least),
...
because they would reset their block state upon removal and loss of power.
2020-09-06 20:59:19 +02:00
ca007a3737
Fix compatibility with fabric-api 0.20
2020-09-05 19:30:00 +02:00
92b6650022
Reformat.
2020-09-05 19:22:21 +02:00
e1cd3bba25
Improved logging and slight refactor.
2020-09-05 19:22:05 +02:00
689bf6e8d9
Removed unused worldgen registry,
...
added biome blacklists for meteorites and quartz ore, and
also fixed adding meteorite/quartz to biomes that are
registered after AE2 initializes.
2020-09-05 19:15:45 +02:00
c8a5049d71
Fix path to AE2 logo in mod json.
2020-09-03 23:33:48 +02:00
10a1a6d855
Fixes #4674 : Facade quads should not keep their original cull-faces if they're moved away
...
from the block face.
2020-09-03 17:54:23 +02:00
d9bb81a00f
Fixes #4680 : Facade advancement is showing an untextured facade.
2020-09-03 17:36:20 +02:00
39e038d916
Fixes #4683 : Hopefully LazyOptional works as advertised ( #4684 )
2020-09-02 21:36:40 +02:00
575a625f75
Also update the layer-map, even though the spatial biome should never show up in any vanilla layering.
2020-09-02 19:44:37 +02:00
Sebastian Hartte