b1feeca41c
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
0fdc46b358
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# gradle.properties
# gradle/wrapper/gradle-wrapper.jar
# gradle/wrapper/gradle-wrapper.properties
# src/api/java/appeng/api/features/IWorldGen.java
# src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java
# src/api/java/appeng/api/parts/IPart.java
# src/api/java/appeng/api/storage/ISpatialDimension.java
# src/api/java/appeng/api/util/DimensionalCoord.java
# src/datagen/java/appeng/data/providers/IAE2DataProvider.java
# src/main/java/appeng/block/AEBaseBlockItemChargeable.java
# src/main/java/appeng/block/misc/ChargerBlock.java
# src/main/java/appeng/block/misc/QuartzFixtureBlock.java
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/block/networking/CableBusColor.java
# src/main/java/appeng/block/networking/ControllerBlock.java
# src/main/java/appeng/block/networking/WirelessBlock.java
# src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
# src/main/java/appeng/block/paint/PaintSplotchesModel.java
# src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
# src/main/java/appeng/block/qnb/QnbFormedModel.java
# src/main/java/appeng/block/spatial/MatrixFrameBlock.java
# src/main/java/appeng/block/storage/ChestBlock.java
# src/main/java/appeng/block/storage/DriveSlotState.java
# src/main/java/appeng/client/gui/AEBaseMEScreen.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/AESubScreen.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/CraftingStatusScreen.java
# src/main/java/appeng/client/gui/implementations/CraftingTermScreen.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/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
# src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.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/NumberEntryWidget.java
# src/main/java/appeng/client/gui/implementations/PatternTermScreen.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.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/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/NumberBox.java
# src/main/java/appeng/client/gui/widgets/ProgressBar.java
# src/main/java/appeng/client/gui/widgets/TabButton.java
# src/main/java/appeng/client/gui/widgets/ToggleButton.java
# src/main/java/appeng/client/render/ColorableTileBlockColor.java
# src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
# src/main/java/appeng/client/render/FacadeItemModel.java
# src/main/java/appeng/client/render/FacingToRotation.java
# src/main/java/appeng/client/render/SpatialSkyRender.java
# src/main/java/appeng/client/render/StackSizeRenderer.java
# src/main/java/appeng/client/render/StaticBlockColor.java
# src/main/java/appeng/client/render/TesrRenderHelper.java
# src/main/java/appeng/client/render/cablebus/CableBuilder.java
# src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java
# src/main/java/appeng/client/render/cablebus/CableBusModel.java
# src/main/java/appeng/client/render/cablebus/CableBusRenderState.java
# src/main/java/appeng/client/render/cablebus/CableCoreType.java
# src/main/java/appeng/client/render/cablebus/CubeBuilder.java
# src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java
# src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
# src/main/java/appeng/client/render/cablebus/QuadRotator.java
# src/main/java/appeng/client/render/cablebus/SmartCableTextures.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/crafting/EncodedPatternModel.java
# src/main/java/appeng/client/render/effects/CraftingFx.java
# src/main/java/appeng/client/render/effects/EnergyFx.java
# src/main/java/appeng/client/render/effects/LightningArcParticleData.java
# src/main/java/appeng/client/render/effects/LightningFX.java
# src/main/java/appeng/client/render/effects/MatterCannonFX.java
# src/main/java/appeng/client/render/effects/VibrantFX.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/GlassBakedModel.java
# src/main/java/appeng/client/render/model/GlassModel.java
# src/main/java/appeng/client/render/model/MatrixVertexTransformer.java
# src/main/java/appeng/client/render/model/MemoryCardModel.java
# src/main/java/appeng/client/render/model/RenderHelper.java
# src/main/java/appeng/client/render/model/SkyCompassBakedModel.java
# src/main/java/appeng/client/render/model/SkyCompassModel.java
# src/main/java/appeng/client/render/renderable/ItemRenderable.java
# src/main/java/appeng/client/render/spatial/SpatialPylonModel.java
# src/main/java/appeng/client/render/tesr/CellLedRenderer.java
# src/main/java/appeng/client/render/tesr/CrankTESR.java
# src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
# src/main/java/appeng/client/render/tesr/InscriberTESR.java
# src/main/java/appeng/client/render/tesr/SkyChestTESR.java
# src/main/java/appeng/container/implementations/PatternTermContainer.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/features/registries/MovableTileRegistry.java
# src/main/java/appeng/core/features/registries/WorldGenRegistry.java
# src/main/java/appeng/core/localization/GuiText.java
# src/main/java/appeng/core/sync/BasePacket.java
# src/main/java/appeng/core/sync/network/NetworkHandler.java
# src/main/java/appeng/core/sync/network/TargetPoint.java
# src/main/java/appeng/core/sync/packets/ClickPacket.java
# src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
# src/main/java/appeng/core/worlddata/WorldData.java
# src/main/java/appeng/crafting/CraftingTreeProcess.java
# src/main/java/appeng/datagen/AE2DataGenerators.java
# src/main/java/appeng/datagen/providers/IAE2DataProvider.java
# src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java
# src/main/java/appeng/datagen/providers/recipes/SlabStairRecipes.java
# src/main/java/appeng/debug/ChunkLoaderBlockEntity.java
# src/main/java/appeng/debug/DebugPartPlacerItem.java
# src/main/java/appeng/debug/ReplicatorCardItem.java
# src/main/java/appeng/entity/TinyTNTPrimedEntity.java
# src/main/java/appeng/entity/TinyTNTPrimedRenderer.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/FluidLevelEmitterScreen.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/parts/FluidFormationPlanePart.java
# src/main/java/appeng/fluids/parts/FluidInterfacePart.java
# src/main/java/appeng/fluids/parts/FluidStorageBusPart.java
# src/main/java/appeng/fluids/parts/SharedFluidBusPart.java
# src/main/java/appeng/forge/data/providers/IAE2DataProvider.java
# src/main/java/appeng/helpers/AEMaterials.java
# src/main/java/appeng/helpers/CraftingPatternDetails.java
# src/main/java/appeng/helpers/DualityInterface.java
# src/main/java/appeng/helpers/Splotch.java
# src/main/java/appeng/integration/modules/jei/CondenserCategory.java
# src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java
# src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java
# src/main/java/appeng/integration/modules/theoneprobe/part/PowerStateInfoProvider.java
# src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java
# src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java
# src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java
# src/main/java/appeng/integration/modules/waila/part/PartAccessor.java
# src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java
# src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java
# src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.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/quartz/QuartzCuttingKnifeItem.java
# src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/parts/AEBasePart.java
# src/main/java/appeng/parts/CableBusContainer.java
# src/main/java/appeng/parts/ICableBusContainer.java
# src/main/java/appeng/parts/NullCableBusContainer.java
# src/main/java/appeng/parts/PartPlacement.java
# src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
# src/main/java/appeng/parts/automation/ExportBusPart.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/automation/ImportBusPart.java
# src/main/java/appeng/parts/automation/PlaneModel.java
# src/main/java/appeng/parts/misc/CableAnchorPart.java
# src/main/java/appeng/parts/misc/InterfacePart.java
# src/main/java/appeng/parts/misc/StorageBusPart.java
# src/main/java/appeng/parts/p2p/P2PTunnelPart.java
# src/main/java/appeng/parts/reporting/AbstractMonitorPart.java
# src/main/java/appeng/parts/reporting/AbstractReportingPart.java
# src/main/java/appeng/parts/reporting/AbstractTerminalPart.java
# src/main/java/appeng/parts/reporting/ConversionMonitorPart.java
# src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java
# src/main/java/appeng/parts/reporting/PatternTerminalPart.java
# src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java
# src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.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/SpatialDimensionManager.java
# src/main/java/appeng/spatial/StorageCellDimension.java
# src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java
# src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java
# src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java
# src/main/java/appeng/tile/AEBaseBlockEntity.java
# src/main/java/appeng/tile/AEBaseInvTileEntity.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java
# src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java
# src/main/java/appeng/tile/grid/AENetworkBlockEntity.java
# src/main/java/appeng/tile/grid/AENetworkInvBlockEntity.java
# src/main/java/appeng/tile/grid/AENetworkPowerBlockEntity.java
# src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java
# src/main/java/appeng/tile/misc/CondenserBlockEntity.java
# src/main/java/appeng/tile/misc/InscriberBlockEntity.java
# src/main/java/appeng/tile/misc/InterfaceBlockEntity.java
# src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java
# src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java
# src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java
# src/main/java/appeng/tile/networking/CableBusBlockEntity.java
# src/main/java/appeng/tile/networking/EnergyCellBlockEntity.java
# src/main/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java
# src/main/java/appeng/tile/storage/ChestBlockEntity.java
# src/main/java/appeng/tile/storage/DriveBlockEntity.java
# src/main/java/appeng/tile/storage/IOPortBlockEntity.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/MeteoriteStructureStart.java
# src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java
# src/unported/java/appeng/client/ClientHelper.java
# src/unported/java/appeng/client/render/DummyFluidItemModel.java
# src/unported/java/appeng/client/render/model/UVLModelLoader.java
2020-07-27 19:07:35 +02:00
56ecda5173
1.16 port
2020-07-27 11:21:50 +02:00
3a4b171443
Fixes #4468 : Default to ae serverside ( #4496 )
2020-07-25 16:05:58 +02:00
8306f5bf0a
Port more stuff
2020-07-25 02:24:36 +02:00
1933b4b10d
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java
# src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java
# src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
# src/main/java/appeng/client/gui/implementations/PriorityScreen.java
# src/main/java/appeng/client/gui/widgets/NumberBox.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
# src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
# src/main/java/appeng/container/implementations/CraftingCPUContainer.java
# src/main/java/appeng/container/implementations/LevelEmitterContainer.java
# src/main/java/appeng/container/implementations/PriorityContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
# src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
2020-07-20 20:19:42 +02:00
590e435ad6
Formatting fixes
2020-07-19 23:51:57 +02:00
ebe589a714
Ported the other number entry dialogs over to the shared widget.
2020-07-19 23:25:11 +02:00
1e20cd8c08
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/recipes/ResolverResult.java
# src/main/java/appeng/block/AEBaseBlockItemChargeable.java
# src/main/java/appeng/block/crafting/CraftingStorageItem.java
# src/main/java/appeng/block/misc/ChargerBlock.java
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/block/storage/ChestBlock.java
# src/main/java/appeng/block/storage/DriveSlotCellType.java
# src/main/java/appeng/capabilities/Capabilities.java
# src/main/java/appeng/client/me/ItemRepo.java
# src/main/java/appeng/client/render/cablebus/FacadeBuilder.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/EnergyFx.java
# src/main/java/appeng/client/render/effects/LightningArcFX.java
# src/main/java/appeng/client/render/effects/LightningFX.java
# src/main/java/appeng/client/render/effects/MatterCannonFX.java
# src/main/java/appeng/client/render/effects/VibrantFX.java
# src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java
# src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
# src/main/java/appeng/container/AEBaseContainer.java
# src/main/java/appeng/container/implementations/CellWorkbenchContainer.java
# src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java
# src/main/java/appeng/container/implementations/PatternTermContainer.java
# src/main/java/appeng/container/implementations/QuartzKnifeContainer.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/core/AEItemGroup.java
# src/main/java/appeng/core/Api.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/definitions/ApiBlocks.java
# src/main/java/appeng/core/api/definitions/ApiParts.java
# src/main/java/appeng/core/features/registries/MovableTileRegistry.java
# src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
# src/main/java/appeng/core/features/registries/WirelessRegistry.java
# src/main/java/appeng/core/features/registries/WorldGenRegistry.java
# src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java
# src/main/java/appeng/core/sync/BasePacketHandler.java
# src/main/java/appeng/core/sync/packets/ClickPacket.java
# src/main/java/appeng/core/sync/packets/PatternSlotPacket.java
# src/main/java/appeng/crafting/CraftingTreeProcess.java
# src/main/java/appeng/debug/ReplicatorCardItem.java
# src/main/java/appeng/entity/ChargedQuartzEntity.java
# src/main/java/appeng/entity/SingularityEntity.java
# src/main/java/appeng/entity/TinyTNTPrimedEntity.java
# src/main/java/appeng/fluids/helper/DualityFluidInterface.java
# src/main/java/appeng/fluids/helper/FluidCellConfig.java
# src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java
# src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java
# src/main/java/appeng/forge/data/providers/IAE2DataProvider.java
# src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java
# src/main/java/appeng/helpers/CraftingPatternDetails.java
# src/main/java/appeng/helpers/DualityInterface.java
# src/main/java/appeng/helpers/WirelessTerminalGuiObject.java
# src/main/java/appeng/hooks/IBlockTool.java
# src/main/java/appeng/hooks/TickHandler.java
# src/main/java/appeng/integration/modules/jei/CondenserCategory.java
# src/main/java/appeng/integration/modules/jei/JEIPlugin.java
# src/main/java/appeng/items/misc/EncodedPatternItem.java
# src/main/java/appeng/items/parts/FacadeItem.java
# src/main/java/appeng/items/parts/PartItem.java
# src/main/java/appeng/items/storage/AbstractStorageCell.java
# src/main/java/appeng/items/storage/CreativeStorageCellItem.java
# src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
# src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
# src/main/java/appeng/items/tools/powered/MatterCannonItem.java
# src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
# src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java
# src/main/java/appeng/parts/PartPlacement.java
# src/main/java/appeng/parts/automation/FormationPlanePart.java
# src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java
# src/main/java/appeng/parts/reporting/PatternTerminalPart.java
# src/main/java/appeng/spatial/CachedPlane.java
# src/main/java/appeng/spatial/StorageChunkGenerator.java
# src/main/java/appeng/spatial/StorageHelper.java
# src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
# src/main/java/appeng/tile/crafting/CraftingStorageBlockEntity.java
# src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java
# src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
# src/main/java/appeng/tile/misc/ChargerBlockEntity.java
# src/main/java/appeng/tile/misc/CondenserBlockEntity.java
# src/main/java/appeng/tile/misc/InscriberBlockEntity.java
# src/main/java/appeng/tile/misc/InscriberRecipes.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/storage/ChestBlockEntity.java
# src/main/java/appeng/tile/storage/DriveBlockEntity.java
# src/main/java/appeng/util/Platform.java
# src/main/java/team/chisel/ctm/api/IFacade.java
# src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
# src/unported/java/appeng/client/render/FacadeItemModel.java
# src/unported/java/appeng/client/render/model/DriveBakedModel.java
# src/unported/java/appeng/client/render/model/DriveModel.java
# src/unported/java/appeng/core/PluginLoader.java
2020-07-18 01:45:43 +02:00
1bd4bd00a8
Worldgen, Configs
2020-07-09 23:56:54 +02:00
d4a1590b51
Added a blocktag for movable tile entities with spatial IO. ( #4448 )
...
`#spatial/whitelist` needs to be explicitly enabled through a config
value.
`#spatial/blacklist` will always be consider on top of the normal
blacklist.
2020-07-03 20:34:53 +02:00
dd9346e53f
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/block/AEBaseBlockItem.java
# src/main/java/appeng/core/AEConfig.java
# src/main/java/appeng/parts/PartPlacement.java
2020-07-02 01:18:31 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
0f11c1e0a4
Hide debug tools from JEI when disabled via config ( #4439 )
2020-07-01 14:29:43 +02:00
55d7ac82e5
Removed no channels pathing.
...
Also use default values for features without a config option
2020-06-28 19:19:05 +02:00
3df93fc66d
Moving
2020-06-28 16:18:11 +02:00
d7a09f70ef
Removed features from config which are no longer possible ( #4431 )
2020-06-25 20:51:51 +02:00
ee086366ed
Removed ConfigHost facade around AEConfig with explicit config options
...
Removed unused config options
2020-06-21 18:31:35 +02:00
afe98cbe04
Fix charged quartz generation.
2020-06-20 20:27:25 +02:00
434386a7ff
Added test command for testing ore gen.
...
Started reimplementing quartz ore gen ontop of vanilla mechanics.
Fixes several sidedness issues.
Added recipe serialization for server->client sync.
2020-06-20 18:04:20 +02:00
fcdd0bc378
Fix several config default value issues.
2020-06-20 01:33:09 +02:00
fe215f0a91
Code Cleanup
2020-06-19 16:09:06 +02:00
5225ea426b
pick 97420a31d The big reformat of 2020
2020-06-16 21:45:35 +02:00
fd7ed5bbf0
GUI Refactoring and consolidation
2020-06-14 18:00:02 +02:00
ecbcc56997
Added grinder and inscriber recipes. Improved JEI integration.
2020-06-11 00:40:14 +02:00
51e82587c7
Added older registries back in
2020-06-04 23:25:11 +02:00
58afa6539f
Add data generation. ( #4399 )
...
Recipe and other Data Generators
2020-06-02 23:13:49 +02:00
6a88728544
First shot at starting.
2020-05-31 17:16:25 +02:00
ec3b464655
Some additional fixes from other branch.
2020-05-31 16:13:07 +02:00
c8eb792d38
Move some blocks to their own feature category and add some comments ( #3618 )
...
Start of a bigger cleanup happening in 1.13 to fix the worst issues.
2018-07-14 21:25:06 +02:00
7cd8b72bb7
Add fluid level emitter ( #3588 )
...
Fixes #3571
2018-07-04 19:56:47 +02:00
ccefb47581
Added a config option to disable the CraftingManager fallback. ( #3415 )
2018-03-08 16:44:48 +01:00
bbf4d4a9ce
Spatial rework ( #3048 )
...
* Moved all spatial cells into a single dimension instead of one dimension per cell
Each cell will now be backed by a single region file each. So backups and restores can still be done on a per cell level.
Old cells will not be migrated.
* Moved custom cell tracking to a capability based one on the world
The size and owner of a cell is now stored inside the capabilities of the world/dimension not a custom system and we can rely on forge handling the persistence of it.
* Added the cell id to the actual item tooltip, as this is now a real identifier and not an arbitrary dimension id.
* Added vanilla banners to the whitelist
* Added unittests to the dimension manager to ensure the algorithm mapping to the correct region file
* Updated the API to conform with the new dimenion/types/biomes registration and mappings
* Fixed a couple of bugs related to world/dimension/biome registration
* Fixed a bug when transfering certain blocks due to passing missing/incorrect blockstate
2017-08-24 11:24:33 +02:00
a4c468b9cf
Updated caps to be manually disabled via config
...
Moved the cap injection to a method, allows them to be configurable.
This is not possible for Forge Energy as it is injected before even the
configuration are lodaed, thus violating their own capability contract
to use the method injection to explicitly make it configurable.
Updated the ratio key for forge energy to "ForgeEnergy" without a space
2017-07-22 13:29:14 +02:00
15582fd1df
Always use qualified access for fields and methods
2017-07-20 21:27:22 +02:00
eb1e86cacb
Refactored GrinderRegistry. ( #2644 )
...
* Refactored GrinderRegistry.
Changed IGrinderRegistry#getRecipes to return an unmodifiable collection.
Added a way to remove recipes explicitly instead the internal list.
Added a cache to lookup recipes instead of iterating a list.
Renamed IGrinderEntry to IGrinderRecipe
Made IGrindRecipe immutable for easy caching.
Improved GrinderLogging and Exception Handling
JEI Workaround as it expects a List instead Collection.
* Added blacklist of explicit oredict names for the grindstone.
This can be used should the automatic recipe generation create unintended
loopholes.
2016-12-02 23:47:50 +01:00
a665200c31
Refactored AEConfig ( #2633 )
...
Added a singleton getter instead the public field.
Reduced all fields to private.
Replaced field access with getters.
Added setters where necessary (Dimension/Biome Registration)
Added config options to disable more features.
Splitted Enum name from the config key.
Changed FacadeConfig and Networkhandler similar to AEConfig.init().
2016-11-26 14:07:34 +01:00
4253d659f1
Add Config to Remove Crashing Items from Storage Cells ( #2573 )
...
Added a configuration option to enable players to recover their world if any of their items in storage cause crashes on load.
2016-11-05 13:50:54 +01:00
223a210d49
Replaced reference to FMLCommonHandler EventBus through MinecraftForge.EVENT_BUS due to deprecation notice
2016-11-02 14:22:00 +01:00
a72c97e666
#2438 : Implemented forge energy capabilities. Removed other disabled energy units for the time being.
2016-10-19 20:57:59 +02:00
8df692053a
Added JEI integration ( #2436 ).
2016-10-08 13:06:21 +02:00
6f2bbfab4c
Major Refactoring of Bootstrap Code ( #75 )
...
- Refactored boostrap code:
* Completely reworked item/block/tile registration.
* Fixed server side startup.
* Fixed server side startup.
* More documentation.
* More heavy cleanup
* More cleanups.
* Major refactoring of state mapping and fixes a lot of other issue related to item rendering.
* Fixes sky chest item models (no item TESR).
* Only use CachingRotatingBakedModel for tile entities automatically.
Fix default rotation of quartz pillar for item model.
* Used method reference instead of lambda for ItemMeshDefinition for multiparts.
* Removed unnecessary IHasSpecialItemModel
* Removed unused IconReg class.
* Updated resource pack version.
2016-08-26 12:42:21 +02:00
5498eb6d7c
First update pass (1/3) - ~1400 -> 82 errors
...
This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
2016-06-19 14:43:27 +02:00
f84b9a7e1d
All parameters on one line (for now)
...
Easier picking of 1.7 changes
2016-01-01 02:02:05 +01:00
99215e1701
Organized imports
2015-12-24 02:07:03 +01:00
e94a0cfccf
Reduces visibility of internal fields/methods
...
Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.
Reduces the visibility of internal methods to private/protected/default when possible.
2015-12-24 01:59:13 +01:00
888b3e5600
Closes #1899 , Fixed #1898 : Adds an easy way to export interesting information into CSV format
...
Mostly used for the recipe system, but can also be used for debugging purposes. Debug options needs to be ticked to use the full information gain. Recipes only require the normal localization and the specific name plus metadata.
Shifted the recipes into a recipes folder where the CSV will also reside. This will also elevate the copying of the readme to the user directory since it can reside in the recipes folder.
Fixed a bug where the copier would copy the would also copy empty folders
2015-12-23 14:32:53 +01:00
8b3a954f73
final variables and parameters
2015-09-30 14:24:44 +02:00
059523f543
Reduce scope of variables
2015-09-30 14:22:21 +02:00
Sebastian Hartte