3e5787be76
Fix internal inventory on the client not being updated.
2020-08-02 20:58:24 +02:00
780f68952b
Added spotless back and reformatted
2020-07-27 20:07:27 +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
0d43ca15be
Removed AEApi
...
Moved all internal access to the internal `Api` class using a new static
getter.
2020-07-11 19:40:34 +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
46955643b9
Utils ported
2020-06-28 13:28:14 +02:00
fee5b7fdfc
Utils ported
2020-06-28 03:41:44 +02:00
ba71a82288
Migrations
2020-06-27 16:18:20 +02:00
5225ea426b
pick 97420a31d The big reformat of 2020
2020-06-16 21:45:35 +02:00
23b6e195ac
Revert using internal API
2020-06-07 17:21:20 +02:00
271e8889a1
Sky Chest TESR / Tile Entity Registration Changes
2020-06-01 21:59:08 +02:00
5cdeff01be
Custom Model Loader
2020-06-01 04:02:37 +02:00
ec3b464655
Some additional fixes from other branch.
2020-05-31 16:13:07 +02:00
16d6d55d7f
1.15 port
2020-05-18 14:02:45 +02:00
d88f550eb0
Switch to new IItemHandler ( #3669 )
2018-10-04 20:39:06 +02:00
66c365d11f
Code Formatting
2018-08-30 20:31:27 +02:00
56a5363528
Fix NetworkToolViewer stack overflow, saveguard against markDirty recursion.
...
fixes #3199
2017-11-08 13:17:34 +01:00
6e81f698c0
Refactored StorageChannel enum into an interface ( #3138 )
...
This replaces the static enum with a more dynamic interface providing
factory methods for handling network storage.
2017-10-08 17:59:30 +02:00
1e15b23506
Rework AEItemStack ( #3091 )
...
* Use itemstack as itemdef
* HIGH_TAG/LOW_TAG should be compared both directions
* Remove getTagCompound
* Make Itemlist implementation independent
* Cache item id for performance reasons
* Add preconditions to saveguard against external meddling
* Chache itemDamage
* Remove IAEStackSearchKey for now, rename getDisplayStack
2017-09-30 17:18:30 +02:00
a3269826f9
cleanup inventory change handling
2017-08-31 14:01:46 +02:00
e39855b48f
Use qualified method and field access
2017-08-11 21:43:47 +02:00
52d28fabe3
Use IItemHandler instead of IInventory internally ( #2971 )
...
* Use IItemHandler instead of IInventory internally
2017-07-28 22:04:32 +02:00
a24ed38e90
Added missing Override annotations
2017-07-20 21:28:16 +02:00
da5879b667
First batch of null -> isEmpty() checks.
...
I most likely still missed a ton of checks...
2017-06-26 05:15:25 +02:00
1cde7bc933
Changed to Null ItemStack instead of null.
2016-12-21 20:38:37 +01:00
ed9e6dd21c
Port to 1.11
2016-12-21 20:38:36 +01:00
1e20086799
Extracts item comparison from Platform into their own helper. ( #2555 )
...
* Extracts item comparison from Platform into their own helper.
Renamed methods to be more more fitting for the actual comparison.
Added documentation about each methods behaviour.
2016-11-04 09:27:52 +01: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
02ac8cf220
Refactored the logging
...
Using LogManager instead of FMLRelaunchLog to access the logger instance.
Added logging of the name of failed exports instead of exception.
Improved crafting log to include issuer including their location and the
requested item.
Removed superfluous FMLRelaunchLog instance.
Removed superfluous parameters for PlayerData constructor.
2016-01-01 02:55:36 +01:00
f84b9a7e1d
All parameters on one line (for now)
...
Easier picking of 1.7 changes
2016-01-01 02:02:05 +01:00
71afa9bf53
1.8.8 + deleted all integration can be recovered later or something.
2015-12-31 17:19:44 -06:00
99215e1701
Organized imports
2015-12-24 02:07:03 +01:00
c9e8a6e939
Formatted code
2015-12-24 02:03:16 +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
ebda927fb5
Add this qualifier
2015-09-30 14:26:54 +02:00
8b3a954f73
final variables and parameters
2015-09-30 14:24:44 +02:00
59dbfb1452
Fixed stairs
2015-09-30 11:34:16 +02:00
38afde724b
Most of the 1.8 Port.
2015-06-15 19:44:59 -05:00
f193c2adc4
Replaces all method parameter regarding their naming conventions
2015-05-08 23:25:19 +02:00
64ed05a1b4
Puts everywhere brackets
2015-04-29 18:38:24 +02:00
d34c988c88
Basic reformat, hit once, hope never again
2015-04-03 15:07:13 +02:00
4b4693498d
Replace call to simple getter from within class with inlined version
2015-03-26 10:23:59 +01:00
9b7b0fc0fb
Organize imports
2014-12-29 21:59:05 +01:00
f471513bd0
Changed access to use this qualifier
2014-12-29 15:13:47 +01:00
7505f9b66a
Added copyright to all java files
2014-11-14 12:03:00 +01:00
c074280b68
Temporary set of catch to ignored if they are ignored
2014-10-01 15:20:42 +02:00
474596f095
Make fields final if possible to ensure immutability
2014-09-30 09:52:57 +02:00
76b147fd5b
Improved readability of variables
...
Hopefully improved semantics of variables
Fixed typos
Added hyphenations
2014-09-28 12:21:34 +02:00
386d18a059
Relocate Source to proper directory.
2014-09-23 19:26:27 -05:00
Sebastian Hartte