0be7322c2c
Formatting Fixes.
2020-09-09 02:27:12 +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
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
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
63c251294e
Added custom item entity support via mixin.
2020-08-03 15:10:41 +02:00
2655620fd0
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/api/java/appeng/api/parts/IPart.java
# src/main/java/appeng/block/AEBaseBlockItemChargeable.java
# src/main/java/appeng/block/qnb/QnbFormedModel.java
# src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
# src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java
# src/main/java/appeng/client/render/BakedModelUnwrapper.java
# src/main/java/appeng/client/render/BasicUnbakedModel.java
# src/main/java/appeng/client/render/FacadeItemModel.java
# src/main/java/appeng/client/render/cablebus/CableBusModel.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
# src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
# src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java
# src/main/java/appeng/client/render/model/BiometricCardModel.java
# src/main/java/appeng/client/render/model/ColorApplicatorModel.java
# src/main/java/appeng/client/render/model/DriveBakedModel.java
# src/main/java/appeng/client/render/model/DriveModel.java
# src/main/java/appeng/client/render/model/GlassModel.java
# src/main/java/appeng/client/render/model/MemoryCardModel.java
# src/main/java/appeng/client/render/model/SkyCompassModel.java
# src/main/java/appeng/client/render/spatial/SpatialPylonModel.java
# src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java
# src/main/java/appeng/core/AERecipeType.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/client/ApiCellModelRegistry.java
# src/main/java/appeng/core/api/definitions/ApiItems.java
# src/main/java/appeng/fluids/helper/DualityFluidInterface.java
# src/main/java/appeng/items/misc/CrystalSeedItem.java
# src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
# src/main/java/appeng/parts/automation/PlaneModel.java
# src/main/java/appeng/recipes/handlers/GrinderRecipe.java
# src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java
# src/main/java/appeng/recipes/handlers/InscriberRecipe.java
# src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java
# src/main/java/appeng/spatial/SpatialDimensionManager.java
# src/main/java/appeng/tile/networking/CableBusBlockEntity.java
# src/main/java/appeng/tile/storage/SkyChestBlockEntity.java
2020-08-02 14:37:29 +02:00
c8d08f9726
Fixes sidedness issues that cropped up with 1.16 ( #4533 )
2020-08-01 22:16:57 +02:00
84e6aaa122
Compiles again.
2020-07-27 23:50:28 +02:00
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
fee5b7fdfc
Utils ported
2020-06-28 03:41:44 +02:00
b79cd732b2
Fabric port in progress
2020-06-27 23:25:38 +02:00
80fbb58d4f
API compiles
2020-06-27 18:09:44 +02:00
ba71a82288
Migrations
2020-06-27 16:18:20 +02:00
b4471b1abb
The Great Renamening of 2020
2020-06-22 13:21:23 +02:00
Sebastian Hartte