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
469a1e205b
Reactivated REI
2020-08-02 22:31:27 +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
62ac6a0052
Fix server-side problems.
2020-08-02 18:09:21 +02:00
7f7b794c0b
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/block/crafting/CraftingMonitorBlockRendering.java
2020-08-02 15:46:11 +02:00
a97ebaf40d
Server can at least begin to launch now.
2020-08-02 15:45:59 +02:00
5fca946ef3
The lambda has to be replaced with an explicit method to annotate it with @OnlyIn.
2020-08-02 15:45:15 +02:00
80375c436d
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/core/api/definitions/ApiBlocks.java
2020-08-02 15:41:50 +02:00
f8446209ce
Move CraftingMonitor rendering customization out to its own class to circumvent issues with a client-side only lambda method being generated in a common-side class.
2020-08-02 15:40:50 +02:00
9ce4a65203
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# src/main/java/appeng/block/misc/ChargerBlock.java
# src/main/java/appeng/core/api/definitions/ApiBlocks.java
2020-08-02 15:15:39 +02:00
f5aee56a0b
Remove unused imports.
2020-08-02 15:14:28 +02:00
088627aedf
Remove client-only methods from ChargerBlock which could potentially create synthetic lambda methods that reference client-only classes (and are not stripped).
2020-08-02 15:13:20 +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
3c86f2eae4
Working on lifecycle.
2020-08-02 14:07:54 +02:00
cdba0b04fb
Change datagen task to use the source set outputs directly to avoid problems with modCompileOnly transitive dependencies.
2020-08-02 13:27:32 +02:00
c8d08f9726
Fixes sidedness issues that cropped up with 1.16 ( #4533 )
2020-08-01 22:16:57 +02:00
259d932946
Fixes 4529: Updated IPart to match new ICapabilityProvider ( #4534 )
2020-08-01 21:01:19 +02:00
a6fb17b008
Formatting Fixes
2020-08-01 17:24:48 +02:00
1b31185cdb
Ported to 1.16.2-pre
2020-08-01 17:14:12 +02:00
d66986df85
Fix cell models not being loaded. ( #4528 )
2020-08-01 12:59:05 +02:00
4fa78a2add
Fix #4521 : Register RecipeTypes. ( #4523 )
2020-07-31 17:22:44 +02:00
3d1a919e69
Removed unnecessary dependencies.
2020-07-31 01:02:38 +02:00
98e9faa262
Ported model dependency changes from Fabric 1.16.
...
Made IChestLid sided.
2020-07-30 22:08:19 +02:00
80710cc818
Simplify Git Workflow
2020-07-28 23:17:02 +02:00
b8c63df11b
Make build depend on generateData, and remove unmapped mods from its dependencies.
2020-07-28 23:16:08 +02:00
20fd760274
Switch to right task for data generation
2020-07-28 22:59:58 +02:00
27cdbfb7f3
Fix NPEs when the input isn't an item.
2020-07-28 22:56:03 +02:00
33d247fec8
Fix server startup, jar building and after-merge fixes.
2020-07-28 22:45:09 +02:00
75dd1d4bb6
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# build.gradle
# gradle.properties
# src/api/java/appeng/api/config/Upgrades.java
# src/api/java/appeng/api/features/IWorldGen.java
# src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java
# src/api/java/appeng/api/storage/ISpatialDimension.java
# src/api/java/appeng/api/util/DimensionalCoord.java
# src/main/java/appeng/block/AEBaseBlockItemChargeable.java
# src/main/java/appeng/block/AEBaseTileBlock.java
# src/main/java/appeng/block/misc/TinyTNTBlock.java
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
# src/main/java/appeng/block/spatial/MatrixFrameBlock.java
# src/main/java/appeng/block/storage/ChestBlock.java
# src/main/java/appeng/client/gui/AEBaseMEScreen.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java
# src/main/java/appeng/client/gui/implementations/ChestScreen.java
# src/main/java/appeng/client/gui/implementations/CondenserScreen.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/CraftingCPUScreen.java
# src/main/java/appeng/client/gui/implementations/DriveScreen.java
# src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java
# src/main/java/appeng/client/gui/implementations/GrinderScreen.java
# src/main/java/appeng/client/gui/implementations/IOPortScreen.java
# src/main/java/appeng/client/gui/implementations/InscriberScreen.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/MEMonitorableScreen.java
# src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java
# src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java
# src/main/java/appeng/client/gui/implementations/PatternTermScreen.java
# src/main/java/appeng/client/gui/implementations/QNBScreen.java
# src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java
# src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java
# src/main/java/appeng/client/gui/implementations/SkyChestScreen.java
# src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java
# src/main/java/appeng/client/gui/implementations/StorageBusScreen.java
# src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java
# src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java
# src/main/java/appeng/client/gui/implementations/WirelessScreen.java
# src/main/java/appeng/client/gui/widgets/AETextField.java
# src/main/java/appeng/client/gui/widgets/ActionButton.java
# src/main/java/appeng/client/gui/widgets/CustomSlotWidget.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/client/render/ColorableTileBlockColor.java
# src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java
# src/main/java/appeng/client/render/FacingToRotation.java
# src/main/java/appeng/client/render/SpatialSkyRender.java
# src/main/java/appeng/client/render/StaticBlockColor.java
# src/main/java/appeng/client/render/cablebus/CableBuilder.java
# src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
# src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java
# src/main/java/appeng/client/render/effects/ChargedOreFX.java
# src/main/java/appeng/client/render/effects/CraftingFx.java
# src/main/java/appeng/client/render/effects/LightningArcFX.java
# src/main/java/appeng/client/render/effects/MatterCannonFX.java
# src/main/java/appeng/client/render/effects/ParticleTypes.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/MemoryCardBakedModel.java
# src/main/java/appeng/client/render/model/MemoryCardModel.java
# src/main/java/appeng/client/render/model/SkyCompassBakedModel.java
# src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java
# src/main/java/appeng/client/render/tesr/CrankTESR.java
# src/main/java/appeng/client/render/tesr/SkyCompassTESR.java
# src/main/java/appeng/container/ContainerLocator.java
# src/main/java/appeng/container/guisync/SyncData.java
# src/main/java/appeng/container/implementations/CraftConfirmContainer.java
# src/main/java/appeng/container/implementations/WirelessTermContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/ApiClientHelper.java
# src/main/java/appeng/core/api/definitions/ApiBlocks.java
# src/main/java/appeng/core/features/registries/WirelessRegistry.java
# src/main/java/appeng/core/features/registries/WorldGenRegistry.java
# src/main/java/appeng/core/localization/ButtonToolTips.java
# src/main/java/appeng/core/localization/GuiText.java
# src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java
# src/main/java/appeng/core/sync/network/NetworkHandler.java
# src/main/java/appeng/core/sync/network/TargetPoint.java
# src/main/java/appeng/core/worlddata/WorldData.java
# src/main/java/appeng/debug/ChunkLoaderBlockEntity.java
# src/main/java/appeng/debug/CubeGeneratorBlockEntity.java
# src/main/java/appeng/debug/DebugCardItem.java
# src/main/java/appeng/debug/DebugPartPlacerItem.java
# src/main/java/appeng/debug/MeteoritePlacerItem.java
# src/main/java/appeng/debug/ReplicatorCardItem.java
# src/main/java/appeng/decorative/solid/SkyStoneBlock.java
# src/main/java/appeng/entity/TinyTNTPrimedEntity.java
# src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java
# src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java
# src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java
# src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.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/parts/FluidAnnihilationPlanePart.java
# src/main/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java
# src/main/java/appeng/helpers/DualityInterface.java
# src/main/java/appeng/helpers/InvalidPatternHelper.java
# src/main/java/appeng/helpers/MetaRotation.java
# src/main/java/appeng/hooks/DynamicDimensions.java
# src/main/java/appeng/integration/modules/jei/CondenserCategory.java
# src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java
# src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java
# src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java
# src/main/java/appeng/items/misc/CrystalSeedItem.java
# src/main/java/appeng/items/misc/EncodedPatternItem.java
# src/main/java/appeng/items/parts/FacadeItem.java
# src/main/java/appeng/items/storage/SpatialStorageCellItem.java
# src/main/java/appeng/items/tools/BiometricCardItem.java
# src/main/java/appeng/items/tools/MemoryCardItem.java
# src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
# src/main/java/appeng/items/tools/powered/MatterCannonItem.java
# src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/mixins/DimensionTypeMixin.java
# src/main/java/appeng/mixins/MinecraftServerMixin.java
# src/main/java/appeng/mixins/SkyPropertiesMixin.java
# src/main/java/appeng/mixins/SkyRenderMixin.java
# src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java
# src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
# src/main/java/appeng/parts/misc/CableAnchorPart.java
# src/main/java/appeng/parts/reporting/AbstractMonitorPart.java
# src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
# src/main/java/appeng/server/subcommands/TestOreGenCommand.java
# src/main/java/appeng/services/CompassService.java
# src/main/java/appeng/spatial/CachedPlane.java
# src/main/java/appeng/spatial/SpatialDimensionExtraData.java
# src/main/java/appeng/spatial/SpatialDimensionManager.java
# src/main/java/appeng/spatial/StorageCellBiome.java
# src/main/java/appeng/spatial/StorageChunkGenerator.java
# src/main/java/appeng/spatial/StorageHelper.java
# src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java
# src/main/java/appeng/tile/storage/SkyChestBlockEntity.java
# src/main/java/appeng/util/Platform.java
# src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java
# src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java
# src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java
# src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java
# src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
# src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java
# src/main/resources/appliedenergistics2.mixins.json
# src/unported/java/appeng/client/ClientHelper.java
# src/unported/resources/META-INF/accesstransformer.cfg
2020-07-28 22:08:09 +02:00
a8e79826bd
Fix fabric-api version
2020-07-28 21:54:10 +02:00
b9ece3a18a
Updated Gradle Wrapper
2020-07-28 21:44:50 +02:00
a628a469ce
Fix refmap reference for non-dev deployment.
2020-07-28 21:02:51 +02:00
2fca330ff1
Use BlockPos.toMutable
2020-07-28 20:25:18 +02:00
3802eace7a
Use StringTextComponent.EMPTY
2020-07-28 20:24:07 +02:00
2b9c997191
Fix formatting.
2020-07-28 20:19:11 +02:00
1cb32517ae
Added missing chunk generator registration.
2020-07-28 20:11:18 +02:00
b3b7547325
Updated mappings to 20200723-1.16.1 ( #4514 )
...
* Limit to 1 gradle worker
2020-07-28 18:33:28 +02:00
307a6817d4
Remove xvfb steps as runData should now run headless ( #4513 )
...
Also run `prepareRunData` in a separate step to avoid a race condition with ForgeGradle writing the generated dependency after it has already written it for `runData`
2020-07-28 14:49:33 +02:00
0beab559a6
Fix formatting
2020-07-28 11:44:57 +02:00
a65be62cd1
Organize and clean imports
2020-07-28 10:29:57 +02:00
e640918ca0
Compiles, can get ingame, uses Mixins to work around missing Fork Hooks for structures and custom dimensions.
2020-07-28 02:05:24 +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
Sebastian Hartte