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
235fc2e81f
Removed superfluous IAEStack methods
2020-07-07 12:12:48 +02:00
9220ca0048
Added HWYLA
2020-07-05 16:50:39 +02:00
eb0e4289b3
Unify the client/server-side shared itemstack registry to avoid over-dependence on the current thread
...
when this class is used. Otherwise if a thread is not correctly detected to be part of the server or client
thread groups, a shared item stack from the wrong domain is returned.
2020-07-05 12:23:16 +02:00
b8aa810a5f
Add equals(ItemStack) to IAEItemStack contract.
2020-07-03 14:32:48 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
46955643b9
Utils ported
2020-06-28 13:28:14 +02:00
fee5b7fdfc
Utils ported
2020-06-28 03:41:44 +02:00
80fbb58d4f
API compiles
2020-06-27 18:09: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
d449ee47c4
Refactored AEStacks & ItemList ( #4406 )
...
Removed custom VarInt/VarLong solution.
Moved itemstack and fluidstack serialisation to their own NBT tag to avoid interference.
Removed now useless NBT sorting
Added NullItemList
2020-06-11 20:20:16 +02:00
23b6e195ac
Revert using internal API
2020-06-07 17:21:20 +02:00
46b1d1ffdc
GUI Rendering and various fixes
2020-06-07 03:29:57 +02:00
237463dd94
Lots of compile fixes
2020-06-04 03:02:48 +02:00
19cdea7eb5
Move from ByteBuf to PacketBuffer
2020-06-02 11:07:46 +09:30
dffea9a167
More compile things
2020-06-01 22:17:34 +09:30
adfc2577ed
Connected Glass
2020-06-01 13:13:18 +02:00
5cdeff01be
Custom Model Loader
2020-06-01 04:02:37 +02:00
16d6d55d7f
1.15 port
2020-05-18 14:02:45 +02:00
d5fc7a5b21
Fixes #4256 : Cache AESharedItemStack#hashCode() ( #4257 )
2020-01-16 13:22:42 +01:00
dfcba264f3
Fixes #3880 : Incorrect compare with empty itemstack. ( #3882 )
2018-12-25 21:21:19 +01:00
32a4fcab77
Fixes #3768 : Damageable items with nbt and without damage could crash. ( #3867 )
2018-12-23 22:42:09 +01:00
87999dbf27
Moved FluidList to fluid package ( #3568 )
2018-06-27 20:28:29 +02:00
d7b97fa7b8
Replaced LinkedList with ArrayList or ArrayDeque when applicable. ( #3392 )
2018-05-27 21:15:50 +02:00
62435a65f1
IAEStack#fuzzyComparison now compares the same subtypes. ( #3384 )
...
To reduce the amount of instanceof checks, it will now compare the same
subtupe.
Comparing an ItemStack and IAEItemStack can simply wrap it before
calling it. Heavy use should already use an IAEStack internal.
Analogue for fluids or other types.
2018-05-27 21:15:42 +02:00
eed4776c6f
Fixes #3389 : Prevent inventory cache from becoming unmatched. ( #3390 )
...
Use slightly faster ArrayDeqeue instead of LinkedList.
Check boolean fields before more complex datatypes
2018-02-17 19:10:09 +01:00
ae352c093e
fix typo in AEItemStack#fuzzyComparison
2018-02-10 19:02:32 +01:00
36d6681eac
Rework fuzzy comparison for 99 percent threshold ( #3367 )
...
* Rework fuzzy comparison for 99 percent threshold
The current implementation is quite convoluted and can handle 99%
incorrectly when items exceed a certain damage range.
* Use metadata explicitly for comparison
Some item could use metadata to pack damageable and undamageable items
into the same id. Thus could lead to get ItemStack#getItemDamage() to
return bogus values for undamageable items.
2018-02-05 15:20:02 +01:00
1ad49edd76
Fixes #3260 : Only match damaged items when selected and set to 99%. ( #3261 )
2017-12-01 21:14:29 +01:00
3749742231
Fix handling of ItemStacks using getShareTag or Capabilites ( #3171 )
...
Temporary fix, ideally we would have a way to reference the original ItemStack so we don't need to send the full NBT data to the client.
2017-10-26 17:59:55 +02:00
f80f623ccf
Fix AESharedItemStack#compareNBT to get consistent ordering. ( #3169 )
2017-10-20 23:25:18 +02: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
375e1efb15
We don't need the showCraftingLabel flag, as IAEStack is perfectly fine with 0 size stacks. ( #3071 )
...
Adjust rendering code to use ItemStack with size 1 where required.
2017-09-09 12:58:22 +02:00
7de90ed0ae
Finally use Java7 <>
2017-07-20 21:21:45 +02:00
621910df91
Format sourcecode
2017-07-20 21:17:10 +02:00
61b81fc802
Fix facade recipes. Hopefully the last null check fix.
2017-06-27 20:39:06 +02:00
5432decf95
Fix items showing up as craftable when they weren't after taking out the last one.
2017-06-26 05:42:21 +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
370fc49357
Temporary (?) hacky fix to display the craftable items
...
This is kind of a hackjob IMO but it saves me the trouble of possibly rewriting large portions of either the AE codebase or ASM'ing the vanilla classes.
2017-06-25 18:01:30 +02:00
1a4db4b8d7
Fixed taking items out of the AE system
...
Same issue as last commit. ItemStacks with a count of 0 get "nullified".
2017-06-24 16:45:28 +02:00
42bfc549be
Fixed drawing of items in storage.
...
An ItemStack count of 0 trips the check for isEmpty and hence doesn't give us the item we want.
2017-06-24 15:01:06 +02:00
ed9e6dd21c
Port to 1.11
2016-12-21 20:38:36 +01:00
a14cf2204d
Fixes anchor rendering ( #2698 )
...
* Fixes #2680 : Use a shorter cable anchor model when blocked by a facade.
* Fixes #2664 : Prevent anchors from creating intersection.
Replaced the simple List<ResourceLocation> for the static models with a
new container also indicating a solid part, which can be used to prevent
the creation of an intersection.
2016-12-14 22:37:10 +01:00
b3560aaa00
Fixes #2571 : Only call getDurabilityForDisplay if the item is damageable.
2016-11-05 12:58:15 +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
71396637e3
Organise imports
2016-09-17 17:05:07 +02:00
7e027da804
Reimplemented cable and parts rendering.
2016-09-10 00:56:28 +02:00
Sebastian Hartte