b03a249da3
Remove libstructure
...
Migrate to 1.16.2 final
2020-08-12 18:23:32 +02:00
964559baa1
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java
2020-08-11 16:35:05 +02:00
87c2c94bd4
Use minus sign for minus buttons in number widget.
2020-08-11 16:31:20 +02:00
06f30b3daa
Reformat
2020-08-11 16:21:05 +02:00
68a02ed64b
Updated to 1.16.2-rc2
2020-08-11 16:20:31 +02:00
c59a6e34eb
Post-merge fixes
2020-08-11 02:12:26 +02:00
5b4f450fc3
Fix toLowerCase issues
2020-08-11 02:07:32 +02:00
ff0d38d56a
Merge fixes
2020-08-11 01:36:51 +02:00
d591a1492c
Fixes #4583 : Confine fluix crafting into the same block ( #4586 )
...
Fluix crystals will now spawn within an area around the center of the block as well as some tuned down motion while still maintaining some randomness.
2020-08-10 11:30:04 +02:00
d1ba26311b
One Spatial Dimension ( #4570 )
...
* Ported the "one spatial dimension" concept from pre-1.15
* Apply lighting updates after moving chunks.
Mark world data as dirty when changing it.
* Consolidated naming of spatial storage world/dimension.
Use server light manager to update lighting info in chunk.
* Save last transition information,
and add ae2 spatial command to interact with spatial storage.
* Formatting fixes.
* Improved docs for the origin generation.
Inverted condition on when the x/z axis are flipped.
Also added a helper to map a plot to a region file
* Remove TransitionResult since it's only used in lieu of a boolean.
Rework transition to make the checks BEFORE allocating a new cell.
* Removed unused imports.
Co-authored-by: yueh <yueh@users.noreply.github.com >
2020-08-10 11:29:07 +02:00
8733c2c11f
Fix Special Model Registration ( #4577 )
...
* Fixes #4575 by updating Forge (ModelRegistryEvent is a modbus event but was misflagged as not being one). And update Forge because their breaking change breaks our mod.
* Update gradle.properties
Co-authored-by: yueh <yueh@users.noreply.github.com >
* Update src/main/resources/META-INF/mods.toml
Co-authored-by: yueh <yueh@users.noreply.github.com >
Co-authored-by: yueh <yueh@users.noreply.github.com >
2020-08-10 11:25:26 +02:00
4230fc7325
Fixes #4576 : Append the amount to each button ( #4580 )
2020-08-09 13:23:24 +02:00
9456f639d4
Simplify "unlit" quad loading and move to Mixins ( #4569 )
...
* Simplified the UV loader concept: We only need it to make quads "unlit" which means that the lighting system is not applied to them. They always render at their full brightness.
* More documentation and slight cleanups.
2020-08-09 01:27:19 +02:00
fe753c540b
Fixes #4571 : When not used for displaying localized text, specify Locale.ROOT for toLowerCase/toUpperCase to avoid issues with locale-specific non-ASCII lowercase conversions for ASCII uppercase characters (i.e. turkish lowercase i for uppercase I). ( #4573 )
2020-08-08 14:56:51 +02:00
2fabab3a6a
Fix AO lighting for faces not fully snapped to block edges.
2020-08-08 02:20:40 +02:00
c7d3877129
Use the declared power drain for p2p tunnels ( #4567 )
2020-08-06 20:07:40 +02:00
89058448cf
Merged most recent master.
2020-08-06 00:46:20 +02:00
3c737d8d1e
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java
# src/main/java/appeng/client/gui/widgets/ITooltip.java
# src/main/java/appeng/client/gui/widgets/IconButton.java
# src/main/java/appeng/client/gui/widgets/ProgressBar.java
# src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
# src/main/java/appeng/client/gui/widgets/ToggleButton.java
# src/main/java/appeng/container/slot/PlayerInvSlot.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java
# src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java
# src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
# src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java
# src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java
2020-08-05 23:40:58 +02:00
8f740be431
Respect max amount per slot.
2020-08-05 23:15:04 +02:00
77e07e9b3b
Remove shape logic in AEBaseInvBlockEntity and bring offering inventories in line with caps.
2020-08-05 23:12:39 +02:00
d04cd2a001
Actually implement WrapperFilteredItemHandler.
2020-08-05 23:12:03 +02:00
239f8d027a
Fix network status screen showing translation keys.
2020-08-05 23:11:31 +02:00
c4c4d20303
Added Vanilla Hopper integration.
2020-08-05 23:06:56 +02:00
e7c57c0f61
Update the nominal face after the cull face, since
...
updating the cull face will also force the nominal
face to the cull face.
2020-08-05 23:06:09 +02:00
822249dda8
Added missing @Override annotations.
2020-08-05 22:11:00 +02:00
1404806d3d
Fixes #4559 : Use visual bounding box for overlay ( #4561 )
2020-08-05 21:52:34 +02:00
12e3fa9127
Makes formation planes a bit more consistent and less violent. ( #4553 )
...
* Makes formation planes a bit more consistent and less violent.
Items will now have a slower speed when spawning as well as a narrower area to avoid having them glitch into a wall and be teleported around
* Removed debug output, added clarifying parenthesis and extracted method.
* Fixes various other issues with the formation plane
Also removed now useless code
Co-authored-by: Sebastian Hartte <sebastian@hartte.de >
2020-08-05 17:56:42 +02:00
8617dc8340
Plane Connection Refactor ( #4556 )
...
* Refactors all plane parts to use a common helper for
calculating connections to adjacent planes.
Also fixes problems with updating these connections on neighbor updates.
* Fix conflicting GuiSync ID.
* Slightly refactor PlaneConnectionHelper, and fix an issue where the bounding box was calculated incorrectly by using the wrong up-direction.
2020-08-05 17:45:33 +02:00
9bc844738c
Fixes #4547 : Name clash between ITooltip#getWidth, ITooltip#getHeight and Vanilla Widget methods leads to missing methods at runtime, since the implementing methods will be remapped to SRG names, while referees of the interface will try to call the renamed methods by their name in the interface, leading to an AbstractMethodError. ( #4557 )
2020-08-05 16:33:44 +02:00
eab6483bd7
Fixes #4551 : Bounding box of annihilation planes is too small.
2020-08-05 00:54:26 +02:00
7ca9405c8b
Apply the FE tunnel behaviour to the fluid tunnel ( #4550 )
2020-08-04 17:57:59 +02:00
39959145a3
Revert "Apply the FE tunnel behaviour to the fluid tunnel ( #4545 )" ( #4549 )
...
This reverts commit 22f552217f
2020-08-04 08:45:10 +02:00
184fe8c1fc
Fix items being lost when trying to stack items in the player inventory.
2020-08-03 22:29:03 +02:00
6f4722b393
Preliminary fix for AO-enabled auto-rotated blocks using the wrong face for getting lighting values.
2020-08-03 22:28:15 +02:00
22f552217f
Apply the FE tunnel behaviour to the fluid tunnel ( #4545 )
...
* Apply the FE tunnel behaviour to the fluid tunnel
* Make a second pass to try and get all the requested fill amount sent out to outputs.
Co-authored-by: Sebastian Hartte <sebastian@hartte.de >
2020-08-03 21:39:34 +02:00
8f0e408772
Fixes NPE on empty tooltips ( #4546 )
2020-08-03 20:57:10 +02:00
62bbc32763
Minor cleanup.
2020-08-03 20:31:30 +02:00
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
63c251294e
Added custom item entity support via mixin.
2020-08-03 15:10:41 +02:00
872d8d33cb
Clean up global state for cable render mode ( #4539 )
...
* Clean up the global state used to hack part interaction into respecting
the player's facade render mode. Make the name more indicative of
what is actually happening.
* Fun.
2020-08-03 14:46:39 +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
541f07a7e3
Fix output item stacking for condenser.
...
Fix exposed inventories for condenser.
2020-08-03 13:06:00 +02:00
1693271660
Fix recipe transfer for recipes that are not 3x3.
2020-08-03 13:05:34 +02:00
3a12fa4843
Minor cleanup.
2020-08-03 13:05:23 +02:00
ba85da2c72
Fix SkyStone placement not immediately updating the compass.
2020-08-03 13:05:05 +02:00
d238f6e8e4
Post-Merge fixes
2020-08-02 22:31:20 +02:00
c0fa8ab2dc
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/client/me/SlotDisconnected.java
# src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
# src/main/java/appeng/container/slot/AppEngCraftingSlot.java
# src/main/java/appeng/container/slot/AppEngSlot.java
# src/main/java/appeng/container/slot/CraftingMatrixSlot.java
# src/main/java/appeng/container/slot/CraftingTermSlot.java
# src/main/java/appeng/container/slot/DisabledSlot.java
# src/main/java/appeng/container/slot/FakeBlacklistSlot.java
# src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java
# src/main/java/appeng/container/slot/FakeSlot.java
# src/main/java/appeng/container/slot/FakeTypeOnlySlot.java
# src/main/java/appeng/container/slot/InaccessibleSlot.java
# src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java
# src/main/java/appeng/container/slot/NormalSlot.java
# src/main/java/appeng/container/slot/OptionalFakeSlot.java
# src/main/java/appeng/container/slot/OptionalNormalSlot.java
# src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java
# src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java
# src/main/java/appeng/container/slot/OutputSlot.java
# src/main/java/appeng/container/slot/PatternOutputsSlot.java
# src/main/java/appeng/container/slot/PlayerHotBarSlot.java
# src/main/java/appeng/container/slot/PlayerInvSlot.java
# src/main/java/appeng/container/slot/RestrictedInputSlot.java
2020-08-02 22:28:37 +02:00
a85ffec9f9
Unified Parameter-Names for Slots
2020-08-02 22:12:08 +02:00
3e5787be76
Fix internal inventory on the client not being updated.
2020-08-02 20:58:24 +02:00
52ec63413f
Fix client-side particle effects.
2020-08-02 20:58:03 +02:00
Sebastian Hartte