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
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
89ea923c43
Merge fixes
2020-09-02 19:41:44 +02:00
5d818eb03e
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-02 02:55:39 +02:00
12ca8d109a
Merge remote-tracking branch 'origin/8.0.x-1.16.1'
2020-09-02 02:55:12 +02:00
e34126458b
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# gradle.properties
# src/main/java/appeng/client/gui/Size1Slot.java
# src/main/java/appeng/client/me/SlotFluidME.java
# src/main/java/appeng/client/me/SlotME.java
# src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
# src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java
# src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java
# src/main/java/appeng/core/sync/packets/MEInterfaceUpdatePacket.java
# src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java
# src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
# src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
# src/main/java/appeng/fluids/helper/FluidCellConfig.java
# src/main/resources/META-INF/mods.toml
2020-09-02 02:45:31 +02:00
0ac918c363
Fixed exclusion zones for many screens.
2020-09-02 02:37:47 +02:00
b6160e40bc
Fixes #4671 : Use other Ingredient method which is not client-only.
2020-09-02 01:49:24 +02:00
cf103b06c1
Fixes #4677 : Stackoverflow when crafting with the quartz knife.
2020-09-02 00:12:20 +02:00
f0d0595c8f
Fixes #4669 : Take NBT into account for comparing. ( #4675 )
...
This only covers combining different items together.
Fuzzy filtering is still a bit too fuzzy for corner cases.
2020-09-01 21:59:08 +02:00
b756d68be1
Implemented a cache with maximum quad-count it will cache for the cable bus, ( #4670 )
...
which also fixes concurrent access to the hashmap.
2020-09-01 18:20:51 +02:00
60b07e5ca5
Merge branch '8.0.x-1.16.1'
2020-09-01 01:07:47 +02:00
7c99fca789
Fixes removal of facades not invalidating the cached server-side collision boxes. ( #4663 )
...
(cherry picked from commit 957bc4c5cc
2020-09-01 01:07:30 +02:00
ab393b0ed1
Serialize the complete NBT data to avoid mismatches ( #4665 )
...
This might increase the network traffic a bit, but the amount of mods actually using the share tag seems to be very limited.
For now it is worth the risk as it solves the problem. In case we run into actual issues, there might still be other solutions, which will be way more complex and can potentially introduce additional problems.
(cherry picked from commit e90dd2f9c6
2020-09-01 01:07:28 +02:00
957bc4c5cc
Fixes removal of facades not invalidating the cached server-side collision boxes. ( #4663 )
2020-08-31 23:10:25 +02:00
133ed1f09d
Remove GZipStreams from packets. ( #4664 )
...
This should now be handled by the normal network manager (hopefully).
Also renamed the `CompressedNBTPacket` to `MEInterfaceUpdatePacket` as that is the only use case.
2020-08-31 23:09:28 +02:00
e90dd2f9c6
Serialize the complete NBT data to avoid mismatches ( #4665 )
...
This might increase the network traffic a bit, but the amount of mods actually using the share tag seems to be very limited.
For now it is worth the risk as it solves the problem. In case we run into actual issues, there might still be other solutions, which will be way more complex and can potentially introduce additional problems.
2020-08-31 23:09:14 +02:00
9719c7ffc3
Bump to Forge 33.0.22
2020-08-29 23:13:29 +02:00
Sebastian Hartte