From 3b181eb231a68ee578c53aa72b276ca5c8e29366 Mon Sep 17 00:00:00 2001 From: Algent Date: Tue, 17 Nov 2026 18:43:29 +0100 Subject: [PATCH] [Target 2.10+] Port ForgeMultipart to Java. Checkpoint with binary compatibility preserved for safe consumers port. (#59) --- .github/workflows/build-and-test.yml | 46 + CHANGELOG-2.1.1.0.md | 32 - README.md | 31 +- addon.gradle | 161 ++- build.gradle | 26 + dependencies.gradle | 18 +- docs/API.md | 136 +++ docs/RELEASE_NOTES.md | 142 +++ docs/api/BLOCK_CONVERTERS.md | 75 ++ docs/api/BUTTON_ORIENTATIONS.md | 61 + docs/api/CLIENT_PREVIEW.md | 59 + docs/api/COMPOSITE_GENERATION.md | 83 ++ docs/api/CUSTOM_PARTS.md | 91 ++ docs/api/CUSTOM_TILE_TRAITS.md | 134 +++ docs/api/FACTORY_LOOKUP.md | 68 ++ docs/api/HIT_PART.md | 40 + docs/api/MATERIAL_ACCESS.md | 49 + docs/api/MATERIAL_ENUMERATION.md | 62 + docs/api/MICROBLOCK_CREATION.md | 89 ++ docs/api/MICROBLOCK_EXTENSIONS.md | 76 ++ docs/api/MIGRATION_CHECKLIST.md | 58 + docs/api/OCCLUSION.md | 113 ++ docs/api/PART_LOADING.md | 94 ++ docs/api/PART_REGISTRATION.md | 80 ++ docs/api/PART_TRAVERSAL.md | 95 ++ docs/api/RENDER_ID.md | 31 + docs/api/SAW_STRENGTH.md | 53 + docs/api/TILE_CONVERSION.md | 57 + docs/api/TILE_TRAIT_ACCESS.md | 140 +++ docs/migration/COMPATIBILITY.md | 905 ++++++++++++++ docs/migration/DIVERGENCES.md | 224 ++++ docs/migration/MAINTAINERS.md | 149 +++ docs/migration/MANUAL_CHECKS.md | 156 +++ docs/migration/README.md | 71 ++ gradle.properties | 26 +- repositories.gradle | 1 - .../examples/BlockConversionExample.java | 86 ++ .../examples/ButtonOrientationExample.java | 22 + .../examples/ClientPreviewExample.java | 29 + .../examples/CompositeGenerationExample.java | 31 + .../multipart/examples/CustomTileTrait.java | 28 + .../examples/CustomTileTraitCapability.java | 7 + .../examples/CustomTileTraitExample.java | 22 + .../examples/CustomTileTraitPart.java | 7 + .../examples/IlluminatedMicroMaterial.java | 30 + .../IlluminatedMicroblockExample.java | 122 ++ .../examples/IlluminatedMicroblockTrait.java | 30 + .../examples/MaterialAccessExample.java | 38 + .../examples/MicroblockCreationExample.java | 21 + .../examples/PartFactoryLookupExample.java | 21 + .../examples/PartRegistrationExample.java | 105 ++ .../examples/TileConversionExample.java | 19 + .../examples/TileTraitAccessExample.java | 26 + .../test/ASMBridgeFunctionalTest.java | 299 +++++ ...ASMMixinCompilerStartupFunctionalTest.java | 167 +++ .../test/ASMSuperLookupFunctionalTest.java | 306 +++++ .../test/AbstractJavaMixinFunctionalTest.java | 190 +++ .../BlockMicroMaterialFunctionalTest.java | 160 +++ .../test/ButtonOrientationFunctionalTest.java | 146 +++ .../test/ClassBytesFunctionalTest.java | 373 ++++++ .../test/ClassDefinitionFunctionalTest.java | 359 ++++++ .../test/ClassInfoFunctionalTest.java | 243 ++++ .../CompositeGenerationFunctionalTest.java | 182 +++ .../test/ControlKeyModiferFunctionalTest.java | 101 ++ .../CornerMicroblockTraitsFunctionalTest.java | 128 ++ .../test/CustomTileTraitFunctionalTest.java | 76 ++ .../test/DebugPrinterFunctionalTest.java | 192 +++ .../test/DefaultContentFunctionalTest.java | 647 ++++++++++ .../EdgeMicroblockTraitsFunctionalTest.java | 132 +++ .../multipart/test/ExpectedErrorLog.java | 40 + .../FaceMicroblockTraitsFunctionalTest.java | 105 ++ .../test/ForgeEnvironmentSmokeTest.java | 695 +++++++++++ .../test/ForgeMultipartFunctionalTestMod.java | 136 +++ .../test/ForgeMultipartProfileWorkload.java | 323 +++++ .../test/GeneratorPassThroughFixture.java | 13 + .../GrassMicroMaterialFunctionalTest.java | 63 + .../HollowMicroblockClientFunctionalTest.java | 308 +++++ .../HollowMicroblockTraitsFunctionalTest.java | 248 ++++ .../IlluminatedMicroblockFunctionalTest.java | 228 ++++ .../JavaTraitRegistrationFunctionalTest.java | 436 +++++++ .../test/MicroRecipeFunctionalTest.java | 229 ++++ .../MicroblockEventHandlerFunctionalTest.java | 31 + .../MicroblockGeneratorFunctionalTest.java | 250 ++++ .../test/MicroblockModFunctionalTest.java | 37 + ...MicroblockPacketHandlerFunctionalTest.java | 86 ++ .../MicroblockPlacementFunctionalTest.java | 299 +++++ .../test/MicroblockProxyFunctionalTest.java | 105 ++ .../test/MicroblockTraitsFunctionalTest.java | 87 ++ .../MissingMicroMaterialFunctionalTest.java | 53 + .../test/MixinClassesFunctionalTest.java | 376 ++++++ .../MultipartCompatiblityFunctionalTest.java | 61 + .../MultipartEventHandlerFunctionalTest.java | 130 ++ .../MultipartGeneratorFunctionalTest.java | 319 +++++ .../test/MultipartHelperFunctionalTest.java | 214 ++++ .../MultipartMixinFactoryFunctionalTest.java | 145 +++ .../test/MultipartModFunctionalTest.java | 57 + .../test/MultipartProxyFunctionalTest.java | 40 + .../test/MultipartRendererFunctionalTest.java | 270 +++++ .../test/MultipartSaveLoadFunctionalTest.java | 295 +++++ .../test/PacketSchedulerFunctionalTest.java | 210 ++++ .../test/PartConverterFunctionalTest.java | 181 +++ .../test/PartFactoryLookupFunctionalTest.java | 92 ++ .../test/PartRegistrationFunctionalTest.java | 293 +++++ .../PostMicroblockClientFunctionalTest.java | 212 ++++ .../PostMicroblockTraitsFunctionalTest.java | 174 +++ .../test/ProxyLoggerFunctionalTest.java | 22 + .../multipart/test/RawTileTraitCalls.java | 20 + .../RedstoneInteractionsFunctionalTest.java | 184 +++ .../test/SavedTickLoadingFunctionalTest.java | 70 ++ .../ScalaTraitRegistrationFunctionalTest.java | 492 ++++++++ .../SideOnlyAnnotationFunctionalTest.java | 234 ++++ .../test/TFluidHandlerTileFunctionalTest.java | 302 +++++ .../test/TIInventoryTileFunctionalTest.java | 445 +++++++ .../test/TMicroOcclusionFunctionalTest.java | 85 ++ .../test/TRedstoneTileFunctionalTest.java | 267 +++++ .../test/TSlottedTileFunctionalTest.java | 286 +++++ .../test/TTileChangeTileFunctionalTest.java | 175 +++ .../test/TileCacheFunctionalTest.java | 76 ++ .../test/TileConversionFunctionalTest.java | 160 +++ .../TileMultipartClientFunctionalTest.java | 299 +++++ .../TileMultipartLifecycleFunctionalTest.java | 288 +++++ .../test/TileTraitAccessFunctionalTest.java | 98 ++ ...eScalaMultipartGeneratorConsumer.class.b64 | 33 + ...ceScalaMultipartSaveLoadConsumer.class.b64 | 1 + .../test/ExternalScalaMicroblockFixture.scala | 16 + .../test/ScalaTraitRegistrationFixture.scala | 28 + .../test/SideOnlySignatureFixture.scala | 16 + .../java/codechicken/multipart/IDWriter.java | 51 + .../multipart/JPartialOcclusion.java | 15 + .../multipart/PartialOcclusionTest.java | 78 ++ .../microblock/AdditionPlacement.java | 25 + .../microblock/AngelicaCompat.java | 35 + .../microblock/AngelicaCompat.scala | 26 - .../microblock/BlockMicroMaterial$.java | 65 + .../microblock/BlockMicroMaterial.java | 246 ++++ .../microblock/BlockMicroMaterial.scala | 201 ---- .../microblock/CommonMicroClass$.java | 30 + .../microblock/CommonMicroClass.java | 32 + .../microblock/ConfigContent$.java | 226 ++++ .../codechicken/microblock/ConfigContent.java | 35 + .../microblock/ConfigContent.scala | 173 --- .../microblock/CornerMicroClass$.java | 66 ++ .../microblock/CornerMicroClass.java | 76 ++ .../microblock/CornerMicroblock.scala | 52 - .../CornerMicroblockTraitLogic.java | 21 + .../microblock/CornerMicroblockTraits.scala | 13 + .../microblock/CornerPlacement$.java | 23 + .../microblock/CornerPlacement.java | 30 + .../microblock/CornerPlacementGrid$.java | 56 + .../microblock/CornerPlacementGrid.java | 24 + .../microblock/DefaultContent$.java | 67 ++ .../microblock/DefaultContent.java | 10 + .../microblock/DefaultContent.scala | 60 - .../microblock/EdgeMicroClass$.java | 69 ++ .../microblock/EdgeMicroClass.java | 76 ++ .../microblock/EdgeMicroblock.scala | 224 ---- .../microblock/EdgeMicroblockTraitLogic.java | 21 + .../microblock/EdgeMicroblockTraits.scala | 81 ++ .../microblock/EdgePlacement$.java | 57 + .../codechicken/microblock/EdgePlacement.java | 30 + .../microblock/EdgePlacementGrid$.java | 74 ++ .../microblock/EdgePlacementGrid.java | 24 + .../microblock/ExecutablePlacement.java | 30 + .../microblock/ExpandingPlacement.java | 29 + .../codechicken/microblock/FaceEdgeGrid.java | 80 ++ .../microblock/FaceMicroClass$.java | 62 + .../microblock/FaceMicroClass.java | 74 ++ .../microblock/FaceMicroblock.scala | 85 -- .../microblock/FaceMicroblockTraitLogic.java | 37 + .../microblock/FaceMicroblockTraits.scala | 18 + .../microblock/FacePlacement$.java | 33 + .../codechicken/microblock/FacePlacement.java | 30 + .../microblock/FacePlacementGrid$.java | 10 + .../microblock/FacePlacementGrid.java | 24 + .../microblock/GrassMicroMaterial.java | 71 ++ .../microblock/GrassMicroMaterial.scala | 63 - .../microblock/HollowMicroClass$.java | 88 ++ .../microblock/HollowMicroClass.java | 85 ++ .../microblock/HollowMicroblock.scala | 416 ------- .../HollowMicroblockClientLogic.java | 180 +++ .../HollowMicroblockTraitLogic.java | 139 +++ .../microblock/HollowMicroblockTraits.scala | 81 ++ .../microblock/HollowPlacement$.java | 33 + .../microblock/HollowPlacement.java | 39 + .../microblock/IMicroMaterialRender.java | 26 + .../microblock/IMicroMaterialRender.scala | 21 - .../microblock/ISidedHollowConnect.java | 14 + .../microblock/ISidedHollowConnect.scala | 15 - .../microblock/ItemMicroPart$.java | 53 + .../codechicken/microblock/ItemMicroPart.java | 128 ++ .../microblock/ItemMicroPart.scala | 209 ---- .../microblock/ItemMicroPartRenderer$.java | 79 ++ .../microblock/ItemMicroPartRenderer.java | 30 + .../scala/codechicken/microblock/ItemSaw.java | 59 + .../codechicken/microblock/ItemSaw.scala | 136 --- .../microblock/ItemSawRenderer$.java | 118 ++ .../microblock/ItemSawRenderer.java | 43 + .../microblock/MaterialBlockAccess.java | 82 ++ .../microblock/MaterialRenderHelper$.java | 72 ++ .../microblock/MaterialRenderHelper.java | 48 + .../microblock/MicroMaterialRegistry$.java | 112 ++ .../microblock/MicroMaterialRegistry.java | 364 ++++++ .../microblock/MicroMaterialRegistry.scala | 255 ---- .../microblock/MicroOcclusion$.java | 212 ++++ .../microblock/MicroOcclusion.java | 36 + .../codechicken/microblock/MicroRecipe$.java | 302 +++++ .../codechicken/microblock/MicroRecipe.java | 82 ++ .../codechicken/microblock/MicroRecipe.scala | 247 ---- .../codechicken/microblock/Microblock$.java | 12 + .../codechicken/microblock/Microblock.java | 199 ++++ .../codechicken/microblock/Microblock.scala | 177 --- .../microblock/MicroblockClass.java | 73 ++ .../microblock/MicroblockClass.scala | 63 - .../microblock/MicroblockGenerator$.java | 61 + .../microblock/MicroblockGenerator.java | 99 ++ .../microblock/MicroblockGenerator.scala | 26 - .../microblock/MicroblockPlacement$.java | 16 + .../microblock/MicroblockPlacement.java | 238 ++++ .../microblock/MicroblockPlacement.scala | 180 --- .../microblock/MicroblockRender$.java | 84 ++ .../microblock/MicroblockRender.java | 31 + .../microblock/MicroblockRender.scala | 76 -- .../microblock/MicroblockTraitLogic.java | 68 ++ .../microblock/MicroblockTraits.scala | 58 + .../microblock/MissingMicroMaterial$.java | 91 ++ .../microblock/MissingMicroMaterial.java | 68 ++ .../microblock/MissingMicroMaterial.scala | 55 - .../microblock/PlacementGrid$class.java | 38 + .../codechicken/microblock/PlacementGrid.java | 18 + .../microblock/PlacementGrids.scala | 180 --- .../microblock/PlacementProperties.java | 22 + .../microblock/PostMicroClass$.java | 53 + .../microblock/PostMicroClass.java | 60 + .../microblock/PostMicroblockClientLogic.java | 83 ++ .../microblock/PostMicroblockTraitLogic.java | 56 + .../codechicken/microblock/Saw$class.java | 20 + .../scala/codechicken/microblock/Saw.java | 21 + .../microblock/TMicroOcclusion.scala | 212 +--- .../TMicroOcclusionClientLogic.java | 12 + .../microblock/TMicroOcclusionLogic.java | 57 + .../codechicken/microblock/ThreadState.java | 25 + .../microblock/TopMicroMaterial$.java | 12 + .../microblock/TopMicroMaterial.java | 33 + .../microblock/handler/MicroblockCPH$.java | 41 + .../microblock/handler/MicroblockCPH.java | 23 + .../handler/MicroblockEventHandler$.java | 44 + .../handler/MicroblockEventHandler.java | 25 + .../handler/MicroblockEventHandler.scala | 44 - .../microblock/handler/MicroblockMod$.java | 67 ++ .../microblock/handler/MicroblockMod.java | 55 + .../microblock/handler/MicroblockMod.scala | 60 - .../microblock/handler/MicroblockPH.java | 10 + .../microblock/handler/MicroblockProxy$.java | 8 + .../microblock/handler/MicroblockProxy.java | 98 ++ .../handler/MicroblockProxy_clientImpl.java | 60 + .../handler/MicroblockProxy_serverImpl.java | 167 +++ .../microblock/handler/MicroblockSPH$.java | 27 + .../microblock/handler/MicroblockSPH.java | 24 + .../microblock/handler/packethandlers.scala | 72 -- .../microblock/handler/proxies.scala | 142 --- .../codechicken/microblock/package.scala | 7 - .../multipart/BlockMultipart$.java | 35 + .../codechicken/multipart/BlockMultipart.java | 407 +++++++ .../multipart/BlockMultipart.scala | 449 ------- .../multipart/ControlKeyHandler.java | 50 + .../multipart/ControlKeyModifer.java | 46 + .../multipart/ControlKeyModifier.scala | 63 - .../codechicken/multipart/IDWriter.scala | 26 - .../multipart/IFaceRedstonePart.java | 7 + .../multipart/IMaskedRedstonePart.java | 7 + .../multipart/INeighborTileChange.java | 14 + .../multipart/INeighborTileChange.scala | 16 - .../multipart/IRandomDisplayTick.java | 14 + .../multipart/IRandomDisplayTick.scala | 14 - .../multipart/IRedstoneConnector.java | 9 + .../multipart/IRedstoneConnectorBlock.java | 11 + .../codechicken/multipart/IRedstonePart.java | 11 + .../codechicken/multipart/IRedstonePart.scala | 310 ----- .../codechicken/multipart/IRedstoneTile.java | 19 + .../multipart/IScheduledPacketPart.java | 22 + .../codechicken/multipart/IconHitEffects.java | 67 ++ .../codechicken/multipart/ItemMultiPart.scala | 68 -- .../codechicken/multipart/JCuboidPart.java | 53 + .../multipart/JIconHitEffects$class.java | 20 + .../multipart/JIconHitEffects.java | 45 + .../codechicken/multipart/JItemMultiPart.java | 58 + .../multipart/JNormalOcclusion.java | 13 + .../multipart/JsonModeledPart.java | 2 +- .../multipart/MultiPartRegistry$.java | 114 ++ .../multipart/MultiPartRegistry.java | 394 +++++++ .../multipart/MultiPartRegistry.scala | 247 ---- .../multipart/MultipartGenerator$.java | 221 ++++ .../multipart/MultipartGenerator.java | 107 ++ .../multipart/MultipartGenerator.scala | 241 ---- .../multipart/MultipartHelper$.java | 31 + .../multipart/MultipartHelper.java | 181 +++ .../multipart/MultipartHelper.scala | 112 -- .../multipart/MultipartRenderer$.java | 99 ++ .../multipart/MultipartRenderer.java | 40 + .../multipart/MultipartRenderer.scala | 95 -- .../multipart/NormalOcclusionTest$.java | 27 + .../multipart/NormalOcclusionTest.java | 90 ++ .../multipart/NormallyOccludedPart.java | 34 + .../multipart/PacketScheduler.java | 72 ++ .../multipart/PacketScheduler.scala | 80 -- .../multipart/RedstoneInteractions$.java | 151 +++ .../multipart/RedstoneInteractions.java | 58 + .../multipart/RenderPartResolver.java | 26 +- .../multipart/TCuboidPart$class.java | 33 + .../codechicken/multipart/TCuboidPart.java | 28 + .../codechicken/multipart/TCuboidPart.scala | 42 - .../multipart/TEdgePart$class.java | 17 + .../codechicken/multipart/TEdgePart.java | 14 + .../codechicken/multipart/TEdgePart.scala | 11 - .../multipart/TFacePart$class.java | 21 + .../codechicken/multipart/TFacePart.java | 22 + .../codechicken/multipart/TFacePart.scala | 17 - .../multipart/TIconHitEffects$class.java | 26 + .../multipart/TIconHitEffects.java | 23 + .../multipart/TIconHitEffects.scala | 92 -- .../multipart/TItemMultiPart$class.java | 28 + .../codechicken/multipart/TItemMultiPart.java | 29 + .../codechicken/multipart/TMultiPart.java | 404 +++++++ .../codechicken/multipart/TMultiPart.scala | 368 ------ .../multipart/TNormalOcclusion$class.java | 15 + .../multipart/TNormalOcclusion.java | 23 + .../multipart/TNormalOcclusion.scala | 65 - .../multipart/TPartialOcclusion.scala | 73 -- .../multipart/TRandomUpdateTick.java | 30 + .../multipart/TRandomUpdateTick.scala | 19 - .../multipart/TScheduledPacketPart.java | 54 + .../codechicken/multipart/TSlottedPart.java | 16 + .../codechicken/multipart/TSlottedPart.scala | 14 - .../codechicken/multipart/TickScheduler$.java | 41 + .../codechicken/multipart/TickScheduler.java | 426 +++++++ .../codechicken/multipart/TickScheduler.scala | 259 ---- .../codechicken/multipart/TileCache.java | 82 ++ .../codechicken/multipart/TileCache.scala | 46 - .../multipart/TileConversionResult.java | 29 + .../codechicken/multipart/TileMultipart$.java | 78 ++ .../codechicken/multipart/TileMultipart.java | 1048 +++++++++++++++++ .../codechicken/multipart/TileMultipart.scala | 819 ------------- .../multipart/TileMultipartClient.java | 196 +++ .../multipart/asm/ASMBridgeEmitter.java | 60 + .../multipart/asm/ASMImplicits$.java | 22 + .../multipart/asm/ASMImplicits.java | 128 ++ .../multipart/asm/ASMImplicits.scala | 22 - .../multipart/asm/ASMMixinCompiler.scala | 804 ++----------- .../multipart/asm/ASMMixinFactory.java | 149 +++ .../multipart/asm/ASMMixinFactory.scala | 95 -- .../multipart/asm/ByteCodeReader.java | 71 ++ .../multipart/asm/ByteCodecs$.java | 217 ++++ .../codechicken/multipart/asm/ByteCodecs.java | 30 + .../multipart/asm/ByteCodecs.scala | 211 ---- .../codechicken/multipart/asm/ClassBytes.java | 85 ++ .../multipart/asm/ClassInfoLookup.java | 229 ++++ .../multipart/asm/CompilerBootstrap.java | 44 + .../multipart/asm/DebugPrinter$.java | 55 + .../multipart/asm/DebugPrinter.java | 30 + .../multipart/asm/JavaTraitRegistration.java | 387 ++++++ .../multipart/asm/MixinClassGenerator.java | 204 ++++ .../multipart/asm/MultipartMixinFactory$.java | 268 +++++ .../multipart/asm/MultipartMixinFactory.java | 56 + .../multipart/asm/MultipartMixinFactory.scala | 248 ---- .../multipart/asm/ScalaSigReader$.java | 52 + .../multipart/asm/ScalaSigReader.java | 31 + .../multipart/asm/ScalaSignature.scala | 218 +--- .../multipart/asm/ScalaSignatureParser.java | 271 +++++ .../multipart/asm/ScalaTraitRegistration.java | 130 ++ .../multipart/asm/ScratchBitSet$class.java | 29 + .../multipart/asm/ScratchBitSet.java | 16 + .../multipart/asm/ScratchBitSet.scala | 20 - .../multipart/asm/StackAnalyser.scala | 217 +--- .../multipart/asm/StackAnalyserLogic.java | 379 ++++++ .../multipart/handler/CubicChunksCompat.java | 24 + .../multipart/handler/CubicChunksCompat.scala | 18 - .../multipart/handler/MCPCCompatModule$.java | 49 + .../multipart/handler/MCPCCompatModule.java | 11 + .../multipart/handler/MultipartCPH$.java | 88 ++ .../multipart/handler/MultipartCPH.java | 36 + .../handler/MultipartCompatiblity$.java | 41 + .../handler/MultipartCompatiblity.java | 23 + .../handler/MultipartCompatiblity.scala | 47 - .../handler/MultipartEventHandler$.java | 96 ++ .../handler/MultipartEventHandler.java | 58 + .../handler/MultipartEventHandler.scala | 82 -- .../multipart/handler/MultipartMod$.java | 53 + .../multipart/handler/MultipartMod.java | 45 + .../multipart/handler/MultipartMod.scala | 50 - .../multipart/handler/MultipartPH.java | 15 + .../multipart/handler/MultipartProxy$.java | 23 + .../multipart/handler/MultipartProxy.java | 69 ++ .../handler/MultipartProxy_clientImpl.java | 34 + .../handler/MultipartProxy_serverImpl.java | 108 ++ .../multipart/handler/MultipartSPH$.java | 235 ++++ .../multipart/handler/MultipartSPH.java | 77 ++ .../multipart/handler/MultipartSaveLoad$.java | 124 ++ .../multipart/handler/MultipartSaveLoad.java | 70 ++ .../multipart/handler/MultipartSaveLoad.scala | 98 -- .../multipart/handler/packethandlers.scala | 244 ---- .../multipart/handler/proxies.scala | 129 -- .../multipart/minecraft/ButtonPart.java | 50 + .../multipart/minecraft/McBlockPart.java | 7 + .../scala/codechicken/multipart/package.scala | 7 - .../multipart/scalatraits/JInventoryTile.java | 234 ++++ .../scalatraits/TFluidHandlerTile.java | 165 +++ .../scalatraits/TFluidHandlerTile.scala | 139 --- .../scalatraits/TIInventoryTile.java | 87 ++ .../scalatraits/TIInventoryTile.scala | 126 -- .../scalatraits/TPartialOcclusionTile.java | 37 + .../scalatraits/TPartialOcclusionTile.scala | 36 - .../scalatraits/TRandomDisplayTickTile.java | 34 + .../scalatraits/TRandomDisplayTickTile.scala | 14 - .../multipart/scalatraits/TRedstoneTile.java | 156 +++ .../multipart/scalatraits/TRedstoneTile.scala | 86 -- .../multipart/scalatraits/TSlottedTile.java | 86 ++ .../multipart/scalatraits/TSlottedTile.scala | 55 - .../scalatraits/TTileChangeTile.java | 114 ++ .../scalatraits/TTileChangeTile.scala | 58 - src/test/fixtures/README.md | 426 +++++++ .../fixtures/abi/gtnh-2.9.0-rc2-consumers.txt | 824 +++++++++++++ .../fixtures/abi/gtnh-daily-678-consumers.txt | 811 +++++++++++++ .../ReferenceScalaAppliedTypeDescriptor.scala | 22 + ...renceScalaBlockMicroMaterialConsumer.scala | 20 + .../compat/ReferenceScalaClassParent.scala | 32 + .../ReferenceScalaClassSymbolFull.scala | 20 + .../ReferenceScalaCornerMicroblock.scala | 23 + .../compat/ReferenceScalaCuboidPart.scala | 13 + .../compat/ReferenceScalaEdgeMicroblock.scala | 23 + .../compat/ReferenceScalaEdgePart.scala | 12 + .../ReferenceScalaFaceMicroblockClient.scala | 39 + .../compat/ReferenceScalaFacePart.scala | 12 + .../ReferenceScalaHollowMicroblock.scala | 56 + ...ReferenceScalaHollowMicroblockClient.scala | 53 + .../compat/ReferenceScalaIconHitEffects.scala | 22 + .../compat/ReferenceScalaInterfaceNames.scala | 23 + .../ReferenceScalaItemMicroPartConsumer.scala | 20 + .../compat/ReferenceScalaItemMultiPart.scala | 29 + ...ReferenceScalaMethodSymbolDescriptor.scala | 16 + .../ReferenceScalaMethodSymbolFull.scala | 7 + .../ReferenceScalaMethodSymbolInfo.scala | 7 + .../ReferenceScalaMicroMaterialConsumer.scala | 21 + .../ReferenceScalaMicroblockTraits.scala | 37 + ...renceScalaMultipartGeneratorConsumer.scala | 12 + ...erenceScalaMultipartSaveLoadConsumer.scala | 15 + .../ReferenceScalaNormalOcclusion.scala | 15 + .../compat/ReferenceScalaPostMicroblock.scala | 55 + .../ReferenceScalaPostMicroblockClient.scala | 67 ++ .../multipart/compat/ReferenceScalaSaw.scala | 15 + .../ReferenceScalaTMicroOcclusion.scala | 45 + .../ReferenceScalaTMicroOcclusionClient.scala | 49 + .../AngelicaCompatCharacterizationTest.java | 138 +++ ...kMicroMaterialBinaryCompatibilityTest.java | 48 + ...lockMicroMaterialCharacterizationTest.java | 521 ++++++++ .../ConfigContentCharacterizationTest.java | 257 ++++ .../CornerMicroblockCharacterizationTest.java | 164 +++ ...rMicroblockTraitsCharacterizationTest.java | 93 ++ .../DefaultContentCharacterizationTest.java | 44 + .../EdgeMicroblockCharacterizationTest.java | 255 ++++ ...eMicroblockTraitsCharacterizationTest.java | 94 ++ .../FaceMicroblockCharacterizationTest.java | 179 +++ ...eMicroblockTraitsCharacterizationTest.java | 190 +++ ...rassMicroMaterialCharacterizationTest.java | 234 ++++ .../HollowMicroblockCharacterizationTest.java | 225 ++++ ...wMicroblockClientCharacterizationTest.java | 538 +++++++++ ...wMicroblockTraitsCharacterizationTest.java | 262 +++++ .../ItemMicroPartBinaryCompatibilityTest.java | 80 ++ .../ItemMicroPartCharacterizationTest.java | 174 +++ .../ItemSawCharacterizationTest.java | 276 +++++ .../MarkerInterfaceCharacterizationTest.java | 124 ++ ...terialRegistryBinaryCompatibilityTest.java | 75 ++ ...oMaterialRegistryCharacterizationTest.java | 352 ++++++ .../MicroOcclusionCharacterizationTest.java | 451 +++++++ .../MicroRecipeBinaryCompatibilityTest.java | 84 ++ .../MicroblockCharacterizationTest.java | 566 +++++++++ .../MicroblockClassCharacterizationTest.java | 276 +++++ ...croblockGeneratorCharacterizationTest.java | 224 ++++ ...croblockPlacementCharacterizationTest.java | 212 ++++ .../MicroblockRenderCharacterizationTest.java | 289 +++++ .../MicroblockTraitsCharacterizationTest.java | 293 +++++ ...singMicroMaterialCharacterizationTest.java | 126 ++ .../microblock/ParticleTintTest.java | 92 ++ .../PlacementGridsCharacterizationTest.java | 202 ++++ ...tMicroblockClientCharacterizationTest.java | 389 ++++++ ...tMicroblockTraitsCharacterizationTest.java | 223 ++++ .../SawBinaryCompatibilityTest.java | 53 + .../microblock/SawCharacterizationTest.java | 82 ++ .../TMicroOcclusionCharacterizationTest.java | 269 +++++ ...roOcclusionClientCharacterizationTest.java | 237 ++++ .../examples/MaterialEnumerationExample.java | 21 + .../examples/SawStrengthExample.java | 27 + ...blockEventHandlerCharacterizationTest.java | 90 ++ .../MicroblockModCharacterizationTest.java | 103 ++ .../MicroblockPacketHandlerBehaviorTest.java | 114 ++ ...lockPacketHandlerCharacterizationTest.java | 121 ++ .../MicroblockProxyCharacterizationTest.java | 193 +++ .../BlockMultipartCharacterizationTest.java | 198 ++++ .../ConsumerReflectionCompatibilityTest.java | 75 ++ ...ControlKeyModiferCharacterizationTest.java | 35 + .../CuboidPartCharacterizationTest.java | 129 ++ .../EdgePartCharacterizationTest.java | 58 + .../FacePartCharacterizationTest.java | 88 ++ .../IDWriterCharacterizationTest.java | 84 ++ .../IconHitEffectsCharacterizationTest.java | 100 ++ .../ItemMultiPartCharacterizationTest.java | 140 +++ .../MarkerInterfaceCharacterizationTest.java | 141 +++ ...MultiPartRegistryCharacterizationTest.java | 260 ++++ ...ultipartGeneratorCharacterizationTest.java | 134 +++ .../MultipartHelperCharacterizationTest.java | 192 +++ ...MultipartRendererCharacterizationTest.java | 145 +++ .../multipart/NormalOcclusionBoxTest.java | 180 +++ .../NormalOcclusionCharacterizationTest.java | 202 ++++ .../PacketSchedulerCharacterizationTest.java | 128 ++ .../PartialOcclusionCharacterizationTest.java | 170 +++ ...stoneInteractionsCharacterizationTest.java | 334 ++++++ .../TCuboidPartBinaryCompatibilityTest.java | 68 ++ .../TEdgePartBinaryCompatibilityTest.java | 53 + .../TFacePartBinaryCompatibilityTest.java | 55 + ...IconHitEffectsBinaryCompatibilityTest.java | 68 ++ ...TItemMultiPartBinaryCompatibilityTest.java | 77 ++ .../TMultiPartTileAccessorRegressionTest.java | 142 +++ ...ormalOcclusionBinaryCompatibilityTest.java | 55 + .../TickSchedulerCallbackRegressionTest.java | 55 + .../TickSchedulerClockRegressionTest.java | 58 + .../TickSchedulerEqualityRegressionTest.java | 90 ++ .../TickSchedulerMoveRegressionTest.java | 106 ++ ...ickSchedulerPersistenceRegressionTest.java | 56 + ...ickSchedulerSaveFailureRegressionTest.java | 25 + .../TileCacheCharacterizationTest.java | 118 ++ .../TileMultipartCharacterizationTest.java | 764 ++++++++++++ .../TileMultipartEqualityRegressionTest.java | 272 +++++ .../multipart/TileMultipartLoadingTest.java | 280 +++++ .../multipart/TileMultipartOcclusionTest.java | 226 ++++ .../multipart/TileMultipartRenderIdTest.java | 58 + .../asm/ASMImplicitsCharacterizationTest.java | 256 ++++ .../ASMMixinFactoryCharacterizationTest.java | 135 +++ .../ByteCodeReaderCharacterizationTest.java | 155 +++ .../asm/ByteCodecsCharacterizationTest.java | 164 +++ .../asm/ClassInfoCharacterizationTest.java | 357 ++++++ .../asm/DebugPrinterCharacterizationTest.java | 80 ++ .../asm/FieldMixinAccessNameTest.java | 144 +++ .../multipart/asm/MixinInfoLineariseTest.java | 191 +++ ...ipartMixinFactoryCharacterizationTest.java | 166 +++ .../ScalaSigReaderCharacterizationTest.java | 162 +++ ...alaSignatureAppliedTypeDescriptorTest.java | 180 +++ .../asm/ScalaSignatureBytesSectionTest.java | 160 +++ .../asm/ScalaSignatureClassParentTest.java | 226 ++++ .../ScalaSignatureClassSymbolFullTest.java | 220 ++++ .../ScalaSignatureClassSymbolStringTest.java | 204 ++++ .../asm/ScalaSignatureInterfaceNamesTest.java | 251 ++++ .../ScalaSignatureMethodDescriptorTest.java | 236 ++++ ...laSignatureMethodSymbolDescriptorTest.java | 192 +++ .../ScalaSignatureMethodSymbolFullTest.java | 213 ++++ .../ScalaSignatureMethodSymbolInfoTest.java | 209 ++++ .../ScalaSignatureMethodSymbolStringTest.java | 190 +++ ...laSignatureParserCharacterizationTest.java | 199 ++++ .../asm/ScalaSignatureTypeDescriptorTest.java | 193 +++ .../asm/ScalaSignatureTypeNameTest.java | 183 +++ .../ScratchBitSetCharacterizationTest.java | 177 +++ .../StackAnalyserCharacterizationTest.java | 532 +++++++++ .../multipart/asm/StackAnalyserConstTest.java | 166 +++ .../asm/StackAnalyserInitializationTest.java | 261 ++++ .../examples/BoxOcclusionExample.java | 16 + .../multipart/examples/HitPartExample.java | 22 + .../multipart/examples/OcclusionExample.java | 18 + .../examples/PartLoadingExample.java | 26 + .../examples/PartTraversalExample.java | 27 + .../multipart/examples/RenderIdExample.java | 13 + ...ipartCompatiblityCharacterizationTest.java | 103 ++ ...ipartEventHandlerCharacterizationTest.java | 102 ++ .../MultipartModCharacterizationTest.java | 79 ++ .../MultipartPacketHandlerBehaviorTest.java | 212 ++++ ...partPacketHandlerCharacterizationTest.java | 177 +++ .../MultipartProxyCharacterizationTest.java | 177 +++ ...MultipartSaveLoadCharacterizationTest.java | 130 ++ ...tialOcclusionTileCharacterizationTest.java | 169 +++ .../ReferenceHollowClientBase.class.b64 | 1 + .../ReferenceHollowMicroblockBase.class.b64 | 1 + .../ReferenceMicroOcclusionBase.class.b64 | 1 + ...eferenceMicroOcclusionClientBase.class.b64 | 1 + .../compat/ReferencePostClientBase.class.b64 | 1 + .../compat/ReferencePostFace.class.b64 | 1 + .../ReferencePostMicroblockBase.class.b64 | 1 + ...alaAppliedTypeDescriptor$$anon$1.class.b64 | 33 + ...erenceScalaAppliedTypeDescriptor.class.b64 | 42 + ...eScalaBlockMicroMaterialConsumer.class.b64 | 31 + ...eferenceScalaClassParent$$anon$1.class.b64 | 30 + ...eferenceScalaClassParent$$anon$2.class.b64 | 83 ++ .../ReferenceScalaClassParent.class.b64 | 62 + ...enceScalaClassSymbolFull$$anon$1.class.b64 | 86 ++ .../ReferenceScalaClassSymbolFull.class.b64 | 40 + .../ReferenceScalaCornerMicroblock.class.b64 | 1 + .../compat/ReferenceScalaCuboidPart.class.b64 | 37 + .../ReferenceScalaEdgeMicroblock.class.b64 | 1 + .../compat/ReferenceScalaEdgePart.class.b64 | 22 + ...ferenceScalaFaceMicroblockClient.class.b64 | 1 + .../compat/ReferenceScalaFacePart.class.b64 | 25 + .../ReferenceScalaHollowMicroblock.class.b64 | 1 + ...renceScalaHollowMicroblockClient.class.b64 | 1 + .../ReferenceScalaIconHitEffects.class.b64 | 55 + ...renceScalaInterfaceNames$$anon$1.class.b64 | 30 + ...renceScalaInterfaceNames$$anon$2.class.b64 | 31 + .../ReferenceScalaInterfaceNames.class.b64 | 53 + ...erenceScalaItemMicroPartConsumer.class.b64 | 37 + .../ReferenceScalaItemMultiPart.class.b64 | 66 ++ ...laMethodSymbolDescriptor$$anon$1.class.b64 | 29 + ...renceScalaMethodSymbolDescriptor.class.b64 | 38 + .../ReferenceScalaMethodSymbolFull.class.b64 | 21 + .../ReferenceScalaMethodSymbolInfo.class.b64 | 24 + ...erenceScalaMicroMaterialConsumer.class.b64 | 42 + .../ReferenceScalaMicroblockTraits.class.b64 | 1 + .../ReferenceScalaNormalOcclusion.class.b64 | 34 + .../ReferenceScalaPostMicroblock.class.b64 | 1 + ...ferenceScalaPostMicroblockClient.class.b64 | 1 + .../compat/ReferenceScalaSaw.class.b64 | 24 + .../ReferenceScalaTMicroOcclusion.class.b64 | 1 + ...erenceScalaTMicroOcclusionClient.class.b64 | 1 + tools/AbiScan.java | 233 ++++ 618 files changed, 61535 insertions(+), 9991 deletions(-) delete mode 100644 CHANGELOG-2.1.1.0.md create mode 100644 docs/API.md create mode 100644 docs/RELEASE_NOTES.md create mode 100644 docs/api/BLOCK_CONVERTERS.md create mode 100644 docs/api/BUTTON_ORIENTATIONS.md create mode 100644 docs/api/CLIENT_PREVIEW.md create mode 100644 docs/api/COMPOSITE_GENERATION.md create mode 100644 docs/api/CUSTOM_PARTS.md create mode 100644 docs/api/CUSTOM_TILE_TRAITS.md create mode 100644 docs/api/FACTORY_LOOKUP.md create mode 100644 docs/api/HIT_PART.md create mode 100644 docs/api/MATERIAL_ACCESS.md create mode 100644 docs/api/MATERIAL_ENUMERATION.md create mode 100644 docs/api/MICROBLOCK_CREATION.md create mode 100644 docs/api/MICROBLOCK_EXTENSIONS.md create mode 100644 docs/api/MIGRATION_CHECKLIST.md create mode 100644 docs/api/OCCLUSION.md create mode 100644 docs/api/PART_LOADING.md create mode 100644 docs/api/PART_REGISTRATION.md create mode 100644 docs/api/PART_TRAVERSAL.md create mode 100644 docs/api/RENDER_ID.md create mode 100644 docs/api/SAW_STRENGTH.md create mode 100644 docs/api/TILE_CONVERSION.md create mode 100644 docs/api/TILE_TRAIT_ACCESS.md create mode 100644 docs/migration/COMPATIBILITY.md create mode 100644 docs/migration/DIVERGENCES.md create mode 100644 docs/migration/MAINTAINERS.md create mode 100644 docs/migration/MANUAL_CHECKS.md create mode 100644 docs/migration/README.md create mode 100644 src/functionalTest/java/codechicken/multipart/examples/BlockConversionExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/ButtonOrientationExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/ClientPreviewExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/CompositeGenerationExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/CustomTileTrait.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitCapability.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitPart.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroMaterial.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockTrait.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/MaterialAccessExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/MicroblockCreationExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/PartFactoryLookupExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/PartRegistrationExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/TileConversionExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/examples/TileTraitAccessExample.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ASMBridgeFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ASMMixinCompilerStartupFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ASMSuperLookupFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/AbstractJavaMixinFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/BlockMicroMaterialFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ButtonOrientationFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ClassBytesFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ClassDefinitionFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ClassInfoFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/CompositeGenerationFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ControlKeyModiferFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/CornerMicroblockTraitsFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/CustomTileTraitFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/DebugPrinterFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/DefaultContentFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/EdgeMicroblockTraitsFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ExpectedErrorLog.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/FaceMicroblockTraitsFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ForgeEnvironmentSmokeTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ForgeMultipartFunctionalTestMod.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ForgeMultipartProfileWorkload.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/GeneratorPassThroughFixture.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/GrassMicroMaterialFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/HollowMicroblockClientFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/HollowMicroblockTraitsFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/IlluminatedMicroblockFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/JavaTraitRegistrationFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MicroRecipeFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MicroblockEventHandlerFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MicroblockGeneratorFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MicroblockModFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MicroblockPacketHandlerFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MicroblockPlacementFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MicroblockProxyFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MicroblockTraitsFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MissingMicroMaterialFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MixinClassesFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MultipartCompatiblityFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MultipartEventHandlerFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MultipartGeneratorFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MultipartHelperFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MultipartMixinFactoryFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MultipartModFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MultipartProxyFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MultipartRendererFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/MultipartSaveLoadFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/PacketSchedulerFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/PartConverterFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/PartFactoryLookupFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/PartRegistrationFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/PostMicroblockClientFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/PostMicroblockTraitsFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ProxyLoggerFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/RawTileTraitCalls.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/RedstoneInteractionsFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/SavedTickLoadingFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/ScalaTraitRegistrationFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/SideOnlyAnnotationFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TFluidHandlerTileFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TIInventoryTileFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TMicroOcclusionFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TRedstoneTileFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TSlottedTileFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TTileChangeTileFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TileCacheFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TileConversionFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TileMultipartClientFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TileMultipartLifecycleFunctionalTest.java create mode 100644 src/functionalTest/java/codechicken/multipart/test/TileTraitAccessFunctionalTest.java create mode 100644 src/functionalTest/resources/compat/ReferenceScalaMultipartGeneratorConsumer.class.b64 create mode 100644 src/functionalTest/resources/compat/ReferenceScalaMultipartSaveLoadConsumer.class.b64 create mode 100644 src/functionalTest/scala/codechicken/multipart/test/ExternalScalaMicroblockFixture.scala create mode 100644 src/functionalTest/scala/codechicken/multipart/test/ScalaTraitRegistrationFixture.scala create mode 100644 src/functionalTest/scala/codechicken/multipart/test/SideOnlySignatureFixture.scala create mode 100644 src/main/java/codechicken/multipart/IDWriter.java create mode 100644 src/main/java/codechicken/multipart/JPartialOcclusion.java create mode 100644 src/main/java/codechicken/multipart/PartialOcclusionTest.java create mode 100644 src/main/scala/codechicken/microblock/AdditionPlacement.java create mode 100644 src/main/scala/codechicken/microblock/AngelicaCompat.java delete mode 100644 src/main/scala/codechicken/microblock/AngelicaCompat.scala create mode 100644 src/main/scala/codechicken/microblock/BlockMicroMaterial$.java create mode 100644 src/main/scala/codechicken/microblock/BlockMicroMaterial.java delete mode 100644 src/main/scala/codechicken/microblock/BlockMicroMaterial.scala create mode 100644 src/main/scala/codechicken/microblock/CommonMicroClass$.java create mode 100644 src/main/scala/codechicken/microblock/CommonMicroClass.java create mode 100644 src/main/scala/codechicken/microblock/ConfigContent$.java create mode 100644 src/main/scala/codechicken/microblock/ConfigContent.java delete mode 100644 src/main/scala/codechicken/microblock/ConfigContent.scala create mode 100644 src/main/scala/codechicken/microblock/CornerMicroClass$.java create mode 100644 src/main/scala/codechicken/microblock/CornerMicroClass.java delete mode 100644 src/main/scala/codechicken/microblock/CornerMicroblock.scala create mode 100644 src/main/scala/codechicken/microblock/CornerMicroblockTraitLogic.java create mode 100644 src/main/scala/codechicken/microblock/CornerMicroblockTraits.scala create mode 100644 src/main/scala/codechicken/microblock/CornerPlacement$.java create mode 100644 src/main/scala/codechicken/microblock/CornerPlacement.java create mode 100644 src/main/scala/codechicken/microblock/CornerPlacementGrid$.java create mode 100644 src/main/scala/codechicken/microblock/CornerPlacementGrid.java create mode 100644 src/main/scala/codechicken/microblock/DefaultContent$.java create mode 100644 src/main/scala/codechicken/microblock/DefaultContent.java delete mode 100644 src/main/scala/codechicken/microblock/DefaultContent.scala create mode 100644 src/main/scala/codechicken/microblock/EdgeMicroClass$.java create mode 100644 src/main/scala/codechicken/microblock/EdgeMicroClass.java delete mode 100644 src/main/scala/codechicken/microblock/EdgeMicroblock.scala create mode 100644 src/main/scala/codechicken/microblock/EdgeMicroblockTraitLogic.java create mode 100644 src/main/scala/codechicken/microblock/EdgeMicroblockTraits.scala create mode 100644 src/main/scala/codechicken/microblock/EdgePlacement$.java create mode 100644 src/main/scala/codechicken/microblock/EdgePlacement.java create mode 100644 src/main/scala/codechicken/microblock/EdgePlacementGrid$.java create mode 100644 src/main/scala/codechicken/microblock/EdgePlacementGrid.java create mode 100644 src/main/scala/codechicken/microblock/ExecutablePlacement.java create mode 100644 src/main/scala/codechicken/microblock/ExpandingPlacement.java create mode 100644 src/main/scala/codechicken/microblock/FaceEdgeGrid.java create mode 100644 src/main/scala/codechicken/microblock/FaceMicroClass$.java create mode 100644 src/main/scala/codechicken/microblock/FaceMicroClass.java delete mode 100644 src/main/scala/codechicken/microblock/FaceMicroblock.scala create mode 100644 src/main/scala/codechicken/microblock/FaceMicroblockTraitLogic.java create mode 100644 src/main/scala/codechicken/microblock/FaceMicroblockTraits.scala create mode 100644 src/main/scala/codechicken/microblock/FacePlacement$.java create mode 100644 src/main/scala/codechicken/microblock/FacePlacement.java create mode 100644 src/main/scala/codechicken/microblock/FacePlacementGrid$.java create mode 100644 src/main/scala/codechicken/microblock/FacePlacementGrid.java create mode 100644 src/main/scala/codechicken/microblock/GrassMicroMaterial.java delete mode 100644 src/main/scala/codechicken/microblock/GrassMicroMaterial.scala create mode 100644 src/main/scala/codechicken/microblock/HollowMicroClass$.java create mode 100644 src/main/scala/codechicken/microblock/HollowMicroClass.java delete mode 100644 src/main/scala/codechicken/microblock/HollowMicroblock.scala create mode 100644 src/main/scala/codechicken/microblock/HollowMicroblockClientLogic.java create mode 100644 src/main/scala/codechicken/microblock/HollowMicroblockTraitLogic.java create mode 100644 src/main/scala/codechicken/microblock/HollowMicroblockTraits.scala create mode 100644 src/main/scala/codechicken/microblock/HollowPlacement$.java create mode 100644 src/main/scala/codechicken/microblock/HollowPlacement.java create mode 100644 src/main/scala/codechicken/microblock/IMicroMaterialRender.java delete mode 100644 src/main/scala/codechicken/microblock/IMicroMaterialRender.scala create mode 100644 src/main/scala/codechicken/microblock/ISidedHollowConnect.java delete mode 100644 src/main/scala/codechicken/microblock/ISidedHollowConnect.scala create mode 100644 src/main/scala/codechicken/microblock/ItemMicroPart$.java create mode 100644 src/main/scala/codechicken/microblock/ItemMicroPart.java delete mode 100644 src/main/scala/codechicken/microblock/ItemMicroPart.scala create mode 100644 src/main/scala/codechicken/microblock/ItemMicroPartRenderer$.java create mode 100644 src/main/scala/codechicken/microblock/ItemMicroPartRenderer.java create mode 100644 src/main/scala/codechicken/microblock/ItemSaw.java delete mode 100644 src/main/scala/codechicken/microblock/ItemSaw.scala create mode 100644 src/main/scala/codechicken/microblock/ItemSawRenderer$.java create mode 100644 src/main/scala/codechicken/microblock/ItemSawRenderer.java create mode 100644 src/main/scala/codechicken/microblock/MaterialBlockAccess.java create mode 100644 src/main/scala/codechicken/microblock/MaterialRenderHelper$.java create mode 100644 src/main/scala/codechicken/microblock/MaterialRenderHelper.java create mode 100644 src/main/scala/codechicken/microblock/MicroMaterialRegistry$.java create mode 100644 src/main/scala/codechicken/microblock/MicroMaterialRegistry.java delete mode 100644 src/main/scala/codechicken/microblock/MicroMaterialRegistry.scala create mode 100644 src/main/scala/codechicken/microblock/MicroOcclusion$.java create mode 100644 src/main/scala/codechicken/microblock/MicroOcclusion.java create mode 100644 src/main/scala/codechicken/microblock/MicroRecipe$.java create mode 100644 src/main/scala/codechicken/microblock/MicroRecipe.java delete mode 100644 src/main/scala/codechicken/microblock/MicroRecipe.scala create mode 100644 src/main/scala/codechicken/microblock/Microblock$.java create mode 100644 src/main/scala/codechicken/microblock/Microblock.java delete mode 100644 src/main/scala/codechicken/microblock/Microblock.scala create mode 100644 src/main/scala/codechicken/microblock/MicroblockClass.java delete mode 100644 src/main/scala/codechicken/microblock/MicroblockClass.scala create mode 100644 src/main/scala/codechicken/microblock/MicroblockGenerator$.java create mode 100644 src/main/scala/codechicken/microblock/MicroblockGenerator.java delete mode 100644 src/main/scala/codechicken/microblock/MicroblockGenerator.scala create mode 100644 src/main/scala/codechicken/microblock/MicroblockPlacement$.java create mode 100644 src/main/scala/codechicken/microblock/MicroblockPlacement.java delete mode 100644 src/main/scala/codechicken/microblock/MicroblockPlacement.scala create mode 100644 src/main/scala/codechicken/microblock/MicroblockRender$.java create mode 100644 src/main/scala/codechicken/microblock/MicroblockRender.java delete mode 100644 src/main/scala/codechicken/microblock/MicroblockRender.scala create mode 100644 src/main/scala/codechicken/microblock/MicroblockTraitLogic.java create mode 100644 src/main/scala/codechicken/microblock/MicroblockTraits.scala create mode 100644 src/main/scala/codechicken/microblock/MissingMicroMaterial$.java create mode 100644 src/main/scala/codechicken/microblock/MissingMicroMaterial.java delete mode 100644 src/main/scala/codechicken/microblock/MissingMicroMaterial.scala create mode 100644 src/main/scala/codechicken/microblock/PlacementGrid$class.java create mode 100644 src/main/scala/codechicken/microblock/PlacementGrid.java delete mode 100644 src/main/scala/codechicken/microblock/PlacementGrids.scala create mode 100644 src/main/scala/codechicken/microblock/PlacementProperties.java create mode 100644 src/main/scala/codechicken/microblock/PostMicroClass$.java create mode 100644 src/main/scala/codechicken/microblock/PostMicroClass.java create mode 100644 src/main/scala/codechicken/microblock/PostMicroblockClientLogic.java create mode 100644 src/main/scala/codechicken/microblock/PostMicroblockTraitLogic.java create mode 100644 src/main/scala/codechicken/microblock/Saw$class.java create mode 100644 src/main/scala/codechicken/microblock/Saw.java create mode 100644 src/main/scala/codechicken/microblock/TMicroOcclusionClientLogic.java create mode 100644 src/main/scala/codechicken/microblock/TMicroOcclusionLogic.java create mode 100644 src/main/scala/codechicken/microblock/ThreadState.java create mode 100644 src/main/scala/codechicken/microblock/TopMicroMaterial$.java create mode 100644 src/main/scala/codechicken/microblock/TopMicroMaterial.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockCPH$.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockCPH.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockEventHandler$.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockEventHandler.java delete mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockEventHandler.scala create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockMod$.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockMod.java delete mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockMod.scala create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockPH.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockProxy$.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockProxy.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockProxy_clientImpl.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockProxy_serverImpl.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockSPH$.java create mode 100644 src/main/scala/codechicken/microblock/handler/MicroblockSPH.java delete mode 100644 src/main/scala/codechicken/microblock/handler/packethandlers.scala delete mode 100644 src/main/scala/codechicken/microblock/handler/proxies.scala delete mode 100644 src/main/scala/codechicken/microblock/package.scala create mode 100644 src/main/scala/codechicken/multipart/BlockMultipart$.java create mode 100644 src/main/scala/codechicken/multipart/BlockMultipart.java delete mode 100644 src/main/scala/codechicken/multipart/BlockMultipart.scala create mode 100644 src/main/scala/codechicken/multipart/ControlKeyHandler.java create mode 100644 src/main/scala/codechicken/multipart/ControlKeyModifer.java delete mode 100644 src/main/scala/codechicken/multipart/ControlKeyModifier.scala delete mode 100644 src/main/scala/codechicken/multipart/IDWriter.scala create mode 100644 src/main/scala/codechicken/multipart/IFaceRedstonePart.java create mode 100644 src/main/scala/codechicken/multipart/IMaskedRedstonePart.java create mode 100644 src/main/scala/codechicken/multipart/INeighborTileChange.java delete mode 100644 src/main/scala/codechicken/multipart/INeighborTileChange.scala create mode 100644 src/main/scala/codechicken/multipart/IRandomDisplayTick.java delete mode 100644 src/main/scala/codechicken/multipart/IRandomDisplayTick.scala create mode 100644 src/main/scala/codechicken/multipart/IRedstoneConnector.java create mode 100644 src/main/scala/codechicken/multipart/IRedstoneConnectorBlock.java create mode 100644 src/main/scala/codechicken/multipart/IRedstonePart.java delete mode 100644 src/main/scala/codechicken/multipart/IRedstonePart.scala create mode 100644 src/main/scala/codechicken/multipart/IRedstoneTile.java create mode 100644 src/main/scala/codechicken/multipart/IScheduledPacketPart.java create mode 100644 src/main/scala/codechicken/multipart/IconHitEffects.java delete mode 100644 src/main/scala/codechicken/multipart/ItemMultiPart.scala create mode 100644 src/main/scala/codechicken/multipart/JCuboidPart.java create mode 100644 src/main/scala/codechicken/multipart/JIconHitEffects$class.java create mode 100644 src/main/scala/codechicken/multipart/JIconHitEffects.java create mode 100644 src/main/scala/codechicken/multipart/JItemMultiPart.java create mode 100644 src/main/scala/codechicken/multipart/JNormalOcclusion.java create mode 100644 src/main/scala/codechicken/multipart/MultiPartRegistry$.java create mode 100644 src/main/scala/codechicken/multipart/MultiPartRegistry.java delete mode 100644 src/main/scala/codechicken/multipart/MultiPartRegistry.scala create mode 100644 src/main/scala/codechicken/multipart/MultipartGenerator$.java create mode 100644 src/main/scala/codechicken/multipart/MultipartGenerator.java delete mode 100644 src/main/scala/codechicken/multipart/MultipartGenerator.scala create mode 100644 src/main/scala/codechicken/multipart/MultipartHelper$.java create mode 100644 src/main/scala/codechicken/multipart/MultipartHelper.java delete mode 100644 src/main/scala/codechicken/multipart/MultipartHelper.scala create mode 100644 src/main/scala/codechicken/multipart/MultipartRenderer$.java create mode 100644 src/main/scala/codechicken/multipart/MultipartRenderer.java delete mode 100644 src/main/scala/codechicken/multipart/MultipartRenderer.scala create mode 100644 src/main/scala/codechicken/multipart/NormalOcclusionTest$.java create mode 100644 src/main/scala/codechicken/multipart/NormalOcclusionTest.java create mode 100644 src/main/scala/codechicken/multipart/NormallyOccludedPart.java create mode 100644 src/main/scala/codechicken/multipart/PacketScheduler.java delete mode 100644 src/main/scala/codechicken/multipart/PacketScheduler.scala create mode 100644 src/main/scala/codechicken/multipart/RedstoneInteractions$.java create mode 100644 src/main/scala/codechicken/multipart/RedstoneInteractions.java create mode 100644 src/main/scala/codechicken/multipart/TCuboidPart$class.java create mode 100644 src/main/scala/codechicken/multipart/TCuboidPart.java delete mode 100644 src/main/scala/codechicken/multipart/TCuboidPart.scala create mode 100644 src/main/scala/codechicken/multipart/TEdgePart$class.java create mode 100644 src/main/scala/codechicken/multipart/TEdgePart.java delete mode 100644 src/main/scala/codechicken/multipart/TEdgePart.scala create mode 100644 src/main/scala/codechicken/multipart/TFacePart$class.java create mode 100644 src/main/scala/codechicken/multipart/TFacePart.java delete mode 100644 src/main/scala/codechicken/multipart/TFacePart.scala create mode 100644 src/main/scala/codechicken/multipart/TIconHitEffects$class.java create mode 100644 src/main/scala/codechicken/multipart/TIconHitEffects.java delete mode 100644 src/main/scala/codechicken/multipart/TIconHitEffects.scala create mode 100644 src/main/scala/codechicken/multipart/TItemMultiPart$class.java create mode 100644 src/main/scala/codechicken/multipart/TItemMultiPart.java create mode 100644 src/main/scala/codechicken/multipart/TMultiPart.java delete mode 100644 src/main/scala/codechicken/multipart/TMultiPart.scala create mode 100644 src/main/scala/codechicken/multipart/TNormalOcclusion$class.java create mode 100644 src/main/scala/codechicken/multipart/TNormalOcclusion.java delete mode 100644 src/main/scala/codechicken/multipart/TNormalOcclusion.scala delete mode 100644 src/main/scala/codechicken/multipart/TPartialOcclusion.scala create mode 100644 src/main/scala/codechicken/multipart/TRandomUpdateTick.java delete mode 100644 src/main/scala/codechicken/multipart/TRandomUpdateTick.scala create mode 100644 src/main/scala/codechicken/multipart/TScheduledPacketPart.java create mode 100644 src/main/scala/codechicken/multipart/TSlottedPart.java delete mode 100644 src/main/scala/codechicken/multipart/TSlottedPart.scala create mode 100644 src/main/scala/codechicken/multipart/TickScheduler$.java create mode 100644 src/main/scala/codechicken/multipart/TickScheduler.java delete mode 100644 src/main/scala/codechicken/multipart/TickScheduler.scala create mode 100644 src/main/scala/codechicken/multipart/TileCache.java delete mode 100644 src/main/scala/codechicken/multipart/TileCache.scala create mode 100644 src/main/scala/codechicken/multipart/TileConversionResult.java create mode 100644 src/main/scala/codechicken/multipart/TileMultipart$.java create mode 100644 src/main/scala/codechicken/multipart/TileMultipart.java delete mode 100644 src/main/scala/codechicken/multipart/TileMultipart.scala create mode 100644 src/main/scala/codechicken/multipart/TileMultipartClient.java create mode 100644 src/main/scala/codechicken/multipart/asm/ASMBridgeEmitter.java create mode 100644 src/main/scala/codechicken/multipart/asm/ASMImplicits$.java create mode 100644 src/main/scala/codechicken/multipart/asm/ASMImplicits.java delete mode 100644 src/main/scala/codechicken/multipart/asm/ASMImplicits.scala create mode 100644 src/main/scala/codechicken/multipart/asm/ASMMixinFactory.java delete mode 100644 src/main/scala/codechicken/multipart/asm/ASMMixinFactory.scala create mode 100644 src/main/scala/codechicken/multipart/asm/ByteCodeReader.java create mode 100644 src/main/scala/codechicken/multipart/asm/ByteCodecs$.java create mode 100644 src/main/scala/codechicken/multipart/asm/ByteCodecs.java delete mode 100644 src/main/scala/codechicken/multipart/asm/ByteCodecs.scala create mode 100644 src/main/scala/codechicken/multipart/asm/ClassBytes.java create mode 100644 src/main/scala/codechicken/multipart/asm/ClassInfoLookup.java create mode 100644 src/main/scala/codechicken/multipart/asm/CompilerBootstrap.java create mode 100644 src/main/scala/codechicken/multipart/asm/DebugPrinter$.java create mode 100644 src/main/scala/codechicken/multipart/asm/DebugPrinter.java create mode 100644 src/main/scala/codechicken/multipart/asm/JavaTraitRegistration.java create mode 100644 src/main/scala/codechicken/multipart/asm/MixinClassGenerator.java create mode 100644 src/main/scala/codechicken/multipart/asm/MultipartMixinFactory$.java create mode 100644 src/main/scala/codechicken/multipart/asm/MultipartMixinFactory.java delete mode 100644 src/main/scala/codechicken/multipart/asm/MultipartMixinFactory.scala create mode 100644 src/main/scala/codechicken/multipart/asm/ScalaSigReader$.java create mode 100644 src/main/scala/codechicken/multipart/asm/ScalaSigReader.java create mode 100644 src/main/scala/codechicken/multipart/asm/ScalaSignatureParser.java create mode 100644 src/main/scala/codechicken/multipart/asm/ScalaTraitRegistration.java create mode 100644 src/main/scala/codechicken/multipart/asm/ScratchBitSet$class.java create mode 100644 src/main/scala/codechicken/multipart/asm/ScratchBitSet.java delete mode 100644 src/main/scala/codechicken/multipart/asm/ScratchBitSet.scala create mode 100644 src/main/scala/codechicken/multipart/asm/StackAnalyserLogic.java create mode 100644 src/main/scala/codechicken/multipart/handler/CubicChunksCompat.java delete mode 100644 src/main/scala/codechicken/multipart/handler/CubicChunksCompat.scala create mode 100644 src/main/scala/codechicken/multipart/handler/MCPCCompatModule$.java create mode 100644 src/main/scala/codechicken/multipart/handler/MCPCCompatModule.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartCPH$.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartCPH.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartCompatiblity$.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartCompatiblity.java delete mode 100644 src/main/scala/codechicken/multipart/handler/MultipartCompatiblity.scala create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartEventHandler$.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartEventHandler.java delete mode 100644 src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartMod$.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartMod.java delete mode 100644 src/main/scala/codechicken/multipart/handler/MultipartMod.scala create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartPH.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartProxy$.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartProxy.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartProxy_clientImpl.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartProxy_serverImpl.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartSPH$.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartSPH.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartSaveLoad$.java create mode 100644 src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.java delete mode 100644 src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala delete mode 100644 src/main/scala/codechicken/multipart/handler/packethandlers.scala delete mode 100644 src/main/scala/codechicken/multipart/handler/proxies.scala delete mode 100644 src/main/scala/codechicken/multipart/package.scala create mode 100644 src/main/scala/codechicken/multipart/scalatraits/JInventoryTile.java create mode 100644 src/main/scala/codechicken/multipart/scalatraits/TFluidHandlerTile.java delete mode 100644 src/main/scala/codechicken/multipart/scalatraits/TFluidHandlerTile.scala create mode 100644 src/main/scala/codechicken/multipart/scalatraits/TIInventoryTile.java delete mode 100644 src/main/scala/codechicken/multipart/scalatraits/TIInventoryTile.scala create mode 100644 src/main/scala/codechicken/multipart/scalatraits/TPartialOcclusionTile.java delete mode 100644 src/main/scala/codechicken/multipart/scalatraits/TPartialOcclusionTile.scala create mode 100644 src/main/scala/codechicken/multipart/scalatraits/TRandomDisplayTickTile.java delete mode 100644 src/main/scala/codechicken/multipart/scalatraits/TRandomDisplayTickTile.scala create mode 100644 src/main/scala/codechicken/multipart/scalatraits/TRedstoneTile.java delete mode 100644 src/main/scala/codechicken/multipart/scalatraits/TRedstoneTile.scala create mode 100644 src/main/scala/codechicken/multipart/scalatraits/TSlottedTile.java delete mode 100644 src/main/scala/codechicken/multipart/scalatraits/TSlottedTile.scala create mode 100644 src/main/scala/codechicken/multipart/scalatraits/TTileChangeTile.java delete mode 100644 src/main/scala/codechicken/multipart/scalatraits/TTileChangeTile.scala create mode 100644 src/test/fixtures/README.md create mode 100644 src/test/fixtures/abi/gtnh-2.9.0-rc2-consumers.txt create mode 100644 src/test/fixtures/abi/gtnh-daily-678-consumers.txt create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaAppliedTypeDescriptor.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaBlockMicroMaterialConsumer.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaClassParent.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaClassSymbolFull.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaCornerMicroblock.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaCuboidPart.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaEdgeMicroblock.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaEdgePart.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaFaceMicroblockClient.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaFacePart.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblock.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblockClient.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaIconHitEffects.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaInterfaceNames.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaItemMicroPartConsumer.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaItemMultiPart.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolDescriptor.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolFull.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolInfo.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMicroMaterialConsumer.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMicroblockTraits.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMultipartGeneratorConsumer.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMultipartSaveLoadConsumer.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaNormalOcclusion.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaPostMicroblock.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaPostMicroblockClient.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaSaw.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusion.scala create mode 100644 src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusionClient.scala create mode 100644 src/test/java/codechicken/microblock/AngelicaCompatCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/BlockMicroMaterialBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/microblock/BlockMicroMaterialCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/ConfigContentCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/CornerMicroblockCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/CornerMicroblockTraitsCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/DefaultContentCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/EdgeMicroblockCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/EdgeMicroblockTraitsCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/FaceMicroblockCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/FaceMicroblockTraitsCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/GrassMicroMaterialCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/HollowMicroblockCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/HollowMicroblockClientCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/HollowMicroblockTraitsCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/ItemMicroPartBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/microblock/ItemMicroPartCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/ItemSawCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MarkerInterfaceCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MicroMaterialRegistryBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/microblock/MicroMaterialRegistryCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MicroOcclusionCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MicroRecipeBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/microblock/MicroblockCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MicroblockClassCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MicroblockGeneratorCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MicroblockPlacementCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MicroblockRenderCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MicroblockTraitsCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/MissingMicroMaterialCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/ParticleTintTest.java create mode 100644 src/test/java/codechicken/microblock/PlacementGridsCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/PostMicroblockClientCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/PostMicroblockTraitsCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/SawBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/microblock/SawCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/TMicroOcclusionCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/TMicroOcclusionClientCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/examples/MaterialEnumerationExample.java create mode 100644 src/test/java/codechicken/microblock/examples/SawStrengthExample.java create mode 100644 src/test/java/codechicken/microblock/handler/MicroblockEventHandlerCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/handler/MicroblockModCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/handler/MicroblockPacketHandlerBehaviorTest.java create mode 100644 src/test/java/codechicken/microblock/handler/MicroblockPacketHandlerCharacterizationTest.java create mode 100644 src/test/java/codechicken/microblock/handler/MicroblockProxyCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/BlockMultipartCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/ConsumerReflectionCompatibilityTest.java create mode 100644 src/test/java/codechicken/multipart/ControlKeyModiferCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/CuboidPartCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/EdgePartCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/FacePartCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/IDWriterCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/IconHitEffectsCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/ItemMultiPartCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/MarkerInterfaceCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/MultiPartRegistryCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/MultipartGeneratorCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/MultipartHelperCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/MultipartRendererCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/NormalOcclusionBoxTest.java create mode 100644 src/test/java/codechicken/multipart/NormalOcclusionCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/PacketSchedulerCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/PartialOcclusionCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/RedstoneInteractionsCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/TCuboidPartBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/multipart/TEdgePartBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/multipart/TFacePartBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/multipart/TIconHitEffectsBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/multipart/TItemMultiPartBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/multipart/TMultiPartTileAccessorRegressionTest.java create mode 100644 src/test/java/codechicken/multipart/TNormalOcclusionBinaryCompatibilityTest.java create mode 100644 src/test/java/codechicken/multipart/TickSchedulerCallbackRegressionTest.java create mode 100644 src/test/java/codechicken/multipart/TickSchedulerClockRegressionTest.java create mode 100644 src/test/java/codechicken/multipart/TickSchedulerEqualityRegressionTest.java create mode 100644 src/test/java/codechicken/multipart/TickSchedulerMoveRegressionTest.java create mode 100644 src/test/java/codechicken/multipart/TickSchedulerPersistenceRegressionTest.java create mode 100644 src/test/java/codechicken/multipart/TickSchedulerSaveFailureRegressionTest.java create mode 100644 src/test/java/codechicken/multipart/TileCacheCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/TileMultipartCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/TileMultipartEqualityRegressionTest.java create mode 100644 src/test/java/codechicken/multipart/TileMultipartLoadingTest.java create mode 100644 src/test/java/codechicken/multipart/TileMultipartOcclusionTest.java create mode 100644 src/test/java/codechicken/multipart/TileMultipartRenderIdTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ASMImplicitsCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ASMMixinFactoryCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ByteCodeReaderCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ByteCodecsCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ClassInfoCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/DebugPrinterCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/FieldMixinAccessNameTest.java create mode 100644 src/test/java/codechicken/multipart/asm/MixinInfoLineariseTest.java create mode 100644 src/test/java/codechicken/multipart/asm/MultipartMixinFactoryCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSigReaderCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureAppliedTypeDescriptorTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureBytesSectionTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureClassParentTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureClassSymbolFullTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureClassSymbolStringTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureInterfaceNamesTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureMethodDescriptorTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolDescriptorTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolFullTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolInfoTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolStringTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureParserCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureTypeDescriptorTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScalaSignatureTypeNameTest.java create mode 100644 src/test/java/codechicken/multipart/asm/ScratchBitSetCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/StackAnalyserCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/asm/StackAnalyserConstTest.java create mode 100644 src/test/java/codechicken/multipart/asm/StackAnalyserInitializationTest.java create mode 100644 src/test/java/codechicken/multipart/examples/BoxOcclusionExample.java create mode 100644 src/test/java/codechicken/multipart/examples/HitPartExample.java create mode 100644 src/test/java/codechicken/multipart/examples/OcclusionExample.java create mode 100644 src/test/java/codechicken/multipart/examples/PartLoadingExample.java create mode 100644 src/test/java/codechicken/multipart/examples/PartTraversalExample.java create mode 100644 src/test/java/codechicken/multipart/examples/RenderIdExample.java create mode 100644 src/test/java/codechicken/multipart/handler/MultipartCompatiblityCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/handler/MultipartEventHandlerCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/handler/MultipartModCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/handler/MultipartPacketHandlerBehaviorTest.java create mode 100644 src/test/java/codechicken/multipart/handler/MultipartPacketHandlerCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/handler/MultipartProxyCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/handler/MultipartSaveLoadCharacterizationTest.java create mode 100644 src/test/java/codechicken/multipart/scalatraits/TPartialOcclusionTileCharacterizationTest.java create mode 100644 src/test/resources/compat/ReferenceHollowClientBase.class.b64 create mode 100644 src/test/resources/compat/ReferenceHollowMicroblockBase.class.b64 create mode 100644 src/test/resources/compat/ReferenceMicroOcclusionBase.class.b64 create mode 100644 src/test/resources/compat/ReferenceMicroOcclusionClientBase.class.b64 create mode 100644 src/test/resources/compat/ReferencePostClientBase.class.b64 create mode 100644 src/test/resources/compat/ReferencePostFace.class.b64 create mode 100644 src/test/resources/compat/ReferencePostMicroblockBase.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaAppliedTypeDescriptor$$anon$1.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaAppliedTypeDescriptor.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaBlockMicroMaterialConsumer.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaClassParent$$anon$1.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaClassParent$$anon$2.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaClassParent.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaClassSymbolFull$$anon$1.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaClassSymbolFull.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaCornerMicroblock.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaCuboidPart.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaEdgeMicroblock.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaEdgePart.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaFaceMicroblockClient.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaFacePart.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaHollowMicroblock.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaHollowMicroblockClient.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaIconHitEffects.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaInterfaceNames$$anon$1.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaInterfaceNames$$anon$2.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaInterfaceNames.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaItemMicroPartConsumer.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaItemMultiPart.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaMethodSymbolDescriptor$$anon$1.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaMethodSymbolDescriptor.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaMethodSymbolFull.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaMethodSymbolInfo.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaMicroMaterialConsumer.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaMicroblockTraits.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaNormalOcclusion.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaPostMicroblock.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaPostMicroblockClient.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaSaw.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaTMicroOcclusion.class.b64 create mode 100644 src/test/resources/compat/ReferenceScalaTMicroOcclusionClient.class.b64 create mode 100644 tools/AbiScan.java diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 796502d..86ed808 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,3 +11,49 @@ jobs: build-and-test: uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master secrets: inherit + + forge-functional-tests: + needs: build-and-test + runs-on: ubuntu-24.04 + timeout-minutes: 30 + steps: + - name: Checkout mod repo + uses: actions/checkout@v5 + with: + fetch-depth: 0 + + - name: Set up Java + uses: actions/setup-java@v5 + with: + distribution: zulu + java-version: 8 + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v5 + with: + validate-wrappers: true + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Accept the Minecraft EULA + run: | + mkdir -p run/server + echo "eula=true" > run/eula.txt + echo "eula=true" > run/server/eula.txt + + - name: Run Forge functional tests + run: ./gradlew --build-cache --stacktrace runFunctionalTestServer + + # The server runs out of process; without this a failure leaves only the counts. + - name: Upload functional test reports + if: always() + uses: actions/upload-artifact@v4 + with: + name: forge-functional-test-reports + path: | + run/server/junit-out/ + run/server/logs/ + run/server/crash-reports/ + if-no-files-found: warn + retention-days: 14 diff --git a/CHANGELOG-2.1.1.0.md b/CHANGELOG-2.1.1.0.md deleted file mode 100644 index d7e52b7..0000000 --- a/CHANGELOG-2.1.1.0.md +++ /dev/null @@ -1,32 +0,0 @@ - -# ForgeMultipart - -Changelog of ForgeMultipart. - - -### No issue -**Bump minor version** - -[022b1f363e676a5](https://github.com/GTNewHorizons/ForgeMultipart/commit/022b1f363e676a5) -by Jason Mitchell *2021-05-16 17:40:32* - -**Fix buildscript** - -[15c1419db896c6b](https://github.com/GTNewHorizons/ForgeMultipart/commit/15c1419db896c6b) -by Jason Mitchell *2021-05-16 17:33:41* - -**update gradle** - -[b3c96b992fdabc5](https://github.com/GTNewHorizons/ForgeMultipart/commit/b3c96b992fdabc5) -by DreamMasterXXL *2021-03-07 20:05:11* - -**Guard against meta > 15** - -[ad1ad6da380dbfa](https://github.com/GTNewHorizons/ForgeMultipart/commit/ad1ad6da380dbfa) -by Jason Mitchell *2021-03-07 18:01:36* - -**Update buildscripts to work** - -[64776f0d32f8eb5](https://github.com/GTNewHorizons/ForgeMultipart/commit/64776f0d32f8eb5) -by Jason Mitchell *2021-03-07 18:01:12* - diff --git a/README.md b/README.md index f2b6d19..9240a27 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,27 @@ ForgeMultipart ============== -An API for dynamically handling different functional parts in the one block space. +An API for dynamically handling different functional parts in the one block space, for Minecraft 1.7.10 / Forge. +This is the GT New Horizons fork. -Requirements: -* The latest version of CCL (files.minecraftforge.net/CodeChickenLib/) -* Forge -* A scala compatible IDE and project (For eclipse, download the scala eclipse plugin and right click on the project -> Add Scala Nature) +## Using the API -If you only want to use the API and not modify it: - * Download the latest dev version from files.minecraftforge.net/ForgeMultipart/ - * Download the latest dev version of CCL. - * Place both mods in your /libs/ folder and link them as libraries in your IDE. +Depend on the dev artifact, for example `com.github.GTNewHorizons:ForgeMultipart::dev`, alongside GTNH +CodeChickenCore. Start at the [Java API index](docs/API.md): it lists the supported entry points with a guide and a +compiling Java example for each. You do not need Scala in your own mod to use them. -Implementation of all parts of the API should be clean and easy in Java. The minecraft multipart mod is implemented in java as a test case. +If you are rebuilding an existing integration against the Java port, read the [release notes](docs/RELEASE_NOTES.md) +first. Already compiled consumer jars keep working. + +## Building + +The codebase is being ported from Scala to Java. Most sources are Java now, but they still live under +`src/main/scala` so they can be joint-compiled with the Scala files that remain. Everything compiles for Java 8. + +``` +./gradlew build +``` + +Use `gradlew.bat` on Windows. The [maintainer guide](docs/migration/MAINTAINERS.md) covers the build boundaries, +the Forge functional tests and the full verification sequence. Port status and remaining work are in the +[migration status](docs/migration/README.md). diff --git a/addon.gradle b/addon.gradle index b37f27e..56ce69a 100644 --- a/addon.gradle +++ b/addon.gradle @@ -1 +1,160 @@ -apply plugin: 'scala' \ No newline at end of file +import org.gradle.api.tasks.GradleBuild +import groovy.xml.XmlSlurper + +apply plugin: 'scala' + +SourceSet functionalTestSet + +sourceSets { + functionalTestSet = create("functionalTest") { + java { + srcDir("src/functionalTest/java") + compileClasspath += sourceSets.patchedMc.output + sourceSets.main.output + } + } +} + +configurations { + named(functionalTestSet.compileClasspathConfigurationName).configure { + extendsFrom(named("compileClasspath").get()) + } + named(functionalTestSet.runtimeClasspathConfigurationName).configure { + extendsFrom(named("runtimeClasspath").get()) + } + named(functionalTestSet.annotationProcessorConfigurationName).configure { + extendsFrom(named("annotationProcessor").get()) + } +} + +// FML scans classpath jars for @Mod with an ASM that predates Java 9, so every JUnit jar logs a LoaderException +// stack trace for its module-info. Repackage them into the test mod jar and keep the originals off the classpath. +def junitArtifactPrefixes = ["junit-jupiter", "junit-platform", "opentest4j", "apiguardian"] +def isJunitArtifact = { File f -> junitArtifactPrefixes.any { f.name.startsWith(it) } } +def functionalTestRuntime = configurations.named(functionalTestSet.runtimeClasspathConfigurationName) + +tasks.register(functionalTestSet.jarTaskName, Jar) { + from(functionalTestSet.output) + from(functionalTestRuntime.map { cfg -> cfg.files.findAll(isJunitArtifact).collect { zipTree(it) } }) { + // META-INF/versions is the Java 9+ half of the multi-release jars, never loaded on this Java 8 server. + // Signatures do not survive repackaging; the engine is still found through META-INF/services. + exclude( + "module-info.class", + "META-INF/versions/**", + "META-INF/*.SF", + "META-INF/*.DSA", + "META-INF/*.RSA") + } + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + archiveClassifier.set("functionalTests") + archiveVersion.set("1.0") + destinationDirectory.set(layout.buildDirectory.dir("tmp")) +} + +// Compile the documented consumer surface against the packaged dev jar, not main/test class directories. +def compileJavaApiExamples = tasks.register("compileJavaApiExamples", JavaCompile) { + group = "verification" + description = "Compiles the Java API examples against the dev jar without Scala libraries" + source(fileTree("src/test/java") { include("codechicken/**/examples/*.java") }) + source(fileTree("src/functionalTest/java") { include("codechicken/**/examples/*.java") }) + classpath = files(tasks.named("jar")) + sourceSets.main.compileClasspath.filter { + !it.name.startsWith("scala-") + } + destinationDirectory = layout.buildDirectory.dir("classes/java/apiExamples") + javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(8) } + sourceCompatibility = "1.8" + targetCompatibility = "1.8" + options.encoding = "UTF-8" + options.annotationProcessorPath = files() + options.sourcepath = files() + options.compilerArgs.add("-proc:none") +} + +tasks.named("check") { dependsOn(compileJavaApiExamples) } + +def functionalTestRunProperty = "forgemultipart.withFunctionalTests" +def withFunctionalTests = providers.gradleProperty(functionalTestRunProperty).map { it.toBoolean() }.orElse(false).get() +def profileRunProperty = "forgemultipart.profileFunctionalTests" +def profileFunctionalTests = providers.gradleProperty(profileRunProperty).map { it.toBoolean() }.orElse(false).get() +def functionalTestReportDirectory = layout.projectDirectory.dir("run/server/junit-out") +def functionalTestProfileRecording = layout.projectDirectory.file("run/server/forgemultipart-baseline.jfr") +def functionalTestProfileResults = layout.projectDirectory.file("run/server/forgemultipart-profile.txt") +def addFunctionalTestsToRun = { JavaExec task -> + task.dependsOn(functionalTestSet.jarTaskName) + task.classpath( + // JUnit is repackaged into the test mod jar above. + functionalTestRuntime.map { cfg -> cfg.files.findAll { !isJunitArtifact(it) } }, + tasks.named(functionalTestSet.jarTaskName)) +} + +tasks.register("runFunctionalTestServer", GradleBuild) { + group = "verification" + description = "Runs the Java 8 Forge server with the ForgeMultipart functional test mod" + setTasks(["runServer"]) + startParameter.projectProperties.put(functionalTestRunProperty, "true") + if (profileFunctionalTests) { + startParameter.projectProperties.put(profileRunProperty, "true") + } + + doFirst { + delete(functionalTestReportDirectory) + if (profileFunctionalTests) { + delete(functionalTestProfileRecording, functionalTestProfileResults) + } + } + doLast { + def reports = fileTree(functionalTestReportDirectory).matching { include("TEST-*.xml") }.files + if (reports.isEmpty()) { + throw new GradleException("ForgeMultipart functional tests produced no JUnit XML report") + } + + int tests = 0 + int failures = 0 + int errors = 0 + int skipped = 0 + def failed = [] + reports.each { report -> + def suite = new XmlSlurper(false, false).parse(report) + tests += suite.@tests.toInteger() + failures += suite.@failures.toInteger() + errors += suite.@errors.toInteger() + skipped += suite.@skipped.toString().isEmpty() ? 0 : suite.@skipped.toInteger() + suite.testcase.each { testcase -> + if (!testcase.failure.isEmpty() || !testcase.error.isEmpty()) { + failed << "${testcase.@classname}.${testcase.@name}" + } + } + } + + def summary = "Forge functional tests: ${tests} tests, ${tests - failures - errors - skipped} passed, " + + "${failures} failures, ${errors} errors, ${skipped} skipped" + logger.lifecycle(summary) + failed.each { logger.lifecycle(" FAILED ${it}") } + + def stepSummary = System.getenv("GITHUB_STEP_SUMMARY") + if (stepSummary) { + new File(stepSummary) << "### ${summary}\n" + failed.collect { "- FAILED `${it}`\n" }.join() + } + + if (tests == 0 || failures > 0 || errors > 0) { + throw new GradleException("ForgeMultipart functional tests failed: ${summary}") + } + if (profileFunctionalTests + && (!functionalTestProfileRecording.asFile.isFile() || !functionalTestProfileResults.asFile.isFile())) { + throw new GradleException("ForgeMultipart profile produced incomplete output") + } + } +} + +if (withFunctionalTests) { + tasks.withType(JavaExec).configureEach { task -> + if (task.name == "runServer") { + addFunctionalTestsToRun(task) + if (profileFunctionalTests) { + task.jvmArgs( + "-XX:+FlightRecorder", + "-XX:StartFlightRecording=filename=forgemultipart-baseline.jfr,settings=profile,dumponexit=true") + task.systemProperty(profileRunProperty, "true") + } + } + } +} diff --git a/build.gradle b/build.gradle index e57a16f..c4569cc 100644 --- a/build.gradle +++ b/build.gradle @@ -3,3 +3,29 @@ plugins { id 'com.gtnewhorizons.gtnhconvention' } + +tasks.test { + useJUnitPlatform() + testLogging { + events("failed") + exceptionFormat = "full" + } + // Gradle prints nothing on success, so a green run never says how much ran. + afterSuite { desc, result -> + if (desc.parent != null) { + return + } + def summary = "Unit tests: ${result.testCount} tests, ${result.successfulTestCount} passed, " + + "${result.failedTestCount} failed, ${result.skippedTestCount} skipped" + logger.lifecycle(summary) + def stepSummary = System.getenv("GITHUB_STEP_SUMMARY") + if (stepSummary) { + new File(stepSummary) << "### ${summary}\n" + } + } +} + +tasks.named('compileScala') { + // Zinc does not invalidate joint-compiled Java annotations when Tags.VERSION changes. + scalaCompileOptions.force = true +} diff --git a/dependencies.gradle b/dependencies.gradle index 40be0e6..6cc0184 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,8 +1,18 @@ -// Add your dependencies here - dependencies { + testImplementation(platform("org.junit:junit-bom:5.11.4")) + testImplementation("org.junit.jupiter:junit-jupiter") + testRuntimeOnly("org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + + functionalTestImplementation(platform("org.junit:junit-bom:5.11.4")) + functionalTestImplementation("org.junit.jupiter:junit-jupiter") + functionalTestImplementation("org.junit.platform:junit-platform-engine") + functionalTestImplementation("org.junit.platform:junit-platform-launcher") + functionalTestImplementation("org.junit.platform:junit-platform-reporting") + implementation("com.github.GTNewHorizons:CodeChickenCore:1.4.22:dev") - compileOnly("com.cardinalstar.cubicchunks:CubicChunks1710:v0.1.8-alpha:dev") + compileOnly("com.cardinalstar.cubicchunks:CubicChunks1710:v0.1.22-alpha:dev") compileOnly("com.github.GTNewHorizons:Angelica:2.2.32:dev") runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.7.216:dev") compileOnly("com.github.GTNewHorizons:Postea:1.2.7:dev") {transitive = false} @@ -10,6 +20,4 @@ dependencies { exclude group: 'com.github.GTNewHorizons', module: 'CodeChickenCore' } compileOnly("com.github.GTNewHorizons:GTNHLib:0.11.54:dev") - // devOnlyNonPublishable("com.github.GTNewHorizons:Angelica:2.2.32:dev") - devOnlyNonPublishable("io.github.legacymoddingmc:unimixins:0.1.23:dev") } diff --git a/docs/API.md b/docs/API.md new file mode 100644 index 0000000..0e3bbe8 --- /dev/null +++ b/docs/API.md @@ -0,0 +1,136 @@ +# ForgeMultipart Java API + +Start here when integrating with ForgeMultipart for **Minecraft 1.7.10 / Forge**. This describes the `algent/java` +migration branch. Its new APIs are implemented and tested but do not yet have a minimum published dependency version. +Use a dev artifact containing the methods you need; source Javadocs are packaged with the sources artifact. + +Consumers can use the Java surface without importing Scala types. FMP itself still needs Scala at runtime. A +Scala-authored mod can adopt the Java API without converting the rest of its code to Java. + +Every guide links a compiling example. `./gradlew compileJavaApiExamples` (also run by `check`) compiles all of them +as Java 8 against the packaged dev jar with no `scala-*` library on the classpath, so a documented example that +needs Scala fails the build. Add new documented examples to the test or functional-test `examples` packages. + +**Rebuilding an existing mod against this branch? Read the [release notes](RELEASE_NOTES.md) first.** Shipped binaries +keep working, but recompiling has three classes of break, and the trait-composition one compiles cleanly and changes +behavior at runtime. Use the [consumer migration checklist](api/MIGRATION_CHECKLIST.md) to carry a source change through +runtime validation, release and target-pack adoption. + +## Direct calls and optional integration + +The intended consumer API uses direct typed public calls, without reflection, private-field mixins or Scala +companion lookup. Reuse existing entry points where they cover the task. For optional support, isolate FMP-typed +code in a compatibility class loaded only after mod-presence and supported-version checks; test absent and present +mod loading. Reflection snippets in older guides are legacy interoperability options, not the migration target. +Existing reflective binaries remain supported until consumer release and pack adoption. + +## Choose a guide + +| Task | API and guide | +| --- | --- | +| Define, place, persist, synchronize and remove a custom part | `TMultiPart`, `canPlacePart`, `addPart`, `remPart` - [end-to-end custom-part lifecycle](api/CUSTOM_PARTS.md) | +| Register block converters | `registerConverter(IPartConverter)` - [registration, state ownership and committed lifecycle](api/BLOCK_CONVERTERS.md) | +| Register part factories during mod initialization | `registerPartFactory(IPartFactory2, String...)` - [factory timing, payload ownership and migration](api/PART_REGISTRATION.md) | +| Find the factory registered for a part type | `getPartFactory(String)` - [lookup ownership and Schematica reflection migration](api/FACTORY_LOOKUP.md) | +| Enumerate microblock materials by numeric ID | `materialCount()`, `materialName(int)`, `getMaterial(int)` - [material enumeration](api/MATERIAL_ENUMERATION.md) | +| Read a microblock material's block and metadata | `BlockMicroMaterial.block()`, `meta()` - [typed GuideNH query, identity and overrides](api/MATERIAL_ACCESS.md) | +| Create a microblock with the requested material and side | `MicroblockGenerator.create(MicroblockClass, int, boolean)` - [construction, material traits and GuideNH migration](api/MICROBLOCK_CREATION.md) | +| Call generated tile capabilities from Java | `TileMultipart`, `IRedstoneTile` and ordinary interfaces - [safe compilation and raw-trait pitfalls](api/TILE_TRAIT_ACCESS.md) | +| Add aggregate or lifecycle behavior to generated multipart tiles | `registerTrait(marker, trait)` - [custom Java tile traits, stable capabilities and transformer constraints](api/CUSTOM_TILE_TRAITS.md) | +| Refresh slots after a stored part changes shape | `refreshPartSlots(TMultiPart)` - [ownership, equality and notification responsibilities](api/TILE_TRAIT_ACCESS.md#refreshing-a-changed-slot-mask) | +| Refresh the tile inventory after a stored part changes its inventory size | `refreshInventorySlots()` - [mapping, scope and AE2 migration](api/TILE_TRAIT_ACCESS.md#refreshing-inventory-slots) | +| Add material-specific behavior to generated microblocks | `registerTrait(String)` and `IGeneratedMaterial` - [illuminated Java extension, compilation and side contracts](api/MICROBLOCK_EXTENSIONS.md) | +| Access built-in saws and change their cutting strength | `MicroblockProxy.sawStone()` and `ItemSaw.setHarvestLevel(int)` - [state, rendering and Iguana migration](api/SAW_STRENGTH.md) | +| Read/index/search a tile's parts | `jPartList()` - [part collection ownership and order](api/PART_TRAVERSAL.md#collection-ownership-and-ordering) | +| Run callbacks only on parts still owned by the tile | `forEachPart(Consumer)` - [callback and override behavior](api/PART_TRAVERSAL.md#callback-behavior) | +| Rebuild parts on an already prepared composite tile | `loadPartList(Collection)` - [part loading](api/PART_LOADING.md) | +| Select client/server tile capabilities before preparing state and loading | `MultipartGenerator.generateCompositeTile(TileEntity, Iterable, boolean)` - [staged generation and reflection migration](api/COMPOSITE_GENERATION.md) | +| Build and render an uninstalled client tile from saved multipart NBT | `MultipartHelper.createPreviewTileFromNBT(World, NBTTagCompound)` - [client preview lifecycle and reflection migration](api/CLIENT_PREVIEW.md) | +| Assign stored parts during reconstruction, without binding or notifications | `setPartList(List)` - [storage assignment](api/PART_LOADING.md#storage-assignment) | +| Test a candidate against a selected collection of parts | `testOcclusion(Collection, candidate)` - [occlusion queries and generated hooks](api/OCCLUSION.md) | +| Test two groups of bounding boxes directly | `NormalOcclusionTest.testBoxes(Iterable, Iterable)` - [box-versus-box queries](api/OCCLUSION.md#box-versus-box-queries) | +| Read FMP's global render registration ID | `TileMultipart.getRenderID()` - [render-ID meaning, lifecycle and setter](api/RENDER_ID.md) | +| Find which part a ray-trace hit struck | `BlockMultipart.hitPartIndex(MovingObjectPosition)` - [index meaning, staleness and GT5U migration](api/HIT_PART.md) | +| Inspect an existing tile or converted placeholder with a named result | `getOrConvertTileResult(World, BlockCoord)` - [conversion outcomes and placement lifecycle](api/TILE_CONVERSION.md) | +| Add or remap multipart button attachment orientations | `ButtonPart.setOrientation(int, ForgeDirection)` - [metadata, face mapping and Et Futurum migration](api/BUTTON_ORIENTATIONS.md) | +| Read a custom button's orientation metadata from its attachment face | `ButtonPart.metaForSide(int)` - [live inverse lookup and ProjectRed migration](api/BUTTON_ORIENTATIONS.md#reading-orientation-metadata) | + +Each guide explains ownership, lifecycle, legacy replacements and limitations. The loading/setter APIs are advanced reconstruction operations; ordinary placement and +removal should use the existing world APIs below. + +## Existing Java entry points + +These entry points already exist. The links lead to their source/Javadocs; detailed migration guides and checks for +compilation without Scala are still pending in these areas. A Java-typed overload can still require Scala on the +compile classpath for overload resolution, as the [loading guide](api/PART_LOADING.md#overrides-and-reflection) explains. + +| Area | Starting points | +| --- | --- | +| Construct a server composite tile from parts, or restore saved multipart NBT | [MultipartHelper](../src/main/scala/codechicken/multipart/MultipartHelper.java): `createTileFromParts(Iterable)`, `createTileFromNBT(World, NBTTagCompound)` | +| Register microblock materials | [MicroMaterialRegistry](../src/main/scala/codechicken/microblock/MicroMaterialRegistry.java) and [BlockMicroMaterial](../src/main/scala/codechicken/microblock/BlockMicroMaterial.java) | +| Register generated tile traits or pass-through interfaces | [MultipartGenerator](../src/main/scala/codechicken/multipart/MultipartGenerator.java); see [custom tile-trait authoring](api/CUSTOM_TILE_TRAITS.md) and [safe capability access](api/TILE_TRAIT_ACCESS.md) | + +New API examples use Java 8 language/library features. The source path `src/main/scala` also contains Java classes +because of the current joint-compilation layout; it does not imply that those APIs require Scala source in a consumer. + +## Supported API and internal hooks + +Public visibility alone does not make a method a consumer entry point. Scala's former package-private methods are +public in bytecode. Source Javadocs now mark the following audited implementation hooks **Internal FMP**; keep +consumer code on the public operations in the right column. These markers change no visibility, descriptor or +behavior and do not deprecate or authorize removing a method. Trait callbacks and generated overrides still run. + +| Internal hooks | Consumer operation or responsibility | +| --- | --- | +| `TileMultipart.addPart_impl`, `addPart_do`, `writeAddPart` | Place through `TileMultipart.addPart(world, pos, part)`; use [part loading](api/PART_LOADING.md) for prepared reconstruction | +| `TileMultipart.remPart_impl` | Remove through `tile.remPart(part)` on the server and retain the returned tile | +| `TileMultipart.partAdded`, `partRemoved` | Lifecycle callbacks for trait overrides; callers use placement/removal APIs | +| `TileMultipart.from`, `copyFrom`, `loadFrom`, `setValid` | FMP composite transitions; use [staged generation](api/COMPOSITE_GENERATION.md) and [loading](api/PART_LOADING.md) for consumer reconstruction | +| `MicroMaterialRegistry.setupIDMap`, `calcMaxCuttingStrength` | FMP initializes IDs and cutting strength; register materials at initialization and read the resulting values | +| `MicroMaterialRegistry.loadIcons` | FMP dispatches client texture callbacks; override the supported `IMicroMaterial.loadIcons()` material callback | +| `MicroMaterialRegistry.writeIDMap`, `readIDMap` | FMP's whole-map handshake; part packets use `writeMaterialID` / `readMaterialID` for individual IDs | + +The registry's matching companion methods carry the same internal marker. This is a bounded consumer audit, +not a claim that every other public member is a supported API. See [TileMultipart's Javadocs](../src/main/scala/codechicken/multipart/TileMultipart.java) +and [registry Javadocs](../src/main/scala/codechicken/microblock/MicroMaterialRegistry.java) for method-specific details. + +Four advanced methods remain supported because consumers use them directly: + +- **`bindPart(part)`** updates capability caches through generated overrides. It does not insert the part, change + its tile binding or perform placement/notifications. The legacy OpenComputers integration clears a print part's old + slot entries before calling it to populate a changed slot mask. A repeated call does not clear obsolete slots and + may append entries in other trait caches. Use `refreshPartSlots` for that migration; full reconstruction uses + `loadPartList`. +- **`refreshPartSlots(part)`** replaces OpenComputers' direct generated-array mutation. Generated slotted tiles clear + equal cached entries and invoke the virtual bind chain once; base tiles do nothing. It leaves ownership, storage, + validation and notifications to the caller. See the [slot-refresh contract](api/TILE_TRAIT_ACCESS.md#refreshing-a-changed-slot-mask). +- **`refreshInventorySlots()`** replaces AE2's direct `TIInventoryTile.rebuildSlotMap()` call. Generated inventory + tiles recompute their flattened slot mapping from the inventories they already track; other tiles do nothing. It + does not bind parts or notify. See [refreshing inventory slots](api/TILE_TRAIT_ACCESS.md#refreshing-inventory-slots). +- **`internalPartChange(part)`** sends local `onPartChanged` callbacks through the retained `operate` hook. The base + traversal captures list order, visits only parts still bound to the receiving tile, and excludes parts equal to the + changed part using `part.equals(p)`. Null broadcasts to all eligible parts. Detached or transferred parts are skipped. + Callback failures stop traversal and propagate. ProjectRed deliberately handles dirty state, + packets and external neighbors separately; this method does none of those. `notifyPartChange` also performs world + update/neighbor/lighting notifications when needed. + +No reflection is needed to call any of these methods. `operate` and `getOrConvertTile2` retain their documented legacy +contracts and Java replacements; neither receives an internal-only marker. Removing those bridges still requires +consumer and internal migration gates. The [consumer audit](migration/COMPATIBILITY.md#api-boundary-audit) +records the checked source calls and validation. + +## Legacy entry points and project status + +Deprecated Scala-facing entry points remain callable, with their descriptors and supported override dispatch retained. +Follow the method-specific guide: a Java sibling is not automatically a replacement override hook, and reflection +must select the intended parameter types when a method is overloaded. + +Remaining work, consumer adoption and the Scala-removal gates are tracked in the [migration status](migration/README.md). + +| Need | Document | +| --- | --- | +| What is complete and what comes next? | [Migration status](migration/README.md) | +| Which consumers need changes, releases and pack adoption? | [Consumer adoption ledger](migration/COMPATIBILITY.md#java-api-adoption-ledger) | +| Which binary names, reflective lookups and runtime contracts must survive? | [ABI inventory and consumer audit](migration/COMPATIBILITY.md) | +| What has been tested and what still needs a client/pack run? | [Migration status](migration/README.md), [manual release checks](migration/MANUAL_CHECKS.md) | +| Why is some Scala or older Java syntax retained? | [Build boundaries](migration/MAINTAINERS.md#build-and-runtime-boundaries), [compiler constraints](migration/MAINTAINERS.md#retained-compiler-constraints) | diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md new file mode 100644 index 0000000..0bb69c7 --- /dev/null +++ b/docs/RELEASE_NOTES.md @@ -0,0 +1,142 @@ +# Release notes - the Java port + +ForgeMultipart's implementation moved from Scala to Java. This page is for mod authors who depend on FMP. + +**If you ship a compiled jar and do not rebuild it, nothing here affects you.** Every runtime interface, method +descriptor and reflective name the audited consumers use was preserved deliberately, and the retained Scala bridges +still link. Intentional behavior differences are listed in the [divergence ledger](migration/DIVERGENCES.md). + +**If you rebuild against the new dev jar, read on.** Recompiling is the case that breaks, and one class of break is +silent. There are three kinds, in descending order of how badly they fail. The [consumer migration checklist](api/MIGRATION_CHECKLIST.md) +turns the cases below into concrete compile, runtime, release and pack-adoption gates. + +## 1. Linkage errors: the generated tile traits + +Six types were Scala traits, which compile to an interface plus a `$class` helper. They are now concrete Java classes +in the dev jar. Forge's transformer rewrites them back into interfaces at load time, so **existing binaries are +unaffected** - they already call interface methods, and the runtime type is still an interface. + +Source compiled against the untransformed dev jar is the problem. `javac` and `scalac` see a class, emit +`invokevirtual` or `getfield`, and the JVM then rejects it against the runtime interface. + +| Type | Recompiled call fails with | +| --- | --- | +| `scalatraits.TRedstoneTile` | `IncompatibleClassChangeError` | +| `scalatraits.TSlottedTile` | `NoSuchFieldError` on `v_partMap` | +| `scalatraits.TTileChangeTile` | `IncompatibleClassChangeError` | +| `scalatraits.TFluidHandlerTile` | `IncompatibleClassChangeError` | +| `scalatraits.TRandomDisplayTickTile` | `IncompatibleClassChangeError` | +| `TileMultipartClient` | `IncompatibleClassChangeError` | + +**The fix is to target the stable capability interface instead of the raw dev-jar class.** Note the package: the +types that break are in `codechicken.multipart.scalatraits`, the replacements are not. The existing +`IRedstoneTile.openConnections` and `TileMultipart.partMap` contracts work on both old and new FMP; the new +`TileMultipart.refreshPartSlots` requires an FMP release containing the Java API. + +| Instead of | Use | +| --- | --- | +| `scalatraits.TRedstoneTile.openConnections(side)` | `codechicken.multipart.IRedstoneTile.openConnections(side)` | +| casting to `scalatraits.TSlottedTile` and writing `v_partMap` | `codechicken.multipart.TileMultipart.refreshPartSlots(part)` | +| reading `scalatraits.TSlottedTile.partMap(slot)` | `codechicken.multipart.TileMultipart.partMap(slot)` | + +`refreshPartSlots` clears value-equal entries from the live array and dispatches the bind chain once. Keep your own +validation and state change before the call, and your sound, notification, description and scheduling order after it. +See [stable tile capability access](api/TILE_TRAIT_ACCESS.md) for the full contract and worked examples. + +### Known affected consumers + +Confirmed still present on each project's default branch: + +| Mod | Call site | Member | +| --- | --- | --- | +| ProjectRed | `transmission/redwires.scala` | `TRedstoneTile.openConnections` | +| OpenComputers | `integration/fmp/PrintPart.scala` | `TSlottedTile.v_partMap` | + +`TTileChangeTile`, `TFluidHandlerTile` and `TRandomDisplayTickTile` have no known consumer references. + +## 2. Silent behavior changes: recompiled Scala trait composition + +**This is the dangerous one - it compiles cleanly and does the wrong thing at runtime.** + +A Java interface cannot supply a Scala trait's class supertype or its linearization. When a superclass method and an +interface default both apply, the superclass wins. So recompiling `extends TMultiPart with TCuboidPart` silently +selects `TMultiPart`'s empty methods instead of the cuboid implementations, and your part loses its collision boxes +rather than failing to build. + +Where the implementation is now an interface default, forward explicitly: + +| Trait | What to do when recompiling | +| --- | --- | +| `TCuboidPart` | Extend `JCuboidPart`, or forward subparts, collision boxes and breaking rendering to its statics | +| `TNormalOcclusion` | Combine `NormalOcclusionTest.apply(this, other)` with the intended super chain explicitly. Audit existing `super.occlusionTest` calls: they no longer route through the old trait | +| `TIconHitEffects` | Forward `addHitEffects` and `addDestroyEffects` to `IconHitEffects` | +| `TItemMultiPart` | Forward `onItemUse` to `JItemMultiPart`; the inherited `Item` method otherwise wins | +| `TRandomUpdateTick` | Implement `onWorldJoin` as `TickScheduler.loadRandomTick(this)` | +| `TScheduledPacketPart` | Forward `read` to `TScheduledPacketPart.readMask(this, packet)` | +| `ScratchBitSet` | Implement both methods and the storage accessors, and initialize storage explicitly | + +Previously compiled calls into **retained** `$class` bridges still link; this applies only to recompilation. + +## 3. Compile errors: Scala source syntax + +These fail loudly at build time, so they are the safe category. Existing bytecode keeps working. + +- An `object` used as a value needs `X$.MODULE$` where the companion is retained. Static forwarders alone do not + supply a singleton value. +- Application sugar becomes an explicit `.apply(...)`, e.g. `NormalOcclusionTest.apply(...)`. +- `x.partList(i)` becomes `x.partList.apply(i)`. +- Scala property assignment needs the Java `_$eq(...)` method, e.g. `renderID`, `loadingWorld`, microblock `shape`. +- `Tuple2` members typed `Boolean` in Scala arrive as `Object` and need a cast. +- Scala 2.11 will not adapt a lambda to `Function1[_, BoxedUnit]`, so `operate { p => ... }` needs an explicit + `AbstractFunction1`. Prefer the Java `forEachPart(Consumer)` entry point. +- The Face, Corner, Edge and Post bounds facades are Java static array getters now, so they need an extra empty + argument list before the index. +- `ByteCodeReader.advance(length)(value)` becomes `advance(length, value)`. +- `ASMImplicits` no longer provides implicit or value-class syntax; call the retained `$extension` entry points + explicitly. +- `ASMMixinFactory` constructor and `construct` arguments need an explicit Scala `Seq`, not varargs. + +One runtime trap that is not a compile error: **do not call a side-only Scala object's static facade from common +Java.** `MultipartProxy.postInit()` exists in the raw jar but inherits `@SideOnly(CLIENT)`, so Forge strips the +forwarder on a dedicated server and the call fails with `NoSuchMethodError`. Call `MultipartProxy$.MODULE$.postInit()` +as the Scala reference did. + +## Adopting the Java API + +You do not have to convert your mod to Java. A Scala mod can call the Java surface directly, and the documented +entry points compile with no Scala on the classpath. Start at the [Java API index](API.md). + +Direct typed calls are the intended end state. Reflection snippets in older guides are legacy interoperability +options, not the migration target. For optional integration, isolate FMP-typed code in a compatibility class loaded +only after mod-presence and version checks, and test both the absent and present cases. + +Saved multipart client previews can use `MultipartHelper.createPreviewTileFromNBT` plus the existing +`MultipartRenderer.renderWorldBlock`; see the [client preview guide](api/CLIENT_PREVIEW.md). Custom `IPartFactory2` +implementations opt in through `createPartForClientPreview` when they can build their client variant from saved NBT. + +## Will I have to migrate again? + +No, if you migrate to the documented Java surface. That is the point of shipping it alongside the old one. + +FMP still retains Scala storage, runtime and compatibility bridges. A later release removes them, and that release +removes the **Scala-shaped** entry points: `partList(): scala.collection.Seq`, `operate(Function1)`, +`registerParts(Seq)`, the `$class` trait helpers and the `MODULE$` companions. The Java siblings that replace them +stay. So: + +| What you depend on | What the Scala-removal release does to it | +| --- | --- | +| The documented Java surface: `jPartList`, `forEachPart`, `registerPartFactory`, `refreshPartSlots`, `IRedstoneTile` | Unaffected. One migration, done. | +| The Scala-shaped entry points | Removed. This is the migration being asked for now. | +| A raw dev-jar class such as `scalatraits.TRedstoneTile` | Wrong target. See below. | + +**The one way to migrate twice is to aim at the wrong type.** If a rebuild fails on `TRedstoneTile` and the fix looks +like "cast to the class the dev jar actually shows", that produces the `IncompatibleClassChangeError` in section 1 and +still has to be redone against `IRedstoneTile` afterwards. Always target the stable capability interface, never the +raw class the dev jar exposes for a transformed trait. + +Two honest limits on that guarantee. It covers the surface that is documented here and in the +[compatibility audit](migration/COMPATIBILITY.md); a dependency in neither can still be caught out, which is +why removal waits on evidence of adoption in released consumer jars rather than on source patches alone. And FMP's own +source layout will change when Scala goes, since the Java sources currently live under `src/main/scala` for joint +compilation. That moves no class, package, descriptor or reflective name, so it is invisible to consumers; only +source-attachment paths in an IDE change. diff --git a/docs/api/BLOCK_CONVERTERS.md b/docs/api/BLOCK_CONVERTERS.md new file mode 100644 index 0000000..80e3217 --- /dev/null +++ b/docs/api/BLOCK_CONVERTERS.md @@ -0,0 +1,75 @@ +# Registering block converters from Java + +[API index](../API.md) · [Factory registration](PART_REGISTRATION.md) · [Conversion results](TILE_CONVERSION.md) + +Use the existing `MultiPartRegistry.registerConverter(IPartConverter)` on both sides during common mod initialization, +after registering the source blocks. It already accepts ordinary Java types; no new wrapper, reflection or Scala +companion lookup is needed. Register the converted part's persistent factory separately with `registerPartFactory`. + +## Compiling example + +[BlockConversionExample.java](../../src/functionalTest/java/codechicken/multipart/examples/BlockConversionExample.java) +registers one converter and its NBT/packet factory: + +```java +BlockConversionExample.register(yourSourceBlock); +``` + +Replace `yourmod:converted` and the sample part with your own stable type and implementation. The example copies +block metadata into a fresh part, preserves it through NBT and description packets, and leaves the source untouched. +It intentionally covers registration and state only: it supplies no custom geometry, rendering, drops or gameplay. +Existing published IDs, field names and packet formats must remain unchanged when migrating real parts. + +`blockTypes()` returns a Java `Iterable`; `Collections.singletonList` or `Arrays.asList` covers ordinary cases. +These are block instances, not numeric IDs or metadata values. `convert(world, pos)` checks metadata or tile type as +needed and returns null to decline. The example checks the source block explicitly because it can also be called +directly. Read the source before returning: the registry does not subsequently call `load` or `readDesc` on this part. +The independent factory creates blank instances; normal reconstruction supplies their payload afterward. + +## Registration and dispatch + +- Register once on the initialization thread. FMP retains the converter, enumerates its block iterable immediately, + and appends it to each block's list. Mutating the iterable afterward does not change existing entries. +- Order matters: the first non-null result wins. Returning null continues; throwing stops dispatch and propagates. + There is no priority field, fallback after an exception, result validation, or rollback. +- Duplicate blocks and repeated registration produce duplicate entries. There is no unregister operation. Avoid + registration on world/server load, which can repeat within the same process. +- Unlike factory registration, converter registration does not enforce a mod-container or postInit state gate. + Common preInit/init is the supported integration timing, not a promise of a runtime registration error afterward. + Supply valid non-null blocks and a non-null iterable. An iterator failure leaves earlier registrations present. +- `convertBlock(world, pos, block)` selects by its explicit block argument, passes the same world/position references + to callbacks and returns the result unchanged. It does not check the world's block, call a factory, bind a part, + replace the block or invoke lifecycle hooks. Treat the position as borrowed and do not mutate it. + +## Probes and committed conversion + +Conversion can run repeatedly: a preview, `getOrConvertTileResult`, a rejected or accepted `canPlacePart`, then +`addPart` may each create a different part. Return a fresh, unbound instance each time. Do not drain inventories, +disconnect networks, remove the source block or transfer ownership inside `convert`. A rejected candidate receives +no compensating cleanup callback. Copy state without changing the original; use `world.isRemote` if construction +needs different client/server classes. The sample uses the same class on both paths. + +An accepted lookup creates a bound, uninstalled placeholder. Normal server placement performs conversion again and +then follows this sequence: + +1. The converted part is bound to a placeholder with world and position, while the original block/tile still exists. +2. `invalidateConvertedTile()` runs before replacement. Clear resources already copied into the part here when + necessary to prevent the old block's removal from dropping them again. The base implementation does nothing. +3. FMP replaces the block, installs the placeholder, sends the block-change notification, then calls `onConverted()`. + The base implementation calls `onAdded()`. Preserve that lifecycle if overriding, unless deliberately replacing it. +4. FMP writes the converted part's add-part description, promotes the tile if the requested new part needs more + capabilities, then adds that new part through its normal placement lifecycle. + +Keep the tile returned by `TileMultipart.addPart`; even the tile observed inside `onConverted()` may later be replaced +by capability promotion. A callback failure propagates at its current stage; committed conversion is not transactional. +These hooks run on the server placement path, not on probes. Clients reconstruct from packets instead. For ordinary +placement, check `canPlacePart` first and call `addPart` only on the server. Neither a successful check nor a saved +placeholder reserves the location. See [conversion results](TILE_CONVERSION.md) for lookup ownership. + +## Consumer migration + +Chisel copies torch variant/orientation, ForgeRelocationFMP constructs a frame, OpenComputers inspects cable/print +tiles, and AE2 copies cable-bus state from the original tile. Preserve each consumer's eligibility, state-copy and +cleanup rules. Existing Java converter registrations need no rename; Scala consumers can retain Scala implementation +code while returning Java collections and calling the static entry. Their separate factory migration still uses +`registerPartFactory`. diff --git a/docs/api/BUTTON_ORIENTATIONS.md b/docs/api/BUTTON_ORIENTATIONS.md new file mode 100644 index 0000000..8a4cf5a --- /dev/null +++ b/docs/api/BUTTON_ORIENTATIONS.md @@ -0,0 +1,61 @@ +# Multipart button orientations + +[Java API index](../API.md) + +`ButtonPart.setOrientation(int, ForgeDirection)` maps a button's orientation metadata to the multipart face it +occupies. It updates the metadata-to-face and face-to-metadata lookups together, so placement, face slots, support +checks and strong redstone output continue to agree. + +Et Futurum Requiem can enable its floor and ceiling button metadata during common initialization with direct calls: + +```java +ButtonPart.setOrientation(0, ForgeDirection.UP); +ButtonPart.setOrientation(5, ForgeDirection.DOWN); +``` + +The [compiling example](../../src/functionalTest/java/codechicken/multipart/examples/ButtonOrientationExample.java) +contains the same two calls. + +## Metadata and face meaning + +Pass only the orientation metadata from the low three bits, from `0` through `7`. Do not include bit `8`, which records +the pressed state, or bit `16`, which selects a wooden button. The face is the standard Forge direction returned by +`ButtonPart.getFace()`: `UP` for a ceiling button and `DOWN` for a floor button. `UNKNOWN`, `null` and out-of-range +metadata are rejected with `IllegalArgumentException` before either map changes. + +The mapping is one-to-one. Setting an existing metadata value to another face clears its old reverse entry; assigning +a face already used by another metadata value clears that old forward entry. Repeating an existing pair is harmless. + +Call the method during common mod initialization on each physical side, before worlds load button parts or players can +place them. The mappings are process-global. Changing one later also changes how existing button metadata is +interpreted for slots, support and redstone notification, so runtime reconfiguration is unsupported. + +This method does not define a vanilla button block's bounds. `ButtonPart` captures all 16 button block bounds during +class initialization, after normal class transformations; a mod adding metadata orientations must still make its +button block expose the matching bounds. + +## Reading orientation metadata + +`ButtonPart.metaForSide(int)` returns the current metadata for an attachment face index (`0` through `5`), including +`-1` for an unmapped face. It reads the live inverse mapping, so both `setOrientation` and legacy array mutations or +replacement remain visible. Invalid indices throw `IndexOutOfBoundsException`; the accessor does not mask indices, +check world support, construct a part or reject an unmapped result on the caller's behalf. + +ProjectRed's `ItemPartButtonCommons.newPart` can replace `ButtonPart.sideMetaMap(side ^ 1)` with: + +```scala +val b = getNewInst(ButtonPart.metaForSide(side ^ 1)) +``` + +Keep its existing vertical-face rejection, support check, custom factory and `onPlaced` call. Here `side` is the +clicked face, so `side ^ 1` is the attachment face. `sideForMeta` performs the opposite lookup; +`ButtonPart.placement` is not a replacement because it constructs an ordinary button and applies its own validation. + +## Migrating Et Futurum Requiem + +Replace the reflective reads, four array writes and reflective field assignments with the two calls above. Do not +catch and ignore API failures: an invalid metadata or direction is a configuration error that should remain visible. +Keep Et Futurum's existing FMP presence/version gate so older FMP versions never load the typed compatibility class. + +The public mutable `metaSideMap` and `sideMetaMap` fields remain binary and reflective compatibility surfaces for old +releases. New integrations should not read, replace or mutate them directly. diff --git a/docs/api/CLIENT_PREVIEW.md b/docs/api/CLIENT_PREVIEW.md new file mode 100644 index 0000000..3b3c164 --- /dev/null +++ b/docs/api/CLIENT_PREVIEW.md @@ -0,0 +1,59 @@ +# Building client multipart previews + +[Java API index](../API.md) + +Use `MultipartHelper.createPreviewTileFromNBT(World, NBTTagCompound)` to rebuild saved multipart NBT as an +uninstalled client tile. It replaces the registry reflection, client-part promotion, Scala collection conversion, +composite generation and manual loading previously needed by preview integrations. + +```java +TileMultipart preview = MultipartHelper.createPreviewTileFromNBT(clientWorld, savedTile); +if (preview == null) { + return false; +} +return MultipartRenderer.renderWorldBlock( + blockAccess, x, y, z, multipartBlock, multipartBlock.getRenderType(), renderBlocks); +``` + +The [compiling example](../../src/functionalTest/java/codechicken/multipart/examples/ClientPreviewExample.java) uses +only Java API types. Keep this code in a client integration class because `MultipartRenderer` is client-only. + +## Reconstruction contract + +The helper accepts only a `savedMultipart` tag with at least one supported part. It preserves part order, loads each +part from its original tag, generates the required client tile traits, restores tile coordinates and NBT state, and +binds the parts. With a client world it then calls `onWorldJoin`, broadcasts a local part change, marks the render and +rebuilds the client render cache. With a null world it creates a worldless staged preview; render caches initialize +lazily. + +A non-null world must have `isRemote == true`. The helper does not validate placement, install the tile in a chunk, +notify neighbors, recalculate lighting or send packets. It reads the supplied NBT without mutating it. + +Reconstruction is all-or-nothing. A foreign or empty tag, missing factory, or factory that does not support preview +construction returns null. Factory, part loading and generated-trait failures propagate. + +## Factory support + +`IPartFactory2.createPartForClientPreview(String, NBTTagCompound)` constructs the client variant needed for saved NBT. +The default returns null, so an existing packet-aware factory does not accidentally treat NBT as a description +packet. Override it when the factory can return a fresh, unbound client part without consuming or changing the tag: + +```java +@Override +public TMultiPart createPartForClientPreview(String name, NBTTagCompound tag) { + return new ExamplePart(); +} +``` + +The helper calls `part.load(tag)` afterward. Legacy Boolean and Scala-function factory adapters already route preview +construction through their client branch. Built-in microblock factories resolve the saved material name and construct +the generated client microblock before loading its shape and other state. + +## Consumer migration + +- Schematica can replace its private registry map, `MicroblockClass.create`, Scala iterable conversion, companion + generator, reflected loader and per-part refresh loop with this helper. +- GuideNH can replace its server-tile reconstruction, `TileMultipartClient` promotion, microblock promotion and + Scala reload/finalization with this helper. Its material export and part statistics already use typed Java traversal. + +Keep the old reflection fallback only while supporting an older FMP release that lacks this API. diff --git a/docs/api/COMPOSITE_GENERATION.md b/docs/api/COMPOSITE_GENERATION.md new file mode 100644 index 0000000..3bde7c0 --- /dev/null +++ b/docs/api/COMPOSITE_GENERATION.md @@ -0,0 +1,83 @@ +# Staged composite-tile generation + +[Java API index](../API.md) + +`MultipartGenerator.generateCompositeTile(TileEntity, java.lang.Iterable, boolean)` selects a tile's +generated capabilities without loading its parts. The [compiling example](../../src/functionalTest/java/codechicken/multipart/examples/CompositeGenerationExample.java) +then assigns world/position and loads the same parts, leaving installation to its caller. + +```java +TileMultipart prepared = MultipartGenerator.generateCompositeTile(candidate, parts, client); +// Prepare world, coordinates and any required tile NBT before loading. +prepared.loadPartList(parts); +``` + +Use a `List` or another repeatable collection when the same parts will subsequently be loaded. Generation +accepts `Iterable`; loading accepts `Collection`. A one-shot iterable can select traits, but +cannot then supply the same parts again. The generator reads the input once on every call, including candidate reuse, +without copying it. Do not mutate it during generation or change the required capabilities between generation and loading. + +## Selection and ownership + +| Candidate and required traits | Result | +| --- | --- | +| Null or a non-multipart tile | A fresh empty generated tile | +| Registered multipart class with exactly the required trait set | The same tile, with all existing state untouched | +| Registered multipart class with a different trait set or side | A fresh empty replacement; the candidate remains untouched | +| Multipart class unknown to the generator | `NoSuchElementException`, after reading the parts | + +An empty iterable is valid and chooses the side's base tile. Order and duplicate parts do not add extra copies of a +trait, but each input entry is visited. The generator caches constructed classes; fresh tiles are still distinct objects. + +Generation does not load or bind parts, assign world/position, copy source state, invalidate an old tile, install a +replacement or send notifications. New tiles have empty part storage and caches. Existing part-to-tile bindings remain +until the caller loads/rebinds them; loading a replacement does not clear the old tile's stored list. + +Call after trait registration on the initialization/game thread. Trait selection uses existing caches and scratch +state. Iterator exceptions, null inputs/elements and unregistered-class failures propagate without rollback of that +internal state. Generation is neither a placement check nor a transaction for replacing a live tile. + +## Side and loading lifecycle + +`client=true` selects client tile capabilities. It does not turn server parts into client part variants; supply the +correctly constructed parts yourself. The world assigned for loading must agree with the intended side. The example +also allows null for explicitly worldless staging, which omits world-dependent loading callbacks. + +Prepare position, world and any required tile NBT before [loading](PART_LOADING.md). With a world, the default loader +notifies parts and neighbors and updates lighting; a client world also triggers `onWorldJoin`. Preserve the integration's +subsequent installation, tile/render notifications and synchronization. Do not add them blindly to a worldless preview. + +For ordinary world placement use `TileMultipart.canPlacePart` / `addPart`. For immediate server construction and +loading, the existing `MultipartHelper.createTileFromParts` remains supported. It is not a substitute for consumers +that must set state between generation and loading. + +## Schematica and GuideNH migration + +For saved-NBT client previews, prefer the complete [client preview helper](CLIENT_PREVIEW.md). It owns client part +construction, generation, loading and local render preparation. Use this lower-level generator for reconstruction +flows that need to prepare or reuse a candidate tile themselves. + +Prefer the direct call `MultipartGenerator.generateCompositeTile(candidate, parts, client)`, as in the compiling +example. Gate optional typed integration code as described in the [API index](../API.md#direct-calls-and-optional-integration). +For temporary interoperability with an existing reflective integration, the method can also be resolved with: + +```java +Method generate = MultipartGenerator.class.getMethod( + "generateCompositeTile", TileEntity.class, java.lang.Iterable.class, boolean.class); +TileMultipart tile = (TileMultipart) generate.invoke(null, candidate, parts, client); +``` + +An optional integration can obtain the owner through `Class.forName("codechicken.multipart.MultipartGenerator")`. +Pass a Java list directly and cache the method during integration initialization. + +- **Older Schematica integrations:** remove `JavaConversions.collectionAsScalaIterable` from generation; keep material resolution, + [factory lookup](FACTORY_LOOKUP.md), side-specific microblock construction, per-part NBT loading and rejection when + any part is missing. Preserve its following tile `readFromNBT`, `loadPartList(parts)` and per-part notification order. +- **Older GuideNH integrations:** keep promotion of parts to their client variants, then use a Java list for generation. Preserve its + same-instance branch, copying of coordinates/world/block state, storage assignment where required, loading, + `notifyTileChange` and `markRender`. Generation does not perform any of those steps automatically. + +The old companion's `generateCompositeTile(TileEntity, scala.collection.Iterable, boolean)` keeps its descriptor and +body, deprecated for callers in favor of the static Java entry. Existing direct calls and Schematica's exact +reflective lookup remain valid. GuideNH's separate microblock-generator call has an +[existing Java replacement](MICROBLOCK_CREATION.md). diff --git a/docs/api/CUSTOM_PARTS.md b/docs/api/CUSTOM_PARTS.md new file mode 100644 index 0000000..c48be7d --- /dev/null +++ b/docs/api/CUSTOM_PARTS.md @@ -0,0 +1,91 @@ +# Writing and placing a custom part + +[API index](../API.md) · [Factory registration](PART_REGISTRATION.md) + +This guide connects the ordinary custom-part lifecycle from registration through placement, saved state, client +state and removal. The [compiling example](../../src/functionalTest/java/codechicken/multipart/examples/PartRegistrationExample.java) +uses one integer as representative state; replace its empty geometry and rendering with the capabilities your part +needs. + +Existing part binaries remain supported; use the [release notes](../RELEASE_NOTES.md) when rebuilding source. + +## Register and construct + +Give every published part type a stable persistent ID and register its factory during common `preInit` or `init`, on +both client and server: + +```java +MultiPartRegistry.registerPartFactory(new PartRegistrationExample(), "yourmod:part"); +``` + +The factory returns a fresh, unbound part. It should select the implementation, not finish loading it: FMP calls +`load` after the NBT factory path and `readDesc` after the packet factory path. Preserve existing IDs and packet +prefixes when migrating. See [factory registration](PART_REGISTRATION.md) for payload ownership and failure ordering. + +A basic part extends `TMultiPart`, returns its registered ID from `getType()`, and overrides only the capabilities and +callbacks it needs. The base class ticks by default, so a part without per-tick logic should return `false` from +`doesTick()` as the example does. Add collision/ray-trace boxes, drops, rendering, slots, redstone or other capability +interfaces according to the part's real behavior. + +## Place on the server + +Choose the target from the item or interaction, then check and place on the server: + +```java +TileMultipart tile = PartRegistrationExample.place(world, pos, initialValue); +if (tile == null) { + return false; +} +``` + +The example returns null on the client or when `TileMultipart.canPlacePart` rejects the candidate. A successful +`TileMultipart.addPart` installs or updates the generated container, binds the part, calls `onAdded`, notifies the +world and clients, and returns the current tile. Retain that return value: adding a capability can replace a previous +tile instance. A successful `canPlacePart` is only a check; do not mutate inventory or other durable state until +`addPart` succeeds. + +## Persist and synchronize state + +Use separate callbacks for disk and network state: + +| Purpose | Write | Read | When | +| --- | --- | --- | --- | +| Saved server state | `save(NBTTagCompound)` | `load(NBTTagCompound)` | World save and server reconstruction | +| Initial client state | `writeDesc(MCDataOutput)` | `readDesc(MCDataInput)` | Chunk description and part addition | +| Later client changes | `sendDescUpdate()` | Base `read` calls `readDesc` | Buffered part update | + +The example's `setValue` is server-owned and performs the three actions needed because its value is assumed to affect +all three concerns: + +```java +sendDescUpdate(); +tile().notifyPartChange(this); +tile().markDirty(); +``` + +`sendDescUpdate` synchronizes the description payload; the base client `read` then calls `readDesc` and marks the tile +for rendering. `notifyPartChange` calls sibling-part callbacks and updates the block, neighbors and lighting. +`markDirty` requests persistence. Use only the calls the changed state requires, but keep packet reads exactly +symmetric with writes. Run authoritative mutation on the server; the client applies network state in `readDesc` or a +custom `read` implementation. + +## Lifecycle callbacks + +`onAdded` / `onRemoved` describe placement and removal. Their base implementations call `onWorldJoin` / +`onWorldSeparate`. Server chunk load/unload and movement can call the world-level hooks again, while initial client +reconstruction calls `onWorldJoin` without `onAdded`. Put repeatable external-network registration in the world-level +hooks, and one-time placement/removal effects in the narrower hooks. Preserve the base call when overriding a narrow +hook unless deliberately replacing its world-level behavior. + +`preRemove` runs before the part leaves storage and before its binding is cleared. Remove on the server and retain the +returned tile because dropping the last capability can replace the container, while removing the final part returns +null after the block is removed: + +```java +TileMultipart current = part.tile(); +TileMultipart replacement = current.remPart(part); +``` + +Ordinary placement and removal already perform container synchronization and notifications. The generation, +`setPartList` and `loadPartList` APIs are for controlled reconstruction and have different ownership rules; see +[part loading](PART_LOADING.md) and [composite generation](COMPOSITE_GENERATION.md) before using them. diff --git a/docs/api/CUSTOM_TILE_TRAITS.md b/docs/api/CUSTOM_TILE_TRAITS.md new file mode 100644 index 0000000..266aa96 --- /dev/null +++ b/docs/api/CUSTOM_TILE_TRAITS.md @@ -0,0 +1,134 @@ +# Custom generated tile traits from Java + +[API index](../API.md) · [Stable capability access](TILE_TRAIT_ACCESS.md) · [Composite generation](COMPOSITE_GENERATION.md) + +A custom tile trait adds behavior to every generated `TileMultipart` that contains a part implementing a chosen marker +interface. Use it for tile-wide aggregation or lifecycle behavior. If the tile only needs to expose one interface and +forward its methods to one implementing part, use `MultipartGenerator.registerPassThroughInterface` instead; FMP +already generates that forwarding and rejects a second implementor through occlusion. + +The complete compiling example has four small types: + +- [CustomTileTraitPart.java](../../src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitPart.java) is + the marker and contribution contract implemented by requesting parts. +- [CustomTileTraitCapability.java](../../src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitCapability.java) + is the stable interface used by callers. +- [CustomTileTrait.java](../../src/functionalTest/java/codechicken/multipart/examples/CustomTileTrait.java) is the raw + input class FMP transforms, plus its ordinary helper. +- [CustomTileTraitExample.java](../../src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitExample.java) + registers and accesses the capability. + +These files live in the functional-test source set and are examples, not classes shipped in the production artifact. + +## Registration and selection + +Register during common mod initialization, before FMP first inspects any part class implementing the marker: + +```java +private static final String TRAIT = "example.multipart.ContributionTileTrait"; + +public static void register() { + MultipartGenerator.registerTrait(ContributionPart.class.getName(), TRAIT); +} +``` + +Keep the trait name as a string literal. `ContributionTileTrait.class.getName()` loads the untransformed class before +FMP can rewrite it. The marker is an ordinary interface, so its class literal is safe. Names may contain dots or +slashes. + +The two-argument overload installs the same trait on client and server generated tiles. Use +`registerTrait(marker, clientTrait, serverTrait)` when the sides differ; either trait name may be null. The order is +client first, then server. Register a parent Java trait before a child trait. + +Registration is global for the running game. A second mapping for the same marker and side logs an error and leaves +the first mapping active. Registration loads and validates the trait bytes, so missing or invalid traits fail at that +point. It does not register a part type, construct a tile, load parts or bind ownership. + +When FMP first sees a concrete part class, it records every registered marker that class implements. Composite classes +are then cached by the exact selected trait set and side. Registering after that inspection is too late for the cached +part class. + +## Trait and stable capability + +The transformed input is a top-level class extending `TileMultipart`. It may be abstract and needs a no-argument +constructor. Put the API that other code calls on a separate ordinary interface: + +```java +public interface ContributionTileCapability { + int totalContribution(); +} + +public abstract class ContributionTileTrait extends TileMultipart + implements ContributionTileCapability { + + @Override + public int totalContribution() { + return ContributionTileTraitAccess.total(this); + } +} +``` + +At runtime FMP rewrites `ContributionTileTrait` into an interface and copies its method bodies into a generated helper. +Calling through the untransformed class can therefore emit invalid class method or field bytecode. Callers use the +stable capability instead: + +```java +int total = tile instanceof ContributionTileCapability + ? ((ContributionTileCapability) tile).totalContribution() + : 0; +``` + +Keep the absent-capability behavior in the caller-facing helper. The example returns zero for null and ordinary tiles. +Adding or removing a requesting part may replace the tile with another generated class, so retain the tile returned by +FMP's normal placement and removal APIs. + +## Transformer-safe method bodies + +The current Java trait transformer supports the example's small delegating method. Keep substantial work in an +ordinary top-level helper outside the transformed class: + +```java +final class ContributionTileTraitAccess { + static int total(Object receiver) { + TileMultipart tile = (TileMultipart) receiver; + int total = 0; + for (TMultiPart part : tile.jPartList()) { + if (part instanceof ContributionPart) { + total += ((ContributionPart) part).contribution(); + } + } + return total; + } +} +``` + +The helper parameter must be `Object`. If it is typed as the raw trait, javac can remove the cast to `TileMultipart`; +after transformation the verifier then sees an interface receiver where the bytecode expected a class. The helper is +also where inherited field/method access and field access on method arguments belong, because the transformer can +otherwise mistake those reads for trait-owned state. + +Keep the transformed class free of nested, local and anonymous classes, lambdas and compiler-generated inner-class +helpers. Primitive-array allocation is also unsupported in a trait body. Put those operations in the ordinary helper. +Client-only members may use Forge's `@SideOnly(Side.CLIENT)`; FMP removes opposite-side members before collecting the +trait. Test the resulting generated class on each selected side. + +## State and lifecycle + +Prefer derived behavior when it is cheap enough. The example sums the current `jPartList()` and owns no tile state, +which avoids NBT, packet, invalidation and transition rules. + +If a trait declares fields, FMP generates `copyFrom(TileMultipart)` when the trait does not declare one. It copies each +non-transient field only when the source tile has the same trait; transient fields are excluded. Persistent or +client-synchronized state still needs explicit NBT/description handling. A custom `copyFrom` replaces the generated +field copier, so it must preserve the normal superclass chain and define behavior for sources without the trait. + +Cached aggregates must also follow every lifecycle path that can change them. Override the relevant `bindPart`, +`partRemoved` and `clearParts` hooks, call `super` in the established order, and cover tile promotion/demotion and +loading with a focused Forge test. Do not use a custom cache unless measurement shows the derived scan is too costly. + +`MultipartGenerator.generateCompositeTile` only chooses or constructs the empty composite class. If using that advanced +API directly, prepare world/position or saved state and then call `loadPartList`; ordinary placement performs the +required transition itself. See the [staged generation guide](COMPOSITE_GENERATION.md) for ownership and failure rules. + +[CustomTileTraitFunctionalTest.java](../../src/functionalTest/java/codechicken/multipart/test/CustomTileTraitFunctionalTest.java) +shows how to register a trait during Forge initialization and assert selection and dispatch on both sides. diff --git a/docs/api/FACTORY_LOOKUP.md b/docs/api/FACTORY_LOOKUP.md new file mode 100644 index 0000000..faff729 --- /dev/null +++ b/docs/api/FACTORY_LOOKUP.md @@ -0,0 +1,68 @@ +# Registered part factory lookup + +[Java API index](../API.md) + +`MultiPartRegistry.getPartFactory(String)` returns the registered `IPartFactory2` for an exact part type name, or +`null` when no factory is mapped. + +```java +IPartFactory2 factory = MultiPartRegistry.getPartFactory("mcr_face"); +``` + +Lookup is case-sensitive, uses string equality and reads the current registration map. It neither constructs a part, +logs unknown names, waits for registration nor changes registry state. It does not depend on the numeric network ID +map. Look up after the owning mod has registered its types, on the initialization/game thread; no synchronization is +added. Use published, non-null type names. + +The result is the exact registered factory instance, not a copy or a mutable registry view. Do not modify its state. +Registration remains the job of [`registerPartFactory`](PART_REGISTRATION.md); lookup does not expose a replacement, +removal or enumeration operation. An earlier lookup result does not update itself if registry state later changes. + +## Choose the construction path + +Most consumers should continue using `loadPart(name, nbt)` or `readPart(input)`. Those choose the registered factory's +NBT/server or packet/client method. Their caller still invokes `part.load(nbt)` or `part.readDesc(input)`, respectively, +and later binds/places the part. See [factory and payload contracts](PART_REGISTRATION.md). + +Factory lookup is useful when a supported factory subtype provides a specialized construction method. Older Schematica +looks up a `MicroblockClass` and calls `create(client, materialId)` before loading the saved microblock NBT. Calling +`loadPart` instead would select the server/NBT construction path, even for a client preview. Passing a null packet or +using deprecated `createPart(name, true)` is also unsuitable: microblock packet factories read a material ID from it. + +New preview integrations should use the complete [client preview helper](CLIENT_PREVIEW.md). See +[microblock creation](MICROBLOCK_CREATION.md) when a caller specifically needs an unbound microblock. + +The [compiling Java example](../../src/functionalTest/java/codechicken/multipart/examples/PartFactoryLookupExample.java) +checks for `MicroblockClass` and creates a fresh unbound microblock. The caller must resolve a valid material ID, +load the part's NBT, prepare the correct composite tile and complete its existing lifecycle. This example only covers +factory selection and construction, not a complete schematic loader. Its null result for an unsupported type must +cause the whole preview to be rejected when matching Schematica's all-parts-required policy. + +## Migrating Schematica's optional reflection + +Prefer direct `MultiPartRegistry.getPartFactory(partID)` calls, as in the compiling example above. Isolate typed +optional integration code behind mod-presence/version checks; see the [direct-call policy](../API.md#direct-calls-and-optional-integration). +The following is only a legacy interoperability option for a consumer retaining reflection temporarily. It replaces +the companion singleton/private-field lookup and Scala `Map.get` / `Option` handling: + +```java +Class registry = Class.forName("codechicken.multipart.MultiPartRegistry"); +Method lookup = registry.getMethod("getPartFactory", String.class); +Object factory = lookup.invoke(null, partID); +if (factory == null) { + return null; // Keep the caller's missing-part rejection. +} +``` + +Cache the `Method` during integration initialization as Schematica already does. Continue resolving +`MicroblockClass.create(boolean.class, int.class)` with its exact parameter types and invoking it on this factory. +Not every registered factory is a microblock class: keep the existing rejection of an unsupported factory, or check +the reflected microblock class's `isInstance(factory)` explicitly before invoking. Do not silently produce a partial preview. + +This removes only the registry-map Scala dependency. The [client preview helper](CLIENT_PREVIEW.md) replaces the +complete Schematica reconstruction path when the minimum FMP version can require it. + +The private `MultiPartRegistry$.codechicken$multipart$MultiPartRegistry$$typeMap` field keeps its exact name, modifiers, +Scala mutable-map type and live backing, so existing binary/reflection callers keep working. + +Client microblock creation only works on a physical client: a dedicated server strips `clientTrait()`. diff --git a/docs/api/HIT_PART.md b/docs/api/HIT_PART.md new file mode 100644 index 0000000..7aaa838 --- /dev/null +++ b/docs/api/HIT_PART.md @@ -0,0 +1,40 @@ +# Struck part index + +[API index](../API.md) + +`BlockMultipart.hitPartIndex(MovingObjectPosition)` returns the index of the part a multipart ray trace struck, or +`-1` if the hit carries no part index. + +```java +int index = BlockMultipart.hitPartIndex(hit); +List parts = tile.jPartList(); +TMultiPart struck = index >= 0 && index < parts.size() ? parts.get(index) : null; +``` + +See the [compiling example](../../src/test/java/codechicken/multipart/examples/HitPartExample.java). + +## Where the index comes from + +`TileMultipart.rayTraceAll` asks each part in `jPartList()` order for its own hit. It then wraps each hit's data as +`(index, partData)`, so a part that misses still uses up its index. `collisionRayTrace` returns the nearest of those +hits. A hit from `BlockMultipart.collisionRayTrace` or `RayTracer.retraceBlock` on a multipart block goes through the +same path. + +The index refers to the tile's part list when the trace ran. Adding or removing parts afterwards makes it stale, so +retrace rather than keeping a hit across ticks. The method reads only the hit. It does not check coordinates, look +up a tile or bounds-check the index. Retrieve the tile at the hit's block yourself, as the example does. + +`-1` means the hit is null, a plain `MovingObjectPosition`, or an `ExtendedMOP` whose data is not FMP's index pair. +For example, another mod's tile can produce an `ExtendedMOP` with its own data. + +## Legacy compatibility + +`BlockMultipart.reduceMOP(MovingObjectPosition)` and its companion entry remain unchanged and are not deprecated. +They return a `scala.Tuple2` of the boxed `Integer` index and a copy of the hit rebased onto the part's own data. +FMP's activation, click, harvest, hardness, hit-effect, pick-block and highlight dispatch uses the rebased hit; there is no Java replacement for it +because no consumer needs one. + +GT5U `5.09.54.205` reads `(Integer) BlockMultipart.reduceMOP(hit)._1()` to recolor ProjectRed wires. That call +can become `hitPartIndex(hit)` with the same value and no Scala types. Keep the existing `hit instanceof ExtendedMOP` +and coordinate checks, which protect the tile lookup. The released GT5U jar keeps linking the `Tuple2` descriptor, +which stays until a migrated release is in the target pack. diff --git a/docs/api/MATERIAL_ACCESS.md b/docs/api/MATERIAL_ACCESS.md new file mode 100644 index 0000000..b373e31 --- /dev/null +++ b/docs/api/MATERIAL_ACCESS.md @@ -0,0 +1,49 @@ +# Read a microblock's block and metadata + +[Java API index](../API.md) + +Use the existing public `BlockMicroMaterial.block()` and `meta()` methods. Neither reflection nor an accessor mixin +is needed. The [compiling Java example](../../src/functionalTest/java/codechicken/multipart/examples/MaterialAccessExample.java) +implements the primary-material query using GuideNH's filtering and metadata convention, with the failure and +accessor-order differences documented below: + +1. Traverse `TileMultipart.jPartList()` in its stored order. +2. For each `Microblock`, resolve `material()` through `MicroMaterialRegistry.getMaterial(int)`. +3. If the result is a `BlockMicroMaterial`, read `block()` then `meta()`. +4. Skip null/air blocks and absent/empty block registry names; return the first usable block ID. + +For example, wool with metadata 14 exports as `minecraft:wool:14`. GuideNH appends a metadata suffix only when the +value is positive; zero and negative values export the unsuffixed block ID. This is GuideNH's export convention, +not a general material serialization format. The example preserves positive values above 15 without masking. + +## Identity, lifecycle and overrides + +- `block()` returns the constructor's block by identity in the base implementation, including null. `meta()` returns + the original integer unchanged. Both are public virtual methods; consumer calls must respect subclass overrides. +- A microblock's numeric `material()` value is an ID in the active material map, not block metadata. Query after + registry initialization and, on a client, material-ID synchronization. Do not persist these numeric IDs across + sessions; see [material enumeration](MATERIAL_ENUMERATION.md). +- `IMicroMaterial` does not promise a block/meta representation. Skip non-block materials for this block-only query; + do not cast every registered material to `BlockMicroMaterial` or infer its block from an item drop. +- `blockKey()` caches the constructor block's registry name. It can differ from an overridden `block()` and from + the material's registered name. Export the registry name of the returned block, as the example does. +- This is a read operation with no binding, world access, material registration or tile mutation. Observe the + [part-list ownership contract](PART_TRAVERSAL.md#collection-ownership-and-ordering); the traversal is not a snapshot. + +## GuideNH migration + +GuideNH 1.3.33 onward already uses direct part traversal, material lookup and public getters in +`resolvePrimaryMicroblockId`, without the `AccessorBlockMicroMaterial` mixin. FMP's private fields stay unchanged for +older GuideNH releases. + +The old mixin reads constructor fields directly, bypassing overrides. The old reflection fallback already calls +the public virtual getters. The supported typed path follows those getters too, so custom materials that override +them may produce a different export from the mixin. Validate those materials in GuideNH; do not introduce raw-field +accessors to preserve an implementation detail that disagrees with the material's public behavior. + +The example returns null for a null/non-multipart tile or no usable block. Invalid material IDs and exceptions from +custom accessors propagate. Current GuideNH instead catches runtime failures during material lookup, logs and +continues to the next part; getter failures propagate. It reads metadata only after accepting the block and registry +name, and calls `meta()` twice for positive values. The example reads metadata once, before the null/air check. +These differences matter for failing or stateful custom getters; the example is not a drop-in copy of current +GuideNH's failure/accessor-order policy. Validate any intentional change during migration. diff --git a/docs/api/MATERIAL_ENUMERATION.md b/docs/api/MATERIAL_ENUMERATION.md new file mode 100644 index 0000000..b249ba3 --- /dev/null +++ b/docs/api/MATERIAL_ENUMERATION.md @@ -0,0 +1,62 @@ +# Enumerating microblock materials from Java + +[API index](../API.md) + +Use `MicroMaterialRegistry.materialCount()` with the existing `materialName(int)` and `getMaterial(int)` methods to +enumerate materials without importing Scala types. + +## Example + +The following method copies the active material names in numeric ID order: + +```java +public static List materialNames() { + int count = MicroMaterialRegistry.materialCount(); + List names = new ArrayList<>(count); + for (int id = 0; id < count; id++) { + names.add(MicroMaterialRegistry.materialName(id)); + } + return names; +} +``` + +Imports and the enclosing class are in the [compiling example](../../src/test/java/codechicken/microblock/examples/MaterialEnumerationExample.java). +Use `MicroMaterialRegistry.getMaterial(id)` in the loop when you also need the `IMicroMaterial`, for example to obtain +its item. That returns the registered instance, not a copy. +The example's list is an independent copy; editing it does not change the registry. + +## Timing, order and identity + +- Enumerate after ForgeMicroblock has built its ID map during post-initialization. A consumer's own post-init handler + needs suitable mod ordering if it enumerates there; later lifecycle/game callbacks can use the initialized map. + Consumers must not call `setupIDMap()` themselves to force readiness. +- On a multiplayer client, enumeration of the connected server's IDs requires a completed, successful FMP handshake. + FMP also rebuilds the local map before server startup. Reacquire IDs after map replacement. +- Use the game/lifecycle thread. The calls are live lookups, not an atomic snapshot: do not rebuild the map or perform + registration/handshake work from inside an enumeration loop. +- Local setup orders IDs by material name. A multiplayer client adopts server order; do not sort or filter IDs when + preserving a mapping. Store material names in saved data and resolve their numeric IDs for the active map. +- `materialCount()` counts ID slots, including the missing-material placeholder when present. It throws + `IllegalStateException` before initialization and returns zero for an initialized empty map. +- A failed handshake can leave unresolved slots. The count includes them; `materialName(id)` and `getMaterial(id)` + retain their existing `NullPointerException` for such slots. FMP disconnects the client for missing mappings. + The count is not a handshake-success indicator, and callers should not silently skip unresolved IDs. +- The existing indexed lookups throw `ArrayIndexOutOfBoundsException` outside the active ID range and + `NullPointerException` before map initialization. + +## Migrating existing consumers + +| Legacy expression | Java API | +| --- | --- | +| `getIdMap().length` | `materialCount()` | +| `getIdMap()[id]._1()` | `materialName(id)` | +| `getIdMap()[id]._2()` | `getMaterial(id)` | +| Loop over the tuple array | Loop over IDs from zero to `materialCount()`, exclusive | + +For UtilitiesInExcess, apply this to `FMPRecipeLoader.run()` and `UEMultipartItem.getSubItems()`: replace each tuple +loop with an ID loop and use `materialName(id)` wherever the tuple name was used. Preserve its recipe/item ordering, +filters and material-name NBT. A material object, when needed, is available from `getMaterial(id)`. +Extra Utilities' NEI handlers use both tuple fields; both indexed replacements are available. + +The static and companion `getIdMap()` methods are deprecated, with their original descriptors and live-array +behavior retained. The addition does not change packet or NBT formats. diff --git a/docs/api/MICROBLOCK_CREATION.md b/docs/api/MICROBLOCK_CREATION.md new file mode 100644 index 0000000..258fd76 --- /dev/null +++ b/docs/api/MICROBLOCK_CREATION.md @@ -0,0 +1,89 @@ +# Creating and recreating microblocks + +[Java API index](../API.md) + +Use the existing `MicroblockGenerator.create(MicroblockClass, int material, boolean client)` static Java entry. +It delegates to the retained companion implementation. + +```java +Microblock part = MicroblockGenerator.create(microClass, materialId, client); +``` + +`microClass.create(client, materialId)` uses the same generator; note its different parameter order. To find a factory +by part type, use [registered factory lookup](FACTORY_LOOKUP.md) and verify that it is a `MicroblockClass`. + +## Construction and ownership + +Creation chooses the factory's base trait and, for the client path, its client trait. It then resolves the material +from the active numeric ID map and invokes `IGeneratedMaterial.addTraits` when implemented. Finally it constructs a +fresh instance of the resulting generated class with the material ID as its constructor argument. Generated classes +are cached; part instances are not reused. Trait initializers execute during construction. + +The generator does not copy an existing part, assign a requested shape, load NBT, bind the part or install a tile. +Stock face microblocks begin with shape zero, which is not a completed placement shape. Restore shape/NBT before +using geometry or rendering and before [preparing/loading a composite tile](COMPOSITE_GENERATION.md). + +Resolve the intended material before construction. A later `part.load(tag)` or `material_$eq` updates stored material +but does not regenerate the class's material traits. For NBT reconstruction, resolve `tag.getString("material")`, +create the correctly sided part with that ID, then call `load(tag)`. Ordinary `MultiPartRegistry.loadPart` selects the +server/NBT path. The complete [client preview helper](CLIENT_PREVIEW.md) selects the registered factory's preview path +and performs the remaining tile reconstruction. + +Call after factory/trait registration and material-map initialization, on the initialization/game thread. Numeric IDs +belong to the active map and may change across sessions or a multiplayer handshake; persist material names, not IDs. +See [material enumeration and ownership](MATERIAL_ENUMERATION.md). Invalid/unresolved IDs, null factories, callback +exceptions and constructor failures propagate; there is no new fallback or rollback. + +## Material-provided traits + +`IGeneratedMaterial.addTraits(BitSet, MicroblockClass, boolean)` receives the exact factory and side supplied by the +caller. Its borrowed mutable bit set already contains the selected base/client traits. Add registered trait IDs; +do not remove required traits. The generator consumes the modified set immediately after the callback. + +Do not retain the set or recursively call this generator from the callback: the next creation on that thread clears +and reuses it. On failure, already-performed callback side effects and scratch mutations remain; a later creation +clears scratch again. Thread-local scratch does not make registry changes or the complete generator thread-safe. + +ProjectRed's existing external Scala trait path remains supported. For a Java trait, see the +[illuminated microblock extension](MICROBLOCK_EXTENSIONS.md). + +## GuideNH migration + +GuideNH preview reconstruction should use the complete [client preview helper](CLIENT_PREVIEW.md). The direct +generator remains useful when code specifically needs to create or transform one unbound microblock. + +GuideNH currently calls `MicroblockGenerator$.MODULE$.create(MicroblockClass, int, boolean)`; older releases resolved +that same call reflectively. Prefer the typed creation example, with [gated optional integration](../API.md#direct-calls-and-optional-integration). The following cache is only +a temporary interoperability option for consumers retaining reflection: + +```java +Class generator = Class.forName("codechicken.microblock.MicroblockGenerator"); +Class factoryType = Class.forName("codechicken.microblock.MicroblockClass"); +Method create = generator.getMethod("create", factoryType, int.class, boolean.class); +Object promoted = create.invoke(null, microClass, materialId, true); +``` + +Keep the exact parameter types and order. The old companion class, singleton, descriptor and behavior remain +unchanged for existing releases. + +GuideNH's promotion recreates the source family and material on the client, then copies the encoded shape byte. +The [compiling Java example](../../src/functionalTest/java/codechicken/multipart/examples/MicroblockCreationExample.java) +implements that core-data policy through `setShape(size, slot)`, preserving all eight shape bits. `getShape()` alone +is only the slot nibble, while `shape()` returns the complete byte. The example leaves source bindings untouched and +returns an unbound replacement. It is not a clone of arbitrary custom-part state or a shape-validity check. + +The example captures factory, material and shape before construction. Current GuideNH reads the source shape after +creation; material callbacks can have side effects, so that ordering can copy a callback-modified value. Preserve or +explicitly validate that policy when migrating custom materials. + +Public `setShape` uses the virtual shape setter; current GuideNH already calls `shape_$eq` directly, while its older +private-field write bypassed that dispatch. Validate +custom traits overriding these hooks before adopting the change. Preserve its existing missing/failed-promotion +handling, part order, Java collection migration, tile state setup and subsequent loading/notifications. Do not copy +the source tile binding to the new part. Private material-field access has a separate [typed query guide](MATERIAL_ACCESS.md). + +## Side limits + +Use `client=true` on the physical client for client variants. Unlike generating a client tile container, client +microblock construction cannot run on a dedicated server: Forge strips `MicroblockClass.clientTrait()`. +The side parameter selects traits; it does not infer a world side or bypass Forge's side-only filtering. diff --git a/docs/api/MICROBLOCK_EXTENSIONS.md b/docs/api/MICROBLOCK_EXTENSIONS.md new file mode 100644 index 0000000..309dab9 --- /dev/null +++ b/docs/api/MICROBLOCK_EXTENSIONS.md @@ -0,0 +1,76 @@ +# Extend generated microblocks from Java + +[Java API index](../API.md) + +Use `MicroblockGenerator.registerTrait(String)` with a Java source trait, then add its returned ID from an +`IGeneratedMaterial.addTraits` callback. The existing public API selects the Java compiler path automatically; +consumers do not need reflection, Scala types, companion lookup or direct compiler calls. + +This example follows ProjectRed's illuminated microblock contract. It comprises three compiling Java files: + +- [IlluminatedMicroblockTrait](../../src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockTrait.java): + the generated extension's dynamic-render flag, light value and client render callback. +- [IlluminatedMicroMaterial](../../src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroMaterial.java): + block-backed material and material-provided trait selection, including cutter metadata handling. +- [IlluminatedMicroblockExample](../../src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockExample.java): + registration, ordinary Java implementation, configuration supplier and halo-renderer adapter. + +Copy/adapt these into the consumer's own package; update the literal registration name accordingly. They are example +sources in FMP's functional-test source set, not production classes shipped for consumers to depend on. + +## Registration and compilation + +1. Register the consumer's lamp block first. During mod initialization, call `registerMaterials(lamp)` once, on both + physical sides and before FMP creates the material-ID map. The helper registers the trait before materials. +2. Wire `dimLampParts` to a supplier of the consumer's current configuration. On the physical client, set + `haloRenderer` to its halo queue before rendering; ProjectRed can forward to `RenderHalo.addLight(x, y, z, colour, box)`. + Keep renderer-only dependencies out of common initialization. The helper supplies no renderer fallback. +3. Retain the consumer's existing material names, metadata 16 through 31, configuration defaults and block identity. + The test fixture uses its own lamp block; a real ProjectRed migration uses ProjectRed's registered lamp. +4. Create parts through the [public microblock creation API](MICROBLOCK_CREATION.md). The material adds the same + extension ID for every shape and both sides, without clearing the borrowed bit set. The generator also selects + the shape's built-in traits and client trait where applicable. Repeated construction reuses the generated class, + not the instance. Changing a part's material afterward does not regenerate its traits. + +**Register the Java trait by name before loading it.** A Java class literal is appropriate for retained Scala +interfaces, but can load the untransformed Java input too early. Name-based registration is a supported generator +operation, not consumer reflection. IDs are local to this generator and must not be persisted or reused as tile-trait IDs. + +The Java input extends `Microblock`, is abstract, and has a public no-argument constructor calling `super(0)`. +FMP discards that direct super call; the composite's real constructor receives the requested material ID. No extra +trait state is needed for this extension. Keep the input top-level, without nested/anonymous classes or lambdas. + +After registration FMP rewrites that class into an interface. Do not instantiate it, subclass its raw class from +ordinary consumer Java, or invoke inherited members through that raw class type. `instanceof` works after +registration; dispatch uses stable `Microblock` methods. For new extension-specific methods, declare a separate +ordinary capability interface rather than emitting class calls against the transformed input. + +The existing transformer cannot safely handle all inherited field/method accesses in a trait body. Its thin overrides +therefore delegate to an ordinary helper using an **Object parameter**, then cast to `Microblock` in that helper. +This forces the required runtime cast and keeps loops, allocation and callbacks outside the transformed input. + +## Behavioral contract + +- The dynamic-render flag is always true. The client callback submits halos only on pass zero. It uses the part's + tile coordinates, not the supplied camera-relative render position; colour is material metadata minus 16. +- Cutter strength asks the block for the harvest level at `meta() % 16`, preserving the illuminated metadata bit's + exclusion. Ordinary block/meta access remains virtual through the supported methods. +- With dimming enabled, collect all siblings carrying this extension, sum `getSize() / 8.0`, multiply by 15, + truncate to an integer, then cap at 15. Capture the matching parts before invoking size callbacks. With dimming + disabled, any matching sibling gives light 15, otherwise zero. Do not substitute volume for encoded size. +- Read `tile().jPartList()` without detached-part filtering: this preserves the reference's membership behavior. + The part must be bound before querying light; an unbound part fails rather than inventing a light value. Callback + failures propagate. This example adds no stored per-part state, NBT keys or packet fields. +- Ordinary halos copy collision boxes and expand them by 0.025; source boxes remain untouched. Hollow halos instead + use four rotated strips around the current connector opening. Their middle strips are trimmed along the opening, + so simply expanding hollow collision boxes does not reproduce the same geometry. Halo boxes are newly allocated + and may be retained by the renderer queue. Configuration and renderer access run on the owning game/render thread. + +`@SideOnly(CLIENT)` belongs on the trait's render override. The common light flag/value remain present on the server. +The helper uses common geometry types, allowing headless verification; only the supplied halo renderer needs a client. +This is a behavior-preserving migration example, not a performance optimization or a replacement rendering engine. + +## Migrating ProjectRed + +Preserve ProjectRed's registration order and names, and wire its existing configuration and halo queue into the +example's hooks. Its existing external Scala trait keeps working until it migrates. diff --git a/docs/api/MIGRATION_CHECKLIST.md b/docs/api/MIGRATION_CHECKLIST.md new file mode 100644 index 0000000..68c6350 --- /dev/null +++ b/docs/api/MIGRATION_CHECKLIST.md @@ -0,0 +1,58 @@ +# Consumer migration checklist + +[API index](../API.md) · [Java-port release notes](../RELEASE_NOTES.md) + +Use this when rebuilding a mod against the Java-port artifact. It is a release checklist, not a replacement for the +method-specific guides linked from the API index. + +## Before editing + +- [ ] Inventory source and reflective references to `codechicken.multipart` and `codechicken.microblock`, including + inherited traits, companion objects, `$class` helpers and private fields. +- [ ] Preserve published part/material IDs, NBT keys and packet field order unless the change includes an explicit data + migration or protocol break. +- [ ] Identify the exact FMP artifact used to compile and run. New Java APIs on `algent/java` have no minimum published + version yet; require a release that actually contains every method used. +- [ ] If FMP is optional, keep FMP-typed code in a compatibility class loaded only after checking mod presence and a + supported version. Keep FMP types out of classes loaded unconditionally. + +## Change the integration + +- [ ] Prefer the documented direct API over companion lookup, private-field access or new reflection. +- [ ] Call generated tile behavior through `TileMultipart` or a stable capability interface such as `IRedstoneTile`, + `IInventory`, `ISidedInventory` or `IFluidHandler`. Do not compile method or field access against raw classes under + `codechicken.multipart.scalatraits` or `TileMultipartClient`; Forge transforms those classes into interfaces. +- [ ] For recompiled Scala traits, audit every method formerly supplied by trait linearization. A successful compile is + insufficient: Java superclass methods can silently win over interface defaults. Apply the explicit forwarders in + the [release notes](../RELEASE_NOTES.md#2-silent-behavior-changes-recompiled-scala-trait-composition). +- [ ] Use `canPlacePart` followed by `addPart` for normal server placement, and `remPart` for removal. Retain the tile + returned by additions/removals because generated capabilities can replace the container; final removal returns null. +- [ ] Use `save`/`load` for server persistence and `writeDesc`/`readDesc` or a symmetric custom update for clients. + Mark persistent state dirty, synchronize client-visible state and notify parts/neighbors only when that state needs + each effect. See the [custom-part lifecycle](CUSTOM_PARTS.md). +- [ ] Treat `generateCompositeTile`, `setPartList` and `loadPartList` as reconstruction operations. Follow their state, + binding, installation and notification responsibilities instead of substituting them for ordinary placement. + +## Verify the rebuilt consumer + +- [ ] Compile against the same FMP artifact required at runtime, then inspect the rebuilt bytecode for references to raw + transformed trait classes, removed Scala-shaped entry points and legacy private fields. +- [ ] Test optional integration with FMP absent and present. Test a dedicated server separately from a physical client; + headless Forge coverage does not establish client class stripping, rendering or GPU behavior. +- [ ] Load representative pre-migration saves and exercise placement, updates, removal, chunk reload and movement for + every changed part or integration. Verify NBT and packet state, generated capabilities and callback order. +- [ ] Run the rebuilt jar in the target pack with the actual interacting mods. Record manual limits instead of treating + source inspection or isolated tests as full-pack proof. + +## Close adoption before removing compatibility + +A source patch proves only that the migration was written. Keep the old bridge, descriptor, field or Scala runtime +path until all applicable gates are complete: + +1. The consumer patch is merged and its rebuilt jar passes the checks above. +2. A consumer release containing that jar exists. +3. The target pack requires the compatible FMP and consumer releases. +4. A fresh consumer scan confirms no supported released jar still uses the legacy contract. + +Documented Java entry points are intended to survive later Scala removal. Undocumented public members, raw transformed +classes and Scala-shaped bridges do not gain that guarantee merely because current source can call them. diff --git a/docs/api/OCCLUSION.md b/docs/api/OCCLUSION.md new file mode 100644 index 0000000..398126d --- /dev/null +++ b/docs/api/OCCLUSION.md @@ -0,0 +1,113 @@ +# Testing occlusion from Java + +[API index](../API.md) + +`TileMultipart.testOcclusion(Collection, TMultiPart)` tests a supplied collection of parts +through the tile's existing occlusion hook, including generated partial-occlusion checks. For raw geometry, +`NormalOcclusionTest.testBoxes(Iterable, Iterable)` tests two groups of bounding +boxes without constructing parts. See [box-versus-box queries](#box-versus-box-queries). + +## Example + +Use a `NormallyOccludedPart` to test a normal bounding shape against a supplied group of parts: + +```java +public static boolean fitsShape(TileMultipart tile, Collection parts, Cuboid6 bounds) { + return tile.testOcclusion(parts, new NormallyOccludedPart(bounds)); +} +``` + +See the [complete Java example](../../src/test/java/codechicken/multipart/examples/OcclusionExample.java). +Collections of part subclasses, such as `List`, are accepted without a cast. + +Pass `tile.jPartList()` to test against the tile's currently stored parts, or pass a separate collection for a preview +or selected subset. To exercise a real candidate's custom occlusion behavior, pass that part instead of the shape +wrapper. The wrapper represents normal bounding geometry, not all the capabilities of a custom part. + +## What the query checks + +The base tile tests each supplied part against the candidate, then tests the candidate against that same part. It +proceeds in input iteration order and stops immediately when either direction rejects. Unbound/detached parts and +duplicate entries participate; the candidate is not automatically excluded if it is also in the collection. + +Generated partial-occlusion tiles retain their extra aggregate check. When the candidate implements `JPartialOcclusion`, +the existing trait checks the group plus the candidate before the ordinary pair callbacks. A plain `TileMultipart` +does not gain that capability just because the supplied parts need it. Use the appropriate composite tile; this method +does not generate or select tile traits. + +This is an occlusion query, not full placement approval. It does not check placement permissions, duplicate membership, +slot occupancy or world replaceability, and does not bind/store parts or send notifications. For ordinary placement +and replacement, continue using `canPlacePart`, `canAddPart` and `canReplacePart` as appropriate. In particular, +`canReplacePart(outgoing, candidate)` performs its existing outgoing-part exclusion; this collection query does not. + +## Ownership, callbacks and failures + +The Java entry copies the input into an immutable sequence before calling the legacy hook. Order, duplicates, null +entries and part identities are preserved. Callback edits to the caller's collection do not change the current +query's sequence. Part objects are shared, so mutations of their state can affect later callbacks. A nested query +takes its own copy. + +Copying failures, including a null collection, propagate before the legacy hook is called. There is no eager +candidate/null-entry validation: with the base implementation, an empty collection accepts even a null candidate, +and an early rejection can avoid a later null dereference. Callback exceptions propagate unchanged and stop the query; +callback side effects already performed are not undone. Overrides may add checks or customize these boundaries. + +Use the game thread when querying live parts. A geometric query may invoke arbitrary part callbacks, including ones +that read or modify world/part state; it is not a thread-safety guarantee. + +## Overrides and migration + +Dispatch is `testOcclusion(Collection, candidate)` → virtual `occlusionTest(scala.collection.Seq, candidate)`. +The old method keeps its descriptor and body, and is deprecated for callers. Existing subclasses and generated traits +continue to override it. `canAddPart` and `canReplacePart` still call that hook directly; overriding only the new +Java method does not intercept their checks. The distinct Java name avoids introducing another Scala/Java overload +pair, following the [loader compilation finding](PART_LOADING.md#overrides-and-reflection). + +Consumers such as ProjectRed and ForgeRelocationFMP already use the Java-typed `canReplacePart` API and need no rename +for that contract. Part-level `occlusionTest(TMultiPart)` remains supported as-is. The Scala `NormalOcclusionTest.apply` +box-versus-box entry is a separate, still-used contract with the Java replacement below. + +## Box-versus-box queries + +Use `NormalOcclusionTest.testBoxes` when you already have box iterables, including `getOcclusionBoxes()` results: + +```java +public static boolean fitsBounds(Iterable occupied, Cuboid6 candidate) { + return NormalOcclusionTest.testBoxes(occupied, Collections.singletonList(candidate)); +} +``` + +See the [complete example](../../src/test/java/codechicken/multipart/examples/BoxOcclusionExample.java). Both +arguments accept box subclasses and need only implement Java `Iterable`. + +The query fully consumes the first input, then the second, requesting each input's iterator once. It takes shallow +snapshots before testing any pairs, even when one input is empty or the first pair will overlap. Iteration failures +therefore take precedence over geometry results; a failure in the first input prevents reading the second. Input +collections can change during intersection callbacks without changing the captured membership, but boxes themselves +are shared: coordinate changes remain visible. Supply finite iterables and use the game thread for live geometry. + +Each first-group box calls `intersects` on second-group boxes in encounter order. Duplicates participate; the first +intersection returns `false`. No intersections returns `true`. The existing `Cuboid6.intersects` tolerance is retained: +touching faces and sub-tolerance overlaps are allowed. Only cross-group pairs are tested, not pairs within one group. +Neither input nor its boxes is modified by the helper; custom iterators or `intersects` overrides can have side effects. + +Null inputs fail during copying. Null box entries are not eagerly rejected: an empty opposite group never uses them, +and an earlier intersection may avoid them. A reached intersection involving an ordinary null box fails. Iterator and +intersection exceptions propagate unchanged, without undoing callback side effects. + +This does not run part callbacks, generated aggregate partial-occlusion checks, slot checks or placement logic. +Use `tile.testOcclusion` for the tile's occlusion protocol, and the placement/replacement APIs for their wider checks. +The existing `NormalOcclusionTest.apply(JNormalOcclusion, TMultiPart)` part helper remains unchanged. + +Both Scala box-list `apply(Traversable, Traversable)` entries, static and companion, are deprecated with their original +descriptors and bodies retained. OpenComputers' cable/network checks can pass `getOcclusionBoxes()` directly as the +second argument; their Scala `ownBounds` collection needs a Java adapter: + +```scala +import scala.collection.JavaConverters._ +NormalOcclusionTest.testBoxes(ownBounds.asJava, otherBounds) +``` + +ForgeRelocationFMP can similarly adapt its assembled Scala `boxes` sequence and pass its existing Java +`getOcclusionBoxes` iterable directly. Keep its combined normal, partial and collision boxes and caller order intact. +Scala consumers can adopt this FMP API while keeping their own Scala code. diff --git a/docs/api/PART_LOADING.md b/docs/api/PART_LOADING.md new file mode 100644 index 0000000..5bd485d --- /dev/null +++ b/docs/api/PART_LOADING.md @@ -0,0 +1,94 @@ +# Loading and assigning multipart parts from Java + +[API index](../API.md) + +`TileMultipart.loadPartList(Collection)` and `setPartList(List)` adapt to the existing +virtual Scala-parameter hooks. Both legacy entries are deprecated for callers and remain supported for existing +binaries, subclasses and reflection. + +These are reconstruction operations, not normal placement/removal. Use `TileMultipart.addPart` / `remPart` for world +changes. Use `MultipartHelper.createTileFromParts(Iterable)` to construct a new server composite tile; the +loader itself does not choose traits, promote a tile or install it in the world. + +For separate client/server generation before world/NBT setup and loading, use the +[staged composite-generation API](COMPOSITE_GENERATION.md). +For an uninstalled client tile reconstructed from saved multipart NBT, use the complete +[client preview helper](CLIENT_PREVIEW.md) instead of assembling these steps. + +## Loading a prepared tile + +To rebuild a tile using its existing parts, capture them before the loader clears the tile: + +```java +public static void reloadParts(TileMultipart tile) { + List parts = new ArrayList<>(tile.jPartList()); + tile.loadPartList(parts); +} +``` + +For a supplied collection, call `preparedTile.loadPartList(parts)`. The tile must already have all capabilities required +by those parts. An arbitrary `new TileMultipart()` does not acquire slot, inventory or other generated traits by loading. + +The default implementation: + +1. Calls the virtual `clearParts()` hook to clear stored parts and trait caches that implement that hook. +2. Reads the supplied collection in its iteration order. For each part, appends it to stored state, calls `bindPart`, + then `part.bind(tile)`, and enables ticking if needed. It retains the existing 250-part limit. +3. With a client world, visits bound parts through the legacy `operate` hook to call `onWorldJoin`. +4. With either kind of world, calls `notifyPartChange(null)`, which notifies parts, marks the block for update, + notifies neighboring blocks and recalculates lighting. Without a world, neither world step runs. + +Loading does not call `onAdded`, call old parts' removal/separation callbacks, unbind old parts, reset an already-set +ticking flag, check occlusion/duplicates, or send a complete multipart description packet. It is not a general live-tile +replacement transaction. Reconstruction callers remain responsible for their world/position setup, render updates, +tile notifications and any full description synchronization required by their existing flow. + +The Java collection is viewed during the call, not copied first. Its iterator determines the order and mutation +behavior; do not structurally modify it from callbacks. Replacing a pending list entry during a binding callback can +change which part is loaded next. After successful loading, normal stored sequence snapshots no longer track later +edits to the input collection. Part objects remain shared. + +Call on the game thread. Failures propagate without rollback: clearing happens before iteration, and each part is +published before binding. A null collection fails after clearing; a null part can remain in partially loaded storage +before binding fails. A callback exception likewise leaves changes already performed. Supply valid parts rather than +using these failures to validate a proposed live-world change. + +## Storage assignment + +`preparedTile.setPartList(parts)` takes a shallow immutable copy of a non-null Java list, then passes that sequence to +the virtual legacy setter. It preserves order, duplicates, null entries and object identities. Editing the original +list later does not alter the stored sequence; parts themselves are not copied. + +The setter performs storage assignment only. It does not bind parts, rebuild slot/inventory/render caches, update +ticking, validate parts or notify anything. Existing legacy setter overrides can customize that behavior. Use it only +where a reconstruction flow specifically needs to stage stored state before its separate loading/binding step. + +A null list preserves the legacy unset-state sentinel. The generated client render-cache code handles that sentinel; +most ordinary part queries do not. Use an empty list for ordinary empty storage. The old Scala setter still retains +the exact supplied sequence, including mutable aliasing; the new Java setter deliberately copies a non-null list. + +Both operations appear in the [compiling Java example](../../src/test/java/codechicken/multipart/examples/PartLoadingExample.java). +Its staging method illustrates assignment only, not a complete tile-promotion procedure. + +## Overrides and reflection + +Dispatch is `setPartList(List)` → virtual `partList_$eq(Seq)` and `loadPartList(Collection)` → virtual +`loadParts(scala.collection.Iterable)`. Internal reconstruction and storage writes continue using the legacy hooks. +Keep existing overrides there; overriding just the new Java sibling does not intercept all internal calls. + +GuideNH calls the Scala loader directly; older releases select it with assignability-based reflection. +Schematica's exact `loadParts(scala.collection.Iterable)` lookup also remains valid. Java reflection can now request +`getMethod("setPartList", List.class)` or `getMethod("loadPartList", Collection.class)`. Select by parameter type, not +by the first method with the right name. + +The Java loader has a distinct name deliberately: the initially planned `loadParts(Collection)` overload made +`javac --release 8` require `scala.collection.Iterable` during overload resolution even with a Java list argument. +`loadPartList` lets the example compile without Scala on the consumer compile classpath, while retaining the legacy +hook and its name. This changes the planned Java name, not any existing entry point. + +For an older GuideNH-compatible path, use a Java list of the promoted client parts, retain its existing world/position setup, +replace the raw setter with `setPartList`, and call the Collection loader. Preserve its following `notifyTileChange` +and `markRender` steps. Current GuideNH no longer uses the raw setter or reflection, but still needs to migrate its +Scala parts and companion generator to the [static Java replacement](COMPOSITE_GENERATION.md). +Schematica can select the Collection loader and pass its existing Java list directly. +New versions of both integrations should use the [client preview helper](CLIENT_PREVIEW.md). diff --git a/docs/api/PART_REGISTRATION.md b/docs/api/PART_REGISTRATION.md new file mode 100644 index 0000000..15be335 --- /dev/null +++ b/docs/api/PART_REGISTRATION.md @@ -0,0 +1,80 @@ +# Registering part factories from Java + +[API index](../API.md) + +Use `MultiPartRegistry.registerPartFactory(IPartFactory2, String...)`. It delegates to the existing registry and +avoids the Scala types in the `registerParts` overload family. + +To inspect a registered factory without constructing a part, see [factory lookup](FACTORY_LOOKUP.md), including +Schematica's replacement for private registry-map reflection. + +## Example and timing + +The [complete compiling example](../../src/functionalTest/java/codechicken/multipart/examples/PartRegistrationExample.java) +implements both required `IPartFactory2.createPart` methods, opts into saved-NBT client previews, and registers one +persistent type: + +```java +MultiPartRegistry.registerPartFactory(new PartRegistrationExample(), PartRegistrationExample.PART_TYPE); +``` + +Call from your mod's common `preInit` or `init` handler on both sides, before FMP closes registration in `postInit`. +FML must have an active mod container; that container becomes the owner returned by `getModContainer(type)`. +Registration stores the factory without constructing, loading, binding or placing a part. + +The example creates fresh, unbound instances whose `getType()` returns `yourmod:part`. Replace that sample ID and part +implementation with your own. Geometry, rendering and gameplay callbacks belong to the real part. Preserve already +published IDs exactly when migrating; adding a namespace to an existing ID changes its save/network identity. +Both single IDs and arrays are accepted. Multiple names can share a factory that selects the part class by name. + +## Factory and payload ownership + +`IPartFactory2` has two abstract methods, so it is not a single-method lambda interface. Its third method is an +optional default: + +| Construction path | Factory input | What happens next | +| --- | --- | --- | +| Server/NBT | `createPart(String, NBTTagCompound)` receives the original tag object | Normal reconstruction calls `part.load` with that same tag | +| Client/description | `createPart(String, MCDataInput)` receives the original input, after the registry ID | Normal reconstruction calls `part.readDesc` with that same input at its current cursor | +| Client preview/NBT | `createPartForClientPreview(String, NBTTagCompound)` receives the original tag object | [Preview reconstruction](CLIENT_PREVIEW.md) calls `part.load` with that same tag; the default returns null | + +A factory may inspect NBT or consume a packet discriminator to choose a class. There is no packet copy or rewind; +coordinate any consumed prefix with the part's `writeDesc` and `readDesc` protocol. FMP's microblock factory consumes +the material ID this way. Do not call `load` or `readDesc` in the factory merely to initialize the remaining payload, +because normal reconstruction calls them afterward. Return a fresh, unbound part for every supported name. + +Direct `MultiPartRegistry.loadPart` and `readPart` calls only construct the part; their caller remains responsible for +the following payload/lifecycle work. The deprecated `createPart(name, boolean)` passes a null NBT or packet argument; +factories reached through that old path must tolerate it. Neither registration entry adds eager factory validation. + +## Ordering and failures + +IDs are processed in array order. The array itself is not retained, so changing it afterward does not rename registered +parts. The factory object is retained. A duplicate ID throws immediately, leaving any earlier IDs from that call +registered and skipping the suffix. Registration is not transactional; fix duplicate IDs rather than retrying the +whole batch. Later server ID-map setup sorts registered names; registration order is not a stable network numeric ID. + +The new entry preserves the old Java array entry's failure order: a closed registry fails first, then the registry +enters its registering state and checks FML's active container, then it reads the array. Empty arrays still perform +the state/container checks; a null array fails after them. Supply a non-null factory and valid, unique non-null names; +the legacy implementation does not eagerly validate those values. Iterator conversion in the retained Scala sequence +entry still occurs before these checks, so malformed Scala inputs can fail earlier. + +Factory exceptions propagate when constructing parts, not during registration. A registration call does not probe +factory results or promise that a later NBT/packet will be accepted. + +## Migrating old callers + +- `IPartFactory2` callers: retain the factory and IDs, then call `registerPartFactory`. ProjectRed can keep its existing + server/NBT and client/packet methods. Override `createPartForClientPreview` only when saved NBT can select a fresh + client variant. Scala code can pass a `String[]`/`Array[String]` as Java varargs using `: _*`. +- `IPartFactory` or Scala `(String, Boolean) => TMultiPart` callers: implement `IPartFactory2`; route the NBT method to + the old constructor with `false` and the packet method with `true`. Keep any side-specific class selection. A factory + that ignores the old Boolean, such as ForgeRelocationFMP's frame factory, can construct the same part class in both. +- Keep [converter registration](BLOCK_CONVERTERS.md) and trait registration separate. This change neither replaces `registerConverter` nor + completes ProjectRed's external microblock trait migration or Schematica's private registry-map migration. + +All eight old static/companion registration descriptors remain. Both `IPartFactory2` sequence entries are now +deprecated; the older Boolean/function entries were already deprecated and now point to the supported replacement. +The old Java array entries remain callable too. Prefer the new name for consumer Java source: the old overload family +requires `scala.collection.Seq` and `scala.Function2` on the compile classpath even for Java factory/string inputs. diff --git a/docs/api/PART_TRAVERSAL.md b/docs/api/PART_TRAVERSAL.md new file mode 100644 index 0000000..d2e946b --- /dev/null +++ b/docs/api/PART_TRAVERSAL.md @@ -0,0 +1,95 @@ +# Reading and visiting multipart parts from Java + +[API index](../API.md) + +Use `TileMultipart.jPartList()` for ordered collection access, and `forEachPart(Consumer)` for callbacks +that skip detached parts. Both methods work on generated tiles. + +## Examples + +Read all part types in list order: + +```java +public static List partTypes(TileMultipart tile) { + List types = new ArrayList<>(); + for (TMultiPart part : tile.jPartList()) { + types.add(part.getType()); + } + return types; +} +``` + +To visit only parts that are still bound to this tile: + +```java +public static List boundPartTypes(TileMultipart tile) { + List types = new ArrayList<>(); + tile.forEachPart(part -> types.add(part.getType())); + return types; +} +``` + +See the [complete Java example](../../src/test/java/codechicken/multipart/examples/PartTraversalExample.java). The +returned name lists are independent copies. + +## Collection ownership and ordering + +`jPartList()` wraps the sequence returned by the virtual `partList()` getter at that call. It preserves every entry, +its index and its object identity, including detached parts. Use it for indexing, searches, serialization and ordinary +iteration. It does not require parts to have joined a world. + +Normal FMP additions/removals replace an immutable sequence. A previously returned Java list keeps the old sequence; +call `jPartList()` again for the tile's new contents. A legacy setter or getter override can instead supply a mutable +sequence, in which case mutations of that sequence remain visible through its Java view. Therefore the method does +not promise either an independent snapshot or an unmodifiable list for every implementation. + +Treat the view as read-only. Editing it, even when the backing sequence permits it, does not perform part binding, +slot updates, notifications or synchronization. Use `TileMultipart.addPart(world, pos, part)` and `tile.remPart(part)` +for normal world changes, retaining their returned tile because adding/removing capabilities can replace the tile +instance. To capture independent list storage, use `new ArrayList<>(tile.jPartList())`; the part objects remain shared. + +## Callback behavior + +Use the game thread. The default `forEachPart` traversal has the same behavior as the legacy `operate` hook: + +- Capture the current sequence once and visit it in order. Normal additions during a callback publish a new sequence, + so the current traversal does not visit the added parts. +- Check `part.tile() == this` immediately before each callback. Parts detached or rebound to another tile are skipped, + including when an earlier callback replaces the tile and transfers its parts. +- A nested traversal captures the sequence anew and can observe the updated list. Each call has its own traversal state. +- Propagate the original callback exception immediately and stop that traversal. Side effects already performed remain. +- Preserve the iterator behavior of legacy mutable sequences. Do not structurally mutate such a sequence during traversal. +- Pass a non-null callback. For compatibility, there is no eager null check: with the default hook, null throws + `NullPointerException` only when a part still bound to this tile reaches the callback. Empty sequences or sequences + containing only detached/transferred parts invoke nothing. + +`tile.jPartList().forEach(action)` visits every entry, including detached parts. It is not equivalent to +`tile.forEachPart(action)`. Preserve the consumer's original filtering and callback behavior when migrating. + +## Overrides and legacy entry points + +The dispatch paths are `jPartList()` → virtual `partList()`, and `forEachPart(consumer)` → virtual `operate(adapter)`. +The existing Java adapter and traversal implementation are shared; the legacy methods keep their descriptors and +bodies. Both legacy methods are deprecated for callers, with replacements named in their Javadocs. + +Existing getter and `operate` overrides remain supported and can customize these behaviors. Lifecycle callbacks still +call `operate` directly. Overriding `forEachPart` intercepts calls to that convenience method only; it does not intercept +ticks, chunk callbacks or other lifecycle dispatch. Keep a legacy `operate` override in place if it supplies that hook. +No replacement lifecycle override contract is introduced by this addition. + +## Consumer migration + +| Existing use | Java replacement | +| --- | --- | +| `partList().size()` / `isEmpty()` / `indexOf(part)` | The corresponding `jPartList()` list method | +| Scala sequence indexing (`partList().apply(index)` or `tile.partList(index)`) | `tile.jPartList().get(index)` | +| Scala iterator for reading/searching every part | Enhanced `for` loop over `tile.jPartList()` | +| `operate(scalaFunction)` callback | `forEachPart(javaConsumer)`; preserve any existing hook overrides | + +AE2's placement helper and Extra Utilities' renderer loops can use `jPartList()` without adding detached-part filtering. +ProjectRed's illumination calculations and packet/render indices, and OpenComputers' cable/print/network searches, +must retain their original order, filters and aggregation. Those mods can remain Scala internally while calling Java +collection methods. Existing Java consumers already using `jPartList()` need no rename. + +GuideNH already uses `jPartList()` for material export and statistics. Its preview reconstruction and AE2 bridge +still use Scala `partList`; those move to the [client preview helper](CLIENT_PREVIEW.md). diff --git a/docs/api/RENDER_ID.md b/docs/api/RENDER_ID.md new file mode 100644 index 0000000..d1357d6 --- /dev/null +++ b/docs/api/RENDER_ID.md @@ -0,0 +1,31 @@ +# Multipart render ID + +[API index](../API.md) + +`TileMultipart.getRenderID()` and `setRenderID(int)` expose FMP's existing global block-render registration ID. + +```java +int renderType = TileMultipart.getRenderID(); +``` + +See the [compiling example](../../src/test/java/codechicken/multipart/examples/RenderIdExample.java). Reading the ID does not initialize a client renderer, allocate an ID or access a tile. + +## Meaning and lifecycle + +The initial value is `-1`. FMP's client renderer obtains an ID from Forge's `RenderingRegistry` when the renderer +singleton is first initialized, normally from client postInit. `BlockMultipart.getRenderType()` and the renderer's +`getRenderId()` read that same shared value. The dedicated server normally retains `-1`. + +This is not a per-tile setting, a part type ID, a microblock material ID or a persistent identifier. Read the value +after normal client initialization when comparing render types; do not cache `-1` as the eventual client ID. + +The setter is for controlled render setup. It only assigns the existing field, accepting every `int` unchanged, +including negative values. It does not reserve an ID, register a handler, update Forge's mapping, synchronize clients +or rebuild rendering. FMP's later renderer initialization still performs its own assignment. Ordinary integrations +should read the value and leave registration to FMP. Make any intentional setup changes on the initialization/game +thread; there is no new synchronization guarantee. + +## Legacy compatibility + +The old static and companion `renderID()` / `renderID_$eq(int)` methods remain with unchanged descriptors and bodies, +and are deprecated in favor of the Java names. All readers and writers share the original storage. diff --git a/docs/api/SAW_STRENGTH.md b/docs/api/SAW_STRENGTH.md new file mode 100644 index 0000000..63620e2 --- /dev/null +++ b/docs/api/SAW_STRENGTH.md @@ -0,0 +1,53 @@ +# Saw cutting strength + +[Java API index](../API.md) + +`ItemSaw.setHarvestLevel(int)` changes an existing FMP saw's cutting strength without reflection. The value is read +by `harvestLevel()`, `getCuttingStrength(ItemStack)` and `getMaxCuttingStrength()`, so recipes and FMP's 3D saw +renderer observe the same updated tier. + +IguanaTweaksTConstruct can replace its private-field lookup and write with direct calls: + +```java +ItemSaw saw = (ItemSaw) item; +int oldStrength = saw.harvestLevel(); +int updatedStrength = HarvestLevelTweaks.getUpdatedHarvestLevel(oldStrength); +saw.setHarvestLevel(updatedStrength); +``` + +The [compiling example](../../src/test/java/codechicken/microblock/examples/SawStrengthExample.java) contains the +setter call. + +Iguana's client proxy also reads the three built-in saws and the renderer mode through `MicroblockProxy$.MODULE$`. +The Java facade exposes the same state directly: + +```java +Item stoneSaw = MicroblockProxy.sawStone(); +Item ironSaw = MicroblockProxy.sawIron(); +Item diamondSaw = MicroblockProxy.sawDiamond(); +if (!MicroblockProxy.useSawIcons()) { + // Register the existing 3D saw renderers. +} +``` + +Keep the companion access only for already released binaries; rebuilt Java consumers should use the static facade. + +## State and lifecycle + +The setter changes only cutting strength. It does not recalculate the saw's durability or alter existing item-stack +damage. This matches Iguana's current post-construction field mutation. The integer is intentionally unrestricted, +like the constructor and legacy field; the consumer owns its tier mapping. + +FMP calculates `MicroMaterialRegistry.getMaxCuttingStrength()` once during ForgeMicroblock post-initialization. +Startup integrations that add or relevel saws must finish first so the cached maximum sees the final tiers. Iguana's +optional ordering should therefore include `before:ForgeMicroblock` while retaining its existing FMP presence gate. +Call the setter on the main initialization thread, before recipes can be used. + +The method is specific to `ItemSaw`. Other `Saw` implementations may derive strength from each `ItemStack` and do +not promise mutable global strength. + +## Legacy compatibility + +The private `harvestLevel: int` field remains in place for existing Iguana releases. It is mutable so the supported +setter and legacy reflection update the same storage. New integrations should use the public getter and setter and +should not catch and ignore API failures. diff --git a/docs/api/TILE_CONVERSION.md b/docs/api/TILE_CONVERSION.md new file mode 100644 index 0000000..bfc0ed5 --- /dev/null +++ b/docs/api/TILE_CONVERSION.md @@ -0,0 +1,57 @@ +# Tile lookup and conversion results + +[Java API index](../API.md) + +`TileMultipart.getOrConvertTileResult(World, BlockCoord)` returns a `TileConversionResult` with `getTile()` and +`isConverted()` accessors. + +```java +TileConversionResult result = TileMultipart.getOrConvertTileResult(world, pos); +TileMultipart tile = result.getTile(); // May be null. +boolean placeholder = result.isConverted(); +``` + +The [compiling example](../../src/functionalTest/java/codechicken/multipart/examples/TileConversionExample.java) selects a +converted placeholder for inspection. + +## Outcomes and ownership + +| World state | `getTile()` | `isConverted()` | +| --- | --- | --- | +| A multipart tile already exists | That exact tile | `false` | +| A registered converter accepts the block | A fresh generated placeholder with its converted part bound | `true` | +| No multipart tile and no successful conversion | `null` | `false` | + +An unrelated tile entity does not count as a multipart tile. Converters still get a chance to handle its block. +The existing-tile path returns before querying the block or converters. Conversion follows the existing registry +dispatch and uses the world's client/server side when generating the tile. + +The result is an immutable record of one lookup; the referenced tile and its parts remain mutable. There is no +snapshot of tile contents, ownership transfer, synchronization or automatic update when the world later changes. + +To implement conversion, see [block converter registration and lifecycle](BLOCK_CONVERTERS.md). + +## Placeholder lifecycle + +A converted placeholder has world and position assigned and its converted part bound. FMP has not replaced the +original block or installed the tile in the world. This lookup does not invoke the part's `onAdded` or `onConverted` +callbacks. Repeating it can create another tile and part; do not rely on identity across conversion queries. + +Converters and binding hooks execute normally and can have side effects or throw. This is not a pure query or a +placement permission check. Call it on the appropriate world thread after FMP initialization. Converter failures +propagate without a new fallback or rollback guarantee. + +For ordinary placement, use `canPlacePart(world, pos, part)` and then `addPart(world, pos, part)`, retaining the tile +returned by the addition. Addition performs conversion again and handles installation, callbacks and generated tile +replacement. Do not manually install the earlier placeholder, and do not treat it as a reservation of that location. + +Use `getTile(world, pos)` to find only an existing multipart tile. The existing `getOrConvertTile(world, pos)` remains +supported when only the tile is needed; it has the same placeholder caveat and does not need migration. + +## Legacy compatibility + +Both static and companion `getOrConvertTile2(World, BlockCoord)` tuple entries remain, with unchanged descriptors and +bodies, deprecated in favor of the named Java result. The new method delegates to that existing path. +`MicroblockPlacement.gtile()` remains a separate Scala-shaped accessor. + +AE2, Chisel, OpenComputers and Extra Utilities already use the tile-only method and need no change for this contract. diff --git a/docs/api/TILE_TRAIT_ACCESS.md b/docs/api/TILE_TRAIT_ACCESS.md new file mode 100644 index 0000000..7389df6 --- /dev/null +++ b/docs/api/TILE_TRAIT_ACCESS.md @@ -0,0 +1,140 @@ +# Calling generated tile capabilities from Java + +[API index](../API.md) · [Composite generation](COMPOSITE_GENERATION.md) + +Call generated tiles through `TileMultipart` or a stable public capability interface. Several dev-jar classes under +`scalatraits`, and `TileMultipartClient`, are raw inputs to FMP's transformer: Forge changes them into interfaces +before generating a concrete tile. A Java signature that compiles against those classes can still fail at runtime. + +## Why raw trait calls fail + +These consumer expressions compile against the current dev jar but are unsafe: + +```java +((TRedstoneTile) tile).openConnections(side); // javac emits invokevirtual for a class +((TSlottedTile) tile).v_partMap; // javac emits getfield +``` + +At runtime `TRedstoneTile` is an interface, so the first call throws `IncompatibleClassChangeError`. `TSlottedTile` +has generated accessor methods instead of that field, so the second throws `NoSuchFieldError`. A cast or an +`instanceof` check alone can still succeed; that does not make subsequent class-method/field bytecode valid. +Merely adding Scala to the compile classpath does not turn these raw Java classes into interface stubs. + +Already compiled consumers using the original interface/accessor descriptors remain supported. Recompiling source +against the raw Java port is a separate gate. Do not instantiate or subclass raw trait inputs in consumer code, or +call their generated `$class` helpers as a new integration strategy. Reflection is not the migration target. + +## Stable entry points + +| Need | Compile against | Contract | +| --- | --- | --- | +| Parts, slot reads, placement, lifecycle | `TileMultipart` | `jPartList()`, `partMap(slot)`, placement and documented notifications dispatch through generated overrides | +| Open redstone geometry | `IRedstoneTile` | `openConnections(side)`; capability is present when the tile hosts a redstone part | +| Offered redstone connections or masked power | `IRedstoneConnector` | `getConnectionMask(side)`, `weakPowerLevel(side, mask)`; also used by non-FMP connectors | +| Ordinary tile power queries | `TileMultipart` | `strongPowerLevel(side)`, `weakPowerLevel(side)`; preserve each method's side convention | +| Inventory or sided inventory | Minecraft `IInventory` / `ISidedInventory` | Use the interface implemented by the tile, rather than raw `JInventoryTile` or its internal caches | +| Inventory slots after a part's size changes | `TileMultipart` | `refreshInventorySlots()`; see [refreshing inventory slots](#refreshing-inventory-slots) | +| Fluid operations | Forge `IFluidHandler` | Use the interface rather than raw `TFluidHandlerTile` or `tankList` | +| A consumer-owned pass-through capability | The original ordinary Java interface | Register with `MultipartGenerator.registerPassThroughInterface`; generated calls forward to the implementing part | + +Test the capability when it is optional. Keep using the tile returned by placement/removal because adding or removing +capabilities can replace the tile instance. These interfaces do not give a snapshot, reserve a tile, or add thread +safety. Apply the owning method's lifecycle and side rules. Client-only rendering calls remain client-only even when +a stable base method exists. + +## Compiling redstone example + +[TileTraitAccessExample.java](../../src/functionalTest/java/codechicken/multipart/examples/TileTraitAccessExample.java) +uses only `TileMultipart` and `IRedstoneTile` and compiles as Java 8 without Scala on the classpath: + +```java +boolean open = TileTraitAccessExample.hasOpenConnection(tile, side, mask); +``` + +The example returns false for a null tile or absent capability. Its caller supplies a Minecraft side in 0..5 and +a mask using bits 0..3 for rotations around that side and bit 4 for the center. `openConnections` describes openings +after face/edge obstruction; `getConnectionMask` describes the connections offered by contained parts. They are not +interchangeable. The API does not validate the side or add a cache. + +ProjectRed's `transmission/redwires.scala` already knows its tile supports redstone. Its migration can change only +the cast type, preserving the surrounding mask and rotation calculation: + +```scala +tile.asInstanceOf[IRedstoneTile].openConnections(absDir) +``` + +That emits an interface call with the stable owner. ProjectRed can remain Scala internally. + +## Refreshing a changed slot mask + +Use `TileMultipart.refreshPartSlots(part)` after an already stored part validates and applies a new +`TSlottedPart.getSlotMask()`. It provides the Java replacement for OpenComputers' direct `TSlottedTile.v_partMap` +mutation: + +```java +tile.refreshPartSlots(this); +tile.notifyPartChange(this); +sendDescUpdate(); +``` + +The [compiling example](../../src/functionalTest/java/codechicken/multipart/examples/TileTraitAccessExample.java) keeps +the cache operation itself separate because validation, state changes and notification policy belong to the part: + +```java +TileTraitAccessExample.refreshSlots(tile, part); +``` + +On a generated slotted tile, FMP scans the live slot array in index order, clears every entry for which +`Objects.equals(stored, part)` is true, then dispatches the existing virtual `bindPart(part)` once. This preserves +Scala `==` behavior, including distinct equal objects. It reads the array directly, matching the old consumer rather +than a possible `partMap` override. Unrelated slots, part-list storage and tile ownership stay unchanged. The current +mask may overwrite a slot if the caller skipped its normal replacement/occlusion check. + +A tile without the slotted capability does nothing. The method does not check that the part is stored, bound to this +tile or slotted, and it does not validate placement, send notifications, mark dirty/render state or schedule updates. +Call it on the owning world thread only after the new shape passes the consumer's existing `canReplacePart` logic. +Keep the tile/part's existing notification, sound, packet and scheduling sequence afterward. + +`bindPart` dispatches through every generated cache trait, so those hooks still run once. As before, some non-slot +caches append on bind and are not generally idempotent. This API matches OpenComputers' print part, whose additional +capabilities do not append such caches; it is not a general refresh for inventory/fluid capability changes (see +[refreshing inventory slots](#refreshing-inventory-slots)). A whole +`loadPartList` reconstruction would run broader cache, binding and notification behavior and is not equivalent. + +## Refreshing inventory slots + +A tile holding `IInventory` parts exposes one flattened inventory: each part's slots in part order. FMP caches that +mapping and rebuilds it when inventory parts are added, removed, loaded or copied. When a stored part changes its +own `getSizeInventory()`, call `TileMultipart.refreshInventorySlots()`. It replaces AE2's direct +`TIInventoryTile.rebuildSlotMap()` call and drops the `instanceof` check, because tiles without inventory parts do +nothing: + +```java +tile.refreshInventorySlots(); +notifyNeighbors(); +``` + +The [compiling example](../../src/functionalTest/java/codechicken/multipart/examples/TileTraitAccessExample.java) +wraps the same call: + +```java +TileTraitAccessExample.refreshInventory(tile); +``` + +It only recomputes the mapping from the inventories already tracked. It does not add or remove inventories, call +`bindPart`, touch other trait caches, move items, mark the tile dirty or notify neighbors. Keep the caller's existing +notifications afterward and call it on the owning world thread. Do not use `refreshPartSlots` for this: its +`bindPart` dispatch would track the inventory part a second time. + +The old `TIInventoryTile.rebuildSlotMap()` call stays supported for released AE2 jars, and both calls do the same +rebuild. + +## Custom generated tiles + +For custom generated tiles, keep consumer-callable methods on an ordinary Java capability interface and use the +stable base for existing tile hooks. The [custom tile-trait guide](CUSTOM_TILE_TRAITS.md) provides the complete +registration, helper, state/lifecycle and access pattern. Pass-through registration remains the smaller choice when +a tile should only forward one interface to one implementing part. + +[RawTileTraitCalls.java](../../src/functionalTest/java/codechicken/multipart/test/RawTileTraitCalls.java) keeps the two +unsafe caller shapes above as compiled fixtures, so the linkage failures they produce stay reproducible. diff --git a/docs/migration/COMPATIBILITY.md b/docs/migration/COMPATIBILITY.md new file mode 100644 index 0000000..f6ebec1 --- /dev/null +++ b/docs/migration/COMPATIBILITY.md @@ -0,0 +1,905 @@ +# Downstream compatibility: ABI inventory and consumer audit + +Status: installed-jar and source refresh 2026-10-16 against GTNH `2.9.0-RC-2`; older dated snapshots are kept +below as history. Read this before changing any compatibility surface. It has two parts, answering two different +questions. + +- **Part 1, the ABI inventory**, answers "what must still link?" It is a constant-pool scan of every mod jar in a + real pack, not a source search. +- **Part 2, the consumer audit**, answers the harder question: "what behavior do real consumers expect after they + have linked?" It covered all 27 ForgeMultipart consumers in the supplied GTNH daily `2026-08-25+700` instance, plus + UtilitiesInExcess as the planned Extra Utilities replacement. The `2.9.0-RC-2` refresh adds ThaumicEnergistics + as a 28th installed consumer and GT5U's new ProjectRed wire recoloring path. + +Intentional differences from the reference belong in the [divergence ledger](DIVERGENCES.md), and the +consumer-facing summary of what breaks on rebuild is in the [release notes](../RELEASE_NOTES.md). + +# Part 1 - Downstream ABI inventory + +Method: constant-pool scan of every mod jar in a real pack, not a source search. Bytecode is the only oracle that +covers reflection strings, closed-source consumers, and mods whose published source does not match their release jar. +GitHub code search was deliberately not used; it indexes default branches only and silently omits results. + +Scanned: GTNH `2.9.0-RC-2`, 240 mod jars (`ForgeMultipart-1.7.16.jar` itself excluded). Reproduce with +`tools/AbiScan.java`; frozen baselines in `src/test/fixtures/abi/gtnh-2.9.0-rc2-consumers.txt` (current) and +`gtnh-daily-678-consumers.txt` (original `2026-08-14+678` inventory). + +``` +java tools/AbiScan.java /.minecraft/mods ForgeMultipart +``` + +Requires a JDK 17+ single-file source launch. Re-run after public-API changes and diff against the frozen baseline; +any member that disappears from the port but appears in the baseline is a linkage break in a shipping mod. + +The RC-2 scan was resolved against this branch's compiled classes: every inherited type, other type and member +resolves to a non-private declaration, or to an inherited Minecraft member. The one static exception is +`scalatraits.TSlottedTile.v_partMap()`, a runtime-generated trait accessor covered by `ForgeEnvironmentSmokeTest`. + +## Totals + +| Category | `+678` | `2.9.0-RC-2` | +| --- | ---: | ---: | +| Consumer jars | 27 of 240 | 28 of 240 | +| Types extended or implemented downstream | 35 | 35 | +| Referenced members with exact descriptors | 255 | 268 | +| Other referenced types | 76 | 80 | +| Reflective string constants | 20 | 9 | + +Every `+678` member, inherited-type and other-type row is still present. The changes are: + +- **GuideNH `1.3.41`** replaced its 17-string reflection with 28 direct member references, most already linked by other consumers, including + `MultipartGenerator$.generateCompositeTile(TileEntity, scala.collection.Iterable, boolean)`, + `TileMultipart.loadParts(scala.collection.Iterable)`, `MicroblockGenerator$.create` and `Microblock.shape_$eq(B)`. + This matches the [source findings](#guidenh); the reflective contracts remain for older GuideNH jars. +- **GT5U `5.09.54.205`** gained a ProjectRed wire recoloring path: `BlockMultipart.reduceMOP(MovingObjectPosition): + scala.Tuple2`, `TileMultipart.partMap(int)`, `TSlottedPart.getSlotMask()` and `TMultiPart.getType()`. +- **AE2 `rv3-beta-1080`** links `JCuboidPart.bind(TileMultipart)`, the `super.bind` call from its host-refresh fix. +- **ThaumicEnergistics `1.7.64-GTNH`** is a new consumer through one `Class.forName` string. + +## Consumers by weight + +Ranked by number of classes in the jar that touch `codechicken/multipart` or `codechicken/microblock`. + +| Classes | Jar | +| ---: | --- | +| 142 | ProjRed-4.12.47-GTNH | +| 38 | extrautilities-1.2.12 | +| 19 | OpenComputers-1.12.64-GTNH | +| 18 | ProjectBlue-1.2.11-GTNH | +| 7 | appliedenergistics2-rv3-beta-1080-GTNH | +| 7 | buildcraft-compat-7.1.22 | +| 5 | ForgeRelocationFMP-0.2.0, gregtech-5.09.54.205 | +| 4 | Galacticraft-3.4.34-GTNH, ThaumicTinkerer-2.12.33, WR-CBE-1.7.12, chisel-2.17.34-GTNH | +| 3 | IguanaTweaksTConstruct-2.7.12, WitchingGadgets-1.8.51-GTNH, guidenh-1.3.41 | +| 2 | BloodArsenal-1.5.12, Botania-1.13.37-GTNH, Waila-1.19.34, matter-manipulator-0.1.61-GTNH | +| 1 | BiomesOPlenty, BloodMagic-1.9.14, Natura-2.8.24, Schematica-1.12.6-GTNH, TConstruct-1.14.118-GTNH, ae2fc-1.5.113-gtnh, endercore-0.5.15, etfuturum-2.6.60-GTNH, thaumicenergistics-1.7.64-GTNH | + +Two distinct consumer shapes: + +- **Java consumers** (extrautilities, AE2, chisel, WitchingGadgets, ThaumicTinkerer, buildcraft-compat, gregtech, + matter-manipulator, and the long tail) use the Java-facing API: `MultiPartRegistry.registerParts(IPartFactory, String[])`, + `registerConverter`, `BlockMicroMaterial`, `MicroMaterialRegistry.registerMaterial`, `TileMultipart.jPartList()`, + `addPart`, `remPart`, `canAddPart`. None of these need Scala. +- **Scala consumers** (ProjRed, OpenComputers, ProjectBlue, ForgeRelocationFMP) mix in ForgeMultipart traits and call + the generated `$class` static helpers directly. These are the constraint on Scala removal. + +## Load-bearing Scala surface + +Everything in this section must keep its exact descriptor, or a named consumer fails to link. + +### Trait `$class` helpers (8 classes, 16 static methods) + +| Helper | Methods used | Consumers | +| --- | --- | --- | +| `TCuboidPart$class` | `$init$`, `drawBreaking`, `getCollisionBoxes`, `getSubParts` | ForgeRelocationFMP, OpenComputers, ProjRed, ProjectBlue | +| `TIconHitEffects$class` | `$init$`, `addDestroyEffects`, `addHitEffects` | ForgeRelocationFMP, OpenComputers, ProjRed | +| `TNormalOcclusion$class` | `$init$`, `occlusionTest` | ForgeRelocationFMP, OpenComputers, ProjRed | +| `JIconHitEffects$class` | `$init$`, `getBreakingIcon` | ForgeRelocationFMP, OpenComputers, ProjRed | +| `TFacePart$class` | `$init$`, `solid`, `redstoneConductionMap` | OpenComputers, ProjRed, ProjectBlue | +| `TItemMultiPart$class` | `$init$`, `getHitDepth`, `onItemUse` | ProjRed | +| `Saw$class` | `$init$`, `getMaxCuttingStrength` | ProjRed | +| `TEdgePart$class` | `$init$` | OpenComputers | + +`JPartialOcclusion$class` is not retained: it has **no** downstream caller in the pack. The two consumers that +touch `JPartialOcclusion` (ForgeRelocationFMP, WitchingGadgets) only call +`getPartialOcclusionBoxes()Ljava/lang/Iterable;`, which remains. The eight helpers above are the ones that matter. + +### Companion object singletons (17 `MODULE$` fields read downstream) + +`MultiPartRegistry$`, `TileMultipart$`, `MultipartGenerator$`, `NormalOcclusionTest$`, `RedstoneInteractions$`, +`MicroMaterialRegistry$`, `MicroblockGenerator$`, `MicroblockRender$`, `BlockMicroMaterial$`, `ItemMicroPart$`, +`CornerMicroClass$`, `EdgeMicroClass$`, `FaceMicroClass$`, `HollowMicroClass$`, +`handler/MultipartProxy$`, `handler/MultipartSaveLoad$`, `handler/MicroblockProxy$`. + +Each must keep a public static `MODULE$` field of its own type plus the instance methods used on it. + +### Members with Scala types in their descriptors (8 total) + +| Descriptor | Consumers | +| --- | --- | +| `TileMultipart.partList()Lscala/collection/Seq;` | OpenComputers, ProjRed, AE2, extrautilities, guidenh | +| `NormalOcclusionTest$.apply(Lscala/collection/Traversable;Lscala/collection/Traversable;)Z` | ForgeRelocationFMP, OpenComputers | +| `MultiPartRegistry$.registerParts(Lcodechicken/multipart/MultiPartRegistry$IPartFactory2;Lscala/collection/Seq;)V` | ProjRed | +| `MultiPartRegistry$.registerParts(Lscala/Function2;Lscala/collection/Seq;)V` | ForgeRelocationFMP | +| `MicroMaterialRegistry.getIdMap()[Lscala/Tuple2;` | extrautilities | +| `MultipartGenerator$.generateCompositeTile(Lnet/minecraft/tileentity/TileEntity;Lscala/collection/Iterable;Z)Lcodechicken/multipart/TileMultipart;` | guidenh (`2.9.0-RC-2`; previously reflective only) | +| `TileMultipart.loadParts(Lscala/collection/Iterable;)V` | guidenh (`2.9.0-RC-2`; previously reflective only) | +| `BlockMultipart.reduceMOP(Lnet/minecraft/util/MovingObjectPosition;)Lscala/Tuple2;` | gregtech (new in `2.9.0-RC-2`) | + +GT5U reads `reduceMOP`'s `_1()` as the boxed `Integer` part index and ignores `_2()`. The port keeps the exact +static and companion descriptors, and `BlockMultipartCharacterizationTest` pins the boxed index and rebased hit. +`BlockMultipart.hitPartIndex` is the Java replacement for the index; see the [guide](../api/HIT_PART.md) and the +adoption ledger. + +The Scala-typed surface is small. `TileMultipart.jPartList()Ljava/util/List;` is already the more +widely used accessor (ProjectBlue, WitchingGadgets, buildcraft-compat, extrautilities, gregtech, matter-manipulator), +so the Java-first collection API mostly exists already and the Scala overloads are a thin retained shell. + +The port supplies `NormalOcclusionTest.testBoxes(java.lang.Iterable, java.lang.Iterable)` for the box-list +contract. Both old `apply(Traversable, Traversable)` entries remain, with deprecations pointing to the Java entry. +The shipping ForgeRelocationFMP/OpenComputers companion calls still require their exact descriptor until adoption; +see the [migration guide](../api/OCCLUSION.md#box-versus-box-queries) and consumer ledger. + +`MultiPartRegistry.registerPartFactory(IPartFactory2, String...)` now provides the Java registration entry without +Scala overload resolution. Both `registerParts(IPartFactory2, Seq)` entries are deprecated; all eight existing +registration descriptors remain. ProjectRed's sequence and ForgeRelocationFMP's function companion calls still need +their bridges until release/adoption. See the [registration guide](../api/PART_REGISTRATION.md). + +`IDWriter` has **zero** downstream references, so its Scala function accessors were not retained. + +## Reflective consumers + +These fail at runtime, not at link time, so ABI tooling will not catch a break. In `2.9.0-RC-2`, 9 string +constants across: + +- `Schematica-1.12.6-GTNH` - `TileMultipart`, `TMultiPart`, `MultiPartRegistry$`, `MultipartGenerator$`, `MicroblockClass`. +- `Galacticraft-3.4.34-GTNH` - `TileMultipart`, `MicroMaterialRegistry`, `BlockMicroMaterial`. +- `Waila-1.19.34` - `BlockMultipart`. +- `AE2`, `ae2fc`, `thaumicenergistics-1.7.64-GTNH` - `TileMultipart`, loaded with `Class.forName` to register Waila + providers. +- `etfuturum-2.6.60-GTNH` - `codechicken.multipart.minecraft.ButtonPart`. + +`guidenh-1.3.20` in `+678` was the broadest reflective consumer, with 17 strings: `MultipartGenerator`/`MultipartGenerator$`, +`MultipartHelper`/`MultipartHelper$`, `MultipartRenderer`/`MultipartRenderer$`, `TileMultipart`, +`TileMultipartClient`, `MicroblockClient`, `Microblock`, `MicroblockClass`, `MicroblockGenerator$`, +`BlockMicroMaterial`/`BlockMicroMaterial$`, `MicroMaterialRegistry`/`MicroMaterialRegistry$`, `BlockMultipart`. +`guidenh-1.3.41` in RC-2 has none; it links the same members directly. + +Note that both the class and its `$` companion are named in several cases, so renaming or removing a companion +object breaks these even where no bytecode reference exists. + +The port offers `MultipartHelper.createPreviewTileFromNBT` to replace Schematica's private registry map, +microblock construction, Scala collection, generator and loader reflection as one all-or-nothing preview operation. +The lower-level `MultiPartRegistry.getPartFactory(String): IPartFactory2` remains available for specialized callers. +Existing private fields, companions and descriptors remain for released consumers until adoption. + +`ButtonPart.setOrientation(int, ForgeDirection): void` now replaces Et Futurum's four reflective array writes and +keeps the two direction maps consistent; [guide](../api/BUTTON_ORIENTATIONS.md). The existing public mutable static +`metaSideMap` and `sideMetaMap` fields retain their exact names, types and modifiers for old releases. Removing or +narrowing them still waits for a migrated Et Futurum release, target-pack adoption and a fresh reflective-source scan. + +`ItemSaw.setHarvestLevel(int): void` now replaces Iguana's private-field write; [guide](../api/SAW_STRENGTH.md). +The existing private `harvestLevel: int` field remains for old releases and shares storage with the setter. It loses +only `ACC_FINAL`, which makes the supported mutation explicit and keeps reflective writes working. Removal still +waits for an Iguana release, target-pack adoption and a fresh scan. + +## Compatibility retention rules + +1. Scala removal follows released-consumer adoption and retirement of internal Scala users. +2. Keep `registerScalaTrait`, ScalaSignature decoding and the external-trait fixtures covering + `MicroblockGenerator.registerTrait`. Third-party Scala traits are not internal-only: ProjRed's + `LightMicroMaterial$` registers `mrtjp.projectred.illumination.LightMicroblock`, a compiled Scala trait with a + `$class` helper, so `ASMMixinFactory.registerTrait` parses its ScalaSignature. Removing that path breaks + ProjRed's illuminated microblocks until a migrated release ships. +3. Preserve the listed 8 `$class` helpers, 17 `MODULE$` singletons and 8 Scala-typed descriptors until their removal + gates pass. Absence from that list alone is not permission to delete a bridge; check source and reflective use too. +4. Verify reflective member lookups separately; constant-pool strings do not establish which members are selected. + +## Historical GuideNH reflective surface, from source + +This section describes older supported releases, not current GuideNH source or the `1.3.41` jar shipped in +`2.9.0-RC-2`. Commit `4a0cd02e` (2026-09-16, included in tags `1.3.33` onward) removed FMP reflection and the +private-material accessor mixin. Current source +still calls the generator companions and Scala collection APIs directly; see the [current findings](#guidenh). +The constraints below remain relevant to old jars until target-pack adoption is verified. + +The constant-pool scan can see the names guidenh reflects on but not the members it looks up. This section is read +from the checked-out source at `6137525`, in +`src/main/java/com/hfstudio/guidenh/integration/forgemultipart/ForgeMultipartHelpers.java`. **None of this is visible +to the ABI diff**; a break here is silent until a user opens a guide page. + +The dispatch helper is `invokeStaticOrSingletonMethod(class, companion, method, args...)`. It tries a **static** method +on the plain class first, and only on `INVOCATION_MISSING` falls back to reading `companion.MODULE$` and invoking the +method on it. So for most entries the companion is a fallback. The exceptions below are the ones that matter. + +| Owner | Member reflected on | Reached via | +| --- | --- | --- | +| `MultipartHelper` | `createTileFromNBT(World, NBTTagCompound)` | static; companion is fallback | +| `MultipartRenderer` | `renderWorldBlock(IBlockAccess, int, int, int, Block, int, RenderBlocks)` | static; companion is fallback | +| `MultipartGenerator` | `generateCompositeTile(TileEntity, scala.collection.Iterable, boolean)` | **companion only for the Scala descriptor**; new static Java-Iterable entry is additive | +| `BlockMicroMaterial` | `register(material)`, plus a constructor of arity 2 `(Block, int)` or 1 `(Block)` | static; companion is fallback | +| `MicroMaterialRegistry` | `getMaterial(int)` | static; companion is fallback | +| `MicroblockGenerator$` | `create(MicroblockClass, int, boolean)` | GuideNH explicitly selects the companion, matched by exact parameter types; static Java replacement exists | +| `TileMultipart` | `partList()`, `partList_$eq(scala.collection.Seq)`, `loadParts(...)`, `notifyTileChange()`, `markRender()` | instance | +| `Microblock` | `microClass()`, `material()`, `shape()` | instance | +| `TMultiPart` | `getDrops()` | instance | +| `BlockMicroMaterial` | `block()`, `meta()` | instance; absent from general `IMicroMaterial` | + +Types used only for `isInstanceOf`: `BlockMultipart`, `TileMultipart`, `TileMultipartClient`, `Microblock`, +`MicroblockClient`, `BlockMicroMaterial`. + +### Three constraints this adds + +1. **`MultipartGenerator$.MODULE$` is load-bearing through reflection.** `generateCompositeTile` is `private[multipart]` + in Scala, so no static forwarder is emitted on `MultipartGenerator` and guidenh's static attempt always misses. It + reaches the method only through the companion. A port that keeps the class but drops the companion, or + promotes the method to a public static and removes it from the companion, breaks guidenh silently. + + The port adds `MultipartGenerator.generateCompositeTile(TileEntity, java.lang.Iterable, boolean)` while + retaining the exact companion Scala descriptor/body. GuideNH's old Scala sequence is not assignable to the new + Java parameter, so its existing matcher still falls back to the companion. Both old and new reflective contracts + are tested; migration requires a Java parts collection. See the [guide](../api/COMPOSITE_GENERATION.md). + +2. **`MicroblockGenerator$.create` is matched by exact parameter types**, including `pts[0].getName()` string-compared + against `"codechicken.microblock.MicroblockClass"`. That pins `create(MicroblockClass, int, boolean)` on the + companion and pins `MicroblockClass`'s fully qualified name. Widening a parameter or renaming the class breaks the + lookup even though every call site still links. + + The existing static `MicroblockGenerator.create(MicroblockClass, int, boolean)` now has a + [guide and compiling example](../api/MICROBLOCK_CREATION.md). Both exact reflective entries are tested; no API + shape or production method body changes were needed. GuideNH must change its explicitly selected owner and receiver + before it stops using the companion. Release/adoption, shape-setter override checks and client previews remain gates. + +3. **`TileMultipart.partList_$eq(scala.collection.Seq)` is reflectively load-bearing.** The port supplies + `setPartList(java.util.List)` and `loadPartList(java.util.Collection)`, while retaining the exact legacy setter and + loader descriptors and override dispatch. Dropping the old setter in favor of the Java method would still break + guidenh invisibly. Exact and assignability-based reflective tests cover both legacy contracts. `resolvePartList` also falls back to a public *field* + named `partList`, which never existed - Scala emits the field private - so that path is dead in the reference too. + +`MultipartHelper$` is retained on the strength of the fallback path alone: the static is found first today, so the +companion is never reached in practice. That is a weaker justification than the two "companion only" entries above, +but the cost of keeping a four-method forwarder is negligible against a silent break. + +GuideNH's private `BlockMicroMaterial.block: Block` and `meta: int` fields remain unchanged for its accessor mixin. +Existing public virtual `block()` / `meta()` now have a [typed query guide](../api/MATERIAL_ACCESS.md) and regression +coverage; no descriptor or method body changed. The mixin reads constructor fields whereas direct calls honor +subclass overrides, as the old reflective fallback already did. Remove the consumer's mixin only when adopting the +typed query; FMP field removal still waits for released-consumer adoption. + + +# Part 2 - Source-level consumer audit + + +## Bottom line + +The Java conversion cannot be treated as a set of independent class translations. Downstream code depends on five +connected contracts: + +1. **The generated composite tile architecture.** Parts cause `TileMultipart` subclasses to acquire Scala traits, + Java traits, and arbitrary pass-through interfaces. AE2, ProjectRed, Extra Utilities, WR-CBE, + WitchingGadgets, ForgeRelocationFMP, and UtilitiesInExcess all exercise this architecture. +2. **Scala-emitted binary shapes.** ProjectRed, OpenComputers, ProjectBlue, and ForgeRelocationFMP call generated + trait `$class` helpers and companion `MODULE$` objects. Java consumers also use Scala-shaped APIs such as + `partList(): scala.collection.Seq` and `getIdMap(): scala.Tuple2[]`. +3. **Multipart state and lifecycle.** Consumers do more than add parts. They inspect `partMap`, mutate/rebuild slot + maps, move the live tile object, call `onMoved`, remove and reload parts, trigger part/tile notifications, and + make deliberate choices about description packets. +4. **World, NBT, and packet formats.** The container `parts` list, each part's `id`, core microblock fields and part + type strings are an interchange format used by builders, schematic tools, movers, HUD mods, and save/load code. + Material numeric IDs and their packet encoding are also shared outside FMP. +5. **Names that are not in ordinary linkage.** Schematica reaches a private Scala-mangled field, Et Futurum mutates + static arrays, older GuideNH releases mix into private fields, Iguana reflects a saw field, and several mods load FMP classes + and companions by string. A clean ABI diff alone will miss these breaks. + +The safest first Java release is therefore **Java-maintainable implementation with the bounded Scala compatibility +shell retained**. Removing the Scala runtime is a separate coordinated migration, not the end of this source port. + +## Coverage and method + +The supplied instance was rescanned with `tools/AbiScan.java` before reading source: + +- scanner visited 241 mod JARs, one of which was excluded as ForgeMultipart itself; +- 27 consumer JARs; +- 35 downstream-extended or implemented FMP types; +- 255 referenced FMP members with exact descriptors; +- 76 other referenced FMP types; +- 20 class-name/reflection strings. + +Those structural totals are unchanged from the frozen `+678` inventory. The consumer versions changed, but no new +binary API family appeared. The compatibility audit covers active consumer binaries, including Extra Utilities, +and the supplied source checkouts. It records required types/members, reflection contracts, factories, converters, +part subclasses, tile access, registry access, NBT, packets, rendering, occlusion, redstone and movement behavior. +Where source checkouts are available, important call sites were traced through the owning code instead of counting imports. + +The 2026-10-16 refresh rescanned GTNH `2.9.0-RC-2` (above) and traced every new or changed row to consumer source. +The new consumer, ThaumicEnergistics, was read at `83c405d0bee3` (`1.7.66-GTNH`). Its only FMP reference +appeared in `1.7.62-GTNH`, and `ModuleWaila.java` is unchanged since the installed `1.7.64-GTNH` tag. + +This gives full coverage of the current pack's known source and binary consumers. It does not claim that an arbitrary +future mod, a runtime-generated script, or an unpublished patched JAR cannot contain another reflective use. The ABI +scanner should remain a release gate for exactly that reason. + +`ForgeRelocation` itself is not the source of `ForgeRelocationFMP`; both repositories are needed and both are now +present. Only the plugin is one of the FMP consumers. + +### Current source references (2026-10-16) + +Diffed every Java/Scala file that references FMP at either end, between the 2026-09-21 heads and the current +heads. Only three consumers changed such files: + +- **GT5U**: `gregtech/api/util/ColoredBlockContainer.java` gained `ProjectRedWireContainer` (details in the + [GT5U row](#narrow-consumers-still-real-contracts)). +- **ProjectRed**: `transmission/redwires.scala` and `bundledwires.scala` add `recolour(int)` to insulated wires and + bundled cables, plus part-update key `11`. It uses only FMP members ProjectRed already linked: `markDirty`, the + part write stream, `notifyPartChange` and `markRender`. This is the target of GT5U's recoloring. +- **ProjectBlue**: `ControlPanelRenderer.java` changed label spacing only; its FMP use is unchanged. + +All other changed checkouts touched no FMP-referencing file. The September note that only GuideNH and AE2 had +changed still holds for that window. Extra Utilities is the unchanged non-Git 1.2.12. No physical-client run was +performed. + +| Checkout | Inspected HEAD | 2026-09-21 HEAD | +| --- | --- | --- | +| AE2FluidCraft-Rework | `c7ec5b0c8b5f` | `6e8dd013bd4e` | +| Applied-Energistics-2-Unofficial | `c690fbc273be` | `fdedc3a8f023` | +| BiomesOPlenty | `fc7f1f6392a1` | same | +| BloodArsenal | `890824be106a` | same | +| BloodMagic | `10a36f6413b8` | `6776676ef209` | +| Botania | `3f62d4b8fe7c` | `c802a448e4f4` | +| BuildCraftCompat | `79e02803be32` | same | +| Chisel | `d08e48b73ba5` | `3d3260cd71b8` | +| EnderCore | `1998218128c7` | same | +| Et-Futurum-Requiem | `1944927eecd1` | `65407a439b57` | +| ForgeRelocation | `21da7aae0e6e` | same | +| ForgeRelocationFMP | `49a810b8c63b` | same | +| Galacticraft | `ff4c5c87ba21` | `fbdc41b97e81` | +| GT5-Unofficial | `1a9469a13228` | `fe3606a12547` | +| GuideNH | `99785342eff2` | `16f142417df1` | +| IguanaTweaksTConstruct | `2bc09889d3e2` | same | +| MatterManipulator | `dbc15f55a031` | `4d9bc003f193` | +| Natura | `4f88c0665928` | same | +| OpenComputers | `1e4559ff5f24` | `a3ac18595179` | +| ProjectBlue | `28abef1385cb` | `c01a5e769643` | +| ProjectRed | `b29f404eaa05` | `e173952e96a4` | +| Schematica | `3b03ee937953` | same | +| ThaumicEnergistics | `83c405d0bee3` | new | +| ThaumicTinkerer | `e4c8acdd4fa9` | same | +| TinkersConstruct | `644373000cdc` | `8f6e2496f792` | +| UtilitiesInExcess | `3e107a1fe9bc` | same | +| waila | `f998f9ebfe09` | same | +| WirelessRedstone-CBE | `9dfb913b4880` | same | +| WitchingGadgets | `adf174f552f9` | `663bad20ac24` | + +## Cross-cutting compatibility map + +| Contract | Consumers that make it load-bearing | What must survive | +| --- | --- | --- | +| Part factory/converter registration | ProjectRed, Extra Utilities, OpenComputers, AE2, BuildCraftCompat, ForgeRelocationFMP, Chisel, ThaumicTinkerer, WR-CBE, WitchingGadgets, ProjectBlue, UtilitiesInExcess | Java `IPartFactory`/`IPartFactory2`, converters, the Scala `Function2` and `Seq` overloads, stable type strings, client/server construction | +| Dynamic composite tiles | ProjectRed, Extra Utilities, AE2, ForgeRelocationFMP, WR-CBE, WitchingGadgets, UtilitiesInExcess; GuideNH and Schematica reconstruct them | Trait-bit selection, generated subclass caching, pass-through interfaces, client/server selection, promotion of an existing tile | +| External Scala trait generation | ProjectRed illuminated microblocks | `MicroblockGenerator.registerTrait`, ScalaSignature decoding, `$class` helper handling, correct trait initialization and dispatch | +| Tile collections and slot state | ProjectRed, Extra Utilities, OpenComputers, AE2, ProjectBlue, GT5U, BuildCraftCompat, WitchingGadgets, MatterManipulator, GuideNH | `partList(): Seq`, `jPartList(): List`, ordering, `partMap(int)`, mutable `TSlottedTile.v_partMap`, `bindPart`, slot-map rebuilds | +| Capability-cache refresh | OpenComputers `PrintPart.toggleState` | Supported `TileMultipart.bindPart` dispatch, caller-cleared old slot entries, no implicit list insertion or part binding | +| Local part-change notification | ProjectRed `RedstoneGatePart.onOutputChange` | Supported `TileMultipart.internalPartChange`, equality filtering and `operate` dispatch; caller retains packet/dirty/external-neighbor policy | +| Placement/removal/replacement | Most custom-part mods | `getTile`/`getOrConvertTile`, `canPlacePart`, `canAddPart`, `canReplacePart`, `addPart`, `remPart`, binding and notifications in their current order | +| Move lifecycle | ForgeRelocationFMP, MatterManipulator | A live `TileMultipart` can be detached/reinserted, coordinates rewritten, then `onMoved`; render, dirty, lighting, and description synchronization remain coherent | +| Occlusion and geometry | ProjectRed, Extra Utilities, OpenComputers, AE2, ForgeRelocationFMP, Chisel, WR-CBE, WitchingGadgets, UtilitiesInExcess | Normal and partial occlusion, collision/subpart boxes, `PartMap` numbering, Java iterable adapters, Scala `Traversable` overload | +| Redstone and connectivity | ProjectRed, Extra Utilities, OpenComputers, ProjectBlue, AE2, WR-CBE | `IRedstonePart` family, `TRedstoneTile`, `RedstoneInteractions`, face/edge/center maps, neighbor and part-change propagation | +| Micro-material registry | Extra Utilities, ProjectRed, ProjectBlue, AE2, BuildCraftCompat, Chisel, material-only integrations, UtilitiesInExcess | Stable material names, integer IDs, remapping, packet ID encoding, `getIdMap(): Tuple2[]`, block/meta access, material behavior hooks | +| Multipart save/load | Extra Utilities, ProjectRed, OpenComputers, BuildCraftCompat, MatterManipulator, GuideNH, Schematica, Waila, UtilitiesInExcess | Tile `parts` list, per-part `id`, factory lookup, `save`/`load` ordering, microblock fields, unknown/invalid-part behavior | +| Description/update packets | Every substantial custom part integration | `writeDesc`/`readDesc`, keyed part packets, `sendDescUpdate`, `sendDescPacket`, material packet IDs, render and neighbor notification behavior | +| Hit-to-part reduction | GT5U `ColoredBlockContainer` | Static `BlockMultipart.reduceMOP(MovingObjectPosition): scala.Tuple2`, boxed `Integer` `_1()` matching `jPartList()` order for an `ExtendedMOP` from `RayTracer.retraceBlock`; Java replacement `hitPartIndex` | +| Reflection/mixins | Older GuideNH releases, Schematica, Et Futurum, Galacticraft, Waila, AE2/AE2FC/ThaumicEnergistics, Iguana | Exact class/companion/member/field names and, where stated below, exact parameter and field types; current GuideNH uses direct calls | + +## Consumer findings + +### ProjectRed - deepest current consumer + +ProjectRed is not merely an optional integration. Wires, framed wires, bundled wires, gates, lamps, buttons, pipes, +solar panels, and fabricated gates are FMP parts. Its 141 touching classes dominate the installed binary surface. + +- Its parts mix `TMultiPart` with `TCuboidPart`, `TFacePart`, `TSlottedPart`, `TNormalOcclusion`, + `TIconHitEffects`, redstone interfaces, and microblock hollow-connect interfaces. The emitted classes directly call + Scala trait `$class` helpers. +- Item placement uses `TItemMultiPart`; registries use both `IPartFactory` and `IPartFactory2`, including the + Scala-`Seq` registration descriptor. +- Connectivity is built on exact `PartMap` face/edge/center numbering and repeated `partMap` queries across the same + and neighboring tiles. Redstone propagation uses `RedstoneInteractions` and casts generated tiles to + `scalatraits.TRedstoneTile` for `openConnections`. +- Parts rely on lifecycle callbacks and their ordering: `onAdded`, `onRemoved`, `onPartChanged`, + `onNeighborChanged`, `onChunkLoad`, `onWorldJoin`, scheduled ticks, `notifyPartChange`, `markDirty`, and + `markRender`. +- Framed wires persist material names and use `materialID`, `materialName`, `getMaterial`, packet material IDs, and + `ItemMicroPart.create`. Their fit calculation temporarily changes their own occlusion bounds and calls + `tile.canReplacePart(this, this)`. +- Part-owned NBT and packet fields include `connMap`, `side`, `orient`, `shape`, `mat`, and type-specific data. FMP + must keep treating these tags as opaque and must continue calling part save/load and packet hooks exactly once in + the established order. +- `LightMicroMaterial` implements `MicroblockGenerator.IGeneratedMaterial` and registers the third-party Scala trait + `LightMicroblock` with `MicroblockGenerator.registerTrait`. Generated microblocks must actually acquire that trait; + it supplies dynamic halo rendering and computes light from `tile.partList`. +- ProjectRed also uses `MultipartSaveLoad.loadingWorld`, `MultipartProxy.block`, vanilla multipart part classes, + microblock class companions, saw traits, and the material highlight renderer extension. + +**Migration consequence:** ProjectRed is the acceptance test for the complete architecture: Scala trait ingestion, +trait linearization, tile and microblock code generation, redstone tile traits, core lifecycle, rendering, packets, +and the micro-material system. A launch-only smoke test is inadequate; illuminated microblocks, gates, face/framed +wires, and routed pipes need functional fixtures. + +### Extra Utilities 1.2.12 - active supported consumer + +Extra Utilities remains in the supported compatibility target. UtilitiesInExcess is its intended replacement; +approval to switch that target and adoption of the replacement in the pack are still pending. Preserve the current +consumer's required APIs, saved-data behavior and integration coverage until both gates pass. + +Required compatibility spans several FMP subsystems: + +- It registers generated-tile pass-through interfaces for `IAntiMobTorch`, pipe/cosmetic/filter pipe interfaces, + node, inventory, liquid, and energy node interfaces, plus CoFH `IEnergyHandler`. Composite tiles must expose these + interfaces and dispatch to the correct part. +- Transfer pipes and nodes are multipart factories/converters. They use face/slot traits, neighbor-tile callbacks, + hollow connections, `TRedstoneTile`, `RedstoneInteractions`, part lists/maps, and part-change notifications. +- Custom parts include the magnum torch, fence, wall, sphere, pipe jackets, and several microblock-derived shapes. + They exercise normal/partial occlusion, icon hit effects, `PartMetaAccess`, `MicroblockRender`, and client/server + factories. +- Connected-texture and colored/full-bright micro-materials subclass `BlockMicroMaterial` and participate in + material rendering. Fences and walls add their own pass-through interfaces. +- NEI recipes and item enumeration consume `MicroMaterialRegistry.getIdMap()` as `scala.Tuple2[]`, use + `MicroRecipe`, saw cutting strength, material names, and `ItemMicroPart` creation. +- Some paths use `jPartList`; others use `partList().toIterator()`. Both collection views and stable ordering are + required even though the mod's implementation language is Java. + +The jar is sufficient to establish behavior, while the exact JAR's constant pool remains the authority for +names and descriptors. Obfuscated Minecraft method names should not be treated as source-quality naming evidence. + +**Migration consequence:** Extra Utilities covers almost every Java-facing extension seam and is the strongest test +that Java wrappers still compose into the same generated tile. UtilitiesInExcess does not make this compatibility +burden disappear until existing worlds and the old mod have been retired. + +### OpenComputers - generated slot state is part of the effective API + +OpenComputers converts its cable and 3D print blocks to parts and registers `oc` cable/print factories. + +- `CablePart` mixes cuboid, slotted, hollow-connect, normal-occlusion, icon-effect, and OC network-environment + behavior. Network join/separate is driven from part lifecycle callbacks. +- Network traversal locates cable parts through `TileMultipart.partList`. Connection checks combine FMP normal + occlusion boxes, solid face parts, and exact `PartMap.face(...).mask` values. +- `PrintPart` mixes cuboid, edge, face, slotted, normal occlusion, and redstone traits. Its shape and slot mask change + at runtime. +- When a print toggles shape, it casts the generated tile to `scalatraits.TSlottedTile`, directly clears every + matching entry in `v_partMap`, and calls `tile.bindPart(this)` to rebuild its slots. `v_partMap` field shape and + `bindPart` behavior are therefore externally load-bearing, not private implementation details in practice. +- Placement uses `getOrConvertTile`, `canAddPart`, and `addPart`; complexity limits are calculated across the Scala + `partList`. Print redstone input also folds over that list. + +**Migration consequence:** a Java slot-map rewrite must retain a binary and behavioral bridge for `TSlottedTile`, +including its public generated state. Test a print whose on/off shapes occupy different slots next to a cable and a +face part. + +### ProjectBlue - Java parts built on Scala shim bases + +ProjectBlue defines tiny Scala bridge bases (`JFacePart`, `JCuboidFacePart`, `JCenterPart`) so most of its FMP code +can be Java. Its active multipart is the bundled-redstone control panel. + +- The bridge bases inherit `TFacePart`, `TCuboidPart`, and `TSlottedPart`, so their generated `$class` calls remain + binary dependencies. +- Control panels register an `IPartFactory`, place through `canPlacePart`/`addPart`, remove through `remPart`, and + send part description updates. +- Bundled/redwire connectivity repeatedly queries `partMap` using exact face, edge, and center indices and uses + `RedstoneInteractions` for vanilla/FMP power. +- The panel resolves its cover material by stable micro-material name and item representation. Its own persistent + fields are opaque part data. +- Its edit network identifies a target part by world coordinates plus index in `jPartList`; list order is therefore + observable over the network. + +**Migration consequence:** preserve trait bridges, part ordering, `PartMap`, redstone semantics, and stable material +name lookup. A control-panel edit packet is a useful ordering regression test. + +### Applied Energistics 2 + +AE2's cable bus is a full multipart integration, not just visual compatibility. + +- `CableBusPart` is a Java cuboid part with normal occlusion, masked redstone, and `AEMultiTile`; AE2 dynamically + registers `AEMultiTile` and layer interfaces as pass-through interfaces. +- `PartRegistry` constructs registered AE2 parts through AE2's combined-instance helper. The FMP integration acts as + both part factory and block converter. +- Placement/conversion uses `getOrConvertTile`, `canAddPart`, and `addPart`. Code traverses the Scala `partList` + iterator. +- Occlusion is checked both directly with `NormalOcclusionTest` and by asking `tile.canAddPart` with an AE2 + `NormallyOccludedPart` probe. +- When a generated tile implements `TIInventoryTile`, AE2 calls `rebuildSlotMap()` from `notifyNeighbors()`, after + its cable bus inventory size may have changed. `TileMultipart.refreshInventorySlots()` is the supported replacement. +- AE2's Waila path and AE2 Fluid Craft load `TileMultipart` by name to register multipart HUD providers. +- Since `4548d13f0` (2026-09-12), `CableBusPart.bind(TileMultipart)` calls `super.bind` then refreshes hosted + parts through `CableBusContainer.updatePartHostInfo`. Host changes and world join also refresh those references. + Loading and composite expansion/reduction must dispatch through the virtual `bind` hook, with the new tile already + visible through `tile()`, without restarting the parts during replacement. The port retains this behavior; + `TileMultipartLoadingTest` covers consumer host refresh through successive replacements. +- That commit also makes `CableBusPart.addPart` reject placement when `canAddPart` fails, using the existing FMP + occlusion path. No new FMP entry point is required; the Scala part-list dependency remains. + +**Migration consequence:** preserve dynamic pass-through interfaces and generated tile inventory traits, not only +the `CableBusPart` class ABI. Test a cable bus sharing a block with an inventory-bearing part and an occluding cover. + +### BuildCraftCompat + +BuildCraftCompat serializes multipart blocks for builders and reconstructs them later. + +- It identifies `MultipartProxy.block`, walks `jPartList`, calls each part's `save`, and records the part type. +- Restore calls `MultiPartRegistry.loadPart(type, tag)`, then uses `canPlacePart`/`addPart`. +- Its microblock schematic validates the saved material name through `MicroMaterialRegistry.getMaterial`. +- It understands and rotates FMP's own saved type IDs for face, corner, edge, post, hollow, torch, lever, button, + and redstone-torch parts. + +**Migration consequence:** registry lookup, part `save`/`load`, core type IDs, material names, and placement validation +are a world-data contract. A builder round trip containing every built-in Minecraft part and microblock shape should +be a golden test. + +### ForgeRelocationFMP + +The plugin registers `rfmp_frame`, a frame-block converter, an `IFrame` pass-through interface, and an FMP tile +mover. + +- `FramePart` mixes `TCuboidPart`, `TNormalOcclusion`, and `TIconHitEffects`. Its special fit test temporarily exposes + one face occlusion box, calls `canReplacePart(this, this)`, and combines another part's normal boxes, partial boxes, + and collision boxes through the Scala `NormalOcclusionTest` overload. +- Frame placement requires an existing multipart tile and uses `canPlacePart`/`addPart`. +- The mover removes the live `TileMultipart`, moves the original block and tile object, rewrites `xCoord/yCoord/zCoord`, + reinserts it, and calls `onMoved()` in the post-move hook. + +**Migration consequence:** this is a direct test of Scala trait helpers, Scala factory overloads, mixed occlusion, +pass-through interfaces, and live tile movement. `onMoved` must reestablish every coordinate-sensitive/generated-tile +invariant without replacing the tile object. + +### Chisel + +Chisel registers its blocks as micro-materials and adds a `chisel_torch` factory/converter. `PartChiselTorch` +subclasses FMP's `TorchPart`, including its constructors, load/read/write behavior and static side mapping. Placement +uses tile conversion, fit checks, and `addPart`; Chisel also supplies a full-bright material implementation. + +**Migration consequence:** the Minecraft-part classes are extension bases, not internal examples. Keep protected +state, constructors, packet/NBT hooks, and static orientation tables source- and binary-compatible. + +### ThaumicTinkerer + +ThaumicTinkerer registers block micro-materials and factories/converters for candle and nitor parts. The parts extend +`McMetaPart`; the candle participates in random display ticks. They rely on FMP meta-part persistence, placement, +render hooks, and factory type dispatch. + +**Migration consequence:** preserve `McMetaPart` subclass semantics and random-display capability composition. + +### Wireless Redstone CBE + +WR-CBE registers transmitter, receiver, and jammer parts and pass-through interfaces for wireless tile APIs. + +- Its Java parts use `JItemMultiPart`, `JCuboidPart`, face/redstone, normal/partial occlusion, icon effects, and + micro-shrink rendering interfaces. +- It uses `partMap`, `RedstoneInteractions`, `IRedstonePart`, `NormalOcclusionTest`, `MicroOcclusion.recalcBounds`, + `onPartChanged`, `remPart`, and tile item drops. + +**Migration consequence:** Java compatibility bases must retain the same trait defaults and generated composite +behavior. Test wireless interface dispatch through a composite tile, not just direct calls on the part. + +### WitchingGadgets + +WitchingGadgets registers multipart essentia tubes and buffers, with block converters and factories. + +- Parts extend `McMetaPart`; the tube is slotted, and parts implement Thaumcraft transport/wand interfaces. +- Those external APIs are registered as pass-through interfaces, including the overload carrying client/server + generation flags. +- Connection logic walks `jPartList` and directly consumes other parts' normal and partial occlusion boxes. +- Rendering goes through `PartMetaAccess`; placement uses `canAddPart`/`addPart`. + +**Migration consequence:** preserve flag-sensitive pass-through registration, Java occlusion iterables, slotted part +semantics, and `PartMetaAccess` behavior. + +### MatterManipulator + +MatterManipulator is the broadest external editor of multipart state. + +- Analysis records each part's `getType`, calls `save` into NBT containing `id`, and captures `getDrops`. +- Application removes current parts with `remPart`, sorts microblocks before other parts, reconstructs through + `MultiPartRegistry.loadPart(type, nbt)`, calls `part.load(nbt)`, and adds through `TileMultipart.addPart`. +- It interprets core microblock type prefixes and NBT fields `material`, `shape`, `side`, `orient`, and `connMap`, and + transforms exact `PartMap` edge/corner numbering. +- Its mover detaches and reinserts the same tile object, rewrites coordinates, validates it, calls `onMoved`, then + performs dirty, render, block-update, lighting, and description-packet synchronization. +- Its apply path intentionally does **not** send a redundant description packet: rebuilding the tile a second time + previously produced null bounds. Packet timing and reconstruction side effects therefore matter. + +**Migration consequence:** add capture/apply/move golden tests. This consumer will expose changes in part ordering, +factory semantics, core NBT, movement lifecycle, and over-eager network synchronization. + +### GuideNH + +GuideNH reconstructs and renders multipart tiles for guide scenes and exports part statistics. At `16f142417df1`, +the FMP integration uses direct calls guarded by mod-presence checks and Forge `@Optional.Method` annotations. +Commit `4a0cd02e` (2026-09-16, included in tags `1.3.33` onward) removed its FMP reflection and +`AccessorBlockMicroMaterial` mixin. The dependency is FMP `1.7.14`; this is not adoption of the unreleased Java API. +This upstream cleanup uses existing APIs and is not work performed by this migration project. + +- Reconstruction still starts with `MultipartHelper.createTileFromNBT`, promotes client microblocks and tiles, + loads/binds parts, then calls `notifyTileChange` and `markRender`. Rendering calls `MultipartRenderer` directly. +- It directly invokes `MultipartGenerator$.MODULE$.generateCompositeTile` with a Scala iterable and + `MicroblockGenerator$.MODULE$.create`, then copies shape through `shape_$eq(byte)`. +- Preview paths retain `partList(): Seq`, Scala iteration/`ListBuffer`, and `loadParts(scala.collection.Iterable)`. + `Ae2ForgeMultipartBridge` also retains Scala part traversal. The old `partList_$eq` call is gone. +- Material export uses `jPartList`, `Microblock.material`, registry lookup and public `BlockMicroMaterial.block()` / + `meta()` getters. Statistics use `jPartList` and direct `getDrops`. Material lookup failures are logged and skipped; + getter failures propagate. See the [material guide](../api/MATERIAL_ACCESS.md) for differences from the example. +- `createPreviewTileFromNBT` and the Java generator/collection replacements have not been adopted. + +**Migration consequence:** direct linking now enforces the retained companion/Scala contracts. All these calls have +counterparts in the port; no production API change is required. Material access already uses public getters, while +preview/Scala migration remains pending. Keep old private fields and setter descriptors for older supported jars +until pack adoption is verified; source tags alone do not establish installed-artifact compatibility. + +### Schematica + +Schematica's optional integration reconstructs multipart tiles from schematic NBT, especially on the client. It is +more invasive than its small binary footprint suggests. + +- It reflects `MultiPartRegistry$.MODULE$` and the **private Scala-mangled field** + `codechicken$multipart$MultiPartRegistry$$typeMap`, casting it to `scala.collection.mutable.Map`. +- It resolves material IDs, obtains the registered microblock class from that map, and invokes + `MicroblockClass.create(boolean, int)`. +- It reflects part `load`, `onPartChanged`, `TileMultipart.loadParts`, `TileMultipart.createFromNBT`, and + `MultipartGenerator$.generateCompositeTile(TileEntity, scala.collection.Iterable, boolean)`. +- It parses tile NBT `parts`, each part's `id`, and microblock `material`; it rejects a preview if any part fails to + reconstruct. + +**Migration consequence:** the registry's private field name **and Scala mutable-map representation are currently +effective public API**. A Java `Map` replacement will silently disable Schematica unless an exact compatibility field +is retained or Schematica is patched and deployed first. This is a higher-risk constraint than the constant-pool +inventory alone shows. + +`MultiPartRegistry$` retains the exact private field as a Scala mutable-map wrapper backed by the canonical Java +`HashMap`. A regression test performs Schematica's lookup and verifies that both views resolve the same factory. + +The port provides `MultiPartRegistry.getPartFactory(String)` as the supported replacement for map lookup. +It returns the exact registered factory or null without construction or missing-name logging. Schematica can reflect +this public static method and continue invoking `MicroblockClass.create(client, materialId)` on the returned object; +`loadPart` would incorrectly choose the server factory path for its client preview. The old private field remains. +See the [guide](../api/FACTORY_LOOKUP.md) and the now-available [Java tile generator](../api/COMPOSITE_GENERATION.md); +consumer patches and pack adoption remain pending. + +### UtilitiesInExcess - future replacement, already a substantial consumer + +UtilitiesInExcess is not in the `2.9.0-RC-2` JAR scan but is in scope because it is intended to replace Extra Utilities. + +- `Content` implements `IPartFactory2` for `ue_fence`, `ue_wall`, and `ue_sphere`, with legacy Extra Utilities type + aliases when the old mod is absent. +- Parts extend `TMultiPart`, implement Java icon/normal-occlusion interfaces, call the normal occlusion protocol, and + render through microblock material helpers. +- Placement and connectivity use `canPlacePart`, `addPart`, `BlockMultipart`, neighboring `TileMultipart` instances, + `jPartList`, and part sub-boxes. +- Recipes and item enumeration consume `MicroMaterialRegistry.getIdMap()` as `scala.Tuple2[]` and use microblock + class IDs plus `ItemMicroPart.create`. +- Materials use name/ID lookup, packet material ID helpers, remapping, sounds, icons, drops, and rendering. Legacy + Extra Utilities material names are explicitly remapped for world conversion. +- At audited HEAD, the server factory reads NBT key `material` while `MaterialBasedPart.save` writes `mat`. That is a + UtilitiesInExcess-side inconsistency to resolve before relying on save/load round trips; FMP should not special-case + it. + +**Migration consequence:** replacing Extra Utilities does not permit early removal of `IPartFactory2`, the Scala +`Tuple2[]` registry view, legacy material remapping, or the Java part/occlusion bridges. UtilitiesInExcess should be +added to compatibility CI before it enters the pack. + +## Narrow consumers, still real contracts + +| Consumer | Actual use | Compatibility requirement | +| --- | --- | --- | +| BloodArsenal | Registers decorative blocks/metas as `BlockMicroMaterial` instances | Constructor and `registerMaterial`; stable chosen names | +| Botania | Registers decorative blocks/metas as micro-materials | Same material registration API and block/meta behavior | +| Biomes O' Plenty | Registers historical BOP block/metas as micro-materials | Constructor, registry, and its dot-separated material names | +| Natura | Registers single/ranged block metas, using both `createAndRegister` and direct registration | Static helper plus registry API and generated material keys | +| TConstruct | Optional init plugin registers many smeltery/metal/glass blocks with `createAndRegister` | Helper availability and init-time registration behavior | +| Galacticraft | Reflectively constructs `BlockMicroMaterial` and chooses the first public method named `registerMaterial`; separately rejects `TileMultipart` as an energy receiver | Exact class/constructor names; compatible public registration method; tile class identity. Avoid incompatible same-name overloads because it does not check the signature | +| BloodMagic | Teleposer reconstructs multipart tiles with `MultipartHelper.createTileFromNBT` and sends a description packet after placement | NBT reconstruction, placement lifecycle, and `sendDescPacket` | +| Waila | Reflects `BlockMultipart`, reads tile NBT `parts`, then dispatches providers using each part tag's `id` | Block class name and tile/part NBT layout | +| AE2 Fluid Craft | Reflects `TileMultipart` and registers Waila part providers | Tile class name and `jPartList`/provider behavior reached by AE2 | +| GT5U | Detects `TileMultipart`, iterates `jPartList`, and finds a ProjectRed `GatePart` to expose its screwdriver slot. Since `5.09.54.205`, spray cans recolor ProjectRed insulated wires and bundled cables: retrace the block, take `(Integer) BlockMultipart.reduceMOP(hit)._1()` as a `jPartList` index, take the slot from `TSlottedPart.getSlotMask()`, then follow chained blocks through `partMap(slot)` and equal `getType()` | Tile identity, Java list view/order, part instance identity; exact `reduceMOP` static descriptor with Scala `Tuple2` return and boxed-index `_1`; ray-trace index agreeing with `jPartList` order; `partMap` slot numbering; stable type strings | +| ThaumicEnergistics | Loads `TileMultipart` with `Class.forName` and registers Waila body/NBT providers on it, so vis-link info still shows after a cover moves its AE2 parts into a multipart tile. Parts are found through AE2's `Platform.getPartFromTE`, not FMP. Added by `f6422d7` (2026-10-02, tags `1.7.62-GTNH` onward); no FMP compile dependency | Exact `codechicken.multipart.TileMultipart` class name; AE2 part-host pass-through on generated tiles | +| EnderCore | Tests items with `instanceof ItemSaw` for durability display | `ItemSaw` class identity and inheritance | +| IguanaTweaksTConstruct | Creates saws through `MicroblockProxy`, reads saw methods, accesses proxy companions, and reflectively mutates private `ItemSaw.harvestLevel` | Proxy methods and `MODULE$`, `Saw`/`ItemSaw` identity, exact `harvestLevel: int` field name/type until adoption; `setHarvestLevel(int)` is the supported replacement | +| Et Futurum Requiem | Reflectively gets and mutates static `int[] ButtonPart.metaSideMap` and `sideMetaMap` to add floor and ceiling orientation | Exact class and mutable static field names/types until migration; `ButtonPart.setOrientation` is the supported replacement | + +## Source-only hazards + +The constant-pool inventory identifies reflective class names, but source inspection adds exact member-level +requirements: + +| Consumer | Hidden requirement | Likely symptom if broken | +| --- | --- | --- | +| Schematica | `MultiPartRegistry$.MODULE$`; field `codechicken$multipart$MultiPartRegistry$$typeMap` of Scala mutable-map shape; exact generator/load methods | FMP schematic tile reconstruction disables itself or returns no preview | +| Older GuideNH releases | Companion-only generator methods; `partList_$eq(Seq)`; `BlockMicroMaterial.block` and `.meta` mixin fields | Missing/incorrect guide preview, material export, or part statistics; current source instead links directly to companion/Scala methods | +| Et Futurum | Static mutable `ButtonPart.metaSideMap` and `sideMetaMap`, both `int[]`, until direct API adoption | FMP buttons attach with pre-fix orientation behavior | +| Iguana | Private `ItemSaw.harvestLevel` field until direct setter adoption | Existing saw cutting strengths are not adjusted | +| Galacticraft | Reflection by method name only for `registerMaterial` | Galacticraft micro-material registration is skipped after a caught exception | +| Waila | `BlockMultipart` string plus tile NBT `parts`/part `id` | No multipart HUD data | + +These need targeted runtime tests or explicit downstream patches. They cannot be proven safe by `javap` ABI diffing. + +`ConsumerReflectionCompatibilityTest` freezes the older GuideNH, Et Futurum, Iguana, and Galacticraft +member shapes above. `ButtonOrientationFunctionalTest` also freezes Et Futurum's exact array mutation and all-face +placement, then verifies the supported typed replacement. `ItemSawCharacterizationTest` runs Iguana's exact boxed +field mutation and the direct setter against shared storage. Schematica's registry lookup has its own live-view +regression test. The manual client checks remain necessary for end-to-end integration behavior. + +## Data and ordering contracts + +### Core NBT and identity + +The following are read by code outside FMP and must be treated as serialized API: + +- the tile's `parts` compound list; +- the `id` string in every part compound; +- built-in multipart type strings and registry lookup behavior; +- microblock `material`, `shape`, and orientation fields used by schematic/editor code; +- material names and remapping, including legacy Extra Utilities names; +- invalid/unknown part handling during `loadPart`, tile creation, and preview reconstruction. + +Consumer-specific fields such as ProjectRed's `connMap` and UtilitiesInExcess's `mat` belong to their parts. FMP's +obligation is to invoke each part's hooks with the same tag and ordering, not to interpret or rewrite those fields. + +### Observable part order + +Part list order is not an internal detail: + +- ProjectBlue identifies an edited part by its `jPartList` index; +- rendering code in ProjectRed and Extra Utilities indexes `partList` from hit data; +- MatterManipulator deliberately sorts placement, with microblocks first; +- GuideNH and Schematica build an ordered list before generating/loading a composite tile; +- Waila preserves tile NBT order when dispatching part providers. + +The Java port may add faster indexed storage, but all published views, serialization, binding, ray-hit indices, and +packet consumers must observe one consistent order. + +Current-branch verification: `MultipartHelperFunctionalTest` freezes ordered two-part NBT reconstruction and slot +rebinding plus the exact logical chunk-description framing and part payload. `TileMultipartLifecycleFunctionalTest` +freezes add/remove callbacks and the MatterManipulator-shaped live move, including ordered `onWorldSeparate` before +ordered `onMoved`/`onWorldJoin`, without replacing the generated tile. + +### Material IDs and packets + +Numeric material IDs are runtime registry identities used in descriptions and custom-part packets. Names are the +persistent identity. Preserve: + +- deterministic name-to-ID lookup for one runtime; +- remap behavior for renamed materials; +- `writeMaterialID`/`readMaterialID` wire agreement; +- `materialName`/`materialID` round trips; +- the legacy `getIdMap(): scala.Tuple2[]` view until Extra Utilities and UtilitiesInExcess are migrated. + +## Java API adoption ledger + +This ledger tracks migration of a specific legacy contract, not completion of an entire consumer's migration. +Factory registration/lookup, material enumeration, tile collection/traversal access, tile loading/storage assignment, +client preview reconstruction, tile occlusion and box queries, render-ID accessors, named tile conversion results and +the struck-part index and inventory slot refresh are implemented on +`algent/java`. The [API index](../API.md) links the guides and compiling Java examples. These additions are not yet +tied to a released minimum dependency version. Unlisted contracts remain governed by the inventories above. + +| Legacy contract | Consumer and inspected source | Supported replacement | Consumer migration/release | Target-pack adoption and removal gate | +| --- | --- | --- | --- | --- | +| `ButtonPart.sideMetaMap[side ^ 1]` live inverse lookup | ProjectRed `e173952e96a4` and separate preparatory migration checkout: `illumination/items.scala`, `ItemPartButtonCommons.newPart` | `ButtonPart.metaForSide(side ^ 1)`; [lookup contract](../api/BUTTON_ORIENTATIONS.md#reading-orientation-metadata) | FMP accessor/example and regression coverage added; consumer replacement requires a rebuilt FMP artifact; preparatory migration is not upstream adoption | Retain the array until ProjectRed and Et Futurum migrations are released/adopted and a fresh scan clears legacy use | +| `TRedstoneTile.openConnections(int)` | ProjectRed `e173952e96a4`: `transmission/redwires.scala` | Existing stable `IRedstoneTile.openConnections(int)` with the same mask/rotation logic; [guide](../api/TILE_TRAIT_ACCESS.md) | FMP source-access example and Forge coverage complete; consumer source patch/release pending | Retain the old runtime interface descriptor until adoption | +| `TSlottedTile.v_partMap()` array mutation | OpenComputers `2c00f79be24b`: `PrintPart.toggleState` | `TileMultipart.refreshPartSlots(part)`; [equality, cache and notification contract](../api/TILE_TRAIT_ACCESS.md#refreshing-a-changed-slot-mask) | FMP API/example complete; consumer source patch/release pending, preserving validation and following sound/notify/packet/schedule order | Keep the live array/accessor ABI until released pack adoption; do not replace it with reflection or a whole-tile reload | +| `TIInventoryTile.rebuildSlotMap()` raw trait call | AE2 `c690fbc273be`: `appeng/fmp/CableBusPart.notifyNeighbors` | `TileMultipart.refreshInventorySlots()`, a no-op without inventory parts, so the `instanceof` guard can go; [mapping and scope](../api/TILE_TRAIT_ACCESS.md#refreshing-inventory-slots) | FMP API, example and regression coverage complete; consumer source patch and release pending, keeping its neighbor notification afterward | Keep the `TIInventoryTile` interface and `rebuildSlotMap` until released pack adoption | +| External Scala `LightMicroblock` registered through `MicroblockGenerator.registerTrait` | ProjectRed `e173952e96a4`: `illumination/lightmicroblocks.scala` | Java source trait registered by name, `IGeneratedMaterial`, typed sibling traversal and halo helper; [example](../api/MICROBLOCK_EXTENSIONS.md) | FMP example tested; consumer rewrite/release, existing config/halo wiring and physical-client checks pending | Retain external Scala trait ingestion until released-consumer adoption and internal Scala-trait removal | +| `MultiPartRegistry$.registerParts(IPartFactory2, Seq)` and existing array calls | ProjectRed `e173952e96a4`: transmission, expansion and fabrication proxies | `MultiPartRegistry.registerPartFactory` with existing `IPartFactory2` methods and unchanged IDs | Source patch and release pending; Boolean-factory proxies separately need the two-method adapter described in the guide | No migrated pack version verified; retain all registration bridges and external trait support | +| `MultiPartRegistry$.registerParts(Function2, Seq)` | ForgeRelocationFMP `49a810b8c63b`: proxy init registering `rfmp_frame` | `IPartFactory2` creating a fresh `FramePart` on both paths, registered through `registerPartFactory` | Source patch and release pending; preserve `rfmp_frame` and keep converter/pass-through registration | No migrated pack version verified; retain the function companion descriptor | +| `MicroMaterialRegistry.getIdMap(): scala.Tuple2[]` | UtilitiesInExcess `3e107a1fe9bc15fcb6a808242ffda1354dac7c3a`: `FMPRecipeLoader.run`, `UEMultipartItem.getSubItems` | `materialCount()` with `materialName(int)` and, when needed, `getMaterial(int)` | Source patch and first released version pending; checkout used as reference only | No migrated pack version verified; retain the bridge | +| `MicroMaterialRegistry.getIdMap(): scala.Tuple2[]` | Extra Utilities 1.2.12, active supported consumer: NEI and microblock material enumeration | Same ID-based Java enumeration | Keep current compatibility; switching support to UtilitiesInExcess awaits approval and pack adoption | Verify Extra Utilities is absent and its replacement uses the new API before retiring this dependency | +| `TileMultipart.partList(): scala.collection.Seq` | ProjectRed `e173952e96a4`: illumination aggregation, packet indices and rendered-part lookup | `jPartList()` with unchanged indices, filters and aggregation | Source patch and release pending; Scala consumer code may remain Scala | No migrated pack version verified; retain the getter and external trait support | +| `TileMultipart.partList(): scala.collection.Seq` | OpenComputers `2c00f79be24b`: cable/print/network searches and aggregation | `jPartList()` with the same search/aggregation semantics | Source patch and release pending | No migrated pack version verified; retain the getter | +| `TileMultipart.partList(): scala.collection.Seq` | AE2 `fdedc3a8f023`: `FMPPlacementHelper.getPart` and `removePart` | Iterate `jPartList()`; retain last-match lookup and removal/break behavior | Source patch and release pending; September host-binding fix does not migrate traversal | No migrated pack version verified; retain the getter | +| `TileMultipart.partList(): scala.collection.Seq` | Extra Utilities 1.2.12: multipart renderer iterators | Iterate `jPartList()` without adding detached-part filtering | Retirement/replacement pending | Confirm absence or migration in the target pack before retiring the getter | +| `TileMultipart.partList(): scala.collection.Seq` and Scala loading | GuideNH `16f142417df1`: `Ae2ForgeMultipartBridge`, `ForgeMultipartHelpers` | `createPreviewTileFromNBT` for previews; `jPartList()` for remaining traversal | Direct calls replaced reflection in `4a0cd02e` (tags `1.3.33` onward); export/statistics use Java traversal, preview/AE2 paths still use Scala; setter call removed | Retain getter/loader for current source and setter for older supported jars; pack adoption unverified | +| `TileMultipart.loadParts(scala.collection.Iterable)` exact reflection | Schematica `3b03ee937953`: `nbt.ForgeMultipart` | `MultipartHelper.createPreviewTileFromNBT`; [complete preview contract](../api/CLIENT_PREVIEW.md) | Source patch and release pending; replace the whole reconstruction chain rather than one reflected method | No migrated pack version verified; retain the Scala loader descriptor | +| Private `MultiPartRegistry$` Scala `typeMap` field and `Map.get` / `Option` | Schematica `3b03ee937953`: `nbt.ForgeMultipart.init` and `createPart` | `MultipartHelper.createPreviewTileFromNBT`; factories opt in through `createPartForClientPreview` | Source patch/release pending; all-or-nothing lookup, client construction and loading are implemented | No migrated pack version verified; retain the exact private live Scala-map field | +| `MultipartGenerator$.generateCompositeTile(TileEntity, scala.collection.Iterable, boolean)` | Schematica `3b03ee937953` exact reflection; GuideNH `16f142417df1` direct companion call | `createPreviewTileFromNBT` for saved previews; static `MultipartGenerator.generateCompositeTile` for other staged reconstruction | Java API migration pending in both consumers; GuideNH removed reflection but still passes Scala parts | No migrated pack version verified; retain the companion and Scala descriptor | +| `MicroblockGenerator$.create(MicroblockClass, int, boolean)` and encoded shape copy | GuideNH `16f142417df1`: `promoteMicroblockToClient` directly calls companion and `shape_$eq(byte)` | `createPreviewTileFromNBT` for whole previews; static `MicroblockGenerator.create` and `setShape` for individual unbound parts | Reflection/private shape write removed in source; static Java/preview migration pending; validate client traits and shape callback ordering | No migrated pack version verified; retain companion singleton and exact descriptor | +| Private `BlockMicroMaterial.block` / `meta` accessor mixin and reflective material query | GuideNH `16f142417df1`: `resolvePrimaryMicroblockId`; mixin removed | Direct `jPartList()`, `Microblock.material()`, `getMaterial(int)`, `BlockMicroMaterial.block()` / `meta()`; [typed example and policy differences](../api/MATERIAL_ACCESS.md) | Upstream cleanup uses existing public getters since `4a0cd02e`, included in tags `1.3.33` onward; published artifacts, custom getter behavior and optional loading not validated here | No migrated pack version verified; retain private fields for older releases | +| Reflective mutation of `ButtonPart.metaSideMap` / `sideMetaMap` | Et Futurum Requiem `78a5744dfd33`: `compat.CompatMisc.runModHooksInit` | Two direct `ButtonPart.setOrientation(int, ForgeDirection)` calls; [mapping and lifecycle guide](../api/BUTTON_ORIENTATIONS.md) | FMP API/example complete; consumer source patch and first released version pending | Retain both public mutable arrays until the migrated release is in the target pack and a fresh scan confirms no legacy access | +| `MicroblockProxy$.MODULE$` saw access and reflective mutation of private `ItemSaw.harvestLevel` | IguanaTweaksTConstruct `2bc09889d3e2`: `ClientFMPProxy.updateSawRenderers`, `IguanaFMPCompat.postInit` | Use static `MicroblockProxy.sawStone()` / `sawIron()` / `sawDiamond()` / `useSawIcons()`; read `harvestLevel()` and call `setHarvestLevel(int)`; [state and lifecycle guide](../api/SAW_STRENGTH.md) | FMP Scala-free API example complete; consumer source/lifecycle patch and first released version pending | Retain the companion and private field until the migrated release is in the target pack; ensure Iguana runs before ForgeMicroblock post-init and rescan for legacy access | +| `NormalOcclusionTest$.apply(Traversable, Traversable)` | OpenComputers `2c00f79be24b`: `common.block.Cable.canConnectFromSideFMP`, `server.network.Network.canConnectFromSideFMP` | `NormalOcclusionTest.testBoxes(ownBounds.asJava, otherBounds)`; `otherBounds` already comes from Java `getOcclusionBoxes()` | Source patch and release pending; retain side/color/face filtering | No migrated pack version verified; retain the companion and descriptor | +| `NormalOcclusionTest$.apply(Traversable, Traversable)` | ForgeRelocationFMP `49a810b8c63b`: `FramePart.occlusionTest` | `NormalOcclusionTest.testBoxes(boxes.asJava, getOcclusionBoxes)`; retain combined normal/partial/collision boxes and caller order | Source patch and release pending; preserve temporary face bounds and replacement protocol | No migrated pack version verified; retain the companion and descriptor | +| `BlockMultipart.reduceMOP(MovingObjectPosition): scala.Tuple2` | GT5U `1a9469a13228`: `ColoredBlockContainer` ProjectRed wire branch, shipped in `5.09.54.205` | `BlockMultipart.hitPartIndex(hit)`, same index, `-1` when the hit carries none; [guide](../api/HIT_PART.md) | FMP API, example and regression coverage complete; consumer source patch and release pending, keeping its `ExtendedMOP` and coordinate guards | No migrated pack version verified; retain the exact static descriptor and boxed-`Integer` `_1()`; new in `2.9.0-RC-2` | + +## Adoption constraints + +The installed GTNH daily `2026-09-04+719` rescan scanned 241 jars, excluding FMP. Its 27 consumers retained +all 386 full member/type/reflection rows from `+678`: 35 inherited types, 255 members, 76 other types and 20 +reflection strings. The `2.9.0-RC-2` rescan (240 jars, 28 consumers) keeps every `+678` member and type row and +adds 13 members and 4 other types. GuideNH `1.3.41` replaced 17 reflection strings with direct links, and +ThaumicEnergistics adds one. Source revisions above identify inspected checkouts, not guaranteed parity with newer jars. +GuideNH's upstream material-access cleanup ships in RC-2's `1.3.41`, but none of its pending Java API migrations do. No consumer has been verified to have completed the full Java API +migration; update artifact/adoption columns only with actual artifacts. + +### Consumer-specific migration traps + +- UtilitiesInExcess writes and loads its material name under `mat`, while `Content.createPart(String, + NBTTagCompound)` reads `material`. Fix the consumer factory before testing save/load or replacement adoption. FMP + must not add a fallback that hides the consumer's inconsistent persistent format. +- Galacticraft selects the first public `MicroMaterialRegistry.registerMaterial` method by name without checking its + parameters. Keep exactly one compatible public method with that name until Galacticraft migrates; the reflection + compatibility test pins this constraint. +- AE2's `FMPPlacementHelper.getPart` scans the whole part list and retains the last matching `CableBusPart`. Replacing + that loop with a first-match helper changes behavior. Iterate `jPartList()` and preserve the original selection and + removal rules. +- MatterManipulator and ForgeRelocationFMP both move the same live `TileMultipart`, but they own different validation, + render, lighting and packet policies. A future common move coordinator belongs in `MultipartHelper`, which already + owns cross-tile NBT and description-packet operations; `TileMultipart.onMoved()` remains the per-tile callback. Add + such a coordinator only when both consumers can express their existing synchronization policy through it. +- Waila, AE2 Fluid Craft and ThaumicEnergistics use `Class.forName` as an optional-mod loading boundary. That class lookup is intentional; + replacing it with a direct FMP type would make their otherwise optional integration load eagerly. +- GT5U `5.09.54.205` (in `2.9.0-RC-2`) is the first consumer to call `BlockMultipart.reduceMOP`. It needs only + the part index, which `hitPartIndex` returns as an `int`. Add a named result only if a second consumer needs the + rebased hit. Keep the `Tuple2` descriptor, and its boxed-`Integer` `_1()` that GT5U casts, until a migrated GT5U + release ships. + +- FMP's own `ItemMicroPart` and `MicroRecipe$` still use legacy material arrays. Internal tuple paths also remain + in the generator and placement code, including `MicroblockPlacement.gtile()`. External adoption does not retire them. +- Existing `jPartList()` users need no rename. `forEachPart` filters detached/rebound parts and must not replace + arbitrary read/query loops. It delegates through the supported `operate(Function1)` override hook, which lifecycle + callbacks still use. See [traversal](../api/PART_TRAVERSAL.md). +- `setPartList` copies non-null list storage; the legacy setter retains the supplied sequence. Neither binds parts. + Use `loadPartList` for prepared reconstruction, preserving world/position setup and subsequent notifications. + See [loading and storage](../api/PART_LOADING.md). +- No direct supplied consumer call to the two-argument tile `occlusionTest` was found, but generated + `TPartialOcclusionTile` and placement/replacement dispatch still require it. `canAddPart`/`canReplacePart` callers + need no rename and must retain outgoing-part exclusion. Box-list queries are a separate contract; + [testOcclusion and testBoxes](../api/OCCLUSION.md) do not retire each other's bridges. +- `registerPartFactory` avoids Scala-dependent Java overload resolution. Preserve registration IDs, order, + ownership, partial-registration failure policy, and both NBT/packet construction paths. All legacy registration + entries remain; Schematica's private live Scala map is a separate dependency. See [registration](../api/PART_REGISTRATION.md). +- No supplied direct legacy render-ID or tuple-result conversion caller was found (GT5U's `reduceMOP` tuple is + covered above). Existing tile-only `getOrConvertTile` users + need no rename. New [render-ID](../api/RENDER_ID.md) accessors do not allocate/register a renderer; + [conversion results](../api/TILE_CONVERSION.md) still describe uninstalled placeholders. +- Saved client previews should use the complete [preview helper](../api/CLIENT_PREVIEW.md). The lower-level + [staged generator](../api/COMPOSITE_GENERATION.md) still does not copy/load/install parts automatically and remains + available for reconstruction flows that need candidate reuse or custom setup. +- GuideNH's [typed material getters](../api/MATERIAL_ACCESS.md) likewise honor overrides that raw mixin fields + bypassed. Preserve first-usable-part order, export filtering and failure behavior; validate custom overrides and + optional-mod loading. Physical-client construction and GPU previews remain release checks. +- Iguana must apply [saw strength](../api/SAW_STRENGTH.md) before ForgeMicroblock's post-init maximum calculation. + Et Futurum's [orientation setter](../api/BUTTON_ORIENTATIONS.md) maintains both inverse maps; keep the legacy + private field/public arrays until the respective released integrations are adopted. + +## API boundary audit + +Rechecked 2026-09-05 across 28 source checkouts, active Extra Utilities compatibility and the installed `+719` +constant-pool inventory. No external calls were found to the 15 tile/material-registry implementation hooks listed +in the [API boundary table](../API.md#supported-api-and-internal-hooks). Searches covered FMP-importing Java/Scala, +method names and reflective strings; historical GuideNH comments avoiding `from`/`copyFrom` and WR-CBE's unrelated +`RenderWireless.loadIcons` were excluded. This is evidence about the audited references, not every possible mod. + +Supported exceptions are OpenComputers `2c00f79be24b`, `PrintPart.scala:171`, clearing slots before +`tile.bindPart(this)`, and ProjectRed `e173952e96a4`, `gatepartrs.scala:74`, calling `internalPartChange(this)` +between packet/dirty work and selective neighbor notification. Cache binding neither places nor rebinds a part +and is not universally idempotent. Local part notification does not perform world updates. Internal markers change +no descriptor and authorize no removal; `operate`, `getOrConvertTile2` and material `loadIcons` retain their +separate legacy/extension contracts. + +## Extension and converter migration + +- The [illuminated Java microblock example](../api/MICROBLOCK_EXTENSIONS.md) uses name-based registration and + `IGeneratedMaterial`. Register before input-class loading; keep inherited access in an ordinary helper with + `Object` parameters and dispatch through the stable base. It preserves metadata 16–31, cutter metadata modulo + 16, all-shape selection, strict sibling filtering, light rounding/capping, pass-zero halos and hollow trimmed strips, + without new part NBT/packet fields. Headless client-body probes do not replace physical-client construction, + configuration/halo integration and released ProjectRed adoption. +- Existing `IPartConverter`/`registerConverter` users need no replacement API; companion users can use the static + entry. Preserve separate factories, IDs, Chisel metadata selection, ForgeRelocationFMP frame construction, + OpenComputers original-tile lookup, AE2 state copying and consumer-specific cleanup. The + [converter guide](../api/BLOCK_CONVERTERS.md) covers lifecycle; actual inventory/network transfers need integration checks. +- Raw trait classes become interfaces at runtime. ProjectRed should query `IRedstoneTile.openConnections` while + preserving rotation/masks; OpenComputers should use `refreshPartSlots` while preserving validation and subsequent + sound/notify/packet/schedule order; AE2 should call `refreshInventorySlots` before its neighbor notification. Keep their legacy runtime interfaces until adoption. See + [stable tile access](../api/TILE_TRAIT_ACCESS.md). +- The [custom tile-trait guide](../api/CUSTOM_TILE_TRAITS.md) covers a top-level Java input, separate marker/capability + interfaces and ordinary helpers. Stateful extensions still own copy, persistence, synchronization and lifecycle + behavior. No direct custom multipart tile-trait registration was found in supplied consumer source; built-in traits, + pass-through interfaces and ProjectRed's microblock registration are distinct paths. Example coverage does not + authorize retirement of any existing consumer contract. diff --git a/docs/migration/DIVERGENCES.md b/docs/migration/DIVERGENCES.md new file mode 100644 index 0000000..1158023 --- /dev/null +++ b/docs/migration/DIVERGENCES.md @@ -0,0 +1,224 @@ +# Java migration divergences + +Current intentional differences from the `1.7.12` Scala reference. Upstream `master` fixes merged since then +(through `1.8.0`) are ported; rows naming an upstream PR record whether the Java fix matches it. +This is a compatibility ledger, not a port diary. +An unchanged implementation needs no entry. Track remaining work in [migration status](README.md), client gaps in +[manual release checks](MANUAL_CHECKS.md), and use the [performance protocol](MAINTAINERS.md#performance-validation) +for measurements. Superseded decisions and per-port narratives remain in git history. + +“No audited consumer” means the frozen GTNH binary inventory and consumer-source audit, not every possible +third-party mod. Removed members can still break unaudited consumers. Check +`docs/migration/COMPATIBILITY.md`, which holds both the binary inventory and the consumer-source +audit, before extending this list. + +## Runtime and error behavior + +The multipart block intentionally retains the pre-PR #54 unlocalized name `tile.multipart`. +PR #54 (`2d050bd`) renamed it to `tile.codechicken/multipart`; `cb3bef7` reverted that part to preserve +the established name. The block registry ID remains `ForgeMultipart:block`. This is an intentional rollback +of the later upstream rename, not a divergence from the `1.7.12` reference. + +| Area | Difference and consequence | +| --- | --- | +| Raw microblock recipe material lookup | Skips `MissingMicroMaterial`, whose recovery item is stone, so sawing stone selects the real stone material. Existing missing-material microblocks retain their recovery behavior. This fixes a pre-existing Scala bug, also fixed upstream in PR #61. | +| `BlockMicroMaterial.icont()` after a texture stitch | `loadIcons` still builds icons eagerly, then marks them stale; the first `icont()` read after the stitch re-reads the block's icons once. Icons that another mod finishes in a later `TextureStitchEvent.Post` handler (Chisel's CTMLib `-v4` submaps) are picked up instead of rendering as missing or previous-stitch textures. Icons assigned through `icont_$eq` are kept. Upstream PR #63 targets the same bug by lowering the stitch handler to `EventPriority.LOW`; this port does not need that ordering. | +| Client part additions | Reuses an existing multipart tile or creates one without converting the stale client block. Conversion and its outgoing packets remain server-side, avoiding duplicate parts and client disconnects. Matches upstream PR #62. | +| `BlockMicroMaterial.createAndRegister(Block, Seq, String)` | Registers every supplied metadata value instead of only zero, including dark-oak logs and leaves and their legacy-name remaps. This fixes a pre-existing Scala bug; material IDs are rebuilt through the existing registry mapping. | +| Chunk scheduled-tick restoration | Reactivates chunks with restored scheduled ticks so their callbacks resume at the saved deadlines. The Scala implementation restored entries without activating their chunk. NBT layout and duplicate-scheduling behavior are unchanged. | +| Scheduled ticks of moved tiles | `TileMultipart.onMoved` hands its parts' pending scheduled and random ticks to the chunk that now contains the tile, keeping their deadlines; moves requested from a tick callback apply after that tick's processing. The Scala implementation left them in the source chunk, so they were lost if it unloaded first, and were saved at the wrong position. Same-world moves only. This fixes a pre-existing Scala bug. | +| World scheduler clock loading | Retains successfully loaded `schedTime` instead of overwriting it with total world time. Missing or unreadable files still fall back to world time. This fixes a pre-existing Scala bug and preserves the clock used by saved absolute tick deadlines; the file format is unchanged. | +| Converted tile loading | Copies the source tile coordinates to a replacement produced by `MultipartSaveLoad.loadTiles` before assigning its world and validating it. The Scala implementation left converted replacements at their default coordinates. | +| Placement-modifier player lifecycle | Removes cached control-key state when a player logs out and transfers it from the old player object to its replacement on clone. The Scala implementation retained entries until server shutdown. | +| `IDWriter` before `setMax` | `read`/`write` throw `IllegalStateException` instead of `NullPointerException`. Uninitialized use is unsupported. | +| `PacketScheduler` invalid `maskWidth` | Throws `IllegalArgumentException` instead of `scala.MatchError`. Valid widths remain 1, 2, 4 and 8. | +| `NormalOcclusionTest.apply(Traversable, Traversable)` | Materializes both inputs into Java lists before testing instead of nested Scala `forall`. Finite, side-effect-free collections give the same result; eager traversal can change side effects, failure timing and termination for unusual inputs. | +| `MultipartRenderer` dynamic-part guard | Uses short-circuit `\|\|` instead of `\|`; the second getter is no longer evaluated when the first operand succeeds. Ordinary getters give the same render decision. | +| `ControlKeyModifer.map()` | The exposed Java map has no Scala default-value wrapper: an absent key returns null from `get`, not false from Scala `apply`. Use `isControlDown` for the unchanged absent-means-false behavior. | +| Public companion constructors, including `ASMImplicits.ExtBitSet$` / `ExtClass$` | Explicit construction creates an independent instance instead of replacing `MODULE$`. Java initializes the retained final module field in its static initializer; use `MODULE$` for singleton identity. | +| `registerJavaTrait` abstract inputs | Abstract Java classes are accepted instead of throwing `IllegalArgumentException`. Declared abstract methods become generated-interface contracts without helper bodies; a later mixin must implement them before those members can be invoked. A no-argument abstract-mixin constructor may call an argument-taking superclass constructor; registration discards that direct call and its argument evaluation because the composite invokes the real base constructor first. This enables Java microblock mixins without changing existing concrete registrations. | +| `registerJavaTrait` members annotated `@SideOnly` | The old Java path ignored the annotation. It now omits opposite-side fields and methods from generated metadata and output, matching Forge and the Scala-trait path; visible and invisible annotation tables are both accepted. If the no-argument constructor is absent, including after Forge has already stripped it, an empty `$init$` preserves the generated initializer contract without running its body. Current-side members are unchanged. No audited Java registration relied on the old retention. | + +Concrete collection implementations also change without changing the declared `java.lang.Iterable`/`List` contracts: + +| Return path | Reference → Java | +| --- | --- | +| `JCuboidPart.getSubParts` / `getCollisionBoxes` | Scala `Seq` adapter → immutable `Collections.singletonList` | +| `MultipartHelper.IPartTileConverter.convertMulti` default | Scala `Seq` adapter → `Collections.emptyList` / `singletonList` | +| `Microblock.getDrops` | Java view of Scala `ListBuffer` → mutable `ArrayList` | + +Code depending on concrete collection classes or their exact mutation failure behavior must adapt. + +## Removed or changed binary surface + +These removals were accepted because neither audit identified a consumer of the removed surface. This does not +authorize removing other members of the same type. + +| Area | Removed or changed surface | +| --- | --- | +| `IDWriter` | Removed `write()`, `write_$eq(Function2)`, `read()` and `read_$eq(Function1)`. Use the Java methods listed below. | +| Both registries | `MicroMaterialRegistry.readIDMap` and `MultiPartRegistry$.readIDMap` return `java.util.List` instead of `scala.collection.Seq`; the return descriptor changes. | +| Registry compiler accessors | Removed `MicroMaterialRegistry`'s public mangled `$$idMap()`, `$$typeMap()` and `$$nameMap()` accessors, and the five `codechicken$multipart$MultiPartRegistry$$...()` accessors. Schematica's separate private `MultiPartRegistry$.$$typeMap` **field is retained** as a live Scala-map view; it is not one of the removed methods. | +| `NormallyOccludedPart` | Removed the inferred `getType(): scala.runtime.Null$` overload; the `String` method remains. | +| `MissingMicroMaterial` | Removed static `canRenderInPass(int)` and `isSolid()` forwarders. The companion no longer declares these methods but inherits the interface defaults. | +| `TileMultipart` | Removed compiler accessor `protected$worldObj(TileMultipart)`. | +| `BlockMultipart` | Removed `hasTileEntity$default$1()`; source callers must supply metadata explicitly. | +| `TileCache` | `map()` now returns Java `Map`; `add`/`remove` return `void` instead of Scala `Option`; `apply(BlockCoord)` returns a nullable `FlaggedTile` instead of `Option`. | +| `TileCache.FlaggedTile` | Dropped Scala case-class `copy`, copy-default getters, `canEqual`, value `equals`/`hashCode`/`toString`, product methods, and `scala.Product`/`scala.Serializable`. It now has ordinary object identity semantics; `t()` and `removed()` remain. | +| `ControlKeyModifer` | Replaced `isClientPressing_$eq(boolean)` with `setClientPressing(boolean)`; `map()` returns Java `Map` instead of Scala mutable `Map`; removed `playerControlValue(EntityPlayer)` and its implicit wrapper type. | +| `ControlKeyHandler` | Former static facade is now a `KeyBinding` subclass with `INSTANCE`. `wasPressed`/`tick` are instance methods, and the twelve inherited-KeyBinding static forwarders disappear. Initializing this client-only class now initializes its binding. | +| `MultipartRenderer` | Removed inherited-TESR static forwarders `func_147498_b`, `func_147496_a` and `func_147497_a`. | + +Removed named helpers and companions (besides private compiler artifacts covered below): + +- `JPartialOcclusion$class`, including `allowCompleteOcclusion` and `$init$`. +- `MicroMaterialRegistry$IMicroMaterial$class` and its four statics. +- `TRandomUpdateTick$class`, including `onWorldJoin` and `$init$`. +- `TScheduledPacketPart$class` and `PacketScheduler$`. +- `IconHitEffects$`. +- `TileCache$` and `TileCache$FlaggedTile$`. +- `ControlKeyModifer$`, `ControlKeyModifer$ControlKeyValue` and `ControlKeyHandler$`. +- `codechicken.multipart.package` / `package$` and `codechicken.microblock.package` / `package$`. + Their logger aliases are replaced by the corresponding proxy's `logger()`. + +Generated-tile helpers removed only from the **raw artifact** are listed separately below; Forge recreates them. +Other retained `$class` bridges and `MODULE$` companions are not covered by this removal decision. + +## Additions and default-method changes + +| Area | Additive Java entry points | +| --- | --- | +| `IDWriter` | `write(MCDataOutput, int)` and `read(MCDataInput)` | +| `JCuboidPart` | Static `subParts`, `collisionBoxes` and `renderBreaking` implementations for explicit forwarding | +| `JItemMultiPart` | Static `hitDepth` and `onItemUse(part, ...)` implementations | +| `MicroMaterialRegistry` | Static `setupIDMap`, `calcMaxCuttingStrength` and `loadIcons` forwarders | +| `PacketScheduler` / `TScheduledPacketPart` | Static `sendScheduled()` on the facade and `readMask(part, packet)` on the interface | +| `TileMultipart` | `hasDynamicParts` (false by default), `renderStatic`, `renderDynamic` and `randomDisplayTick` hooks for dispatching generated overrides through a stable superclass | +| `MultipartMixinFactory` | Four additional static forwarders: `onCompiled`, `autoCompleteJavaTrait` and the two mangled `ASMMixinFactory` parent helpers. Scala emitted them when the base became Java with its original public JVM access; the Java facade retains them. Existing facade entries are unchanged. | +| `MultipartEventHandler` / `MultipartEventHandler$` | Public `playerLoggedOut(PlayerLoggedOutEvent)` and `playerCloned(PlayerEvent.Clone)` event handlers for placement-modifier state cleanup and transfer | +| `MultipartHelper` | `createPreviewTileFromNBT(World, NBTTagCompound)` builds an uninstalled client composite directly from saved multipart NBT and rejects unsupported parts as a whole | + +Previously abstract JVM interface methods now have Java defaults, allowing inheritance without Scala forwarders: + +| Interface | Default methods | +| --- | --- | +| `JPartialOcclusion` | `allowCompleteOcclusion` | +| `TFacePart` | `solid`, `redstoneConductionMap` | +| `JIconHitEffects` | `getBreakingIcon` | +| `TItemMultiPart` | `getHitDepth` | +| `TEdgePart` | `conductsRedstone` | +| `Saw` | `getMaxCuttingStrength` | +| `MicroMaterialRegistry.IMicroMaterial` | `loadIcons`, `canRenderInPass`, `isSolid` | +| `TScheduledPacketPart` | `writeScheduled`, `readScheduled` | +| `PlacementGrid` | `render`, `drawLines`, `glTransformFace` | +| `MultiPartRegistry.IPartFactory2` | `createPartForClientPreview`; defaults to unsupported, while legacy Boolean/function adapters and built-in microblock factories construct their client variant | + +`ItemSaw` consequently no longer declares `getMaxCuttingStrength`; ordinary calls still resolve to the default, +but declared-member reflection differs. The same distinction applies to the two `MissingMicroMaterial$` methods above. + +The `TNormalOcclusion` super accessor +`codechicken$multipart$TNormalOcclusion$$super$occlusionTest(TMultiPart)` additionally loses `ACC_SYNTHETIC` and +becomes a default returning true, so javac can see and implement it. `NormallyOccludedPart` inherits it rather than +declaring its own. Existing Scala binaries retain their explicit super-chain overrides. + +## Recompiling Scala consumers + +Binary descriptors alone do not preserve Scala source semantics after `ScalaSignature` metadata is removed. + +### Trait composition + +A Java interface cannot supply a Scala trait's class supertype or its linearization. A superclass method wins over +an interface default, so recompiling `extends TMultiPart with TCuboidPart` silently selects the empty superclass +methods. Explicit forwarding is required where the implementation remains abstract: + +| Trait | Source migration | +| --- | --- | +| `TCuboidPart` | Extend `JCuboidPart`, or forward subparts, collision boxes and breaking rendering to its statics. | +| `TNormalOcclusion` | Explicitly combine `NormalOcclusionTest.apply(this, other)` with the intended super chain. Audit existing `super.occlusionTest` calls too: they no longer route through the old trait. | +| `TIconHitEffects` | Explicitly forward `addHitEffects` and `addDestroyEffects` to `IconHitEffects`. | +| `TItemMultiPart` | Explicitly forward `onItemUse` to `JItemMultiPart`; the inherited Item method otherwise wins. | +| `TRandomUpdateTick` | Explicitly implement `onWorldJoin` with `TickScheduler.loadRandomTick(this)`. | +| `TScheduledPacketPart` | Explicitly forward `read` to `TScheduledPacketPart.readMask(this, packet)`. | +| `ScratchBitSet` | Implement both methods and storage accessors, and initialize storage explicitly; the retained `$class` helper supplies the original implementations. | + +Previously compiled calls to **retained** `$class` bridges still link. This does not apply to the removed helpers above. + +### Source syntax and generic signatures + +- An object used as a value now needs `X$.MODULE$` where that companion is retained (event handlers, proxies, + recipes, packet handlers, materials and generators). Static calls alone do not supply a singleton value. +- Object-application sugar becomes explicit `.apply(...)`, e.g. `NormalOcclusionTest.apply(...)` and + `MicroblockPlacement$.MODULE$.apply(...)`. +- `ASMImplicits` no longer provides Scala implicit/value-class syntax. Use `nodeName(clazz.getName)` and + `ExtBitSet$.MODULE$.copy$extension(bits)` explicitly, or construct its retained Java wrappers. Existing boxed and + `$extension` binary entry points remain; implicit conversion requires Scala metadata Java cannot emit. +- Scala property assignment needs the explicit Java-authored `_$eq(...)` method, e.g. `renderID`, `loadingWorld`, + `angelicaCompat` and microblock `shape`. +- `ByteCodeReader.advance(length)(value)` becomes `advance(length, value)` when recompiling Scala. Argument + evaluation remains eager, and previously compiled calls retain the same binary descriptor. +- `ASMMixinFactory` constructor parameters and `construct` arguments need an explicit Scala `Seq`, not Scala + varargs syntax. Overrides of `onCompiled` and `autoCompleteJavaTrait` must be public: Java preserves their original + public JVM access without Scala's protected-source metadata. +- `tile.partList(i)` becomes `tile.partList.apply(i)`. Static bounds getters on Face, Corner, Edge and Post factories + need `aBounds()(index)` instead of `aBounds(index)`; Java no-argument methods may need explicit parentheses. +- `TileMultipart.getOrConvertTile2` exposes `Tuple2` instead of a Scala-typed Boolean second + element; source callers need a cast. Scala 2.11 callbacks to `operate(Function1<..., BoxedUnit>)` need an explicit + `AbstractFunction1` instead of the previous Unit-returning lambda adaptation. +- The Face, Corner, Edge, Post and Hollow factory **companions** widen `baseTrait` to + `Class` from their specific trait type. Their static facades retain the specific generic + type, and the raw JVM return descriptor remains `Class`. +- `MultiPartRegistry.registerParts(IPartFactory, String[])` and the `IPartFactory2` array overload gain Java varargs + flags. `BlockMultipart.addCollisionBoxesToList` uses raw `List` rather than `List` to override vanilla. Neither + changes its raw JVM descriptor. + +## Generated tile traits: raw artifact versus Forge runtime + +These ports replace Scala interfaces/helpers with concrete Java mixin inputs. Forge rewrites the inputs back into +interfaces and generates implementation helpers. Existing binaries retain the runtime interface calls, but code +recompiled against the **untransformed dev jar** may emit `invokevirtual` or `getfield` against a type that becomes +an interface, causing verification/linkage failures. A transformed compile stub or explicit source guidance is +required before claiming source-compatible downstream rebuilds. + +| Raw artifact change | Affected types | +| --- | --- | +| Interface + `$class` → concrete `TileMultipart` subclass | `TSlottedTile`, `TRedstoneTile`, `TTileChangeTile`, `TFluidHandlerTile`, `TileMultipartClient` | +| Interface + `$class` → concrete child mixin input | `TRandomDisplayTickTile` (extends the registered `TileMultipartClient` input) | +| Removed raw `TIInventoryTile$class`; moved implementation into `JInventoryTile` input | `TIInventoryTile` itself remains a Java interface. Source consumers should target it, not the transformed `JInventoryTile` class. | + +Inherited/foreign-field and callback workarounds add package-private access shims for redstone, tile-change, +fluid, inventory and both client traits; they are not new consumer APIs. Transformer constraints and shim recipes +are documented in the [maintainer guide](MAINTAINERS.md#trait-and-dispatch-rules). + +The client-trait port also deliberately extends the Java-trait transformer: + +- Registered Java traits may extend an already registered Java trait; the parent runtime interface participates in + hierarchy and linearization. A child's `super` call dispatches to the parent trait's implementation, or to the + base class when the parent trait does not override that method. +- Explicit field accessors are recognized rather than duplicated. +- Transient input fields are excluded from automatic `copyFrom`. Client render caches use this opt-out; their + generated runtime fields remain ordinary private fields. + +## Shared classfile differences + +These are accepted once for the migration, not repeated for every otherwise equivalent port: + +- Java-authored types lose Scala signature/marker attributes and use Java source-file/debug metadata. Static facades + and helper classes gain private constructors where Scala emitted none. Java class initializers lack Scala's + `ACC_PUBLIC`, and singleton publication follows Java initialization rather than Scala's constructor assignment. +- Unreferenced Scala `$$anonfun$`/anonymous implementation classes and private compiler accessors disappear or are + replaced by Java helpers/lambdas. Their names are not supported API. This does **not** include named compatibility + bridges or reflective fields: audit those individually. Retained Scala traits still emit their required helpers. +- The `Object[]` renderer bridges on `ItemMicroPartRenderer$` and `ItemSawRenderer$` are ordinary Java methods rather + than synthetic Scala methods; signatures and dispatch remain available. +- The private scratch `ThreadLocal` fields on `MicroblockGenerator$` and `MultipartGenerator$` lose `ACC_FINAL` so + their public Scala-trait setters can still replace storage. +- The private `ItemSaw.harvestLevel` field loses `ACC_FINAL` so `setHarvestLevel(int)` can update the same storage as + the retained getter and old Iguana reflection. Its name, type and visibility remain unchanged. +- TickScheduler's private Scala scheduler types become package-private static nested Java classes, retaining their + binary names. + +## Updating this ledger + +Add only a new effective runtime, binary, source or classfile difference, with its consequence and reason for +acceptance. Amend an existing row when a later change supersedes it. Do not add passing test counts, unchanged +behavior, build observations, performance claims or a “no divergence” section for each new port. diff --git a/docs/migration/MAINTAINERS.md b/docs/migration/MAINTAINERS.md new file mode 100644 index 0000000..9066d07 --- /dev/null +++ b/docs/migration/MAINTAINERS.md @@ -0,0 +1,149 @@ +# ForgeMultipart maintainer constraints + +These constraints explain the retained build and runtime machinery. Consumer migration belongs in the +[adoption ledger](COMPATIBILITY.md#java-api-adoption-ledger); remaining release checks belong in +[MANUAL_CHECKS.md](MANUAL_CHECKS.md). Keep this guide about current mechanisms, not completed-port history. + +## Build and runtime boundaries + +- Preserve a Java 8 artifact with equivalent startup, gameplay, serialization and network behavior. The target + modern-runtime policy spans Java 17–26; validate packaged releases on the selected supported runtime. Equal + throughput across Java versions is not required. The deobfuscated Forge test runner uses Java 8; the current + modern dedicated-server run tasks are not a substitute for packaged validation. +- Keep `enableModernJavaSyntax = false` while Scala 2.11.5 remains. Normal Java and joint Scala/Java compilation + use Java 8. Helpers importing retained Scala models belong in the joint `src/main/scala` source set because + `compileJava` runs before those Scala types exist. +- `scalaCompileOptions.force = true` prevents stale `Tags.VERSION` constants in joint-compiled Java `@Mod` + annotations. Zinc otherwise misses those consumers when the generated constant changes. Verify all five mod + annotations in dev/release artifacts against their artifact version; replace the guard only with equivalent coverage. +- Keep registered trait inputs and compatibility facades conservative. Moving `RedstoneInteractions$` or + `BlockMultipart` pulls transformer-sensitive dependencies; `RenderPartResolver` is needed by joint compilation + before Java helpers that use it. The explicit `Microblock` cast in `PostMicroblockTraitLogic` is required by the + retained Scala declaration. +- GTNHLib is compile-only here. Its fastutil compile classpath does not grant a runtime dependency. Declare that + dependency explicitly before using fastutil in ordinary code; require profiling evidence for such a change. + +## Retained compiler constraints + +- Scala multiple-trait inheritance still needs metadata. Java registration incorporates an already registered + superclass trait, not implemented Scala interfaces. `CommonMicroblockClient` combines three parents, including + `TMicroOcclusionClient`. Preserve state/accessor/super bridges until a characterized replacement exists. +- ProjectRed's external `LightMicroblock` requires ScalaSignature ingestion, `$class` helpers and generated + dispatch until its replacement is released and adopted. Abstract Java mixins and side filtering do not remove + that requirement, nor FMP's internal Scala trait inputs. +- ScalaSignature primitive literal `value()` methods coexist with erased `Object value()` bridges that Java + source cannot declare together. Five generic inner-construction branches require exact outer-instance bindings. + Preserve inferred Scala return types too: an explicit type can alter ScalaSignature without changing a JVM descriptor. +- Javac interprets nested `ClassInfo$` names and `IterableLike.view()` differently from scalac. Keep construction + callbacks, the initial Scala `.view`, lazy builders and virtual dispatch; avoid path-dependent symbols or generated + companion classes in Java-callable signatures. Joint helpers resolve `ASMMixinCompiler$.MODULE$` internally. +- Scala 2.11.5 rejects a Java class beside its same-name Scala object. Port `StackAnalyser`'s class, companion, + model and serialization contracts together, rather than splitting their public shapes mechanically. +- Preserve characterized algorithm quirks during mechanical conversion: primitive `NEWARRAY` throws + `MatchError: 188`, wide arguments can misindex `getSuper`, and Scala `String` aliases decode as + `Lscala/Predef/String;`. Successful external fixtures use `java.lang.String`; fix these separately with regressions. +- Metadata keys distinguish dotted/slashed names; byte-cache publication normalizes and invalidates only that key. + Parse failures retain bytes, null results are cached, load failures retry, and dump failures follow publication. + Ordinary duplicate `define` errors remain reflection-wrapped; direct LinkageError handling is case-sensitive and + its null-message behavior is characterized. Do not silently alter these during extraction. + +## Trait and dispatch rules + +- A superclass method wins over a Java interface default, silently bypassing former Scala trait behavior. Audit + implementors and existing `super` call sites; `PostMicroblock.occlusionTest` is a concrete example. Recompiled + implementors may also lose Scala-generated forwarders when a trait gains a default. +- A Scala trait extending a class is only an interface in bytecode. Synthetic super accessors are invisible to + javac. Preserve required non-synthetic bridges; retained Scala super calls can stay in Scala using the existing + result-code pattern instead of eager callbacks. `TScheduledPacketPart.readMask` is the static-helper pattern for + a trait method shadowed by a superclass. +- `private[multipart]` reaches sibling packages, so Java package-private is not equivalent. Keep required public + descriptors and companion-only methods. Check reflective string names as well as bytecode references before + removing companions; `MultipartHelper$` is a reflective dependency. +- Common Java must not use a side-stripped static facade. `MultipartProxy$.MODULE$.postInit()` retains virtual + server fallback; the corresponding static forwarder is stripped on dedicated servers. +- Registered Java trait classes become interfaces at runtime. Consumer calls must use stable base/capability + types, not raw class/field opcodes. See [tile access](../api/TILE_TRAIT_ACCESS.md) and + [custom trait authoring](../api/CUSTOM_TILE_TRAITS.md). +- Put inherited calls, inherited field access, argument-owned field access and primitive-array allocation in an + ordinary helper outside the trait transformer. Use `Object` parameters when a trait-to-base cast must survive + javac; a raw subclass parameter can cause javac to omit the required cast. +- Trait inputs cannot carry an `InnerClasses` attribute; anonymous classes, lambdas and string switches need + transformer-specific scrutiny. Keep callbacks in named helper classes. Register parent Java traits first. + Mark runtime-only fields `transient` when generated `copyFrom` must not copy them. +- Abstract mixin methods remain interface contracts until implemented by a later mixin. Source constructors must + be no-argument; registration removes the superclass call and its argument evaluation but retains field initialization. +- Java API examples must compile against the packaged dev jar with Scala excluded. Merely removing imports does + not prove this: overloaded `loadParts`/`registerParts` still required Scala during resolution, motivating distinct + `loadPartList`/`registerPartFactory` names. Preserve legacy override dispatch underneath the Java adapters. + +## Verification + +For a source conversion, characterize the untouched implementation first and preserve the compiled reference +consumers. Compare names and descriptors together, modifiers, generic signatures, reflective private fields, +class inventory, serialized models, packets/NBT and generated interfaces. Keep behavior fixes separate from +mechanical ports. Coverage percentages and signature counts alone are insufficient. + +```powershell +.\gradlew.bat spotlessApply checkstyleTest build +.\gradlew.bat runFunctionalTestServer +.\gradlew.bat --stop +.\gradlew.bat clean spotlessApply checkstyleTest build +.\gradlew.bat runFunctionalTestServer +``` + +A Scala-to-Java replacement needs clean verification: Zinc can retain the removed Scala class and package it +instead of exercising the new source. Stop the daemon if Windows holds build outputs open. Verify packaged +class version 52 and mod-version freshness, including after the release commit. + +JUnit reports are under `build/test-results/test/` and `run/server/junit-out/`; inspect counts, failures, errors and +skips. The Forge task rejects missing/failed reports. Keep that CI gate required. Generated dumps are under +`run/server/asm/multipart/`; assert a nonzero expected inventory and investigate differences before normalizing +proven debug/private-name changes. Headless client-body probes do not validate actual client loading or GPU output. + +Use Forge for world/registry initialization and FakePlayer cases. Error-path logging needs initialized registries; +shared global state must be restored between tests. Headless class-initialization failures can differ between the +first and subsequent calls, so probes use `LinkageError` rather than one exact subclass. Archived test mods lacking +current registered content need disposable worlds to avoid missing-mapping prompts; restore server configuration. + +Run `java tools/AbiScan.java "/.minecraft/mods" ForgeMultipart` on JDK 17+ and compare full rows with +`src/test/fixtures/abi/gtnh-2.9.0-rc2-consumers.txt` (and `gtnh-daily-678-consumers.txt` for row history). +Then check that every scanned type and member still resolves against the compiled port: a static resolver flags +runtime-generated `scalatraits` accessors such as `TSlottedTile.v_partMap()`, which the Forge smoke test covers +instead. Preserve audited source revisions separately from pack versions. +Compile frozen Scala fixtures with Scala 2.11.5 on Java 8 against the reference artifact using +`scala.tools.nsc.Main -target:jvm-1.8`, not against the replacement. Store bytes under `src/test/resources/compat/` +and provenance/hashes in `src/test/fixtures/README.md`. + +## Performance validation + +Profile typical, busy and explicitly labeled stress scenes: mixed ticking/redstone tiles, placement/occlusion, +chunk transitions and previews, frame moves, client microblocks/halos, multiplayer packets, startup and first-use +class generation. Historical focused results do not establish current whole-pack gains. + +Record world/snapshot, pack and consumer/FMP revisions, hardware, JVM/flags/heap, graphics/view distance, part/trait +counts and repeatable actions. Restore equivalent state. Compare baseline versus changed FMP with consumers fixed, +then old versus migrated consumer calls on the same FMP artifact; include a compatible Scala reference if possible. +Keep runtime/configuration fixed and separate cold startup from warmed play, CPU-bound from GPU-bound scenes. + +Start with five independent runs per variant, alternate order, match warm-up/measurement/profiling overhead, and +extend noisy runs. Report medians and variability, absolute units and relative differences; derive p95/p99 from +sufficient within-run samples. Include allocation, GC, retained/peak heap, cold latency and packet costs where relevant. +Confirm timing without profiling if overhead matters. A helper ratio is not an FPS/TPS claim. + +Before editing, define the hypothesis, measured site and benefit above noise. Keep raw baselines and record commands, +commits, correctness checks, controls, regressions and acceptance decisions. Validate representative pack scenes after +consumer adoption. Below-noise results are valid; no fixed speedup target or speculative optimization is required. + +The existing focused harness runs with an accepted local server EULA: + +```powershell +.\gradlew.bat runFunctionalTestServer "-Pforgemultipart.profileFunctionalTests=true" +jfr summary run/server/forgemultipart-baseline.jfr +jfr view --width 220 hot-methods run/server/forgemultipart-baseline.jfr +jfr view thread-allocation run/server/forgemultipart-baseline.jfr +``` + +Profile mode overwrites ignored `run/server/forgemultipart-profile.txt` and `forgemultipart-baseline.jfr`. +The text's `startEpochMillis`/`nanos` identify phase windows; allocation counts use HotSpot per-thread counters. +Java 8 recordings expose TLAB events, not `ObjectAllocationSample`, so recent JDK `allocation-by-site` views are +not a valid summary. Consult `ForgeMultipartProfileWorkload` for current workload sizes and phases. diff --git a/docs/migration/MANUAL_CHECKS.md b/docs/migration/MANUAL_CHECKS.md new file mode 100644 index 0000000..78d031c --- /dev/null +++ b/docs/migration/MANUAL_CHECKS.md @@ -0,0 +1,156 @@ +# Manual compatibility checklist + +Behavior that the automated layers cannot assert. Plain-JVM tests cannot reach a world, a client or a renderer, and +the Forge server suite is headless, so everything below needs a human in a running client unless stated otherwise. + +Each entry names what to do, what should happen, and which port put it here. Run the relevant entries before any +release that includes those ports. + +Change `[ ]` to `[x]` after a successful check. If a check fails, leave it unchecked and add a dated note immediately +below its table. + +Item examples below use English NEI names, checked against the supplied consumer clones' `en_US.lang` files and +registration code on 2026-09-03. Use the mod name to distinguish similarly named items. Sizes/colours add suffixes; +an OpenComputers print can have a custom label. Record the tested FMP build, pack version and item/setup with results. + +For ProjectRed's external Scala-trait path, start with **Inverted White Lamp** (or another inverted colour), then saw +it into microblocks. `LightMicroMaterial.register` registers only lamp metadata 16–31; ordinary lamps and the +**White Illumar** crafting ingredient do not exercise this path. Useful resulting names include **Inverted White +Lamp Cover**, **Hollow Inverted White Lamp Cover**, **Inverted White Lamp Nook**, **Inverted White Lamp Strip** and +**Inverted White Lamp Post**. + +## Rendering and particles + +| Done | Check | Concrete example / setup | Expected | From | +| --- | --- | --- | --- | --- | +| [ ] | Break a cover or microblock part and watch the break overlay | Forge Multipart **Stone Cover** | The breaking texture is drawn on the part's own cuboid, not the full block | `TCuboidPart.drawBreaking` | +| [ ] | Hit a part repeatedly without breaking it | Forge Multipart **Grass Cover**; its top, side and bottom icons make a wrong face visible | Hit particles spawn on the struck face, using that face's icon | `IconHitEffects.addHitEffects` | +| [ ] | Break a part fully | ProjectRed Expansion **Solar Panel** placed horizontally; it has thin bounds and distinct top/side icons | Destroy particles query sides 0–5 and are scaled to the part's bounds | `IconHitEffects.addDestroyEffects` | +| [ ] | Break a hollow cover | Forge Multipart **Hollow Stone Cover** | Destroy particles use the full block bounds, not the part bounds | `addDestroyEffects` scaleDensity false | +| [ ] | Hover face, hollow, edge and corner microblock placement targets | Forge Multipart **Stone Cover**, **Hollow Stone Cover**, **Stone Strip** and **Stone Nook**; for a consumer override, hold a Stone Cover over ProjectRed **Framed Red Alloy Wire** to preview its jacket | The highlight and guide lines match each placement region, and a mod supplying its own highlight renderer overrides them | `PlacementGrid` / `MicroblockRender.renderHighlight` / `MicroblockEventHandler.drawBlockHighlight` / `MicroMaterialRegistry.renderHighlight` | +| [ ] | Reload client resources after placing several microblock materials | Place **Stone**, **Glass**, **Grass** and ProjectRed **Inverted White Lamp Covers**, then press `F3+T` | The texture atlas reloads every material icon without missing textures | `MicroblockEventHandler.postTextureStitch` / `BlockMicroMaterial.loadIcons` | +| [ ] | Render microblocks of a block whose icons another mod finishes in `TextureStitchEvent.Post` | Saw Chisel **Stone Bricks** variants that use `-v4` textures (2x2 submaps) into covers; check them on world load and again after `F3+T` | Covers show the Chisel texture, never the missing texture, both times | `BlockMicroMaterial.icont` stale re-resolve (GTNH issue 27183) | +| [ ] | Look at a **Stone Saw**, **Iron Saw** and **Diamond Saw** in inventory and in hand | All three items are supplied by Forge Multipart | The saw item renders with its custom transform | `ItemSaw` `IItemRenderer` | +| [ ] | Place microblocks of several materials, including glass | Compare Forge Multipart **Stone Cover** and **Glass Cover** | Transparent materials render in the correct pass and are not opaque | `BlockMicroMaterial` / `IMicroMaterial.canRenderInPass` | +| [ ] | Place grass and mycelium covers at several thicknesses and biomes | Forge Multipart **Grass Cover** and **Mycelium Cover**, preferably 1/8 and 1/2 thicknesses | Grass has an untinted base plus a tinted, height-aligned side overlay and tinted top; mycelium uses its top texture on horizontal faces and height-aligned side texture elsewhere | `GrassMicroMaterial` / `TopMicroMaterial` | +| [ ] | Load a saved microblock whose material is no longer installed | In a disposable instance, add `"minecraft:coal_ore"` to `microblocks.cfg`, create and save a **Coal Ore Cover**, remove that line, then reload | The part remains present and renders the magenta/black missing texture instead of becoming material ID 0 | `MissingMicroMaterial` | +| [ ] | Put a **Stone Cover** and a ProjectRed **Inverted White Lamp Cover** on opposite faces of one block space, then add/remove another part | Use another Stone Cover or ProjectRed **Red Alloy Wire** as the part that triggers cache updates | Static parts remain in the block render, dynamic parts remain in the TESR pass, and neither disappears after a part update | `TileMultipartClient` render caches | +| [ ] | Watch a multipart torch long enough to emit display particles | Add a **Stone Cover** to a vanilla **Torch** to convert it into a multipart; an active **Redstone Torch** is another useful case | Only parts implementing `IRandomDisplayTick` emit particles, with no duplicate or missing callbacks | `TRandomDisplayTickTile.randomDisplayTick` | +| [ ] | Start a client, join a server, place/update a multipart and use the multipart control key | Assign Forge Multipart's **Switch block disposition** key, then place and reorient a **Stone Cover** | Block and generated-tile rendering work, client packets arrive, and control-key state changes are sent once without duplicate registrations | `MultipartProxy_clientImpl.postInit` / `onTileClassBuilt` | +| [ ] | Move into view of a chunk containing several multipart tiles, then add, update and remove parts | Use mixed tiles containing an AE2 **ME Glass Cable**, a **Stone Cover**, and ProjectRed **Red Alloy Wire** on different faces | The initial chunk description reconstructs every tile and compressed updates apply without missing, duplicated or ghost parts | `MultipartCPH` / `MultipartSPH` | +| [ ] | Start a client with 3D saws enabled, inspect all three saw tiers and the microblock item, then repeat with Angelica installed | Set `useSawIcons=false`; inspect Forge Multipart's **Stone**, **Iron** and **Diamond Saws** and any Stone microblock | Each renderer is registered once, saw models use the correct tier, microblock icons load, client packets register, and the Angelica hook initializes without errors | `MicroblockProxy_clientImpl.init` / `postInit` | +| [ ] | Render several block micro-materials with Angelica shaders enabled, then render an unrelated block | Render **Stone**, **Grass** and **Glass Covers**, then an unrelated vanilla Stone block | Each face receives the matching block/meta shader material and the override is reset after the microblock draw | `MaterialRenderHelper.blockAndMeta` / `render` | +| [ ] | Inspect face, hollow, edge and corner microblocks in inventory and as dropped entities | Forge Multipart Stone **Cover**, **Hollow Cover**, **Strip**, **Post** and **Nook** at several sizes | Every size/material combination uses the correct localized name and centered shape/material render | `ItemMicroPart` / `ItemMicroPartRenderer` / `MicroblockRender.renderItem` | +| [ ] | Saw **Stone**, **Glass** and a ProjectRed **Inverted White Lamp** into face covers; place them on all six faces beside other microblocks, then inspect their inventory renders | The named Forge Multipart and ProjectRed microblocks are the concrete cases | Opaque covers retain their outer face while internal faces follow the shrink mask; transparent covers use the shrunk bounds, and inventory renders show the complete shape without missing or doubled faces | `FaceMicroblockClient.render` / `FaceMicroblockTraitLogic.render` | +| [ ] | Saw **Stone**, **Glass** and a ProjectRed **Inverted White Lamp** into strip/post shapes; place crossing posts on all three axes between face covers, then add and remove neighbours | The named Forge Multipart and ProjectRed microblocks are the concrete cases | Compare both split segments with the reference, including the second segment's use of physical bounds; removal resets the split without stale geometry or missing sections | `PostMicroblockClient.recalcBounds` / `PostMicroblockClientLogic` / `shrinkFace` / `shrinkPost` | +| [ ] | Run connected AE2 **ME Glass Cable**, **ME Covered Cable** and **ME Dense Smart Cable**, plus ProjectRed **Framed Red Alloy Wire**, through hollow stone/glass covers on all six faces | The named AE2, ProjectRed and Forge Multipart parts are the concrete cases | Each opening follows the connector size; opaque and transparent rims, breaking overlay and highlight have no missing, doubled or stale sections after neighbour changes | `HollowMicroblockClient` / `HollowMicroblockClientLogic` | +| [ ] | Place touching **Stone Cover**, **Glass Cover**, corner/edge counterparts and ProjectRed **Inverted White Lamp** microblocks at mixed sizes; add/remove neighbours, then rejoin the server | The named Forge Multipart and ProjectRed microblocks are the concrete cases | Intersections choose the same winner, opaque covered faces stay masked, and every surviving segment refreshes without gaps or stale bounds | `MicroOcclusion` / `TMicroOcclusionClient` / `TMicroOcclusionClientLogic` | + +2026-09-03: Placing a ProjectRed part with `1.7.12-algent-java.186+60d060a3ff` crashed in +`MultipartRenderer$.renderTileEntityAt`: its class call to `TileMultipartClient.hasDynamicParts()` encountered the +transformed runtime interface. The renderer now calls the generated getter through a stable `TileMultipart` base +hook. Four headless Forge cases cover the actual renderer bytecode's guards and dispatch; both nonempty cases +reproduced the original crash. The user retested with the supplied fix and confirmed that placement no longer +crashes. Static/dynamic drawing and part updates still need their full client checks before marking the rendering +entries complete. + +## Placement and interaction + +| Done | Check | Concrete example / setup | Expected | From | +| --- | --- | --- | --- | --- | +| [ ] | Right-click a block face with ProjectRed **Red Alloy Wire** at a shallow angle | ProjectRed **Red Alloy Wire** | The part is placed in the clicked block | `TItemMultiPart.onItemUse` depth below 1 | +| [ ] | Repeat with **Red Alloy Wire**, clicking deep into a face | ProjectRed **Red Alloy Wire** | The part is placed in the neighbouring block on that side | `TItemMultiPart.onItemUse` offset path | +| [ ] | Place a part where it would overlap an existing one | Place a **Stone Cover**, then force a second Stone or Hollow Stone Cover into the same face slot using **Switch block disposition** if needed | Placement is refused rather than silently replacing | `NormalOcclusionTest`, `PartialOcclusionTest` | +| [ ] | Pass redstone through a hollow cover on a multipart face | Put ProjectRed **Framed Red Alloy Wire** in the centre and a **Hollow Stone Cover** between it and an external redstone source | Redstone still passes through the hollow centre | `TFacePart.redstoneConductionMap` | +| [ ] | Place **Hollow Stone Cover** and **Hollow Inverted White Lamp Cover** parts at several thicknesses around ProjectRed **Framed Red Alloy Wire** on all six faces; add/remove the wire, select the rim, then save and reload | The named Forge Multipart and ProjectRed parts are the concrete cases | The opening follows the connector, selection/collision respect the hollow centre, incompatible overlaps are refused, and shape/material survive reload | `HollowMicroblock` / `HollowMicroblockTraitLogic` | +| [ ] | Run ProjectRed **Red Alloy Wire** across a **Stone Strip** edge microblock | ProjectRed **Red Alloy Wire** and Forge Multipart **Stone Strip** | Conduction matches the pre-port behavior | `TEdgePart.conductsRedstone` | +| [ ] | Cut materials with saws of different harvest levels | Try **Stone Saw → Iron Block**, **Iron Saw → Diamond Block**, and **Diamond Saw → Obsidian**; confirm weaker saws reject the higher-tier cases | Only materials at or below the saw's strength can be cut | `Saw.getMaxCuttingStrength` | +| [ ] | Place the same microblock in survival and creative, including onto an existing multipart tile | Use a **Stone Cover** in empty space and beside ProjectRed **Framed Red Alloy Wire** | Valid placements play the material sound; survival consumes the expected amount while creative does not | `ItemMicroPart.onItemUse` | +| [ ] | With a second client watching, convert a vanilla torch by adding a cover, then add/remove compatible ProjectRed **Red Alloy Wire**, ProjectBlue **Control Panel**, or AE2 **ME Glass Cable** parts | Start with a vanilla **Torch + Stone Cover**, then use any named consumer part that fits | Both clients see each part exactly once, with no ghost block, stale render or missing part after tile replacement | `MultipartGenerator` conversion packet order and generated tile upgrade/downgrade | + +## Downstream integration + +| Done | Check | Concrete example / setup | Expected | From | +| --- | --- | --- | --- | --- | +| [ ] | Saw a ProjectRed **Inverted White Lamp** into cover, hollow cover, nook/corner and strip/post shapes; test face, corner, edge and centre-post placement | ProjectRed **Inverted White Lamp**; ordinary lamps and **White Illumar** do not exercise this registration path | The lamps generate, use the correct bounds, render and light correctly | `MicroblockGenerator.registerTrait` Scala trait path / shape factory facades | +| [ ] | Place and break OpenComputers **Cable** and a **3D Print**, ProjectBlue **Control Panel** (size suffix varies), and AE2 **ME Glass Cable**; share their block space with a compatible cover | Use a **Stone Cover** with each named consumer part | No `NoSuchMethodError` or `AbstractMethodError` in the log | retained `$class` bridges | +| [ ] | Load and render a schematic containing an ordered mixed multipart tile | Schematica; capture an AE2 **ME Glass Cable** with a **Stone Cover** and ProjectRed **Red Alloy Wire** on different faces | Every part appears in the preview in the saved order; the integration does not silently disable itself | `createPreviewTileFromNBT`, factory preview callbacks and `MultipartRenderer.renderWorldBlock` | +| [ ] | Open a GuideNH scene containing a multipart tile and export its part/material data | GuideNH; use the same **ME Glass Cable + Stone Cover + Red Alloy Wire** composite | The preview, material data and part statistics are complete | `createPreviewTileFromNBT`, typed part/material traversal and `MultipartRenderer.renderWorldBlock` | +| [ ] | Place FMP buttons on every supported face with Et Futurum loaded | Convert a vanilla **Stone Button** by adding a **Stone Cover**; repeat its supported orientations with Et Futurum Requiem installed | Button orientation matches the fixed vanilla behavior | supported `ButtonPart.setOrientation`; legacy arrays until consumer adoption | +| [ ] | With Iguana harvest-level tweaks enabled, inspect and use the Stone, Iron, Diamond, Ardite, Cobalt and Manyullyn saws against materials spanning their configured tiers | Forge Multipart supplies the first three saws; Iguana Tweaks for Tinkers' Construct supplies **Ardite**, **Cobalt** and **Manyullyn Saws** | Tooltips, saw textures and cutting recipes use the remapped tier; weaker saws do not gain the cached strongest-saw exemption | supported `ItemSaw.setHarvestLevel`; legacy field until consumer adoption | +| [ ] | Use OpenComputers **3D Printer** to make a **3D Print** with different off/on shapes that both fit beside a cover; place it with the cover and right-click to toggle | OpenComputers **3D Printer**, its resulting **3D Print**, and a Forge Multipart **Stone Cover** | Its slots are rebuilt without losing, hiding or disconnecting either part | external mutation of `TSlottedTile.v_partMap` plus `bindPart` | +| [ ] | Move the same composite tile using a ProjectRed **Frame Motor** with MCFrames **Frame** blocks, then a **Matter Manipulator MKIII** in move mode | Move the **ME Glass Cable + Stone Cover + Red Alloy Wire** composite with the named ProjectRed, MCFrames and Matter Manipulator items | Coordinates, part-to-tile references, generated interfaces and rendering remain correct after `onMoved` | ForgeRelocationFMP / MatterManipulator live multipart move lifecycle | +| [ ] | Capture and rebuild a mixed multipart tile with a BuildCraft **Builder**, then with a **Matter Manipulator MKIII** copy/paste | Blueprint and copy the **ME Glass Cable + Stone Cover + Red Alloy Wire** composite plus a Stone Strip, Hollow Cover and FMP torch or button; rebuild it elsewhere, rotated | Every part returns once with its material, shape, orientation and connections; microblocks land before other parts and no extra description packet is needed | Part `save`/`loadPart`, core type IDs and microblock NBT read by BuildCraftCompat and MatterManipulator | +| [ ] | Inspect a mixed multipart tile with Waila | Waila; inspect the **ME Glass Cable + Stone Cover + Red Alloy Wire** composite | Providers receive every saved part ID and show the expected part data | reflected block identity and tile NBT `parts`/`id` layout | +| [ ] | Spray ProjectRed wires that share blocks with covers, once normally and once sneaking to chain | GregTech **Spray Can** on ProjectRed **Insulated Wire** and **Bundled Cable** runs, each block also holding a **Stone Cover** placed before the wire | Only the struck wire, and when chaining its same-type neighbours, recolor; the cover is never selected | GT5U `BlockMultipart.reduceMOP` `Tuple2` index plus `jPartList`/`partMap` order | +| [ ] | Look at a ThaumicEnergistics vis interface on a covered AE2 cable with Waila | ThaumicEnergistics **Vis Relay Interface** part on an AE2 **ME Glass Cable** with a **Stone Cover** | The vis-link Waila lines still appear once the cover has turned the cable into a multipart tile | reflected `TileMultipart` class name plus AE2 part-host pass-through | +| [ ] | Load a world saved before the port | Use a pre-port save containing **Stone Covers**, ProjectRed lamp microblocks and an AE2 cable | All microblocks and covers keep their material and shape | `Microblock` shape/material NBT and `MicroMaterialRegistry` id map | +| [ ] | Join a server whose material set differs from the client | In disposable client/server instances, add `"minecraft:coal_ore"` only to the server's `microblocks.cfg` | The client is disconnected with the missing material list, not a crash | `readIDMap` | +| [ ] | Join a server whose multipart type set differs from the client | Setup-only: use a small test addon that registers a part on only one side; stock consumer removal may be rejected earlier by Forge's mod handshake | The client is disconnected with the ordered missing-part list, not a crash | `MultipartCPH.handlePartRegistration` | + +The [Java illuminated extension example](../api/MICROBLOCK_EXTENSIONS.md) has dedicated-server and headless halo +coverage. When adopting it in ProjectRed, rerun the illuminated shape/lighting checks above on a physical client, +including hollow connector widths and all sides, pass filtering and the existing halo queue/configuration. Neither +its callback-side input tests nor its retained client-body probe validates actual client generation or GPU output. + +## Not yet covered anywhere + +- [ ] Follow the [performance protocol](MAINTAINERS.md#performance-validation); historical focused measurements are not full-pack evidence. A representative + full-pack capture and the matching post-optimization comparison still need to be performed. Example setup: a loaded + chunk containing many AE2 cables, ProjectRed wires/lamps and assorted Forge Multipart microblocks. +- [ ] Shape-specific microblock NBT and packet payloads. Core `Microblock` shape/material NBT, description bytes and + one-byte shape updates are complete, along with compact core tile/part NBT and logical chunk-description fixtures. + Example setup: Stone Cover, Hollow Cover, Nook, Strip and Post; save/rejoin and mutate each shape. + +- [ ] Add UtilitiesInExcess as a compile/runtime fixture before it enters the pack: its `IPartFactory2` + registration, fence/wall/sphere parts and `getIdMap` / `materialCount` enumeration against the built port jar. + Fix its `mat` / `material` NBT key mismatch first; see the + [consumer finding](COMPATIBILITY.md#utilitiesinexcess---future-replacement-already-a-substantial-consumer). + +## Item-name references + +Resource paths below are relative to each consumer's `src/main/resources` in its source checkout. +Code locations identify the matching source packages/methods. Registration/behavior was checked in addition to +translation keys; these are examples for running the checks, not claims that the checks have passed. + +| Consumer | Translation key / source | +| --- | --- | +| ProjectRed | `assets/projectred/lang/en_US.lang`: `tile.projectred.illumination.lamp\|16`, `item.projectred.transmission.wire\|0`, `framewire\|0`, `item.projectred.expansion.solar_panel`, `tile.projectred.expansion.machine2\|8`; `illumination/lightmicroblocks.scala` registers inverted lamp materials, `expansion/TileSolarPanel.scala` supplies a thin part with top/side particle icons, and `expansion/TileFrameMotor.scala` uses the relocation API | +| OpenComputers | `assets/opencomputers/lang/en_US.lang`: `tile.oc.cable`, `tile.oc.print`, `tile.oc.printer`; `integration/fmp/PrintPart.scala` toggles state and rebuilds slots | +| ProjectBlue | `assets/projectblue/lang/en_US.lang`: `item.gcewing_projectblue:controlPanel`; `ControlPanelItem.getItemStackDisplayName` appends its grid size | +| AE2 | `assets/appliedenergistics2/lang/en_US.lang`: `item.appliedenergistics2.ItemPart.CableGlass`, `CableCovered`, `CableDense`; `appeng/fmp/CableBusPart.getHollowSize` supplies connected cable bounds | +| ForgeRelocation / MatterManipulator | `assets/mcframes/lang/en_US.lang`: `tile.mcframes.frame`; `assets/matter-manipulator/lang/en_US.lang`: `item.itemMatterManipulator3`; the MKIII tier permits moving | +| Chisel | `compat/fmp/PartChiselTorch.java` and `FMPCompat.java`: any Chisel torch can be converted while preserving its variant and orientation | +| Iguana Tweaks for Tinkers' Construct | `modcompat/fmp`: Ardite, Cobalt and Manyullyn saws plus harvest-level remapping for Forge Multipart saws | +| FMP shapes and saws | This repository's `src/main/resources/assets/multipart/lang/en_US.lang`: `mcr_face`, `mcr_hllw`, `mcr_edge`, `mcr_cnr`, and `item.microblock:sawStone/sawIron/sawDiamond` | + +## Converter integration follow-up + +The [converter guide](../api/BLOCK_CONVERTERS.md) and Forge fixtures establish registration, discarded probes, +committed callback order and example state round trips. Before adopting consumer changes: + +- [ ] On a physical client/server, preview and cancel conversion of Chisel torches, OpenComputers cables/prints, + AE2 cable buses and supported converter blocks; the source state/network must remain intact. Concrete cases: any + **Chisel Torch**, OpenComputers **Cable** and **3D Print**, and AE2 **ME Glass Cable**. +- [ ] Commit conversion, reconnect/reload, and confirm metadata, inventory and network state survive exactly once, + without duplicate drops, lost contents or ghost connections. Exercise rejection as well as successful placement + with the same Chisel, OpenComputers and AE2 cases. +- [ ] Recheck consumer side-specific constructors and descriptions; the headless example packet test does not cover + physical-client class selection or rendering. Record consumer release and actual pack adoption separately. Reuse + the Chisel Torch, OpenComputers Cable/3D Print and AE2 ME Glass Cable cases on both client and server. + +## Stable tile capability adoption + +- [ ] Rebuild ProjectRed's open-connection query against `IRedstoneTile`, retaining its rotation/mask logic; validate + face/framed wires with face covers and edge blockers on a physical client/server, including part changes and moves. + Concrete setup: ProjectRed **Red Alloy Wire** and **Framed Red Alloy Wire** with Stone Covers and Stone Strips. +- [ ] Verify consumer bytecode uses the stable interface/base owner rather than raw transformed trait class calls or + fields. The [Forge fixture](../api/TILE_TRAIT_ACCESS.md) proves server linkage, not all client-side capabilities. + This is a `javap`/ASM inspection check; no in-game item exercises the bytecode owner directly. +- [ ] Rebuild OpenComputers `PrintPart.toggleState` using `tile.refreshPartSlots(this)`, then exercise inactive/active + and button modes on client/server. Confirm old slots clear, new slots occupy, rejected changes leave caches intact, + and sound, part notification, description update and scheduled reset still occur once in the original order. + Concrete setup: an OpenComputers **3D Print** with different compact off/on shapes beside a Stone Cover. +- [ ] Verify the migrated OpenComputers bytecode no longer names `TSlottedTile`/`v_partMap`; retain the old accessor + until its released version is present in the target pack. This is also a `javap`/ASM inspection check, not an + additional in-game item test. diff --git a/docs/migration/README.md b/docs/migration/README.md new file mode 100644 index 0000000..d7be44f --- /dev/null +++ b/docs/migration/README.md @@ -0,0 +1,71 @@ +# ForgeMultipart migration status + +The core runtime implementation and the audited consumer-facing Java replacements are implemented. +Consumer patches, released versions and target-pack adoption are still pending; API availability does not +mean a consumer has migrated. The first Java release retains supported legacy binaries and FMP's Scala bridges. + +## Documentation + +| Document | Purpose | +| --- | --- | +| [Java API](../API.md) and [release notes](../RELEASE_NOTES.md) | Supported replacements, examples and source migration hazards | +| [Compatibility audit](COMPATIBILITY.md) | Frozen ABI inventory, source revisions, reflective contracts and consumer findings | +| [Consumer adoption ledger](COMPATIBILITY.md#java-api-adoption-ledger) | Legacy contract, replacement, source patch, release and target-pack adoption | +| [Divergences](DIVERGENCES.md) | Intentional effective compatibility differences | +| [Manual release checks](MANUAL_CHECKS.md) | Outstanding client, pack and release validation | +| [Maintainer guide](MAINTAINERS.md) | Build boundaries, compiler constraints, verification and performance protocol | + +Use this page for remaining work, not a running diary. Record consumer progress in the adoption ledger and +release results in the manual checklist. Completed-work narratives remain in git history. Test counts and +artifact inventories should come from the reports for the revision being reviewed. + +## Remaining work + +1. **Migrate consumers.** Use the existing typed APIs, with optional integrations gated on presence/version. + Preserve each consumer's state, ordering, failure policy and initialization timing. Record the source revision, + first released version, minimum FMP dependency and actual target-pack artifact for each legacy contract. + Consumer mods may remain Scala internally. Reference checkouts are not evidence of a shipped migration. +2. **Validate client and pack behavior.** Complete the manual checklist, including illuminated microblock + construction/halos, previews, rendering, particles, lighting, interactions, old worlds, multiplayer and movement. + Test optional dependencies both absent and present. The successful MCPC hook needs an actual patched World + where that platform is supported. Headless Forge tests do not establish GPU or full-pack correctness. +3. **Measure performance.** Once representative API/extension workloads are stable, profile realistic scenes and + make only justified changes. Separate FMP implementation gains from consumer API migration gains. Follow the + [measurement protocol](MAINTAINERS.md#performance-validation); historical focused results are not whole-pack claims. +4. **Finish repository/release preparation.** Relocate Java sources only where remaining Scala dependencies allow + it; reassess the forced Scala compilation/version guard after relocation, and update the root README's source + layout note. Validate Java 8 artifacts and packaged/obfuscated artifacts on the supported modern runtime. Modern syntax + expansion is optional and must respect the [build boundary](MAINTAINERS.md#build-and-runtime-boundaries). +5. **Remove FMP's Scala requirement last.** Complete the gates below before retiring bridges, compiler support + or dependencies. Other mods' independent Scala requirements are outside this target. + +Extra Utilities 1.2.12 remains an active supported consumer. Switching support to UtilitiesInExcess requires an +explicit support decision and actual pack adoption, including migration of the replacement's FMP contracts. +GTNHLib/fastutil, Sponge Mixins and a replacement runtime generator are conditional choices, not migration tasks +in themselves. Add them only for a demonstrated need. + +## Scala removal gates + +- Every affected adoption-ledger row is verified against the actual target-pack jars, including reflective fields, + mixin targets, compiler-generated helpers and external Scala traits. Unmodifiable consumers must be retained or replaced. +- A deprecation/removal window and a release permitted to break the old ABI are agreed. That window is still open; + adding a replacement or deprecation is not permission to delete a bridge. +- FMP's own Scala storage, retained models, trait inputs and legacy callers are replaced or retired. In particular, + ProjectRed's released Java extension alone does not eliminate FMP's internal need for Scala-signature decoding. +- Shipped and generated FMP classes, descriptors and runtime loading paths contain no remaining Scala requirements; + Scala compilation and compiler/runtime dependencies can then be removed. +- Migrated consumers pass old-world, packet, client and dedicated-server validation against the resulting artifact. + +## Retained implementation + +| Sources under `src/main/scala/codechicken` | Remaining dependency | +| --- | --- | +| `multipart/asm/ASMMixinCompiler.scala` | Nested models, construction callbacks and Scala entry shell | +| `multipart/asm/ScalaSignature.scala` | Named models, primitive/erased bridges and generic inner construction | +| `multipart/asm/StackAnalyser.scala` | Coordinated class/companion/models, state and handler callbacks | +| `microblock/MicroblockTraits.scala`, `FaceMicroblockTraits.scala`, `CornerMicroblockTraits.scala`, `EdgeMicroblockTraits.scala` | State, inheritance, accessor and super-call shells over Java behavior | +| `microblock/HollowMicroblockTraits.scala`, `TMicroOcclusion.scala` | Server/client inheritance, initializers, state and lifecycle bridges | + +Java sources also retain Scala-backed storage and compatibility references. A source-file count does not measure +removal readiness. Further extraction should enable a consumer migration, fix a demonstrated issue or provide a +measured benefit; mechanical shell conversion is not the next milestone. diff --git a/gradle.properties b/gradle.properties index b2069c1..d8b6655 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,34 +39,13 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE. developmentEnvironmentUserName = Developer -# Enables modern Java syntax support. Valid values: -# - false: No modern syntax, Java 8 only -# - jabel: Jabel syntax-only support, compiles to J8 bytecode -# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs) -# - modern: Native modern Java bytecode, no downgrading +# Retained Scala and Java sources compile directly for Java 8. enableModernJavaSyntax = false # If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues, # and should *not* be used in most situations. -1 disables this. # forceToolchainVersion = -1 -# Target JVM version for JVM Downgrader bytecode downgrading. -# Only used when enableModernJavaSyntax = jvmDowngrader -# downgradeTargetVersion = 8 - -# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only). -# Classes will be available in META-INF/versions/N/ for each version N in this list. -# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade). -# jvmDowngraderMultiReleaseVersions = 21,25 - -# Specifies how JVM Downgrader API stubs are provided. Options: -# - shade: Shade minimized stubs into the jar -# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint) -# - external: Another dependency provides stubs (no constraint, no warning) -# - (empty): Warning reminding you to configure stubs -# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md -# jvmDowngraderStubsProvider = - # Enables injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. enableGenericInjection = false @@ -115,7 +94,7 @@ usesMixins = true separateMixinSourceSet = mixin # Adds some debug arguments like verbose output and class export. -usesMixinDebug = true +usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = @@ -237,4 +216,3 @@ curseForgeRelations = # Whether IDEA should run spotless checks when pressing the Build button. # This is meant to be set in $HOME/.gradle/gradle.properties. # ideaCheckSpotlessOnBuild = true - diff --git a/repositories.gradle b/repositories.gradle index 51d4dea..45729e1 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,5 +1,4 @@ // Add any additional repositiroes for your dependencies here repositories { - mavenLocal() } diff --git a/src/functionalTest/java/codechicken/multipart/examples/BlockConversionExample.java b/src/functionalTest/java/codechicken/multipart/examples/BlockConversionExample.java new file mode 100644 index 0000000..c69e519 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/BlockConversionExample.java @@ -0,0 +1,86 @@ +package codechicken.multipart.examples; + +import java.util.Collections; + +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultiPartRegistry.IPartConverter; +import codechicken.multipart.MultiPartRegistry.IPartFactory2; +import codechicken.multipart.TMultiPart; + +/** Compiling registration/state example; add the real part's geometry, rendering and gameplay behavior. */ +public final class BlockConversionExample implements IPartConverter, IPartFactory2 { + + public static final String PART_TYPE = "yourmod:converted"; + private final Block sourceBlock; + + public BlockConversionExample(Block sourceBlock) { + this.sourceBlock = sourceBlock; + } + + /** Call once from common preInit/init, after registering the source block, on both sides. */ + public static void register(Block sourceBlock) { + BlockConversionExample example = new BlockConversionExample(sourceBlock); + MultiPartRegistry.registerPartFactory(example, PART_TYPE); + MultiPartRegistry.registerConverter(example); + } + + @Override + public Iterable blockTypes() { + return Collections.singletonList(sourceBlock); + } + + @Override + public TMultiPart convert(World world, BlockCoord pos) { + if (world.getBlock(pos.x, pos.y, pos.z) != sourceBlock) return null; + ConvertedPart part = new ConvertedPart(); + part.metadata = world.getBlockMetadata(pos.x, pos.y, pos.z); + return part; + } + + @Override + public TMultiPart createPart(String name, NBTTagCompound nbt) { + return new ConvertedPart(); + } + + @Override + public TMultiPart createPart(String name, MCDataInput packet) { + return new ConvertedPart(); + } + + public static final class ConvertedPart extends TMultiPart { + + private int metadata; + + @Override + public String getType() { + return PART_TYPE; + } + + @Override + public void save(NBTTagCompound tag) { + tag.setInteger("metadata", metadata); + } + + @Override + public void load(NBTTagCompound tag) { + metadata = tag.getInteger("metadata"); + } + + @Override + public void writeDesc(MCDataOutput packet) { + packet.writeInt(metadata); + } + + @Override + public void readDesc(MCDataInput packet) { + metadata = packet.readInt(); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/ButtonOrientationExample.java b/src/functionalTest/java/codechicken/multipart/examples/ButtonOrientationExample.java new file mode 100644 index 0000000..bab22b2 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/ButtonOrientationExample.java @@ -0,0 +1,22 @@ +package codechicken.multipart.examples; + +import net.minecraftforge.common.util.ForgeDirection; + +import codechicken.multipart.minecraft.ButtonPart; + +/** Forge-tested compiling example for docs/api/BUTTON_ORIENTATIONS.md. */ +public final class ButtonOrientationExample { + + private ButtonOrientationExample() {} + + /** Enables the floor and ceiling metadata supplied by Et Futurum Requiem's button extension. */ + public static void registerVerticalOrientations() { + ButtonPart.setOrientation(0, ForgeDirection.UP); + ButtonPart.setOrientation(5, ForgeDirection.DOWN); + } + + /** Looks up a custom button's metadata without changing its placement or construction policy. */ + public static int metadataForClickedFace(int side) { + return ButtonPart.metaForSide(side ^ 1); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/ClientPreviewExample.java b/src/functionalTest/java/codechicken/multipart/examples/ClientPreviewExample.java new file mode 100644 index 0000000..f6238c4 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/ClientPreviewExample.java @@ -0,0 +1,29 @@ +package codechicken.multipart.examples; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.MultipartRenderer; +import codechicken.multipart.TileMultipart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** Compiling example for constructing and rendering an uninstalled multipart preview without reflection or Scala. */ +@SideOnly(Side.CLIENT) +public final class ClientPreviewExample { + + private ClientPreviewExample() {} + + public static TileMultipart create(World clientWorld, NBTTagCompound savedTile) { + return MultipartHelper.createPreviewTileFromNBT(clientWorld, savedTile); + } + + public static boolean render(IBlockAccess world, int x, int y, int z, Block multipartBlock, RenderBlocks renderer) { + return MultipartRenderer + .renderWorldBlock(world, x, y, z, multipartBlock, multipartBlock.getRenderType(), renderer); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/CompositeGenerationExample.java b/src/functionalTest/java/codechicken/multipart/examples/CompositeGenerationExample.java new file mode 100644 index 0000000..2cff7fc --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/CompositeGenerationExample.java @@ -0,0 +1,31 @@ +package codechicken.multipart.examples; + +import java.util.List; + +import net.minecraft.world.World; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultipartGenerator; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Forge-tested compiling example for docs/api/COMPOSITE_GENERATION.md. */ +public final class CompositeGenerationExample { + + private CompositeGenerationExample() {} + + /** + * Prepares and loads a fresh tile without installing it. Parts must already be loaded and appropriate for the + * requested side. A supplied world must agree with that side; null is allowed for worldless staging. + */ + public static TileMultipart createUninstalledTile(World world, BlockCoord pos, List parts, + boolean client) { + TileMultipart tile = MultipartGenerator.generateCompositeTile(null, parts, client); + tile.xCoord = pos.x; + tile.yCoord = pos.y; + tile.zCoord = pos.z; + tile.setWorldObj(world); + tile.loadPartList(parts); + return tile; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/CustomTileTrait.java b/src/functionalTest/java/codechicken/multipart/examples/CustomTileTrait.java new file mode 100644 index 0000000..e5e0d6c --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/CustomTileTrait.java @@ -0,0 +1,28 @@ +package codechicken.multipart.examples; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Register by name before loading this Java class; FMP transforms it into a runtime trait interface. */ +public abstract class CustomTileTrait extends TileMultipart implements CustomTileTraitCapability { + + @Override + public int totalContribution() { + return CustomTileTraitAccess.totalContribution(this); + } +} + +final class CustomTileTraitAccess { + + private CustomTileTraitAccess() {} + + static int totalContribution(Object trait) { + int total = 0; + for (TMultiPart part : ((TileMultipart) trait).jPartList()) { + if (part instanceof CustomTileTraitPart) { + total += ((CustomTileTraitPart) part).tileContribution(); + } + } + return total; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitCapability.java b/src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitCapability.java new file mode 100644 index 0000000..489dd0d --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitCapability.java @@ -0,0 +1,7 @@ +package codechicken.multipart.examples; + +/** Stable consumer-facing API implemented by generated tiles carrying {@link CustomTileTraitPart} parts. */ +public interface CustomTileTraitCapability { + + int totalContribution(); +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitExample.java b/src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitExample.java new file mode 100644 index 0000000..2bc21dc --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitExample.java @@ -0,0 +1,22 @@ +package codechicken.multipart.examples; + +import codechicken.multipart.MultipartGenerator; +import codechicken.multipart.TileMultipart; + +/** Compiling registration and access example for a consumer-owned generated tile trait. */ +public final class CustomTileTraitExample { + + private static final String TRAIT = "codechicken.multipart.examples.CustomTileTrait"; + + private CustomTileTraitExample() {} + + /** Call once during mod initialization, before FMP inspects any implementing part class. */ + public static void register() { + MultipartGenerator.registerTrait(CustomTileTraitPart.class.getName(), TRAIT); + } + + /** Read through the stable capability interface; tiles without the custom trait contribute zero. */ + public static int totalContribution(TileMultipart tile) { + return tile instanceof CustomTileTraitCapability ? ((CustomTileTraitCapability) tile).totalContribution() : 0; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitPart.java b/src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitPart.java new file mode 100644 index 0000000..b8004a4 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/CustomTileTraitPart.java @@ -0,0 +1,7 @@ +package codechicken.multipart.examples; + +/** Marker and contribution contract for parts that request the example generated tile trait. */ +public interface CustomTileTraitPart { + + int tileContribution(); +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroMaterial.java b/src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroMaterial.java new file mode 100644 index 0000000..c305645 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroMaterial.java @@ -0,0 +1,30 @@ +package codechicken.multipart.examples; + +import java.util.BitSet; + +import net.minecraft.block.Block; + +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.MicroblockClass; +import codechicken.microblock.MicroblockGenerator.IGeneratedMaterial; + +/** Example material whose upper metadata bit means illuminated and low bits select the lamp colour. */ +public final class IlluminatedMicroMaterial extends BlockMicroMaterial implements IGeneratedMaterial { + + private final int traitId; + + public IlluminatedMicroMaterial(Block lamp, int meta, int traitId) { + super(lamp, meta); + this.traitId = traitId; + } + + @Override + public void addTraits(BitSet traits, MicroblockClass microClass, boolean client) { + traits.set(traitId); + } + + @Override + public int getCutterStrength() { + return block().getHarvestLevel(meta() % 16); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockExample.java b/src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockExample.java new file mode 100644 index 0000000..637393a --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockExample.java @@ -0,0 +1,122 @@ +package codechicken.multipart.examples; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.BooleanSupplier; + +import net.minecraft.block.Block; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Transformation; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.HollowMicroblock; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockGenerator; +import codechicken.multipart.TMultiPart; + +/** Compiling example for docs/api/MICROBLOCK_EXTENSIONS.md; the consumer supplies its config and halo renderer. */ +public final class IlluminatedMicroblockExample { + + public static BooleanSupplier dimLampParts = () -> false; + + /** + * Install on the physical client before rendering, e.g. a lambda forwarding to ProjectRed's RenderHalo.addLight. + */ + public static HaloRenderer haloRenderer; + + public interface HaloRenderer { + + void addLight(int x, int y, int z, int colour, Cuboid6 bounds); + } + + private IlluminatedMicroblockExample() {} + + /** Call once during mod initialization, after the lamp block is registered and before FMP builds material IDs. */ + public static void registerMaterials(Block lamp) { + int traitId = MicroblockGenerator.registerTrait("codechicken.multipart.examples.IlluminatedMicroblockTrait"); + for (int meta = 16; meta < 32; meta++) { + MicroMaterialRegistry.registerMaterial( + new IlluminatedMicroMaterial(lamp, meta, traitId), + BlockMicroMaterial.materialKey(lamp, meta)); + } + } + + /** Object is deliberate: the transformed trait interface does not inherit Microblock in the JVM type system. */ + public static int lightValue(Object trait) { + Microblock part = (Microblock) trait; + if (dimLampParts.getAsBoolean()) { + // Capture matching parts before size callbacks, as the reference's strict collection pipeline does. + List selected = new ArrayList<>(); + for (TMultiPart sibling : part.tile().jPartList()) { + if (sibling instanceof IlluminatedMicroblockTrait) selected.add((Microblock) sibling); + } + double total = 0; + for (Microblock sibling : selected) total += sibling.getSize() / 8D; + return Math.min(15, (int) (15 * total)); + } + for (TMultiPart sibling : part.tile().jPartList()) { + if (sibling instanceof IlluminatedMicroblockTrait) return 15; + } + return 0; + } + + /** Halo submission is a client responsibility; the geometry itself is headlessly testable. */ + public static void renderHalo(Object trait, int pass) { + if (pass != 0) return; + Microblock part = (Microblock) trait; + List boxes = haloBoxes(part); + int colour = ((IlluminatedMicroMaterial) part.getIMaterial()).meta() - 16; + for (Cuboid6 box : boxes) haloRenderer.addLight(part.x(), part.y(), part.z(), colour, box); + } + + public static List haloBoxes(Microblock part) { + double expansion = 0.025; + if (part instanceof HollowMicroblock) { + int size = ((HollowMicroblock) part).getHollowSize(); + double near = 0.5 - size / 32D; + double far = 0.5 + size / 32D; + double thickness = (part.shape() >> 4) / 8D; + Transformation rotation = Rotation.sideRotations[part.shape() & 15].at(Vector3.center); + List boxes = Arrays.asList( + new Cuboid6( + -expansion, + -expansion, + -expansion, + 1 + expansion, + thickness + expansion, + near + expansion), + new Cuboid6( + -expansion, + -expansion, + far - expansion, + 1 + expansion, + thickness + expansion, + 1 + expansion), + new Cuboid6( + -expansion, + -expansion, + near + expansion, + near + expansion, + thickness + expansion, + far - expansion), + new Cuboid6( + far - expansion, + -expansion, + near + expansion, + 1 + expansion, + thickness + expansion, + far - expansion)); + for (Cuboid6 box : boxes) box.apply(rotation); + return boxes; + } + List source = new ArrayList<>(); + for (Cuboid6 box : part.getCollisionBoxes()) source.add(box); + List expanded = new ArrayList<>(); + for (Cuboid6 box : source) expanded.add(box.copy().expand(expansion)); + return expanded; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockTrait.java b/src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockTrait.java new file mode 100644 index 0000000..d26d1c9 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/IlluminatedMicroblockTrait.java @@ -0,0 +1,30 @@ +package codechicken.multipart.examples; + +import codechicken.lib.vec.Vector3; +import codechicken.microblock.Microblock; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** Register by name before loading this Java class; FMP transforms it into a runtime trait interface. */ +public abstract class IlluminatedMicroblockTrait extends Microblock { + + public IlluminatedMicroblockTrait() { + super(0); + } + + @Override + public boolean shouldRenderDynamic() { + return true; + } + + @Override + public int getLightValue() { + return IlluminatedMicroblockExample.lightValue(this); + } + + @Override + @SideOnly(Side.CLIENT) + public void renderDynamic(Vector3 pos, float frame, int pass) { + IlluminatedMicroblockExample.renderHalo(this, pass); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/MaterialAccessExample.java b/src/functionalTest/java/codechicken/multipart/examples/MaterialAccessExample.java new file mode 100644 index 0000000..5e83d53 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/MaterialAccessExample.java @@ -0,0 +1,38 @@ +package codechicken.multipart.examples; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; + +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.Microblock; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Forge-tested compiling example for docs/api/MATERIAL_ACCESS.md. */ +public final class MaterialAccessExample { + + private MaterialAccessExample() {} + + /** Returns the first usable block ID using GuideNH's metadata suffix policy; failures propagate to the caller. */ + public static String resolvePrimaryMicroblockId(TileEntity tile) { + if (!(tile instanceof TileMultipart)) return null; + for (TMultiPart part : ((TileMultipart) tile).jPartList()) { + if (!(part instanceof Microblock)) continue; + IMicroMaterial material = MicroMaterialRegistry.getMaterial(((Microblock) part).material()); + if (!(material instanceof BlockMicroMaterial)) continue; + BlockMicroMaterial blockMaterial = (BlockMicroMaterial) material; + Block block = blockMaterial.block(); + int meta = blockMaterial.meta(); + if (block == null || block == Blocks.air) continue; + Object registryName = Block.blockRegistry.getNameForObject(block); + if (registryName == null) continue; + String blockId = registryName.toString(); + if (blockId.isEmpty()) continue; + return meta > 0 ? blockId + ":" + meta : blockId; + } + return null; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/MicroblockCreationExample.java b/src/functionalTest/java/codechicken/multipart/examples/MicroblockCreationExample.java new file mode 100644 index 0000000..dde396e --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/MicroblockCreationExample.java @@ -0,0 +1,21 @@ +package codechicken.multipart.examples; + +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockClass; +import codechicken.microblock.MicroblockGenerator; + +/** Forge-tested compiling example for docs/api/MICROBLOCK_CREATION.md. */ +public final class MicroblockCreationExample { + + private MicroblockCreationExample() {} + + /** Recreates the family/material/shape on the requested side; does not clone other custom state or bindings. */ + public static Microblock recreateForSide(Microblock source, boolean client) { + MicroblockClass microClass = source.microClass(); + int material = source.material(); + byte shape = source.shape(); + Microblock created = MicroblockGenerator.create(microClass, material, client); + created.setShape(shape >> 4, shape & 0xF); + return created; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/PartFactoryLookupExample.java b/src/functionalTest/java/codechicken/multipart/examples/PartFactoryLookupExample.java new file mode 100644 index 0000000..7a83936 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/PartFactoryLookupExample.java @@ -0,0 +1,21 @@ +package codechicken.multipart.examples; + +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockClass; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultiPartRegistry.IPartFactory2; + +/** Forge-tested compiling example for docs/api/FACTORY_LOOKUP.md. */ +public final class PartFactoryLookupExample { + + private PartFactoryLookupExample() {} + + /** Creates an unbound microblock; the caller still loads its NBT and prepares the containing tile. */ + public static Microblock createMicroblock(String type, boolean client, int material) { + IPartFactory2 factory = MultiPartRegistry.getPartFactory(type); + if (!(factory instanceof MicroblockClass)) { + return null; + } + return ((MicroblockClass) factory).create(client, material); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/PartRegistrationExample.java b/src/functionalTest/java/codechicken/multipart/examples/PartRegistrationExample.java new file mode 100644 index 0000000..9be7fb9 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/PartRegistrationExample.java @@ -0,0 +1,105 @@ +package codechicken.multipart.examples; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultiPartRegistry.IPartFactory2; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Compiling example for the part-registration and custom-part lifecycle guides. */ +public final class PartRegistrationExample implements IPartFactory2 { + + public static final String PART_TYPE = "yourmod:part"; + + /** Call from the mod's common preInit/init handler, on both sides. */ + public static void register() { + MultiPartRegistry.registerPartFactory(new PartRegistrationExample(), PART_TYPE); + } + + @Override + public TMultiPart createPart(String name, NBTTagCompound nbt) { + return new ExamplePart(); + } + + @Override + public TMultiPart createPart(String name, MCDataInput packet) { + return new ExamplePart(); + } + + @Override + public TMultiPart createPartForClientPreview(String name, NBTTagCompound nbt) { + return new ExamplePart(); + } + + /** Call from the server-side item/action after choosing the target position. */ + public static TileMultipart place(World world, BlockCoord pos, int value) { + ExamplePart part = new ExamplePart(value); + if (world.isRemote || !TileMultipart.canPlacePart(world, pos, part)) { + return null; + } + return TileMultipart.addPart(world, pos, part); + } + + public static final class ExamplePart extends TMultiPart { + + private int value; + + public ExamplePart() {} + + public ExamplePart(int value) { + this.value = value; + } + + @Override + public String getType() { + return PART_TYPE; + } + + @Override + public boolean doesTick() { + return false; + } + + public int value() { + return value; + } + + /** Example for state that affects persistence, clients, sibling parts and rendering. */ + public void setValue(int value) { + if (this.value == value) { + return; + } + this.value = value; + if (world() != null && !world().isRemote) { + sendDescUpdate(); + tile().notifyPartChange(this); + tile().markDirty(); + } + } + + @Override + public void save(NBTTagCompound tag) { + tag.setInteger("value", value); + } + + @Override + public void load(NBTTagCompound tag) { + value = tag.getInteger("value"); + } + + @Override + public void writeDesc(MCDataOutput packet) { + packet.writeInt(value); + } + + @Override + public void readDesc(MCDataInput packet) { + value = packet.readInt(); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/TileConversionExample.java b/src/functionalTest/java/codechicken/multipart/examples/TileConversionExample.java new file mode 100644 index 0000000..2018326 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/TileConversionExample.java @@ -0,0 +1,19 @@ +package codechicken.multipart.examples; + +import net.minecraft.world.World; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.TileConversionResult; +import codechicken.multipart.TileMultipart; + +/** Forge-tested compiling example for docs/api/TILE_CONVERSION.md. */ +public final class TileConversionExample { + + private TileConversionExample() {} + + /** Returns only a newly converted placeholder, for inspection without installing it. */ + public static TileMultipart findConvertedPlaceholder(World world, BlockCoord pos) { + TileConversionResult result = TileMultipart.getOrConvertTileResult(world, pos); + return result.isConverted() ? result.getTile() : null; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/examples/TileTraitAccessExample.java b/src/functionalTest/java/codechicken/multipart/examples/TileTraitAccessExample.java new file mode 100644 index 0000000..0fb08dd --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/examples/TileTraitAccessExample.java @@ -0,0 +1,26 @@ +package codechicken.multipart.examples; + +import codechicken.multipart.IRedstoneTile; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Compiling consumer example using a stable capability instead of the raw transformed trait class. */ +public final class TileTraitAccessExample { + + private TileTraitAccessExample() {} + + /** Returns false for null/non-redstone tiles; side is 0..5 and mask uses the low five connection bits. */ + public static boolean hasOpenConnection(TileMultipart tile, int side, int mask) { + return tile instanceof IRedstoneTile && (((IRedstoneTile) tile).openConnections(side) & mask) != 0; + } + + /** Call after a stored part has validated and applied a new slot mask, before its own notifications. */ + public static void refreshSlots(TileMultipart tile, TMultiPart part) { + tile.refreshPartSlots(part); + } + + /** Call after a stored inventory part changes its size, before notifying neighbors; no-op without inventories. */ + public static void refreshInventory(TileMultipart tile) { + tile.refreshInventorySlots(); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ASMBridgeFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ASMBridgeFunctionalTest.java new file mode 100644 index 0000000..8fd541c --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ASMBridgeFunctionalTest.java @@ -0,0 +1,299 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.asm.ASMMixinCompiler; +import codechicken.multipart.asm.ASMMixinCompiler$; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import scala.Tuple2; + +class ASMBridgeFunctionalTest { + + @Test + void splitsAtTheFirstParenthesisWithoutValidatingTheDescriptor() { + assertEquals( + new Tuple2<>("method", "(JD)Ljava/lang/String;"), + ASMMixinCompiler.seperateDesc("method(JD)Ljava/lang/String;")); + assertEquals(new Tuple2<>("", "()V"), ASMMixinCompiler$.MODULE$.seperateDesc("()V")); + assertEquals( + new Tuple2<>("odd.name", "(not(a descriptor"), + ASMMixinCompiler.seperateDesc("odd.name(not(a descriptor")); + assertThrows(StringIndexOutOfBoundsException.class, () -> ASMMixinCompiler.seperateDesc("missing")); + assertThrows(StringIndexOutOfBoundsException.class, () -> ASMMixinCompiler.seperateDesc("")); + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.seperateDesc(null)); + } + + @Test + void prependsAnObjectReceiverAndPreservesAllArgumentAndReturnTypes() { + for (String result : new String[] { "V", "Z", "B", "C", "S", "I", "F", "J", "D", "Ljava/lang/Object;", + "[[I" }) { + assertEquals("(Ltest/Owner;)" + result, ASMMixinCompiler.staticDesc("test/Owner", "()" + result)); + assertEquals( + "(Ltest/Owner;ZBCSIFJD[ILjava/lang/String;[[D)" + result, + ASMMixinCompiler$.MODULE$.staticDesc("test/Owner", "(ZBCSIFJD[ILjava/lang/String;[[D)" + result)); + } + assertEquals("(Ltest.Owner;)V", ASMMixinCompiler.staticDesc("test.Owner", "()V")); + assertEquals("(Lnull;)V", ASMMixinCompiler.staticDesc(null, "()V")); + assertEquals("(L;)V", ASMMixinCompiler.staticDesc("", "()V")); + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.staticDesc("test/Owner", null)); + assertThrows(ArrayIndexOutOfBoundsException.class, () -> ASMMixinCompiler.staticDesc("test/Owner", "()")); + } + + @Test + void loadsMixedArgumentsInSlotOrderAndUsesTheBridgeDescriptorForItsReturnAndMaxima() { + Trace trace = new Trace(); + ASMMixinCompiler.writeBridge( + trace, + "(ZBCSIFJD[ILjava/lang/String;[[D)D", + INVOKESTATIC, + "test/Helper", + "target", + "(Ljava/lang/Object;)V"); + assertEquals( + Arrays.asList( + "var " + ALOAD + " 0", + "var " + ILOAD + " 1", + "var " + ILOAD + " 2", + "var " + ILOAD + " 3", + "var " + ILOAD + " 4", + "var " + ILOAD + " 5", + "var " + FLOAD + " 6", + "var " + LLOAD + " 7", + "var " + DLOAD + " 9", + "var " + ALOAD + " 11", + "var " + ALOAD + " 12", + "var " + ALOAD + " 13", + "call " + INVOKESTATIC + " test/Helper target (Ljava/lang/Object;)V false", + "insn " + DRETURN, + "max 14 14"), + trace.events); + } + + @Test + void handlesEveryReturnCategoryIncludingWideResultsWithoutArguments() { + String[] returns = { "V", "Z", "B", "C", "S", "I", "F", "J", "D", "Ljava/lang/Object;", "[J" }; + int[] opcodes = { RETURN, IRETURN, IRETURN, IRETURN, IRETURN, IRETURN, FRETURN, LRETURN, DRETURN, ARETURN, + ARETURN }; + int[] stacks = { 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1 }; + for (int i = 0; i < returns.length; i++) { + Trace trace = new Trace(); + String desc = "()" + returns[i]; + ASMMixinCompiler.finishBridgeCall(trace, desc, INVOKEVIRTUAL, "test/Owner", "value", desc); + assertEquals( + Arrays.asList( + "call " + INVOKEVIRTUAL + " test/Owner value " + desc + " false", + "insn " + opcodes[i], + "max " + stacks[i] + " 1"), + trace.events, + desc); + } + } + + @Test + void derivesTheInterfaceFlagOnlyFromTheInvocationOpcodeAndLeavesTheReceiverToTheCaller() { + for (int opcode : new int[] { INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC, INVOKEINTERFACE }) { + Trace trace = new Trace(); + trace.visitVarInsn(ALOAD, 0); + trace.visitFieldInsn(GETFIELD, "test/Wrapper", "delegate", "Ltest/Contract;"); + ASMMixinCompiler$.MODULE$.finishBridgeCall(trace, "(J)I", opcode, "test/Contract", "call", "(J)I"); + assertEquals( + Arrays.asList( + "var " + ALOAD + " 0", + "field " + GETFIELD + " test/Wrapper delegate Ltest/Contract;", + "var " + LLOAD + " 1", + "call " + opcode + " test/Contract call (J)I " + (opcode == INVOKEINTERFACE), + "insn " + IRETURN, + "max 3 3"), + trace.events); + } + } + + @Test + void preservesPartialVisitorOutputAndPropagatesTheOriginalFailure() { + Trace completed = new Trace(); + ASMMixinCompiler.writeBridge(completed, "(JD)I", INVOKEVIRTUAL, "test/Owner", "call", "(JD)I"); + for (int event = 1; event <= completed.events.size(); event++) { + Trace failing = new Trace(); + failing.failAt = event; + assertSame( + failing.failure, + assertThrows( + IllegalStateException.class, + () -> ASMMixinCompiler + .writeBridge(failing, "(JD)I", INVOKEVIRTUAL, "test/Owner", "call", "(JD)I"))); + assertEquals(completed.events.subList(0, event), failing.events); + } + Trace finish = new Trace(); + assertThrows( + NullPointerException.class, + () -> ASMMixinCompiler.finishBridgeCall(finish, null, INVOKEVIRTUAL, "owner", "name", "()V")); + assertTrue(finish.events.isEmpty()); + Trace bridge = new Trace(); + assertThrows( + NullPointerException.class, + () -> ASMMixinCompiler.writeBridge(bridge, null, INVOKEVIRTUAL, "owner", "name", "()V")); + assertEquals(Arrays.asList("var " + ALOAD + " 0"), bridge.events); + } + + @Test + void staticBridgeReadsOverridableMixinMetadataAndDescriptorsInTheOriginalOrder() { + MethodNode method = new MethodNode(ACC_PUBLIC, "bridge", "(I)I", null, null); + List reads = new ArrayList<>(); + MixinInfo mixin = new MixinInfo("unused", null, null, null, null, null) { + + @Override + public String tname() { + reads.add("helper:" + method.desc); + method.desc = "(J)J"; + return "test/Helper"; + } + + @Override + public String name() { + reads.add("receiver:" + method.desc); + method.desc = "(D)D"; + return "test/Receiver"; + } + }; + ASMMixinCompiler.writeStaticBridge(method, "target", mixin); + Trace trace = new Trace(); + method.accept(trace); + assertEquals(Arrays.asList("helper:(I)I", "receiver:(J)J"), reads); + assertEquals( + Arrays.asList( + "var " + ALOAD + " 0", + "var " + ILOAD + " 1", + "call " + INVOKESTATIC + " test/Helper target (Ltest/Receiver;D)D false", + "insn " + IRETURN, + "max 2 2"), + trace.events); + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.writeStaticBridge(method, "target", null)); + } + + @Test + void emittedBridgesExecuteVirtualSpecialInterfaceAndScalaStyleStaticDispatch() throws Exception { + String parent = Type.getInternalName(Receiver.class); + String owner = "codechicken/multipart/test/bridge/ExecutableBridge"; + ClassWriter writer = new ClassWriter(0); + writer.visit(V1_6, ACC_PUBLIC, owner, null, parent, null); + MethodVisitor constructor = writer.visitMethod(ACC_PUBLIC, "", "()V", null, null); + ASMMixinCompiler.writeBridge(constructor, "()V", INVOKESPECIAL, parent, "", "()V"); + constructor.visitEnd(); + MethodVisitor value = writer.visitMethod(ACC_PUBLIC, "value", "()I", null, null); + value.visitIntInsn(BIPUSH, 99); + value.visitInsn(IRETURN); + value.visitMaxs(1, 1); + value.visitEnd(); + addBridge(writer, "viaVirtual", "()I", INVOKEVIRTUAL, parent, "value"); + addBridge(writer, "viaSpecial", "()I", INVOKESPECIAL, parent, "value"); + String desc = "(JDLjava/lang/String;[I)Ljava/lang/String;"; + addBridge(writer, "viaInterface", desc, INVOKEINTERFACE, Type.getInternalName(Contract.class), "combine"); + MethodNode staticBridge = new MethodNode(ACC_PUBLIC, "viaStatic", desc, null, null); + ASMMixinCompiler + .writeStaticBridge(staticBridge, "combine", new MixinInfo(parent, null, null, null, null, null)); + staticBridge.accept(writer); + writer.visitEnd(); + byte[] bytes = writer.toByteArray(); + Class generated = new ClassLoader(getClass().getClassLoader()) { + + Class define() { + return defineClass(null, bytes, 0, bytes.length); + } + }.define(); + Object receiver = generated.getConstructor().newInstance(); + assertEquals(99, generated.getMethod("viaVirtual").invoke(receiver)); + assertEquals(17, generated.getMethod("viaSpecial").invoke(receiver)); + Class[] parameters = { long.class, double.class, String.class, int[].class }; + assertEquals( + "instance:99:1234567890123:2.5:abc:7", + generated.getMethod("viaInterface", parameters) + .invoke(receiver, 1234567890123L, 2.5, "abc", new int[] { 7 })); + assertEquals( + "static:99:1234567890123:2.5:abc:7", + generated.getMethod("viaStatic", parameters) + .invoke(receiver, 1234567890123L, 2.5, "abc", new int[] { 7 })); + } + + private static void addBridge(ClassWriter writer, String name, String desc, int opcode, String owner, + String target) { + MethodVisitor method = writer.visitMethod(ACC_PUBLIC, name, desc, null, null); + ASMMixinCompiler.writeBridge(method, desc, opcode, owner, target, desc); + method.visitEnd(); + } + + private static class Trace extends MethodVisitor { + + final List events = new ArrayList<>(); + final IllegalStateException failure = new IllegalStateException("visitor failure"); + int failAt; + + Trace() { + super(ASM5); + } + + private void record(String event) { + events.add(event); + if (events.size() == failAt) throw failure; + } + + @Override + public void visitVarInsn(int opcode, int local) { + record("var " + opcode + " " + local); + } + + @Override + public void visitFieldInsn(int opcode, String owner, String name, String desc) { + record("field " + opcode + " " + owner + " " + name + " " + desc); + } + + @Override + public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) { + record("call " + opcode + " " + owner + " " + name + " " + desc + " " + itf); + } + + @Override + public void visitInsn(int opcode) { + record("insn " + opcode); + } + + @Override + public void visitMaxs(int stack, int locals) { + record("max " + stack + " " + locals); + } + } + + public interface Contract { + + String combine(long wide, double number, String text, int[] array); + } + + public static class Receiver implements Contract { + + public int value() { + return 17; + } + + @Override + public String combine(long wide, double number, String text, int[] array) { + return "instance:" + value() + ":" + wide + ":" + number + ":" + text + ":" + array[0]; + } + } + + public static class Receiver$class { + + public static String combine(Receiver receiver, long wide, double number, String text, int[] array) { + return "static:" + receiver.value() + ":" + wide + ":" + number + ":" + text + ":" + array[0]; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ASMMixinCompilerStartupFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ASMMixinCompilerStartupFunctionalTest.java new file mode 100644 index 0000000..e3a5b37 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ASMMixinCompilerStartupFunctionalTest.java @@ -0,0 +1,167 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.util.HashMap; +import java.util.Set; + +import net.minecraft.launchwrapper.LaunchClassLoader; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; + +import codechicken.multipart.asm.ASMMixinCompiler$; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import scala.collection.JavaConversions; +import scala.collection.mutable.Map; + +class ASMMixinCompilerStartupFunctionalTest { + + private static final ASMMixinCompiler$ COMPILER = ASMMixinCompiler$.MODULE$; + private static final String PREFIX = "codechicken/multipart/test/bootstrap/"; + + @Test + void bindsTheCompilerToItsActualForgeLaunchClassLoader() { + assertSame(ASMMixinCompiler$.class.getClassLoader(), COMPILER.cl()); + assertInstanceOf(LaunchClassLoader.class, COMPILER.cl()); + } + + @Test + void resolvesAndOpensTheExactJdkAndLaunchWrapperMembers() { + Method define = COMPILER.m_defineClass(); + assertEquals(ClassLoader.class, define.getDeclaringClass()); + assertEquals("defineClass", define.getName()); + assertArrayEquals(new Class[] { byte[].class, int.class, int.class }, define.getParameterTypes()); + assertEquals(Class.class, define.getReturnType()); + assertTrue(Modifier.isFinal(define.getModifiers())); + assertTrue(define.isAccessible()); + + Method transform = COMPILER.m_runTransformers(); + assertEquals(LaunchClassLoader.class, transform.getDeclaringClass()); + assertEquals("runTransformers", transform.getName()); + assertArrayEquals(new Class[] { String.class, String.class, byte[].class }, transform.getParameterTypes()); + assertEquals(byte[].class, transform.getReturnType()); + assertTrue(Modifier.isPrivate(transform.getModifiers())); + assertTrue(transform.isAccessible()); + + Field exclusions = COMPILER.f_transformerExceptions(); + assertEquals(LaunchClassLoader.class, exclusions.getDeclaringClass()); + assertEquals("transformerExceptions", exclusions.getName()); + assertEquals(Set.class, exclusions.getType()); + assertTrue(Modifier.isPrivate(exclusions.getModifiers())); + assertTrue(exclusions.isAccessible()); + } + + @Test + void openedDefineMethodDefinesExecutableBytesOnAnIndependentLoader() throws Exception { + byte[] bytes = executable(PREFIX + "Defined", 73); + try (LaunchClassLoader loader = new LaunchClassLoader(new URL[0])) { + Class defined = (Class) COMPILER.m_defineClass().invoke(loader, bytes, 0, bytes.length); + assertSame(loader, defined.getClassLoader()); + assertEquals(PREFIX.replace('/', '.') + "Defined", defined.getName()); + assertEquals(73, defined.getMethod("value").invoke(null)); + } + } + + @Test + void openedTransformerMethodUsesTheReceiverLoaderAndPreservesBytesWithNoTransformers() throws Exception { + byte[] bytes = executable(PREFIX + "Transformed", 29); + try (LaunchClassLoader loader = new LaunchClassLoader(new URL[0])) { + byte[] transformed = (byte[]) COMPILER.m_runTransformers().invoke( + loader, + PREFIX.replace('/', '.') + "Transformed", + PREFIX.replace('/', '.') + "Transformed", + bytes); + assertSame(bytes, transformed); + assertEquals(PREFIX + "Transformed", new ClassReader(transformed).getClassName()); + assertTrue(loader.getTransformers().isEmpty()); + } + } + + @Test + void openedTransformerExceptionFieldIsTheLiveSetUsedByTheCompilerLoader() throws Exception { + Field exclusions = COMPILER.f_transformerExceptions(); + @SuppressWarnings("unchecked") + Set value = (Set) exclusions.get(COMPILER.cl()); + Field direct = LaunchClassLoader.class.getDeclaredField("transformerExceptions"); + direct.setAccessible(true); + assertSame(direct.get(COMPILER.cl()), value); + String marker = PREFIX.replace('/', '.') + "excluded"; + boolean present = value.contains(marker); + try { + value.add(marker); + assertTrue(((Set) direct.get(COMPILER.cl())).contains(marker)); + } finally { + if (!present) value.remove(marker); + } + } + + @Test + void startupMapStorageUsesIndependentMutableHashMaps() throws Exception { + Map bytes = map("traitByteMap"); + Map mixins = map("mixinMap"); + Map info = map("infoCache"); + assertEquals("scala.collection.mutable.HashMap", bytes.getClass().getName()); + assertEquals(bytes.getClass(), mixins.getClass()); + assertEquals(bytes.getClass(), info.getClass()); + assertNotSame(bytes, mixins); + assertNotSame(bytes, info); + assertNotSame(mixins, info); + + java.util.Map oldBytes = new HashMap<>(JavaConversions.mapAsJavaMap(bytes)); + java.util.Map oldMixins = new HashMap<>(JavaConversions.mapAsJavaMap(mixins)); + java.util.Map oldInfo = new HashMap<>(JavaConversions.mapAsJavaMap(info)); + try { + String key = PREFIX + "independent"; + bytes.put(key, new byte[] { 1 }); + assertFalse(mixins.contains(key)); + assertFalse(info.contains(key)); + mixins.put(key, null); + assertFalse(info.contains(key)); + } finally { + bytes.clear(); + oldBytes.forEach(bytes::put); + mixins.clear(); + oldMixins.forEach(mixins::put); + info.clear(); + oldInfo.forEach(info::put); + } + } + + @Test + void sanityCheckerBytesAreAvailableThroughTheInitializedCompilerPath() throws Exception { + byte[] bytes = COMPILER.getBytes("cpw/mods/fml/common/asm/FMLSanityChecker"); + assertNotNull(bytes); + ClassReader reader = new ClassReader(bytes); + assertEquals("cpw/mods/fml/common/asm/FMLSanityChecker", reader.getClassName()); + assertEquals("java/lang/Object", reader.getSuperName()); + assertTrue(reader.getItemCount() > 1); + } + + private static byte[] executable(String name, int value) { + ClassWriter writer = new ClassWriter(0); + writer.visit(V1_6, ACC_PUBLIC, name, null, "java/lang/Object", null); + MethodVisitor method = writer.visitMethod(ACC_PUBLIC | ACC_STATIC, "value", "()I", null, null); + method.visitLdcInsn(value); + method.visitInsn(IRETURN); + method.visitMaxs(1, 0); + method.visitEnd(); + writer.visitEnd(); + return writer.toByteArray(); + } + + @SuppressWarnings("unchecked") + private static Map map(String name) throws Exception { + Field field = ASMMixinCompiler$.class.getDeclaredField(name); + field.setAccessible(true); + return (Map) field.get(COMPILER); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ASMSuperLookupFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ASMSuperLookupFunctionalTest.java new file mode 100644 index 0000000..91e8205 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ASMSuperLookupFunctionalTest.java @@ -0,0 +1,306 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.asm.ASMMixinCompiler; +import codechicken.multipart.asm.ASMMixinCompiler$; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.MethodInfo; +import codechicken.multipart.asm.StackAnalyser; +import codechicken.multipart.asm.StackAnalyser.Const; +import codechicken.multipart.asm.StackAnalyser.Load; +import codechicken.multipart.asm.StackAnalyser.Param; +import codechicken.multipart.asm.StackAnalyser.StackEntry; +import codechicken.multipart.asm.StackAnalyser.Store; +import codechicken.multipart.asm.StackAnalyser.This; +import scala.Option; +import scala.Some; +import scala.collection.Iterable; +import scala.collection.mutable.Map; + +class ASMSuperLookupFunctionalTest { + + private static final Type OWNER = Type.getType(Child.class); + + @Test + void rejectsOwnOwnerAndWrongNamesBeforeReadingTheDescriptorOrStack() { + StackAnalyser stack = stack("target"); + stack.m().name = null; + assertFalse(ASMMixinCompiler.getSuper(call(OWNER.getInternalName(), null, null), stack).isDefined()); + stack.m().name = "different"; + assertFalse(ASMMixinCompiler.getSuper(call(null, "target", null), stack).isDefined()); + assertFalse(ASMMixinCompiler.getSuper(call(null, null, null), stack).isDefined()); + stack.m().name = "target"; + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.getSuper(call(null, "target", null), stack)); + assertThrows( + IndexOutOfBoundsException.class, + () -> ASMMixinCompiler.getSuper(call(null, "target", "()I"), stack)); + stack.m().name = null; + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.getSuper(call(null, "target", "()I"), stack)); + } + + @Test + void stripsTheGreedyScalaSuperPrefixButRequiresACharacterBeforeIt() { + for (String name : new String[] { "target", "owner$$super$target", "first$$super$second$$super$target" }) { + MethodInfo result = lookup(name, "target", "()I").get(); + assertEquals(Type.getInternalName(Parent.class), result.owner().name()); + assertEquals("target", result.name()); + } + assertFalse(lookup("$$super$target", "target", "()I").isDefined()); + assertFalse(lookup("prefix$$super$targetSuffix", "target", "()I").isDefined()); + assertFalse(lookup("target", "owner$$super$target", "()I").isDefined()); + } + + @Test + void startsAtTheAnalysedOwnersSuperclassAndSelectsTheExactConcreteNonPrivateSignature() { + assertEquals(Type.getInternalName(Parent.class), lookup("target", "target", "()I").get().owner().name()); + StackAnalyser overload = stack("target"); + overload.push(receiver()); + overload.push(new Const(3, null)); + MethodInfo result = ASMMixinCompiler.getSuper(call("unrelated/Owner", "target", "(I)I"), overload).get(); + assertEquals(Type.getInternalName(Grandparent.class), result.owner().name()); + assertEquals("(I)I", result.desc()); + assertEquals( + Type.getInternalName(Grandparent.class), + lookup("inherited", "inherited", "()I").get().owner().name()); + assertTrue(lookup("protectedTarget", "protectedTarget", "()I").isDefined()); + assertFalse(lookup("hidden", "hidden", "()I").isDefined()); + assertFalse(lookup("abstractTarget", "abstractTarget", "()I").isDefined()); + assertFalse(lookup("childOnly", "childOnly", "()I").isDefined()); + assertFalse(lookup("target", "target", "()J").isDefined()); + StackAnalyser root = new StackAnalyser(Type.getType(Object.class), method("target")); + root.push(receiver()); + assertFalse(ASMMixinCompiler.getSuper(call("unrelated/Owner", "target", "()I"), root).isDefined()); + } + + @Test + void requiresALoadOfThisButDoesNotValidateItsTypeTheInvocationOwnerOrOpcode() { + StackEntry[] rejected = { null, new Const(null, null), new Load(null, null), + new Load(new Param(0, OWNER), null), new Load(new Store(receiver(), null), null) }; + for (StackEntry entry : rejected) { + StackAnalyser stack = stack("target"); + stack.stack().$plus$eq(entry); + assertFalse(ASMMixinCompiler.getSuper(call("unrelated/Owner", "target", "()I"), stack).isDefined()); + } + for (int opcode : new int[] { INVOKESPECIAL, INVOKEVIRTUAL, INVOKESTATIC, INVOKEINTERFACE }) { + StackAnalyser stack = stack("target"); + // The pattern does not read This.owner or the entry's type. + stack.stack().$plus$eq(new Load(new This(null), null)); + MethodInsnNode call = new MethodInsnNode(opcode, null, "target", "()I", opcode == INVOKEINTERFACE); + assertEquals( + Type.getInternalName(Parent.class), + ASMMixinCompiler$.MODULE$.getSuper(call, stack).get().owner().name()); + assertEquals(1, stack.stack().size()); + } + } + + @Test + void retainsArgumentCountIndexingEvenWhenWideValuesOccupyTwoStackSlots() { + StackAnalyser narrow = stack("two"); + Load receiver = receiver(); + narrow.push(receiver); + narrow.push(new Const(1, null)); + narrow.push(new Const(2, null)); + assertTrue(ASMMixinCompiler.getSuper(call("parent", "two", "(II)I"), narrow).isDefined()); + assertEquals(3, narrow.stack().size()); + assertSame(receiver, narrow.peek(2)); + for (Object value : new Object[] { 5L, 2.5D }) { + StackAnalyser wide = stack("wide"); + wide.push(receiver); + Const argument = new Const(value, null); + wide.push(argument); + String desc = value instanceof Long ? "(J)I" : "(D)I"; + assertSame(argument, wide.peek(1)); + assertFalse(ASMMixinCompiler.getSuper(call("parent", "wide", desc), wide).isDefined()); + assertEquals(3, wide.stack().size()); + assertSame(receiver, wide.peek(2)); + } + } + + @Test + void preservesVirtualReadsAndUsesTheDescriptorAfterTheSuperclassCallback() throws Exception { + List events = new ArrayList<>(); + MethodInsnNode call = call("parent", "target", "()I"); + Type switched = Type.getObjectType("codechicken/multipart/test/superlookup/Switched"); + Option selected = new Some<>(lookup("target", "target", "()I").get()); + ClassInfo parent = new TestInfo() { + + @Override + public Option findPublicImpl(String name, String desc) { + events.add("find:" + name + desc); + return selected; + } + }; + ClassInfo info = new TestInfo() { + + @Override + public Option superClass() { + events.add("super:" + call.desc); + call.desc = "(J)I"; + call.name = "changed"; + return new Some<>(parent); + } + }; + StackAnalyser stack = new StackAnalyser(OWNER, method("target")) { + + private boolean switchedOwner; + + @Override + public Type owner() { + events.add("owner:" + switchedOwner); + return switchedOwner ? switched : OWNER; + } + + @Override + public StackEntry peek(int index) { + events.add("peek:" + index); + switchedOwner = true; + call.desc = "(I)I"; + return new Load(new This(null), null) { + + @Override + public codechicken.multipart.asm.StackAnalyser.LocalEntry e() { + events.add("load"); + return super.e(); + } + }; + } + }; + events.clear(); // Discard constructor reads; characterize only the query. + Map cache = cache(); + Option previous = cache.put(switched.getInternalName(), info); + try { + assertSame(selected, ASMMixinCompiler.getSuper(call, stack)); + assertEquals( + Arrays.asList("owner:false", "peek:0", "load", "owner:true", "super:(I)I", "find:target(J)I"), + events); + cache.put(switched.getInternalName(), new TestInfo() { + + @Override + public Option superClass() { + return new Some<>(null); + } + }); + call.name = "target"; + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.getSuper(call, stack)); + } finally { + cache.remove(switched.getInternalName()); + if (previous.isDefined()) cache.put(switched.getInternalName(), previous.get()); + } + } + + private static Option lookup(String methodName, String targetName, String desc) { + StackAnalyser stack = stack(methodName); + stack.push(receiver()); + return ASMMixinCompiler.getSuper(call("unrelated/Owner", targetName, desc), stack); + } + + private static StackAnalyser stack(String name) { + return new StackAnalyser(OWNER, method(name)); + } + + private static MethodNode method(String name) { + return new MethodNode(ACC_PUBLIC, name, "()I", null, null); + } + + private static MethodInsnNode call(String owner, String name, String desc) { + return new MethodInsnNode(INVOKESPECIAL, owner, name, desc, false); + } + + private static Load receiver() { + return new Load(new This(OWNER), null); + } + + @SuppressWarnings("unchecked") + private static Map cache() throws Exception { + Field field = ASMMixinCompiler$.class.getDeclaredField("infoCache"); + field.setAccessible(true); + return (Map) field.get(ASMMixinCompiler$.MODULE$); + } + + private abstract static class TestInfo extends ClassInfo { + + @Override + public String name() { + throw new AssertionError("Unexpected name read"); + } + + @Override + public Option superClass() { + throw new AssertionError("Unexpected superclass read"); + } + + @Override + public Iterable interfaces() { + throw new AssertionError("Unexpected interface read"); + } + + @Override + public Iterable methods() { + throw new AssertionError("Unexpected method read"); + } + } + + public static class Grandparent { + + public int inherited() { + return 1; + } + + public int target(int argument) { + return argument; + } + } + + public abstract static class Parent extends Grandparent { + + public int target() { + return 2; + } + + protected int protectedTarget() { + return 3; + } + + private int hidden() { + return 4; + } + + public abstract int abstractTarget(); + + public int two(int first, int second) { + return first + second; + } + + public int wide(long argument) { + return (int) argument; + } + + public int wide(double argument) { + return (int) argument; + } + } + + public abstract static class Child extends Parent { + + @Override + public int target() { + return 5; + } + + public int childOnly() { + return 6; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/AbstractJavaMixinFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/AbstractJavaMixinFunctionalTest.java new file mode 100644 index 0000000..820fe77 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/AbstractJavaMixinFunctionalTest.java @@ -0,0 +1,190 @@ +package codechicken.multipart.test; + +import static codechicken.multipart.test.MixinClassesFunctionalTest.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.lang.reflect.Modifier; +import java.util.Arrays; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; + +class AbstractJavaMixinFunctionalTest { + + private static final String ROOT = "codechicken/multipart/test/abstractmixin/"; + + @Test + void abstractLayerKeepsItsContractAndConcreteChildCompletesTheComposite() throws Exception { + try (Scope scope = new Scope()) { + ClassNode base = abstractIntBase("LayerBase"); + Class baseClass = scope.define(base); + ClassNode layer = abstractInput("Layer", base.name); + byte[] before = ASMHelper.createBytes(layer, 0); + COMPILER.registerJavaTrait(layer); + + assertArrayEquals(before, ASMHelper.createBytes(layer, 0)); + ClassNode contract = COMPILER.classNode(layer.name); + MethodNode required = method(contract, "required"); + assertEquals(ACC_PUBLIC | ACC_ABSTRACT, required.access); + assertEquals(Arrays.asList("java/io/IOException"), required.exceptions); + ClassNode helper = COMPILER.classNode(layer.name + "$class"); + assertFalse(helper.methods.stream().anyMatch(m -> ((MethodNode) m).name.equals("required"))); + MixinInfo layerInfo = COMPILER.getMixinInfo(layer.name).get(); + assertEquals(base.name, layerInfo.parent()); + assertEquals(1, layerInfo.methods().size()); + assertEquals("fromMixin", layerInfo.methods().apply(0).name); + + ClassNode child = concreteInput("Child", layer.name); + COMPILER.registerJavaTrait(child); + MixinInfo childInfo = COMPILER.getMixinInfo(child.name).get(); + assertEquals(base.name, childInfo.parent()); + assertEquals(1, childInfo.parentTraits().size()); + assertSame(layerInfo, childInfo.parentTraits().apply(0)); + + Class composite = COMPILER.mixinClasses(ROOT + "LayerComposite", base.name, seq(child.name)); + assertFalse(Modifier.isAbstract(composite.getModifiers())); + Object value = composite.getConstructor(int.class).newInstance(41); + assertEquals(41, composite.getField("seed").get(value)); + assertEquals(23, composite.getMethod("required").invoke(value)); + assertEquals(23, composite.getMethod("fromMixin").invoke(value)); + assertEquals(23, baseClass.getMethod("fromBase").invoke(value)); + String fieldName = layerInfo.fields().apply(0).accessName(layer.name); + assertEquals(11, composite.getMethod(fieldName).invoke(value)); + } + } + + @Test + void abstractConstructorsStillRejectParametersAndMissingDirectSuperCalls() throws Exception { + try (Scope scope = new Scope()) { + ClassNode arguments = node(ROOT + "Arguments", "java/lang/Object", ACC_PUBLIC | ACC_ABSTRACT); + arguments.visitMethod(ACC_PUBLIC, "", "(I)V", null, null); + assertEquals( + "Constructor arguments are not permitted " + arguments.name + " as a mixin trait", + assertThrows(IllegalArgumentException.class, () -> COMPILER.registerJavaTrait(arguments)) + .getMessage()); + + ClassNode invalid = node(ROOT + "Invalid", ROOT + "ExpectedBase", ACC_PUBLIC | ACC_ABSTRACT); + MethodVisitor constructor = invalid.visitMethod(ACC_PUBLIC, "", "()V", null, null); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V", false); + constructor.visitInsn(RETURN); + constructor.visitMaxs(1, 1); + IllegalArgumentException failure = assertThrows( + IllegalArgumentException.class, + () -> COMPILER.registerJavaTrait(invalid)); + assertTrue(failure.getMessage().startsWith("Invalid constructor insn sequence " + invalid.name + "\n")); + + for (ClassNode input : Arrays.asList(arguments, invalid)) { + assertFalse(scope.bytes.contains(input.name)); + assertFalse(scope.bytes.contains(input.name + "$class")); + assertFalse(scope.mixins.contains(input.name)); + } + } + } + + @Test + void concreteMixinAlreadyTargetsAnAbstractBaseAndPreservesVirtualDispatch() throws Exception { + try (Scope scope = new Scope()) { + ClassNode base = abstractBase("Base"); + Class baseClass = scope.define(base); + ClassNode input = concreteInput("Concrete", base.name); + COMPILER.registerJavaTrait(input); + + MixinInfo info = COMPILER.getMixinInfo(input.name).get(); + assertEquals(base.name, info.parent()); + assertEquals(2, info.methods().size()); + Class composite = COMPILER.mixinClasses(ROOT + "Composite", base.name, seq(input.name)); + assertFalse(Modifier.isAbstract(composite.getModifiers())); + Object value = composite.getConstructor().newInstance(); + assertEquals(23, composite.getMethod("required").invoke(value)); + assertEquals(23, composite.getMethod("fromMixin").invoke(value)); + assertEquals(23, baseClass.getMethod("fromBase").invoke(value)); + } + } + + private static ClassNode abstractBase(String suffix) { + ClassNode base = node(ROOT + suffix, "java/lang/Object", ACC_PUBLIC | ACC_ABSTRACT); + MethodVisitor constructor = base.visitMethod(ACC_PUBLIC, "", "()V", null, null); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V", false); + constructor.visitInsn(RETURN); + constructor.visitMaxs(1, 1); + base.visitMethod(ACC_PUBLIC | ACC_ABSTRACT, "required", "()I", null, null); + MethodVisitor fromBase = base.visitMethod(ACC_PUBLIC, "fromBase", "()I", null, null); + fromBase.visitVarInsn(ALOAD, 0); + fromBase.visitMethodInsn(INVOKEVIRTUAL, base.name, "required", "()I", false); + fromBase.visitInsn(IRETURN); + fromBase.visitMaxs(1, 1); + return base; + } + + private static ClassNode abstractIntBase(String suffix) { + ClassNode base = node(ROOT + suffix, "java/lang/Object", ACC_PUBLIC | ACC_ABSTRACT); + base.visitField(ACC_PUBLIC, "seed", "I", null, null); + MethodVisitor constructor = base.visitMethod(ACC_PUBLIC, "", "(I)V", null, null); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V", false); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitVarInsn(ILOAD, 1); + constructor.visitFieldInsn(PUTFIELD, base.name, "seed", "I"); + constructor.visitInsn(RETURN); + constructor.visitMaxs(2, 2); + base.visitMethod(ACC_PUBLIC | ACC_ABSTRACT, "required", "()I", null, null); + MethodVisitor fromBase = base.visitMethod(ACC_PUBLIC, "fromBase", "()I", null, null); + fromBase.visitVarInsn(ALOAD, 0); + fromBase.visitMethodInsn(INVOKEVIRTUAL, base.name, "required", "()I", false); + fromBase.visitInsn(IRETURN); + fromBase.visitMaxs(1, 1); + return base; + } + + private static ClassNode abstractInput(String suffix, String parent) { + ClassNode input = node(ROOT + suffix, parent, ACC_PUBLIC | ACC_ABSTRACT); + input.visitField(ACC_PRIVATE, "initialized", "I", null, null); + MethodVisitor constructor = input.visitMethod(ACC_PROTECTED, "", "()V", null, null); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitInsn(ICONST_0); + constructor.visitMethodInsn(INVOKESPECIAL, parent, "", "(I)V", false); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitIntInsn(BIPUSH, 11); + constructor.visitFieldInsn(PUTFIELD, input.name, "initialized", "I"); + constructor.visitInsn(RETURN); + constructor.visitMaxs(2, 1); + input.visitMethod(ACC_PUBLIC | ACC_ABSTRACT, "required", "()I", null, new String[] { "java/io/IOException" }); + MethodVisitor fromMixin = input.visitMethod(ACC_PUBLIC, "fromMixin", "()I", null, null); + fromMixin.visitVarInsn(ALOAD, 0); + fromMixin.visitMethodInsn(INVOKEVIRTUAL, input.name, "required", "()I", false); + fromMixin.visitInsn(IRETURN); + fromMixin.visitMaxs(1, 1); + return input; + } + + private static ClassNode concreteInput(String suffix, String parent) { + ClassNode input = node(ROOT + suffix, parent, ACC_PUBLIC); + MethodVisitor constructor = input.visitMethod(ACC_PUBLIC, "", "()V", null, null); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitMethodInsn(INVOKESPECIAL, parent, "", "()V", false); + constructor.visitInsn(RETURN); + constructor.visitMaxs(1, 1); + MethodVisitor required = input.visitMethod(ACC_PUBLIC, "required", "()I", null, null); + required.visitIntInsn(BIPUSH, 23); + required.visitInsn(IRETURN); + required.visitMaxs(1, 1); + MethodVisitor fromMixin = input.visitMethod(ACC_PUBLIC, "fromMixin", "()I", null, null); + fromMixin.visitVarInsn(ALOAD, 0); + fromMixin.visitMethodInsn(INVOKEVIRTUAL, input.name, "required", "()I", false); + fromMixin.visitInsn(IRETURN); + fromMixin.visitMaxs(1, 1); + return input; + } + + private static MethodNode method(ClassNode owner, String name) { + return (MethodNode) owner.methods.stream().filter(m -> ((MethodNode) m).name.equals(name)).findFirst().get(); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/BlockMicroMaterialFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/BlockMicroMaterialFunctionalTest.java new file mode 100644 index 0000000..5cc058a --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/BlockMicroMaterialFunctionalTest.java @@ -0,0 +1,160 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.util.FakePlayerFactory; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.Microblock; +import codechicken.microblock.MissingMicroMaterial$; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.examples.MaterialAccessExample; +import scala.Tuple2; + +class BlockMicroMaterialFunctionalTest { + + @Test + void typedQueryUsesFirstUsableBlockAndGuideNhMetadataFormatting() { + assertNull(MaterialAccessExample.resolvePrimaryMicroblockId(null)); + assertNull(MaterialAccessExample.resolvePrimaryMicroblockId(new TileEntity())); + TileMultipart tile = new TileMultipart(); + assertNull(MaterialAccessExample.resolvePrimaryMicroblockId(tile)); + Microblock first = FaceMicroClass$.MODULE$.create(false, 0); + Microblock second = FaceMicroClass$.MODULE$.create(false, 1); + tile.setPartList(Arrays.asList(new MultipartGeneratorFunctionalTest.PlainPart(), first, second)); + Tuple2[] materials = MicroMaterialRegistry.getIdMap(); + Tuple2 originalFirst = materials[0]; + Tuple2 originalSecond = materials[1]; + try { + materials[1] = new Tuple2<>("test:second", new BlockMicroMaterial(Blocks.stone, 0)); + for (int meta : new int[] { Integer.MIN_VALUE, -1, 0, 15, 17, Integer.MAX_VALUE }) { + materials[0] = new Tuple2<>("test:alias", new BlockMicroMaterial(Blocks.wool, meta)); + assertEquals( + meta > 0 ? "minecraft:wool:" + meta : "minecraft:wool", + MaterialAccessExample.resolvePrimaryMicroblockId(tile)); + } + for (IMicroMaterial skipped : new IMicroMaterial[] { MissingMicroMaterial$.MODULE$, null, + new BlockMicroMaterial(null, 0), new BlockMicroMaterial(Blocks.air, 0), + new BlockMicroMaterial(new Block(Material.rock) {}, 0) }) { + materials[0] = new Tuple2<>("test:skipped", skipped); + assertEquals("minecraft:stone", MaterialAccessExample.resolvePrimaryMicroblockId(tile)); + } + materials[1] = materials[0]; + assertNull(MaterialAccessExample.resolvePrimaryMicroblockId(tile)); + } finally { + materials[0] = originalFirst; + materials[1] = originalSecond; + } + } + + @Test + void typedQueryUsesVirtualAccessorsAndPropagatesFailuresWithoutSelectingALaterPart() { + Microblock first = FaceMicroClass$.MODULE$.create(false, 0); + Microblock second = FaceMicroClass$.MODULE$.create(false, 1); + TileMultipart tile = new TileMultipart(); + tile.setPartList(Arrays.asList(first, second)); + Tuple2[] materials = MicroMaterialRegistry.getIdMap(); + Tuple2 original = materials[0]; + List calls = new ArrayList<>(); + RuntimeException failure = new IllegalStateException("material failure"); + try { + materials[0] = new Tuple2<>("test:override", new BlockMicroMaterial(null, 3) { + + @Override + public Block block() { + calls.add("block"); + return Blocks.wool; + } + + @Override + public int meta() { + calls.add("meta"); + return 23; + } + }); + assertEquals("minecraft:wool:23", MaterialAccessExample.resolvePrimaryMicroblockId(tile)); + assertEquals(Arrays.asList("block", "meta"), calls); + materials[0] = new Tuple2<>("test:failure", new BlockMicroMaterial(null, 0) { + + @Override + public int meta() { + throw failure; + } + }); + assertSame( + failure, + assertThrows(RuntimeException.class, () -> MaterialAccessExample.resolvePrimaryMicroblockId(tile))); + first.material_$eq(Integer.MAX_VALUE); + assertThrows(IndexOutOfBoundsException.class, () -> MaterialAccessExample.resolvePrimaryMicroblockId(tile)); + } finally { + materials[0] = original; + } + } + + @Test + void registeredMaterialsExposeBlockAndMetadataWithoutClientInitialization() throws Exception { + int id = MicroMaterialRegistry.materialID("minecraft:stone"); + BlockMicroMaterial material = (BlockMicroMaterial) MicroMaterialRegistry.getMaterial(id); + assertSame(MicroMaterialRegistry.getMaterial("minecraft:stone"), material); + assertSame(Blocks.stone, material.block()); + assertEquals(0, material.meta()); + assertSame(Blocks.wool, new BlockMicroMaterial(Blocks.wool, 23).block()); + assertEquals(23, new BlockMicroMaterial(Blocks.wool, 23).meta()); + assertEquals("minecraft:stone", net.minecraft.block.Block.blockRegistry.getNameForObject(material.block())); + } + + @Test + void dedicatedServerKeepsCommonMaterialBehaviorAndStripsClientMembers() throws Exception { + BlockMicroMaterial material = (BlockMicroMaterial) MicroMaterialRegistry.getMaterial("minecraft:stone"); + assertSame(Blocks.stone, material.block()); + assertEquals(0, material.meta()); + assertEquals("minecraft:stone", material.blockKey()); + + ItemStack item = material.getItem(); + assertSame(Item.getItemFromBlock(Blocks.stone), item.getItem()); + assertEquals(1, item.stackSize); + assertEquals(0, item.getItemDamage()); + assertEquals(item.getDisplayName(), material.getLocalizedName()); + assertFalse(material.isTransparent()); + assertTrue(new BlockMicroMaterial(Blocks.glass, 0).isTransparent()); + assertEquals(Blocks.glowstone.getLightValue(), new BlockMicroMaterial(Blocks.glowstone, 0).getLightValue()); + assertEquals(Blocks.stone.getHarvestLevel(0), material.getCutterStrength()); + assertSame(Blocks.stone.stepSound, material.getSound()); + assertEquals(Blocks.stone.getExplosionResistance(null), material.explosionResistance(null)); + WorldServer world = MinecraftServer.getServer().worldServers[0]; + EntityPlayer player = FakePlayerFactory.getMinecraft(world); + float hardness = Blocks.stone.getBlockHardness(null, 0, 0, 0); + float expected = player.getBreakSpeed(Blocks.stone, false, 0, 0, -1, 0) / hardness; + assertEquals(expected, material.getStrength(player)); + + assertThrows(NoSuchFieldException.class, () -> BlockMicroMaterial.class.getDeclaredField("icont")); + assertThrows(NoSuchMethodException.class, () -> BlockMicroMaterial.class.getDeclaredMethod("loadIcons")); + assertThrows( + NoSuchMethodException.class, + () -> BlockMicroMaterial.class.getDeclaredMethod("getBreakingIcon", int.class)); + assertSame(Blocks.stone, BlockMicroMaterial.class.getDeclaredMethod("block").invoke(material)); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ButtonOrientationFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ButtonOrientationFunctionalTest.java new file mode 100644 index 0000000..8f2f719 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ButtonOrientationFunctionalTest.java @@ -0,0 +1,146 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import net.minecraft.init.Blocks; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.examples.ButtonOrientationExample; +import codechicken.multipart.minecraft.ButtonPart; + +class ButtonOrientationFunctionalTest { + + private static final BlockCoord BUTTON = new BlockCoord(64, 200, 48); + + @Test + void inverseLookupReadsLiveMappingsWithoutPlacementValidation() { + int[] originalMetaSideMap = ButtonPart.metaSideMap; + int[] originalSideMetaMap = ButtonPart.sideMetaMap; + try { + ButtonPart.metaSideMap = new int[] { -1, 4, 5, 2, 3, -1, -1, -1 }; + ButtonPart.sideMetaMap = new int[] { -1, -1, 3, 4, 1, 2 }; + for (int side = 0; side < 6; side++) { + assertEquals(ButtonPart.sideMetaMap[side], ButtonPart.metaForSide(side)); + assertEquals(ButtonPart.sideMetaMap[side ^ 1], ButtonOrientationExample.metadataForClickedFace(side)); + } + assertEquals(-1, ButtonPart.metaForSide(0)); + ButtonPart.setOrientation(5, ForgeDirection.DOWN); + assertEquals(5, ButtonPart.metaForSide(0)); + ButtonPart.setOrientation(5, ForgeDirection.UP); + assertEquals(-1, ButtonPart.metaForSide(0)); + assertEquals(5, ButtonPart.metaForSide(1)); + ButtonPart.sideMetaMap[2] = 7; + assertEquals(7, ButtonPart.metaForSide(2)); + ButtonPart.sideMetaMap = new int[] { 5, 0, 3, 4, 1, 2 }; + assertEquals(3, ButtonPart.metaForSide(2)); + assertThrows(IndexOutOfBoundsException.class, () -> ButtonPart.metaForSide(-1)); + assertThrows(IndexOutOfBoundsException.class, () -> ButtonPart.metaForSide(6)); + } finally { + ButtonPart.metaSideMap = originalMetaSideMap; + ButtonPart.sideMetaMap = originalSideMetaMap; + } + } + + @Test + void etFuturumArrayMutationEnablesFloorAndCeilingPlacement() { + World world = MinecraftServer.getServer().worldServers[0]; + world.getChunkFromBlockCoords(BUTTON.x, BUTTON.z); + int[] originalMetaSideMap = ButtonPart.metaSideMap; + int[] originalSideMetaMap = ButtonPart.sideMetaMap; + int[] originalMetaSideValues = originalMetaSideMap.clone(); + int[] originalSideMetaValues = originalSideMetaMap.clone(); + + try { + assertArrayEquals(new int[] { -1, 4, 5, 2, 3, -1, -1, -1 }, ButtonPart.metaSideMap); + assertArrayEquals(new int[] { -1, -1, 3, 4, 1, 2 }, ButtonPart.sideMetaMap); + prepareSupports(world); + assertNull(ButtonPart.placement(world, BUTTON, 0, 0)); + assertNull(ButtonPart.placement(world, BUTTON, 1, 0)); + + int[] metaSideMap = ButtonPart.metaSideMap; + metaSideMap[0] = 1; + metaSideMap[5] = 0; + ButtonPart.metaSideMap = metaSideMap; + int[] sideMetaMap = ButtonPart.sideMetaMap; + sideMetaMap[0] = 5; + sideMetaMap[1] = 0; + ButtonPart.sideMetaMap = sideMetaMap; + + assertSame(metaSideMap, ButtonPart.metaSideMap); + assertSame(sideMetaMap, ButtonPart.sideMetaMap); + assertArrayEquals(new int[] { 1, 4, 5, 2, 3, 0, -1, -1 }, ButtonPart.metaSideMap); + assertArrayEquals(new int[] { 5, 0, 3, 4, 1, 2 }, ButtonPart.sideMetaMap); + + int[] expectedMetadata = { 0, 5, 4, 3, 2, 1 }; + for (int side = 0; side < 6; side++) { + ButtonPart part = (ButtonPart) ButtonPart.placement(world, BUTTON, side, 0); + assertEquals(expectedMetadata[side], part.getMetadata()); + assertEquals(side ^ 1, part.getFace()); + } + } finally { + clear(world); + System.arraycopy(originalMetaSideValues, 0, originalMetaSideMap, 0, originalMetaSideMap.length); + System.arraycopy(originalSideMetaValues, 0, originalSideMetaMap, 0, originalSideMetaMap.length); + ButtonPart.metaSideMap = originalMetaSideMap; + ButtonPart.sideMetaMap = originalSideMetaMap; + } + } + + @Test + void typedApiMatchesEtFuturumAndKeepsMappingsOneToOne() { + int[] originalMetaSideMap = ButtonPart.metaSideMap; + int[] originalSideMetaMap = ButtonPart.sideMetaMap; + int[] originalMetaSideValues = originalMetaSideMap.clone(); + int[] originalSideMetaValues = originalSideMetaMap.clone(); + + try { + ButtonOrientationExample.registerVerticalOrientations(); + assertArrayEquals(new int[] { 1, 4, 5, 2, 3, 0, -1, -1 }, ButtonPart.metaSideMap); + assertArrayEquals(new int[] { 5, 0, 3, 4, 1, 2 }, ButtonPart.sideMetaMap); + + ButtonPart.setOrientation(1, ForgeDirection.DOWN); + assertArrayEquals(new int[] { 1, 0, 5, 2, 3, -1, -1, -1 }, ButtonPart.metaSideMap); + assertArrayEquals(new int[] { 1, 0, 3, 4, -1, 2 }, ButtonPart.sideMetaMap); + + int[] metaSideValues = ButtonPart.metaSideMap.clone(); + int[] sideMetaValues = ButtonPart.sideMetaMap.clone(); + assertThrows(IllegalArgumentException.class, () -> ButtonPart.setOrientation(-1, ForgeDirection.UP)); + assertThrows(IllegalArgumentException.class, () -> ButtonPart.setOrientation(8, ForgeDirection.UP)); + assertThrows(IllegalArgumentException.class, () -> ButtonPart.setOrientation(0, null)); + assertThrows(IllegalArgumentException.class, () -> ButtonPart.setOrientation(0, ForgeDirection.UNKNOWN)); + assertArrayEquals(metaSideValues, ButtonPart.metaSideMap); + assertArrayEquals(sideMetaValues, ButtonPart.sideMetaMap); + } finally { + System.arraycopy(originalMetaSideValues, 0, originalMetaSideMap, 0, originalMetaSideMap.length); + System.arraycopy(originalSideMetaValues, 0, originalSideMetaMap, 0, originalSideMetaMap.length); + ButtonPart.metaSideMap = originalMetaSideMap; + ButtonPart.sideMetaMap = originalSideMetaMap; + } + } + + private static void prepareSupports(World world) { + clear(world); + for (int side = 0; side < 6; side++) { + BlockCoord support = BUTTON.copy().offset(side); + assertTrue(world.setBlock(support.x, support.y, support.z, Blocks.stone, 0, 3)); + } + } + + private static void clear(World world) { + world.setBlockToAir(BUTTON.x, BUTTON.y, BUTTON.z); + for (int side = 0; side < 6; side++) { + BlockCoord support = BUTTON.copy().offset(side); + world.setBlockToAir(support.x, support.y, support.z); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ClassBytesFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ClassBytesFunctionalTest.java new file mode 100644 index 0000000..cd93439 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ClassBytesFunctionalTest.java @@ -0,0 +1,373 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; + +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.LaunchClassLoader; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FrameNode; + +import com.google.common.collect.HashBiMap; + +import codechicken.lib.asm.ObfMapping; +import codechicken.multipart.asm.ASMMixinCompiler; +import codechicken.multipart.asm.ASMMixinCompiler$; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.DebugPrinter$; +import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; +import scala.collection.JavaConversions; +import scala.collection.mutable.Map; + +class ClassBytesFunctionalTest { + + private static final String NAME = "codechicken/multipart/test/bytes/Probe"; + private static final String DOTTED = NAME.replace('/', '.'); + + @Test + void normalizesLoaderNamesAndRunsTheTransformerChainOnEveryDirectLookup() throws Exception { + try (State state = new State()) { + byte[] raw = { 1 }, middle = { 2 }, result = { 3 }; + state.loader.bytes = raw; + state.bytes.put(NAME, new byte[] { 4 }); + List calls = new ArrayList<>(); + state.transformers((name, transformed, input) -> { + calls.add(name + ":" + transformed); + assertSame(raw, input); + return middle; + }, (name, transformed, input) -> { + assertSame(middle, input); + return result; + }); + assertSame(result, state.compiler.getBytes(NAME)); + assertSame(result, ASMMixinCompiler.getBytes(DOTTED)); + assertEquals(Arrays.asList(DOTTED, DOTTED), state.loader.names); + assertEquals(Arrays.asList(DOTTED + ":" + DOTTED, DOTTED + ":" + DOTTED), calls); + assertArrayEquals(new byte[] { 4 }, state.bytes.apply(NAME)); + } + } + + @Test + void objectAndMissingBytesSkipExclusionsAndNullNamesFailBeforeLoading() throws Exception { + try (State state = new State()) { + state.setExclusions(null); + assertNull(state.compiler.getBytes("java/lang/Object")); + assertNull(state.compiler.getBytes("java.lang.Object")); + assertThrows(NullPointerException.class, () -> state.compiler.getBytes(null)); + assertTrue(state.loader.names.isEmpty()); + assertNull(state.compiler.getBytes(NAME)); + assertEquals(Arrays.asList(DOTTED), state.loader.names); + state.loader.bytes = new byte[] { 1 }; + assertThrows(NullPointerException.class, () -> state.compiler.getBytes(NAME)); + assertEquals(Arrays.asList(DOTTED, DOTTED), state.loader.names); + } + } + + @Test + void exclusionsUseDottedPrefixesAndStopAtTheFirstMatch() throws Exception { + try (State state = new State()) { + state.loader.bytes = new byte[] { 1 }; + state.transformers((name, transformed, bytes) -> { + fail("Excluded bytes must not reach transformers"); + return bytes; + }); + state.exclusions("unrelated", DOTTED.substring(0, DOTTED.length() - 1), null); + assertSame(state.loader.bytes, state.compiler.getBytes(NAME)); + state.exclusions("", null); + assertSame(state.loader.bytes, state.compiler.getBytes(NAME)); + state.exclusions(NAME, null); + assertThrows(NullPointerException.class, () -> state.compiler.getBytes(NAME)); + } + } + + @Test + void preservesNullTransformerResultsAndReflectiveExceptionWrapping() throws Exception { + try (State state = new State()) { + state.loader.bytes = new byte[] { 1 }; + state.transformers((name, transformed, bytes) -> null); + assertNull(state.compiler.getBytes(NAME)); + Error failure = new LinkageError("transformer probe"); + state.transformers((name, transformed, bytes) -> { throw failure; }); + InvocationTargetException thrown = assertThrows( + InvocationTargetException.class, + () -> state.compiler.getBytes(NAME)); + assertSame(failure, thrown.getCause()); + assertFalse(state.bytes.contains(NAME)); + } + } + + @Test + void remapsTheOriginalInputAndPassesDeobfuscatedThenObfuscatedNamesToTransformers() throws Exception { + try (State state = new State()) { + Field mappings = field(FMLDeobfuscatingRemapper.class, "classNameBiMap"); + Object previous = mappings.get(FMLDeobfuscatingRemapper.INSTANCE); + Field obfuscated = writableStaticFinal(ObfMapping.class, "obfuscated"); + boolean oldObfuscated = obfuscated.getBoolean(null); + HashBiMap names = HashBiMap.create(); + names.put("obf/Probe", NAME); + try { + mappings.set(FMLDeobfuscatingRemapper.INSTANCE, names); + obfuscated.setBoolean(null, true); + byte[] raw = { 1 }, result = { 2 }; + state.loader.bytes = raw; + List calls = new ArrayList<>(); + state.transformers((name, transformed, bytes) -> { + assertSame(raw, bytes); + calls.add(name + ":" + transformed); + return result; + }); + assertSame(result, state.compiler.getBytes(NAME)); + assertSame(result, state.compiler.getBytes(DOTTED)); + assertEquals(Arrays.asList("obf.Probe", DOTTED), state.loader.names); + assertEquals(Arrays.asList(DOTTED + ":obf.Probe", DOTTED + ":" + DOTTED), calls); + state.exclusions("obf."); + assertSame(result, state.compiler.getBytes(NAME)); + state.exclusions(DOTTED); + assertSame(raw, state.compiler.getBytes(NAME)); + assertEquals(3, calls.size()); + } finally { + obfuscated.setBoolean(null, oldObfuscated); + mappings.set(FMLDeobfuscatingRemapper.INSTANCE, previous); + } + } + } + + @Test + void classNodeCachesNormalizedRawBytesButReturnsFreshNodesWithExpandedFrames() throws Exception { + try (State state = new State()) { + byte[] bytes = definition(NAME); + state.loader.bytes = bytes; + ClassNode first = state.compiler.classNode(DOTTED); + assertEquals(NAME, first.name); + FrameNode frame = null; + for (AbstractInsnNode insn : first.methods.get(0).instructions.toArray()) { + if (insn instanceof FrameNode) frame = (FrameNode) insn; + } + assertNotNull(frame); + assertEquals(F_NEW, frame.type); + assertEquals(Arrays.asList(INTEGER), frame.local); + assertSame(bytes, state.bytes.apply(NAME)); + assertFalse(state.bytes.contains(DOTTED)); + first.methods.clear(); + // Class version is read again from the retained array, rather than from a cached node or copied array. + bytes[7] = V1_8; + ClassNode second = ASMMixinCompiler.classNode(NAME); + assertNotSame(first, second); + assertEquals(1, second.methods.size()); + assertEquals(V1_8, second.version); + assertEquals(Arrays.asList(DOTTED), state.loader.names); + } + } + + @Test + void classNodeCachesNullResultsIncludingObjectAndDoesNotCacheNullNameFailures() throws Exception { + try (State state = new State()) { + assertNull(state.compiler.classNode(NAME)); + assertTrue(state.bytes.get(NAME).isDefined()); + assertNull(state.bytes.apply(NAME)); + state.loader.bytes = definition(NAME); + assertNull(state.compiler.classNode(DOTTED)); + assertEquals(1, state.loader.names.size()); + state.bytes.remove("java/lang/Object"); + assertNull(state.compiler.classNode("java.lang.Object")); + assertTrue(state.bytes.get("java/lang/Object").isDefined()); + assertEquals(1, state.loader.names.size()); + assertThrows(NullPointerException.class, () -> state.compiler.classNode(null)); + assertFalse(state.bytes.contains(null)); + } + } + + @Test + void loadFailuresAreRetriedButParseFailuresKeepTheCachedBytes() throws Exception { + try (State state = new State()) { + IOException failure = new IOException("read probe"); + state.loader.failure = failure; + assertSame(failure, assertThrows(IOException.class, () -> state.compiler.classNode(NAME))); + assertFalse(state.bytes.contains(NAME)); + state.loader.failure = null; + byte[] malformed = new byte[0]; + state.loader.bytes = malformed; + assertThrows(ArrayIndexOutOfBoundsException.class, () -> state.compiler.classNode(NAME)); + assertSame(malformed, state.bytes.apply(NAME)); + state.loader.bytes = definition(NAME); + assertThrows(ArrayIndexOutOfBoundsException.class, () -> state.compiler.classNode(DOTTED)); + assertEquals(2, state.loader.names.size()); + state.bytes.remove(NAME); + assertEquals(NAME, state.compiler.classNode(NAME).name); + assertEquals(3, state.loader.names.size()); + } + } + + @Test + void internalDefinePublishesTheSameArrayAndInvalidatesOnlyNormalizedMetadataWithoutDefiningAClass() + throws Exception { + try (State state = new State()) { + state.info.put(NAME, null); + state.info.put(DOTTED, null); + byte[] bytes = definition(NAME); + ASMMixinCompiler.internalDefine(DOTTED, bytes); + assertSame(bytes, state.bytes.apply(NAME)); + assertFalse(state.info.contains(NAME)); + assertTrue(state.info.contains(DOTTED)); + assertEquals(NAME, state.compiler.classNode(DOTTED).name); + assertTrue(state.loader.names.isEmpty()); + java.lang.reflect.Method loaded = ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class); + loaded.setAccessible(true); + assertNull(loaded.invoke(state.loader, DOTTED)); + } + } + + @Test + void internalDefineKeepsCacheChangesWhenDumpingFailsAndAcceptsNullsWithDebugDisabled() throws Exception { + try (State state = new State()) { + DebugPrinter$ printer = DebugPrinter$.MODULE$; + Field debug = field(DebugPrinter$.class, "debug"); + boolean oldDebug = debug.getBoolean(printer); + String name = NAME + "DumpFailure"; + Path blockedDump = printer.dir().toPath().resolve(name.replace('/', '#') + ".txt"); + Files.createDirectory(blockedDump); + try { + debug.setBoolean(printer, true); + state.info.put(name, null); + byte[] bytes = definition(name); + RuntimeException thrown = assertThrows( + RuntimeException.class, + () -> state.compiler.internalDefine(name, bytes)); + assertInstanceOf(IOException.class, thrown.getCause()); + assertSame(bytes, state.bytes.apply(name)); + assertFalse(state.info.contains(name)); + debug.setBoolean(printer, false); + state.info.put(null, null); + state.compiler.internalDefine(null, null); + assertTrue(state.bytes.get(null).isDefined()); + assertNull(state.bytes.apply(null)); + assertFalse(state.info.contains(null)); + assertNull(state.compiler.classNode(null)); + assertTrue(state.loader.names.isEmpty()); + } finally { + debug.setBoolean(printer, oldDebug); + Files.delete(blockedDump); + } + } + } + + private static byte[] definition(String name) { + ClassWriter writer = new ClassWriter(0); + writer.visit(V1_7, ACC_PUBLIC, name, null, "java/lang/Object", null); + MethodVisitor body = writer.visitMethod(ACC_PUBLIC | ACC_STATIC, "choose", "(Z)I", null, null); + body.visitCode(); + body.visitVarInsn(ILOAD, 0); + Label other = new Label(); + body.visitJumpInsn(IFEQ, other); + body.visitInsn(ICONST_1); + body.visitInsn(IRETURN); + body.visitLabel(other); + body.visitFrame(F_SAME, 0, null, 0, null); + body.visitInsn(ICONST_2); + body.visitInsn(IRETURN); + body.visitMaxs(1, 1); + body.visitEnd(); + writer.visitEnd(); + return writer.toByteArray(); + } + + private static Field field(Class owner, String name) throws Exception { + Field field = owner.getDeclaredField(name); + field.setAccessible(true); + return field; + } + + private static Field writableStaticFinal(Class owner, String name) throws Exception { + // The Forge harness runs on Java 8. Temporarily switch the real environment flag to exercise remapping. + Field result = field(owner, name); + field(Field.class, "modifiers").setInt(result, result.getModifiers() & ~Modifier.FINAL); + return result; + } + + private static class RecordingLoader extends LaunchClassLoader { + + final List names = new ArrayList<>(); + byte[] bytes; + IOException failure; + + RecordingLoader() { + super(new URL[0]); + } + + @Override + public byte[] getClassBytes(String name) throws IOException { + names.add(name); + if (failure != null) throw failure; + return bytes; + } + } + + /** Restores the singleton, loader and both cache contents even if a characterization assertion fails. */ + private static class State implements AutoCloseable { + + final ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + final Field loaderField = field(ASMMixinCompiler$.class, "cl"); + final Object oldLoader = loaderField.get(compiler); + final RecordingLoader loader = new RecordingLoader(); + final Map bytes = cache("traitByteMap"); + final Map info = cache("infoCache"); + final java.util.Map oldBytes = new HashMap<>(JavaConversions.mapAsJavaMap(bytes)); + final java.util.Map oldInfo = new HashMap<>(JavaConversions.mapAsJavaMap(info)); + + State() throws Exception { + assertFalse(ObfMapping.obfuscated); + // Initialize the printer before substituting the loader. + assertNotNull(DebugPrinter$.MODULE$.dir()); + exclusions(); + bytes.remove(NAME); + bytes.remove(null); + loaderField.set(compiler, loader); + } + + void exclusions(String... prefixes) throws Exception { + setExclusions(new LinkedHashSet<>(Arrays.asList(prefixes))); + } + + void setExclusions(Object prefixes) throws Exception { + compiler.f_transformerExceptions().set(loader, prefixes); + } + + void transformers(IClassTransformer... transformers) throws Exception { + field(LaunchClassLoader.class, "transformers").set(loader, Arrays.asList(transformers)); + } + + @SuppressWarnings("unchecked") + private Map cache(String name) throws Exception { + return (Map) field(ASMMixinCompiler$.class, name).get(compiler); + } + + @Override + public void close() throws Exception { + loaderField.set(compiler, oldLoader); + bytes.clear(); + oldBytes.forEach(bytes::put); + info.clear(); + oldInfo.forEach(info::put); + loader.close(); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ClassDefinitionFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ClassDefinitionFunctionalTest.java new file mode 100644 index 0000000..a6f9cf6 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ClassDefinitionFunctionalTest.java @@ -0,0 +1,359 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.HashMap; + +import net.minecraft.launchwrapper.LaunchClassLoader; + +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; + +import codechicken.multipart.asm.ASMMixinCompiler; +import codechicken.multipart.asm.ASMMixinCompiler$; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.DebugPrinter$; +import scala.collection.JavaConversions; +import scala.collection.mutable.Map; + +class ClassDefinitionFunctionalTest { + + private static final String NAME = "codechicken/multipart/test/definition/Probe"; + private static final String MARKER = "forgemultipart.test.definition.initialized"; + + @Test + void publishesAndDumpsTheSuppliedKeyButDefinesTheBytecodeNameWithoutInitializingIt() throws Exception { + try (State state = new State()) { + String alias = NAME + "Alias", dotted = alias.replace('/', '.'); + state.info.put(alias, null); + state.info.put(dotted, null); + state.debug.setBoolean(state.printer, true); + byte[] bytes = definition(NAME, 7, true); + Class defined = ASMMixinCompiler.define(dotted, bytes); + assertEquals(NAME.replace('/', '.'), defined.getName()); + assertSame(state.loader, defined.getClassLoader()); + assertSame(defined, state.loader.loaded(defined.getName())); + assertSame(bytes, state.bytes.apply(alias)); + assertFalse(state.bytes.contains(dotted)); + assertFalse(state.info.contains(alias)); + assertTrue(state.info.contains(dotted)); + assertEquals(NAME, state.compiler.classNode(alias).name); + assertEquals(state.oldUsed + bytes.length, state.used()); + assertNull(System.getProperty(MARKER)); + String dump = new String(Files.readAllBytes(state.dump(alias)), java.nio.charset.StandardCharsets.UTF_8); + assertTrue(dump.contains(NAME)); + assertEquals(7, defined.getMethod("value").invoke(null)); + assertEquals("yes", System.getProperty(MARKER)); + } + } + + @Test + void duplicateDefinitionsStayReflectionWrappedAfterReplacingCachesAndCountingBytes() throws Exception { + try (State state = new State()) { + byte[] first = definition(NAME, 7, false), second = definition(NAME, 9, false); + Class defined = state.compiler.define(NAME, first); + state.info.put(NAME, null); + InvocationTargetException thrown = assertThrows( + InvocationTargetException.class, + () -> state.compiler.define(NAME, second)); + assertInstanceOf(LinkageError.class, thrown.getCause()); + assertTrue(thrown.getCause().getMessage().contains("duplicate")); + assertSame(second, state.bytes.apply(NAME)); + assertFalse(state.info.contains(NAME)); + assertEquals(state.oldUsed + first.length + second.length, state.used()); + assertSame(defined, state.loader.loaded(NAME.replace('/', '.'))); + assertEquals(7, defined.getMethod("value").invoke(null)); + } + } + + @Test + void malformedBytesRemainPublishedAndCountedWhenTheJvmRejectsThem() throws Exception { + try (State state = new State()) { + byte[] malformed = { 1, 2, 3 }; + state.info.put(NAME, null); + InvocationTargetException thrown = assertThrows( + InvocationTargetException.class, + () -> state.compiler.define(NAME, malformed)); + assertInstanceOf(ClassFormatError.class, thrown.getCause()); + assertSame(malformed, state.bytes.apply(NAME)); + assertFalse(state.info.contains(NAME)); + assertEquals(state.oldUsed + malformed.length, state.used()); + assertNull(state.loader.loaded(NAME.replace('/', '.'))); + } + } + + @Test + void nullBytesArePublishedBeforeAccountingFails() throws Exception { + try (State state = new State()) { + state.info.put(NAME, null); + assertThrows(NullPointerException.class, () -> state.compiler.define(NAME, null)); + assertTrue(state.bytes.get(NAME).isDefined()); + assertNull(state.bytes.apply(NAME)); + assertFalse(state.info.contains(NAME)); + assertEquals(state.oldUsed, state.used()); + assertNull(state.loader.loaded(NAME.replace('/', '.'))); + } + } + + @Test + void nullNamesAreAcceptedWithoutDumpsButFailBeforeAccountingWhenDumpsAreEnabled() throws Exception { + try (State state = new State()) { + byte[] bytes = definition(NAME, 7, false); + Class defined = state.compiler.define(null, bytes); + assertEquals(NAME.replace('/', '.'), defined.getName()); + assertSame(bytes, state.bytes.apply(null)); + int counted = state.used(); + state.debug.setBoolean(state.printer, true); + byte[] second = definition(NAME + "Other", 9, false); + state.info.put(null, null); + assertThrows(NullPointerException.class, () -> state.compiler.define(null, second)); + assertSame(second, state.bytes.apply(null)); + assertFalse(state.info.contains(null)); + assertEquals(counted, state.used()); + assertNull(state.loader.loaded((NAME + "Other").replace('/', '.'))); + } + } + + @Test + void failedDumpsKeepPublicationButPreventAccountingAndClassDefinition() throws Exception { + try (State state = new State()) { + Path blocked = state.dump(NAME); + Files.createDirectory(blocked); + try { + state.debug.setBoolean(state.printer, true); + state.info.put(NAME, null); + byte[] bytes = definition(NAME, 7, false); + RuntimeException thrown = assertThrows( + RuntimeException.class, + () -> state.compiler.define(NAME, bytes)); + assertInstanceOf(IOException.class, thrown.getCause()); + assertSame(bytes, state.bytes.apply(NAME)); + assertFalse(state.info.contains(NAME)); + assertEquals(state.oldUsed, state.used()); + assertNull(state.loader.loaded(NAME.replace('/', '.'))); + } finally { + Files.delete(blocked); + } + } + } + + @Test + void accountingFailuresEscapeBeforeTheDuplicateErrorHandler() throws Exception { + try (State state = new State()) { + LinkageError failure = new LinkageError("duplicate accounting failure"); + state.counter.setInt(state.printer, 15999); + state.logger.set( + state.printer, + Proxy.newProxyInstance( + Logger.class.getClassLoader(), + new Class[] { Logger.class }, + (proxy, method, args) -> { + assertEquals("debug", method.getName()); + throw failure; + })); + byte[] bytes = definition(NAME, 7, false); + assertSame(failure, assertThrows(LinkageError.class, () -> state.compiler.define(NAME, bytes))); + assertSame(bytes, state.bytes.apply(NAME)); + assertEquals(15999, state.used()); + assertNull(state.loader.loaded(NAME.replace('/', '.'))); + } + } + + @Test + void inaccessibleReflectionFailsAfterPublicationAndAccounting() throws Exception { + try (State state = new State()) { + state.originalDefine.setAccessible(false); + byte[] bytes = definition(NAME, 7, false); + assertThrows(IllegalAccessException.class, () -> state.compiler.define(NAME, bytes)); + assertSame(bytes, state.bytes.apply(NAME)); + assertEquals(state.oldUsed + bytes.length, state.used()); + assertNull(state.loader.loaded(NAME.replace('/', '.'))); + } + } + + @Test + void aDirectDuplicateLinkageErrorIsTranslatedWithTheOriginalRequestedNameAndCause() throws Exception { + try (State state = new State()) { + state.directFailure("prefix duplicate suffix"); + byte[] bytes = definition(NAME, 7, false); + String dotted = NAME.replace('/', '.'); + IllegalStateException thrown = assertThrows( + IllegalStateException.class, + () -> state.compiler.define(dotted, bytes)); + assertEquals( + "class with name: " + dotted + + " already loaded. Do not reference your java mixin classes before registering", + thrown.getMessage()); + assertInstanceOf(LinkageError.class, thrown.getCause()); + assertEquals("prefix duplicate suffix", thrown.getCause().getMessage()); + assertSame(bytes, state.bytes.apply(NAME)); + assertEquals(state.oldUsed + bytes.length, state.used()); + } + } + + @Test + void directNonmatchingLinkageErrorsEscapeAndNullMessagesKeepTheGuardFailure() throws Exception { + for (String message : new String[] { "other failure", "Duplicate", null }) { + try (State state = new State()) { + state.directFailure(message); + byte[] bytes = definition(NAME, 7, false); + if (message == null) { + assertThrows(NullPointerException.class, () -> state.compiler.define(NAME, bytes)); + } else { + LinkageError thrown = assertThrows(LinkageError.class, () -> state.compiler.define(NAME, bytes)); + assertEquals(message, thrown.getMessage()); + } + assertSame(bytes, state.bytes.apply(NAME)); + assertEquals(state.oldUsed + bytes.length, state.used()); + } + } + } + + private static byte[] definition(String name, int value, boolean initialize) { + ClassWriter writer = new ClassWriter(0); + writer.visit(V1_6, ACC_PUBLIC, name, null, "java/lang/Object", null); + if (initialize) { + MethodVisitor init = writer.visitMethod(ACC_STATIC, "", "()V", null, null); + init.visitCode(); + init.visitLdcInsn(MARKER); + init.visitLdcInsn("yes"); + init.visitMethodInsn( + INVOKESTATIC, + "java/lang/System", + "setProperty", + "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", + false); + init.visitInsn(POP); + init.visitInsn(RETURN); + init.visitMaxs(2, 0); + init.visitEnd(); + } + MethodVisitor method = writer.visitMethod(ACC_PUBLIC | ACC_STATIC, "value", "()I", null, null); + method.visitCode(); + method.visitIntInsn(BIPUSH, value); + method.visitInsn(IRETURN); + method.visitMaxs(1, 0); + method.visitEnd(); + writer.visitEnd(); + return writer.toByteArray(); + } + + private static Field field(Class owner, String name) throws Exception { + Field field = owner.getDeclaredField(name); + field.setAccessible(true); + return field; + } + + private static class DefinitionLoader extends LaunchClassLoader { + + DefinitionLoader() { + super(new URL[0]); + } + + Class loaded(String name) { + return findLoadedClass(name); + } + + Class install(byte[] bytes) { + return defineClass(null, bytes, 0, bytes.length); + } + } + + private static class State implements AutoCloseable { + + final ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + final DebugPrinter$ printer = DebugPrinter$.MODULE$; + final Field cl = field(ASMMixinCompiler$.class, "cl"); + final Object oldLoader = cl.get(compiler); + final DefinitionLoader loader = new DefinitionLoader(); + final Field define = field(ASMMixinCompiler$.class, "m_defineClass"); + final Method originalDefine = compiler.m_defineClass(); + final boolean oldAccessible = originalDefine.isAccessible(); + final Field debug = field(DebugPrinter$.class, "debug"); + final boolean oldDebug = printer.debug(); + final Field counter = field(DebugPrinter$.class, "permGenUsed"); + final int oldUsed = used(); + final Field logger = field(DebugPrinter$.class, "logger"); + final Object oldLogger = printer.logger(); + final Map bytes = cache("traitByteMap"); + final Map info = cache("infoCache"); + final java.util.Map oldBytes = new HashMap<>(JavaConversions.mapAsJavaMap(bytes)); + final java.util.Map oldInfo = new HashMap<>(JavaConversions.mapAsJavaMap(info)); + final String oldMarker = System.getProperty(MARKER); + + State() throws Exception { + cl.set(compiler, loader); + debug.setBoolean(printer, false); + System.clearProperty(MARKER); + } + + int used() throws Exception { + return counter.getInt(printer); + } + + Path dump(String name) { + return printer.dir().toPath().resolve(name.replace('/', '#') + ".txt"); + } + + void directFailure(String message) throws Exception { + // Reflection wraps method-body failures but lets class-initialization LinkageErrors escape directly. + ClassWriter writer = new ClassWriter(0); + writer.visit(V1_6, ACC_PUBLIC, NAME + "ReflectionFailure", null, "java/lang/Object", null); + MethodVisitor init = writer.visitMethod(ACC_STATIC, "", "()V", null, null); + init.visitCode(); + init.visitTypeInsn(NEW, "java/lang/LinkageError"); + init.visitInsn(DUP); + if (message == null) init.visitInsn(ACONST_NULL); + else init.visitLdcInsn(message); + init.visitMethodInsn(INVOKESPECIAL, "java/lang/LinkageError", "", "(Ljava/lang/String;)V", false); + init.visitInsn(ATHROW); + init.visitMaxs(3, 0); + init.visitEnd(); + MethodVisitor method = writer + .visitMethod(ACC_PUBLIC | ACC_STATIC, "define", "([BII)Ljava/lang/Class;", null, null); + method.visitCode(); + method.visitLdcInsn(Type.getType(Object.class)); + method.visitInsn(ARETURN); + method.visitMaxs(1, 3); + method.visitEnd(); + writer.visitEnd(); + define.set( + compiler, + loader.install(writer.toByteArray()).getMethod("define", byte[].class, int.class, int.class)); + } + + @SuppressWarnings("unchecked") + private Map cache(String name) throws Exception { + return (Map) field(ASMMixinCompiler$.class, name).get(compiler); + } + + @Override + public void close() throws Exception { + cl.set(compiler, oldLoader); + define.set(compiler, originalDefine); + originalDefine.setAccessible(oldAccessible); + debug.setBoolean(printer, oldDebug); + counter.setInt(printer, oldUsed); + logger.set(printer, oldLogger); + bytes.clear(); + oldBytes.forEach(bytes::put); + info.clear(); + oldInfo.forEach(info::put); + if (oldMarker == null) System.clearProperty(MARKER); + else System.setProperty(MARKER, oldMarker); + loader.close(); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ClassInfoFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ClassInfoFunctionalTest.java new file mode 100644 index 0000000..c439ee0 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ClassInfoFunctionalTest.java @@ -0,0 +1,243 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.ClassNode; + +import codechicken.multipart.asm.ASMMixinCompiler; +import codechicken.multipart.asm.ASMMixinCompiler$; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo$; +import codechicken.multipart.asm.ASMMixinCompiler.MethodInfo; +import scala.Option; +import scala.collection.Iterable; +import scala.collection.Iterator; +import scala.collection.mutable.Map; + +class ClassInfoFunctionalTest { + + @Test + void choosesJavaNodesAndReflectionFallbackWithTheirDistinctRootSemantics() throws Exception { + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + ClassInfo object = compiler.getClassInfo(Object.class); + assertEquals( + "codechicken.multipart.asm.ASMMixinCompiler$ClassInfo$ReflectionClassInfo", + object.getClass().getName()); + assertEquals("java/lang/Object", object.name()); + assertFalse(object.superClass().isDefined()); + assertTrue(object.interfaces().isEmpty()); + assertEquals(Object.class.getMethods().length, object.methods().size()); + + ClassInfo child = compiler.getClassInfo(LoadedChild.class); + assertEquals("codechicken.multipart.asm.ASMMixinCompiler$ClassInfo$ClassNodeInfo", child.getClass().getName()); + assertSame(compiler.getClassInfo(LoadedParent.class), child.superClass().get()); + assertEquals(Arrays.asList("java/lang/Runnable", "java/lang/AutoCloseable"), names(child.interfaces())); + MethodInfo inherited = child.findPublicImpl("inherited", "()I").get(); + assertSame(compiler.getClassInfo(LoadedParent.class), inherited.owner()); + assertTrue(child.findPublicImpl("protectedMethod", "()V").isDefined()); + assertFalse(child.findPublicImpl("privateMethod", "()V").isDefined()); + assertFalse(child.findPublicImpl("run", "()V").isDefined()); + + ClassInfo reflected = construct("ReflectionClassInfo", Class.class, LoadedChild.class); + assertSame(child.superClass().get(), reflected.superClass().get()); + assertEquals(names(child.interfaces()), names(reflected.interfaces())); + // Bytecode nodes preserve Some(null) for a null superclass; reflection represents the root as None. + ClassNode root = new ClassNode(); + root.name = "test/Root"; + Option superClass = construct("ClassNodeInfo", ClassNode.class, root).superClass(); + assertTrue(superClass.isDefined()); + assertNull(superClass.get()); + compiler.remClassInfo((String) null); + } + + @Test + void cachesExactStringKeysAndUsesOnlyTheNameOfSuppliedNodes() { + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + String slash = Type.getInternalName(CacheSubject.class), dotted = CacheSubject.class.getName(); + compiler.remClassInfo(slash); + compiler.remClassInfo(dotted); + try { + ClassInfo first = compiler.getClassInfo(slash); + assertSame(first, compiler.getClassInfo(CacheSubject.class)); + assertSame(first, ASMMixinCompiler.getClassInfo(slash)); + ClassNode misleading = new ClassNode(); + misleading.name = slash; + misleading.superName = "test/Missing"; + assertSame(first, compiler.getClassInfo(misleading)); + assertTrue(first.methods().exists(new scala.runtime.AbstractFunction1() { + + @Override + public Object apply(MethodInfo method) { + return method.name().equals("actual"); + } + })); + ClassInfo alias = compiler.getClassInfo(dotted); + assertNotSame(first, alias); + assertEquals(first.name(), alias.name()); + assertSame(alias, compiler.getClassInfo(dotted)); + assertSame(first, compiler.remClassInfo(slash).get()); + assertFalse(compiler.remClassInfo(slash).isDefined()); + assertNotSame(first, compiler.getClassInfo(slash)); + assertSame(alias, compiler.getClassInfo(dotted)); + } finally { + compiler.remClassInfo(slash); + compiler.remClassInfo(dotted); + } + } + + @Test + void cachesNullResultsButDoesNotCacheFailuresOrTreatUncachedLookupsAsCached() throws Exception { + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + Map cache = state("infoCache"); + Option previousNull = cache.remove(null); + String missing = "codechicken/multipart/test/metadata/DefinitelyAbsent"; + try { + assertNull(compiler.getClassInfo((Class) null)); + assertFalse(cache.contains(null)); + assertThrows(NullPointerException.class, () -> compiler.getClassInfo((ClassNode) null)); + assertNull(compiler.getClassInfo((String) null)); + assertTrue(cache.contains(null)); + assertTrue(compiler.remClassInfo((String) null).isDefined()); + assertThrows(ClassNotFoundException.class, () -> compiler.getClassInfo(missing)); + assertFalse(cache.contains(missing)); + assertThrows(ClassNotFoundException.class, () -> compiler.getClassInfo(missing)); + + String name = Type.getInternalName(CacheSubject.class); + ClassInfo first = ClassInfo$.MODULE$.obtainInfo(name); + ClassInfo second = ClassInfo$.MODULE$.obtainInfo(name); + assertNotSame(first, second); + assertEquals(first.name(), second.name()); + } finally { + cache.remove(null); + if (previousNull.isDefined()) cache.put(null, previousNull.get()); + compiler.remClassInfo(missing); + } + } + + @Test + void internalDefineInvalidatesOnlyTheNormalizedMetadataKey() throws Exception { + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + String slash = "codechicken/multipart/test/metadata/CacheProbe", dotted = slash.replace('/', '.'); + Map bytes = state("traitByteMap"); + Map cache = state("infoCache"); + Option oldBytes = bytes.get(slash); + Option oldSlash = cache.get(slash), oldDotted = cache.get(dotted); + try { + compiler.internalDefine(slash, definition(slash, "before")); + ClassInfo before = compiler.getClassInfo(slash); + ClassInfo alias = compiler.getClassInfo(dotted); + assertTrue(before.findPublicImpl("before", "()V").isDefined()); + compiler.internalDefine(dotted, definition(slash, "after")); + ClassInfo after = compiler.getClassInfo(slash); + assertNotSame(before, after); + assertTrue(after.findPublicImpl("after", "()V").isDefined()); + assertFalse(after.findPublicImpl("before", "()V").isDefined()); + assertSame(alias, compiler.getClassInfo(dotted)); + assertTrue(alias.findPublicImpl("before", "()V").isDefined()); + assertEquals("after", compiler.classNode(slash).methods.get(0).name); + } finally { + restore(bytes, slash, oldBytes); + restore(cache, slash, oldSlash); + restore(cache, dotted, oldDotted); + } + } + + @Test + void readsScalaTraitAndCompanionMetadataFromTheRetainedSignatures() throws Exception { + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + String traitName = "codechicken/multipart/test/ExternalScalaMicroblockFixture"; + ClassInfo trait = compiler.getClassInfo(traitName); + assertEquals("codechicken.multipart.asm.ASMMixinCompiler$ClassInfo$ScalaClassInfo", trait.getClass().getName()); + assertTrue(trait.isScala()); + assertTrue(trait.isTrait()); + assertFalse(trait.isObject()); + assertEquals("codechicken/microblock/Microblock", trait.superClass().get().name()); + codechicken.multipart.asm.ScalaSignature signature = (codechicken.multipart.asm.ScalaSignature) trait.getClass() + .getMethod("sig").invoke(trait); + assertTrue(signature.findClass(traitName.replace('/', '.')).isDefined()); + assertSame( + trait.getClass().getMethod("csym").invoke(trait).getClass(), + signature.findClass(traitName.replace('/', '.')).get().getClass()); + assertEquals(traitName, trait.moduleName()); + + String module = "codechicken/multipart/asm/StackAnalyser$"; + ClassInfo info = compiler.getClassInfo(module); + assertEquals("codechicken.multipart.asm.ASMMixinCompiler$ClassInfo$ScalaClassInfo", info.getClass().getName()); + assertTrue(info.isScala()); + assertTrue(info.isObject()); + assertFalse(info.isTrait()); + // The companion is resolved from the base class's signature and bytecode node. + assertEquals(module.substring(0, module.length() - 1), info.name()); + assertEquals(info.name(), info.moduleName()); + // The current decoder cannot interpret this object's TypeRefType as a ClassType. + assertThrows(ClassCastException.class, info::superClass); + assertThrows(ClassCastException.class, info::interfaces); + assertTrue( + ((codechicken.multipart.asm.ScalaSignature.ClassSymbolRef) info.getClass().getMethod("csym") + .invoke(info)).isObject()); + } + + private static ClassInfo construct(String nestedName, Class parameter, Object value) throws Exception { + return (ClassInfo) Class.forName("codechicken.multipart.asm.ASMMixinCompiler$ClassInfo$" + nestedName) + .getConstructor(parameter).newInstance(value); + } + + private static List names(Iterable infos) { + List result = new ArrayList<>(); + Iterator iterator = infos.iterator(); + while (iterator.hasNext()) result.add(iterator.next().name()); + return result; + } + + private static byte[] definition(String name, String method) { + ClassWriter writer = new ClassWriter(0); + writer.visit(V1_6, ACC_PUBLIC, name, null, "java/lang/Object", null); + org.objectweb.asm.MethodVisitor body = writer.visitMethod(ACC_PUBLIC, method, "()V", null, null); + body.visitCode(); + body.visitInsn(RETURN); + body.visitMaxs(0, 1); + body.visitEnd(); + writer.visitEnd(); + return writer.toByteArray(); + } + + @SuppressWarnings("unchecked") + private static Map state(String name) throws Exception { + Field field = ASMMixinCompiler$.class.getDeclaredField(name); + field.setAccessible(true); + return (Map) field.get(ASMMixinCompiler$.MODULE$); + } + + private static void restore(Map map, String key, Option old) { + map.remove(key); + if (old.isDefined()) map.put(key, old.get()); + } + + public static class LoadedParent { + + public int inherited() { + return 3; + } + + protected void protectedMethod() {} + + private void privateMethod() {} + } + + public abstract static class LoadedChild extends LoadedParent implements Runnable, AutoCloseable { + } + + public static class CacheSubject { + + public void actual() {} + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/CompositeGenerationFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/CompositeGenerationFunctionalTest.java new file mode 100644 index 0000000..2570680 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/CompositeGenerationFunctionalTest.java @@ -0,0 +1,182 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.concurrent.atomic.AtomicInteger; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultipartGenerator; +import codechicken.multipart.MultipartGenerator$; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.TileMultipartClient; +import codechicken.multipart.examples.CompositeGenerationExample; +import codechicken.multipart.scalatraits.TSlottedTile; +import scala.collection.JavaConversions; + +class CompositeGenerationFunctionalTest { + + @Test + void javaGenerationSelectsCapabilitiesWithoutLoadingOrCopyingTiles() { + checkStaging(MultipartGenerator::generateCompositeTile); + } + + @Test + void javaGenerationReadsInputOnceAndPropagatesFailuresBeforeReuse() { + checkInput(MultipartGenerator::generateCompositeTile); + } + + @Test + void javaExactReflectionAcceptsJavaParts() throws Exception { + Method method = MultipartGenerator.class + .getMethod("generateCompositeTile", TileEntity.class, Iterable.class, boolean.class); + TileMultipart tile = (TileMultipart) method.invoke(null, null, Collections.emptyList(), true); + assertTrue(tile instanceof TileMultipartClient); + assertSame(tile, method.invoke(null, tile, Collections.emptyList(), true)); + assertNull(tile.getWorldObj()); + assertTrue(tile.jPartList().isEmpty()); + } + + @Test + void javaExamplePreparesWorldAndCoordinatesBeforeLoadingWithoutInstallation() { + for (boolean client : new boolean[] { false, true }) { + World world = client ? null : MinecraftServer.getServer().worldServers[0]; + BlockCoord pos = new BlockCoord(78, 200, 48); + TileEntity installed = world == null ? null : world.getTileEntity(pos.x, pos.y, pos.z); + TMultiPart part = new MultipartGeneratorFunctionalTest.SlottedPart(); + List parts = Collections.singletonList(part); + TileMultipart tile = CompositeGenerationExample.createUninstalledTile(world, pos, parts, client); + assertEquals(client, tile instanceof TileMultipartClient); + assertSame(world, tile.getWorldObj()); + assertEquals(pos, new BlockCoord(tile)); + assertSame(tile, part.tile()); + assertSame(part, tile.partMap(3)); + assertEquals(parts, tile.jPartList()); + if (world != null) assertSame(installed, world.getTileEntity(pos.x, pos.y, pos.z)); + } + } + + @Test + void legacyGenerationSelectsCapabilitiesWithoutLoadingOrCopyingTiles() { + checkStaging(CompositeGenerationFunctionalTest::legacyGenerate); + } + + @Test + void legacyGenerationReadsInputOnceAndPropagatesFailuresBeforeReuse() { + checkInput(CompositeGenerationFunctionalTest::legacyGenerate); + } + + @Test + void legacyExactReflectionAndScalaArgumentsKeepTheCompanionPath() throws Exception { + Object parts = JavaConversions.asScalaBuffer(Collections.emptyList()).toList(); + Method legacy = MultipartGenerator$.class + .getMethod("generateCompositeTile", TileEntity.class, scala.collection.Iterable.class, boolean.class); + TileMultipart tile = (TileMultipart) legacy.invoke(MultipartGenerator$.MODULE$, null, parts, true); + assertTrue(tile instanceof TileMultipartClient); + // GuideNH selects by argument assignability before falling back to the companion. + for (Method method : MultipartGenerator.class.getMethods()) { + if (method.getName().equals("generateCompositeTile") && method.getParameterCount() == 3) { + assertFalse(method.getParameterTypes()[1].isInstance(parts)); + } + } + } + + private static TileMultipart legacyGenerate(TileEntity tile, Iterable parts, boolean client) { + return MultipartGenerator$.MODULE$ + .generateCompositeTile(tile, JavaConversions.iterableAsScalaIterable(parts), client); + } + + private static void checkStaging(Generator generate) { + for (boolean client : new boolean[] { false, true }) { + TMultiPart part = new MultipartGeneratorFunctionalTest.SlottedPart(); + List parts = Collections.singletonList(part); + TileMultipart source = generate.apply(null, parts, client); + assertEquals(client, source instanceof TileMultipartClient); + assertTrue(source instanceof TSlottedTile); + assertTrue(source.jPartList().isEmpty()); + assertNull(source.partMap(3)); + assertNull(part.tile()); + source.loadPartList(parts); + source.xCoord = 78; + source.yCoord = 200; + source.zCoord = 48; + source.setWorldObj(MinecraftServer.getServer().worldServers[0]); + assertSame(source, generate.apply(source, parts, client)); + assertSame(source, generate.apply(source, Arrays.asList(part, part), client)); + assertEquals(parts, source.jPartList()); + assertSame(part, source.partMap(3)); + assertSame(source, part.tile()); + + TileMultipart replacement = generate.apply(source, parts, !client); + assertNotSame(source, replacement); + assertEquals(!client, replacement instanceof TileMultipartClient); + assertTrue(replacement instanceof TSlottedTile); + assertTrue(replacement.jPartList().isEmpty()); + assertNull(replacement.partMap(3)); + assertNull(replacement.getWorldObj()); + assertEquals(0, replacement.xCoord); + assertEquals(0, replacement.yCoord); + assertEquals(0, replacement.zCoord); + assertFalse(source.isInvalid()); + assertSame(source, part.tile()); + assertEquals(parts, source.jPartList()); + + TileMultipart empty = generate.apply(source, Collections.emptyList(), client); + assertNotSame(source, empty); + assertFalse(empty instanceof TSlottedTile); + assertTrue(empty.jPartList().isEmpty()); + assertSame(empty, generate.apply(empty, Collections.emptyList(), client)); + assertSame(empty.getClass(), generate.apply(new TileEntity(), Collections.emptyList(), client).getClass()); + replacement.loadPartList(parts); + assertSame(replacement, part.tile()); + assertSame(part, replacement.partMap(3)); + assertEquals(parts, source.jPartList(), "Loading the replacement does not clear the old tile"); + } + } + + private static void checkInput(Generator generate) { + List parts = Collections.singletonList(new MultipartGeneratorFunctionalTest.SlottedPart()); + AtomicInteger iterations = new AtomicInteger(); + Iterable counted = () -> { + iterations.incrementAndGet(); + return parts.iterator(); + }; + TileMultipart tile = generate.apply(null, counted, false); + assertEquals(1, iterations.get()); + assertSame(tile, generate.apply(tile, counted, false)); + assertEquals(2, iterations.get(), "Even tile reuse evaluates the supplied parts"); + IllegalStateException failure = new IllegalStateException("input failed"); + Iterable broken = () -> { throw failure; }; + assertSame(failure, assertThrows(IllegalStateException.class, () -> generate.apply(tile, broken, false))); + assertThrows(NullPointerException.class, () -> generate.apply(tile, null, false)); + assertThrows(NullPointerException.class, () -> generate.apply(tile, Collections.singletonList(null), false)); + int before = iterations.get(); + assertThrows( + NoSuchElementException.class, + () -> generate.apply(new MultipartGeneratorFunctionalTest.UnregisteredTile(), counted, false)); + assertEquals(before + 1, iterations.get(), "Parts are read before an unregistered tile class is rejected"); + assertTrue(tile.jPartList().isEmpty()); + } + + private interface Generator { + + TileMultipart apply(TileEntity tile, Iterable parts, boolean client); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ControlKeyModiferFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ControlKeyModiferFunctionalTest.java new file mode 100644 index 0000000..3409a58 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ControlKeyModiferFunctionalTest.java @@ -0,0 +1,101 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.UUID; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayerFactory; +import net.minecraftforge.event.entity.player.PlayerEvent.Clone; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import com.mojang.authlib.GameProfile; + +import codechicken.multipart.ControlKeyModifer; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent; + +/** + * isControlDown needs a player with a world to pick its branch. On a dedicated server the world is never remote, so + * these cover the server half: the map the client keeps in sync through packet 1. The client half reads + * isClientPressing instead and no test harness has a client. + */ +class ControlKeyModiferFunctionalTest { + + @Test + void replacementAndLogoutReleaseOldPlayerReferences() { + EntityPlayer original = player(); + EntityPlayer replacement = FakePlayerFactory.get( + (WorldServer) original.worldObj, + new GameProfile(UUID.fromString("5f09d0b1-0aa8-4bc2-a362-5dd96d81eb55"), "modifier-test")); + record(original, true); + + MinecraftForge.EVENT_BUS.post(new Clone(replacement, original, true)); + assertFalse(ControlKeyModifer.map().containsKey(original)); + assertTrue(ControlKeyModifer.isControlDown(replacement)); + + FMLCommonHandler.instance().bus().post(new PlayerLoggedOutEvent(replacement)); + assertFalse(ControlKeyModifer.map().containsKey(replacement)); + assertFalse(ControlKeyModifer.isControlDown(replacement)); + } + + @BeforeEach + @AfterEach + void clearRecordedPlayers() { + clearAll(); + } + + @Test + void aPlayerTheServerHasNotHeardFromIsNotHoldingTheKey() { + assertFalse(ControlKeyModifer.isControlDown(player())); + } + + @Test + void reflectsWhatTheServerLastRecordedForThePlayer() { + EntityPlayer player = player(); + + record(player, true); + assertTrue(ControlKeyModifer.isControlDown(player)); + + record(player, false); + assertFalse(ControlKeyModifer.isControlDown(player)); + } + + /** Server stop clears the map, so a player must not carry a held key into the next run. */ + @Test + void clearingResetsThePlayerToNotHolding() { + EntityPlayer player = player(); + record(player, true); + + clearAll(); + + assertFalse(ControlKeyModifer.isControlDown(player)); + } + + // The two adapters below are the only places the map's collection type is named. + + private static void record(EntityPlayer player, boolean pressed) { + ControlKeyModifer.map().put(player, pressed); + } + + private static void clearAll() { + ControlKeyModifer.map().clear(); + } + + private static EntityPlayer player() { + WorldServer world = MinecraftServer.getServer().worldServers[0]; + assertNotNull(world); + EntityPlayer player = FakePlayerFactory.getMinecraft(world); + assertNotNull(player); + assertFalse(player.worldObj.isRemote, "A dedicated server world is never remote"); + return player; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/CornerMicroblockTraitsFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/CornerMicroblockTraitsFunctionalTest.java new file mode 100644 index 0000000..ce9f8e8 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/CornerMicroblockTraitsFunctionalTest.java @@ -0,0 +1,128 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicInteger; + +import net.minecraft.nbt.NBTTagCompound; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutputWrapper; +import codechicken.lib.vec.Cuboid6; +import codechicken.microblock.CornerMicroClass; +import codechicken.microblock.CornerMicroClass$; +import codechicken.microblock.CornerMicroblock; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockGenerator; + +class CornerMicroblockTraitsFunctionalTest { + + @Test + void generatedCornerKeepsClassIdentityAndAllFiftySixBounds() { + Microblock part = MicroblockGenerator.create(CornerMicroClass$.MODULE$, 0, false); + CornerMicroblock cornerPart = (CornerMicroblock) part; + assertSame(CornerMicroClass$.MODULE$, cornerPart.microClass()); + assertSame(CornerMicroClass$.MODULE$, part.microClass()); + assertEquals("mcr_cnr", part.getType()); + int[] axisBits = { 4, 1, 2 }; + for (int size = 1; size <= 7; size++) { + for (int corner = 0; corner < 8; corner++) { + part.setShape(size, corner + 7); + assertEquals(size, part.getSize()); + assertEquals(corner + 7, cornerPart.getSlot()); + assertEquals(1 << (corner + 7), cornerPart.getSlotMask()); + Cuboid6 bounds = cornerPart.getBounds(); + assertSame(CornerMicroClass.aBounds()[size * 16 + corner], bounds); + double distance = size / 8D; + double[] min = { bounds.min.x, bounds.min.y, bounds.min.z }; + double[] max = { bounds.max.x, bounds.max.y, bounds.max.z }; + for (int axis = 0; axis < 3; axis++) { + boolean positive = (corner & axisBits[axis]) != 0; + assertEquals(positive ? 1 - distance : 0, min[axis], 1e-12); + assertEquals(positive ? 1 : distance, max[axis], 1e-12); + } + } + } + } + + @Test + void boundsUseSignedShapeIndexAndTheLiveReplaceableArray() { + Microblock part = MicroblockGenerator.create(CornerMicroClass$.MODULE$, 0, false); + CornerMicroblock corner = (CornerMicroblock) part; + for (int shape : new int[] { 0, 8, 127 }) { + part.shape_$eq((byte) shape); + assertNull(corner.getBounds()); + } + for (int shape = -128; shape < 0; shape++) { + part.shape_$eq((byte) shape); + assertThrows(ArrayIndexOutOfBoundsException.class, corner::getBounds); + } + Cuboid6[] original = CornerMicroClass.aBounds(); + Cuboid6[] replacement = new Cuboid6[256]; + Cuboid6 sentinel = new Cuboid6(0.1, 0.2, 0.3, 0.4, 0.5, 0.6); + replacement[35] = sentinel; + part.setShape(2, 10); + try { + CornerMicroClass.aBounds_$eq(replacement); + assertSame(sentinel, corner.getBounds()); + replacement[35] = null; + assertNull(corner.getBounds()); + CornerMicroClass.aBounds_$eq(new Cuboid6[1]); + assertThrows(ArrayIndexOutOfBoundsException.class, corner::getBounds); + } finally { + CornerMicroClass.aBounds_$eq(original); + } + assertSame(original[35], corner.getBounds()); + } + + @Test + void generatedCornersKeepThePackedShapeInNbtAndDescriptions() { + Microblock part = MicroblockGenerator.create(CornerMicroClass$.MODULE$, 0, false); + Microblock loaded = MicroblockGenerator.create(CornerMicroClass$.MODULE$, 0, false); + ByteArrayOutputStream prefixBytes = new ByteArrayOutputStream(); + MicroMaterialRegistry.writeMaterialID(new MCDataOutputWrapper(new DataOutputStream(prefixBytes)), 0); + byte[] prefix = prefixBytes.toByteArray(); + for (int size : new int[] { 1, 4, 7 }) { + for (int corner = 0; corner < 8; corner++) { + byte shape = (byte) (size * 16 + corner); + part.setShape(size, corner + 7); + NBTTagCompound tag = new NBTTagCompound(); + part.save(tag); + assertEquals(shape, tag.getByte("shape")); + assertEquals(MicroMaterialRegistry.materialName(0), tag.getString("material")); + loaded.load(tag); + assertEquals(shape, loaded.shape()); + assertEquals(0, loaded.material()); + assertEquals(corner + 7, ((CornerMicroblock) loaded).getSlot()); + assertSame(part.getBounds(), loaded.getBounds()); + + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + part.writeDesc(new MCDataOutputWrapper(new DataOutputStream(bytes))); + byte[] expected = Arrays.copyOf(prefix, prefix.length + 1); + expected[prefix.length] = shape; + assertArrayEquals(expected, bytes.toByteArray()); + AtomicInteger reads = new AtomicInteger(); + MCDataInput input = (MCDataInput) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, args) -> { + assertEquals("readByte", method.getName()); + reads.incrementAndGet(); + return shape; + }); + loaded.setShape(2, 7); + loaded.readDesc(input); + assertEquals(1, reads.get()); + assertEquals(shape, loaded.shape()); + assertEquals(corner + 7, ((CornerMicroblock) loaded).getSlot()); + } + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/CustomTileTraitFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/CustomTileTraitFunctionalTest.java new file mode 100644 index 0000000..58ea722 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/CustomTileTraitFunctionalTest.java @@ -0,0 +1,76 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.MultipartGenerator; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.TileMultipartClient; +import codechicken.multipart.examples.CustomTileTraitCapability; +import codechicken.multipart.examples.CustomTileTraitExample; +import codechicken.multipart.examples.CustomTileTraitPart; + +class CustomTileTraitFunctionalTest { + + @Test + void registeredJavaTraitIsSelectedOnBothSidesAndExposesItsStableCapability() { + for (boolean client : new boolean[] { false, true }) { + ContributingPart first = new ContributingPart(4); + ContributingPart second = new ContributingPart(7); + List parts = Arrays.asList(first, new PlainPart(), second); + + TileMultipart tile = MultipartGenerator.generateCompositeTile(null, parts, client); + + assertEquals(client, tile instanceof TileMultipartClient); + assertTrue(tile instanceof CustomTileTraitCapability); + assertEquals(0, CustomTileTraitExample.totalContribution(tile), "Generation does not load parts"); + tile.loadPartList(parts); + assertEquals(11, CustomTileTraitExample.totalContribution(tile)); + assertEquals(1, first.calls); + assertEquals(1, second.calls); + assertSame(tile, first.tile()); + assertSame(tile, second.tile()); + assertSame(tile, MultipartGenerator.generateCompositeTile(tile, parts, client)); + assertSame( + tile.getClass(), + MultipartGenerator.generateCompositeTile(null, Arrays.asList(new ContributingPart(1)), client) + .getClass()); + } + + assertFalse(new TileMultipart() instanceof CustomTileTraitCapability); + assertEquals(0, CustomTileTraitExample.totalContribution(new TileMultipart())); + assertEquals(0, CustomTileTraitExample.totalContribution(null)); + } + + private static class PlainPart extends TMultiPart { + + @Override + public String getType() { + return "custom_tile_trait:plain"; + } + } + + private static final class ContributingPart extends PlainPart implements CustomTileTraitPart { + + private final int contribution; + private int calls; + + private ContributingPart(int contribution) { + this.contribution = contribution; + } + + @Override + public int tileContribution() { + calls++; + return contribution; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/DebugPrinterFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/DebugPrinterFunctionalTest.java new file mode 100644 index 0000000..7450a21 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/DebugPrinterFunctionalTest.java @@ -0,0 +1,192 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.lang.reflect.Method; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.Logger; +import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.LdcInsnNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.lib.config.ConfigTag; +import codechicken.multipart.asm.DebugPrinter$; +import codechicken.multipart.handler.MultipartProxy; + +class DebugPrinterFunctionalTest { + + @Test + void createsMissingDirectoriesOnlyWhenEnabled(@TempDir Path root) throws Exception { + for (boolean enabled : new boolean[] { false, true }) { + Path directory = root.resolve(Boolean.toString(enabled)).resolve("nested"); + Object printer = printer(directory, enabled); + assertEquals(enabled, Files.isDirectory(directory)); + + dump(printer, "fixture/Example"); + + assertEquals(enabled, Files.exists(directory.resolve("fixture#Example.txt"))); + assertEquals(enabled, Files.exists(directory)); + } + } + + @Test + void cleansOnlyImmediateChildrenAtStartupAndGatesDumps(@TempDir Path root) throws Exception { + Path expected = root.resolve("expected.txt"); + ASMHelper.dump(classBytes(), expected.toFile(), false, false); + for (boolean enabled : new boolean[] { false, true }) { + Path directory = Files.createDirectory(root.resolve(Boolean.toString(enabled))); + Path stale = Files.write(directory.resolve("stale.txt"), new byte[] { 1, 2, 3 }); + Path empty = Files.createDirectory(directory.resolve("empty")); + Path nested = Files.createDirectory(directory.resolve("nested")); + Path nestedFile = Files.write(nested.resolve("keep.txt"), new byte[] { 4, 5, 6 }); + + Object printer = printer(directory, enabled); + + assertEquals(!enabled, Files.exists(stale)); + assertEquals(!enabled, Files.exists(empty)); + assertArrayEquals(new byte[] { 4, 5, 6 }, Files.readAllBytes(nestedFile), "Cleanup must not recurse"); + if (!enabled) assertArrayEquals(new byte[] { 1, 2, 3 }, Files.readAllBytes(stale)); + + Path later = Files.write(directory.resolve("created-after-startup.txt"), new byte[] { 7 }); + dump(printer, "fixture/Example"); + dump(printer, "fixture/Second"); + assertArrayEquals(new byte[] { 7 }, Files.readAllBytes(later), "Dumping must not repeat startup cleanup"); + for (String name : new String[] { "fixture#Example.txt", "fixture#Second.txt" }) { + Path output = directory.resolve(name); + if (enabled) assertArrayEquals(Files.readAllBytes(expected), Files.readAllBytes(output)); + else assertFalse(Files.exists(output)); + } + } + } + + @Test + void logsOnlyOnCumulativeThresholdCrossingsEvenWhenDumpingIsDisabled(@TempDir Path root) throws Exception { + for (boolean enabled : new boolean[] { false, true }) { + Object printer = printer(root.resolve(Boolean.toString(enabled)), enabled); + Logger logger = (Logger) printer.getClass().getMethod("logger").invoke(printer); + assertEquals("Multipart ASM", logger.getName()); + Level previousLevel = logger.getLevel(); + boolean previousAdditive = logger.isAdditive(); + RecordingAppender appender = new RecordingAppender(); + appender.start(); + logger.addAppender(appender); + try { + logger.setLevel(Level.DEBUG); + logger.setAdditive(false); + Method defined = printer.getClass().getMethod("defined", String.class, byte[].class); + defined.invoke(printer, "first", new byte[15999]); + assertTrue(appender.messages.isEmpty()); + defined.invoke(printer, "boundary", new byte[1]); + assertEquals(Arrays.asList(message(16000)), appender.messages); + defined.invoke(printer, "empty", new byte[0]); + defined.invoke(printer, "below-next", new byte[15999]); + assertEquals(Arrays.asList(message(16000)), appender.messages); + defined.invoke(printer, "next-boundary", new byte[1]); + defined.invoke(printer, "two-boundaries", new byte[32000]); + defined.invoke(printer, "below-next", new byte[1]); + assertEquals(Arrays.asList(message(16000), message(32000), message(64000)), appender.messages); + } finally { + logger.removeAppender(appender); + logger.setLevel(previousLevel); + logger.setAdditive(previousAdditive); + appender.stop(); + } + } + } + + private static String message(int bytes) { + return bytes + " bytes of permGen has been used by ASMMixinCompiler"; + } + + private static void dump(Object printer, String name) throws Exception { + printer.getClass().getMethod("dump", String.class, byte[].class).invoke(printer, name, classBytes()); + } + + private static byte[] classBytes() { + ClassWriter writer = new ClassWriter(0); + writer.visit(Opcodes.V1_6, Opcodes.ACC_PUBLIC, "fixture/Example", null, "java/lang/Object", null); + writer.visitEnd(); + return writer.toByteArray(); + } + + private static Object printer(Path directory, boolean enabled) throws Exception { + // Redirect only the hard-coded path; execute the real constructor and methods in an isolated loader. + ClassNode node = new ClassNode(); + try (InputStream input = DebugPrinter$.class.getResourceAsStream("DebugPrinter$.class")) { + assertNotNull(input); + new ClassReader(input).accept(node, 0); + } + int paths = 0; + for (MethodNode method : node.methods) { + if (!method.name.equals("")) continue; + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof LdcInsnNode && "asm/multipart".equals(((LdcInsnNode) instruction).cst)) { + ((LdcInsnNode) instruction).cst = directory.toAbsolutePath().toString(); + paths++; + } + } + } + assertEquals(1, paths, "Never initialize a test copy with the live dev dump path"); + ClassWriter writer = new ClassWriter(0); + node.accept(writer); + Class type = new FixtureClassLoader(DebugPrinter$.class.getClassLoader()).define(writer.toByteArray()); + ConfigTag tag = MultipartProxy.config().getTag("debug_asm"); + String previous = tag.value; + try { + // In-memory override only: do not save or rewrite the development config file. + tag.value = Boolean.toString(enabled); + Object printer = type.getField("MODULE$").get(null); + assertEquals(enabled, type.getMethod("debug").invoke(printer)); + assertEquals(directory.toAbsolutePath().toFile(), type.getMethod("dir").invoke(printer)); + return printer; + } finally { + tag.value = previous; + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } + + private static final class RecordingAppender extends AbstractAppender { + + private final List messages = new ArrayList<>(); + + private RecordingAppender() { + super("fmp-debug-printer-test", null, null, false); + } + + @Override + public void append(LogEvent event) { + assertEquals(Level.DEBUG, event.getLevel()); + messages.add(event.getMessage().getFormattedMessage()); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/DefaultContentFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/DefaultContentFunctionalTest.java new file mode 100644 index 0000000..7b4247a --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/DefaultContentFunctionalTest.java @@ -0,0 +1,647 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.CommonMicroClass; +import codechicken.microblock.CommonMicroblockClient; +import codechicken.microblock.CornerMicroClass; +import codechicken.microblock.CornerMicroClass$; +import codechicken.microblock.CornerMicroblock; +import codechicken.microblock.CornerPlacement; +import codechicken.microblock.CornerPlacement$; +import codechicken.microblock.CornerPlacementGrid$; +import codechicken.microblock.EdgeMicroClass; +import codechicken.microblock.EdgeMicroClass$; +import codechicken.microblock.EdgeMicroblock; +import codechicken.microblock.EdgePlacement; +import codechicken.microblock.EdgePlacement$; +import codechicken.microblock.EdgePlacementGrid$; +import codechicken.microblock.FaceMicroClass; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.FaceMicroblock; +import codechicken.microblock.FacePlacement$; +import codechicken.microblock.FacePlacementGrid$; +import codechicken.microblock.GrassMicroMaterial; +import codechicken.microblock.HollowMicroClass; +import codechicken.microblock.HollowMicroClass$; +import codechicken.microblock.HollowMicroblock; +import codechicken.microblock.HollowMicroblockClient; +import codechicken.microblock.HollowPlacement; +import codechicken.microblock.HollowPlacement$; +import codechicken.microblock.ISidedHollowConnect; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.Microblock; +import codechicken.microblock.MissingMicroMaterial; +import codechicken.microblock.MissingMicroMaterial$; +import codechicken.microblock.PostMicroClass; +import codechicken.microblock.PostMicroClass$; +import codechicken.microblock.PostMicroblock; +import codechicken.microblock.PostMicroblockClient; +import codechicken.microblock.TopMicroMaterial; +import codechicken.multipart.JPartialOcclusion; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultiPartRegistry.IPartFactory2; +import codechicken.multipart.TEdgePart; +import codechicken.multipart.TFacePart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TNormalOcclusion; +import codechicken.multipart.TSlottedPart; +import codechicken.multipart.TileMultipart; +import scala.Tuple2; +import scala.collection.JavaConversions; + +class DefaultContentFunctionalTest { + + @Test + void registersTheExactBuiltInMicroblockClasses() throws Exception { + CommonMicroClass[] classes = CommonMicroClass.classes(); + assertSame(FaceMicroClass$.MODULE$, classes[0]); + assertSame(HollowMicroClass$.MODULE$, classes[1]); + assertSame(CornerMicroClass$.MODULE$, classes[2]); + assertSame(EdgeMicroClass$.MODULE$, classes[3]); + for (int id = 4; id < classes.length; id++) { + assertNull(classes[id], "Unexpected microblock class ID " + id); + } + + assertEquals(0, FaceMicroClass$.MODULE$.getClassId()); + assertEquals(1, HollowMicroClass$.MODULE$.getClassId()); + assertEquals(2, CornerMicroClass$.MODULE$.getClassId()); + assertEquals(3, EdgeMicroClass$.MODULE$.getClassId()); + + Map factories = partFactories(); + Set microblockTypes = new TreeSet<>(); + for (String type : factories.keySet()) { + if (type.startsWith("mcr_")) { + microblockTypes.add(type); + } + } + assertEquals( + new TreeSet<>(Arrays.asList("mcr_cnr", "mcr_edge", "mcr_face", "mcr_hllw", "mcr_post")), + microblockTypes); + assertSame(CornerMicroClass$.MODULE$, factories.get("mcr_cnr")); + assertSame(EdgeMicroClass$.MODULE$, factories.get("mcr_edge")); + assertSame(FaceMicroClass$.MODULE$, factories.get("mcr_face")); + assertSame(HollowMicroClass$.MODULE$, factories.get("mcr_hllw")); + assertSame(PostMicroClass$.MODULE$, factories.get("mcr_post")); + } + + @Test + void keepsFaceFactoryPlacementAndAllFortyTwoBounds() { + FaceMicroClass$ factory = FaceMicroClass$.MODULE$; + assertSame(factory, FacePlacement$.MODULE$.microClass()); + assertSame(FacePlacementGrid$.MODULE$, FacePlacement$.MODULE$.placementGrid()); + assertSame(factory.aBounds(), FaceMicroClass.aBounds()); + assertEquals("mcr_face", factory.getName()); + assertEquals(3, factory.itemSlot()); + assertEquals(1f, factory.getResistanceFactor()); + + Cuboid6[] bounds = factory.aBounds(); + assertEquals(256, bounds.length); + int populated = 0; + for (int side = 0; side < 6; side++) { + for (int size = 1; size < 8; size++) { + Cuboid6 expected = expectedFaceBounds(side, size / 8d); + Cuboid6 actual = bounds[size << 4 | side]; + assertCuboid(expected, actual); + populated++; + } + } + for (Cuboid6 bound : bounds) { + if (bound != null) { + populated--; + } + } + assertEquals(0, populated, "Only the 6 sides by 7 thicknesses may be populated"); + + Microblock generated = factory.create(false, 0); + assertTrue(generated instanceof FaceMicroblock); + assertTrue(generated instanceof TFacePart); + for (int side = 0; side < 6; side++) { + generated.setShape(3, side); + FaceMicroblock face = (FaceMicroblock) generated; + assertSame(bounds[3 << 4 | side], face.getBounds()); + assertEquals(side, face.getSlot()); + assertEquals(generated.getIMaterial().isSolid(), face.solid(side)); + } + } + + @Test + void keepsCornerFactoryPlacementAndAllFiftySixBounds() { + CornerMicroClass$ factory = CornerMicroClass$.MODULE$; + assertSame(factory, CornerPlacement$.MODULE$.microClass()); + assertSame(factory, CornerPlacement.microClass()); + assertSame(CornerPlacementGrid$.MODULE$, CornerPlacement$.MODULE$.placementGrid()); + assertSame(factory.aBounds(), CornerMicroClass.aBounds()); + assertEquals("mcr_cnr", factory.getName()); + assertEquals(CornerMicroblock.class, factory.baseTrait()); + assertEquals(CommonMicroblockClient.class, factory.clientTrait()); + assertEquals(7, factory.itemSlot()); + assertEquals(1f, factory.getResistanceFactor()); + + Cuboid6[] bounds = factory.aBounds(); + assertEquals(256, bounds.length); + int populated = 0; + for (int corner = 0; corner < 8; corner++) { + for (int size = 1; size < 8; size++) { + Cuboid6 expected = expectedCornerBounds(corner, size / 8d); + Cuboid6 actual = bounds[size << 4 | corner]; + assertCuboid(expected, actual); + populated++; + } + } + for (Cuboid6 bound : bounds) { + if (bound != null) { + populated--; + } + } + assertEquals(0, populated, "Only the 8 corners by 7 sizes may be populated"); + + Microblock generated = factory.create(false, 0); + assertTrue(generated instanceof CornerMicroblock); + for (int slot = 7; slot < 15; slot++) { + generated.setShape(3, slot); + CornerMicroblock corner = (CornerMicroblock) generated; + assertSame(bounds[3 << 4 | slot - 7], corner.getBounds()); + assertEquals(slot - 7, generated.getShape()); + assertEquals(slot, corner.getSlot()); + } + } + + @Test + void keepsEdgeAndPostFactoriesBoundsAndGeneratedParts() { + EdgeMicroClass$ edgeFactory = EdgeMicroClass$.MODULE$; + assertSame(edgeFactory, EdgePlacement$.MODULE$.microClass()); + assertSame(edgeFactory, EdgePlacement.microClass()); + assertSame(EdgePlacementGrid$.MODULE$, EdgePlacement$.MODULE$.placementGrid()); + assertSame(edgeFactory.aBounds(), EdgeMicroClass.aBounds()); + assertEquals("mcr_edge", edgeFactory.getName()); + assertEquals(EdgeMicroblock.class, edgeFactory.baseTrait()); + assertEquals(CommonMicroblockClient.class, edgeFactory.clientTrait()); + assertEquals(15, edgeFactory.itemSlot()); + assertEquals(0.5f, edgeFactory.getResistanceFactor()); + + Cuboid6[] edgeBounds = edgeFactory.aBounds(); + assertEquals(256, edgeBounds.length); + int populated = 0; + for (int edge = 0; edge < 12; edge++) { + for (int size = 1; size < 8; size++) { + assertCuboid(expectedEdgeBounds(edge, size / 8d), edgeBounds[size << 4 | edge]); + populated++; + } + } + assertEquals(populated, countPopulated(edgeBounds)); + + Microblock generatedEdge = edgeFactory.create(false, 0); + assertTrue(generatedEdge instanceof EdgeMicroblock); + assertTrue(generatedEdge instanceof TEdgePart); + for (int slot = 15; slot < 27; slot++) { + generatedEdge.setShape(3, slot); + EdgeMicroblock edge = (EdgeMicroblock) generatedEdge; + assertSame(edgeBounds[3 << 4 | slot - 15], edge.getBounds()); + assertEquals(slot - 15, generatedEdge.getShape()); + assertEquals(slot, edge.getSlot()); + } + + PostMicroClass$ postFactory = PostMicroClass$.MODULE$; + assertSame(postFactory.aBounds(), PostMicroClass.aBounds()); + assertEquals("mcr_post", postFactory.getName()); + assertEquals(PostMicroblock.class, postFactory.baseTrait()); + assertEquals(PostMicroblockClient.class, postFactory.clientTrait()); + assertEquals(0.5f, postFactory.getResistanceFactor()); + + Cuboid6[] postBounds = postFactory.aBounds(); + assertEquals(256, postBounds.length); + populated = 0; + for (int axis = 0; axis < 3; axis++) { + for (int size = 2; size < 8; size += 2) { + assertCuboid(expectedPostBounds(axis, size), postBounds[size << 4 | axis]); + populated++; + } + } + assertEquals(populated, countPopulated(postBounds)); + + Microblock generatedPost = postFactory.create(false, 0); + assertTrue(generatedPost instanceof PostMicroblock); + assertTrue(generatedPost instanceof JPartialOcclusion); + assertTrue(generatedPost instanceof TNormalOcclusion); + PostMicroblock post = (PostMicroblock) generatedPost; + for (int axis = 0; axis < 3; axis++) { + generatedPost.setShape(4, axis); + assertSame(postBounds[4 << 4 | axis], post.getBounds()); + assertEquals(edgeFactory.getClassId(), post.itemClassID()); + assertEquals(0.5f, post.getResistanceFactor()); + assertEquals(axis == 0, post.canPlaceTorchOnTop()); + assertEquals(1, post.getOcclusionBoxes().size()); + assertSame(post.getBounds(), post.getOcclusionBoxes().get(0)); + assertEquals(post.getOcclusionBoxes(), post.getPartialOcclusionBoxes()); + } + } + + @Test + void keepsHollowFactoryBoundsAndGeneratedServerGeometry() { + HollowMicroClass$ factory = HollowMicroClass$.MODULE$; + assertSame(factory, HollowPlacement$.MODULE$.microClass()); + assertSame(factory, HollowPlacement.microClass()); + assertSame(HollowPlacement.HollowPlacementGrid$.MODULE$, HollowPlacement$.MODULE$.placementGrid()); + assertSame(factory.pBoxes(), HollowMicroClass.pBoxes()); + assertSame(factory.occBounds(), HollowMicroClass.occBounds()); + assertEquals("mcr_hllw", factory.getName()); + assertEquals(HollowMicroblock.class, factory.baseTrait()); + assertEquals(HollowMicroblockClient.class, factory.clientTrait()); + assertEquals(3, factory.itemSlot()); + assertEquals(1f, factory.getResistanceFactor()); + + scala.collection.Seq[] partialBounds = factory.pBoxes(); + Cuboid6[] occlusionBounds = factory.occBounds(); + assertEquals(256, partialBounds.length); + assertEquals(256, occlusionBounds.length); + for (int side = 0; side < 6; side++) { + for (int size = 1; size < 8; size++) { + int shape = size << 4 | side; + List partial = JavaConversions.seqAsJavaList(partialBounds[shape]); + assertCuboids(expectedPartialBounds(side, size), partial); + assertCuboid(expectedHollowOcclusionBound(side, size), occlusionBounds[shape]); + } + } + assertEquals(42, countPopulated(partialBounds)); + assertEquals(42, countPopulated(occlusionBounds)); + + Microblock generated = factory.create(false, 0); + assertTrue(generated instanceof HollowMicroblock); + assertTrue(generated instanceof TFacePart); + assertTrue(generated instanceof TNormalOcclusion); + HollowMicroblock hollow = (HollowMicroblock) generated; + assertEquals(factory.getClassId(), hollow.itemClassID()); + assertEquals(8, hollow.getHollowSize()); + assertTrue(hollow.allowCompleteOcclusion()); + assertFalse(hollow.solid(0)); + assertEquals(0x10, hollow.redstoneConductionMap()); + + for (int side = 0; side < 6; side++) { + generated.setShape(3, side); + int shape = 3 << 4 | side; + assertSame(FaceMicroClass$.MODULE$.aBounds()[shape], hollow.getBounds()); + assertCuboids(JavaConversions.seqAsJavaList(partialBounds[shape]), hollow.getPartialOcclusionBoxes()); + assertCuboids(expectedCollisionBounds(side, 3, 8), hollow.getCollisionBoxes()); + assertCuboids(expectedOcclusionBoxes(side, 3, 8), hollow.getOcclusionBoxes()); + assertEquals(4, hollow.getSubParts().size()); + for (int i = 0; i < 4; i++) { + assertEquals(0, hollow.getSubParts().get(i).data); + assertCuboid(hollow.getCollisionBoxes().get(i), hollow.getSubParts().get(i)); + } + } + } + + @Test + void keepsConnectedHollowSizesAndAllDynamicGeometry() { + ConnectorPart connector = new ConnectorPart(); + TileMultipart tile = new TileMultipart() { + + @Override + public TMultiPart partMap(int slot) { + return slot == 6 ? connector : null; + } + }; + connector.bind(tile); + int material = MicroMaterialRegistry.materialID("minecraft:stone"); + assertTrue(material >= 0); + Microblock generated = HollowMicroClass$.MODULE$.create(false, material); + generated.setShape(3, 0); + generated.bind(tile); + HollowMicroblock hollow = (HollowMicroblock) generated; + + for (int size = 1; size < 12; size++) { + connector.size = size; + for (int side = 0; side < 6; side++) { + generated.setShape(3, side); + assertEquals(size, hollow.getHollowSize()); + assertCuboids(expectedCollisionBounds(side, 3, size), hollow.getCollisionBoxes()); + assertCuboids(expectedOcclusionBoxes(side, 3, size), hollow.getOcclusionBoxes()); + assertEquals(4, hollow.getSubParts().size()); + for (int i = 0; i < 4; i++) { + assertEquals(0, hollow.getSubParts().get(i).data); + assertCuboid(hollow.getCollisionBoxes().get(i), hollow.getSubParts().get(i)); + } + } + } + } + + @Test + void registersTheExactOrderedBuiltInMaterialsAndRemaps() throws Exception { + List expectedNames = new ArrayList<>(); + Map expectedRemaps = new HashMap<>(); + add(expectedNames, expectedRemaps, Blocks.stone, "minecraft:stone", 0); + add(expectedNames, expectedRemaps, Blocks.dirt, "minecraft:dirt", 2); + add(expectedNames, expectedRemaps, Blocks.cobblestone, "minecraft:cobblestone", 0); + add(expectedNames, expectedRemaps, Blocks.planks, "minecraft:planks", 5); + add(expectedNames, expectedRemaps, Blocks.log, "minecraft:log", 3); + add(expectedNames, expectedRemaps, Blocks.log2, "minecraft:log2", 1, "tile.log2"); + add(expectedNames, expectedRemaps, Blocks.leaves, "minecraft:leaves", 3); + add(expectedNames, expectedRemaps, Blocks.leaves2, "minecraft:leaves2", 1, "tile.leaves2"); + add(expectedNames, expectedRemaps, Blocks.sponge, "minecraft:sponge", 0); + add(expectedNames, expectedRemaps, Blocks.glass, "minecraft:glass", 0); + add(expectedNames, expectedRemaps, Blocks.lapis_block, "minecraft:lapis_block", 0); + add(expectedNames, expectedRemaps, Blocks.sandstone, "minecraft:sandstone", 2); + add(expectedNames, expectedRemaps, Blocks.wool, "minecraft:wool", 15); + add(expectedNames, expectedRemaps, Blocks.gold_block, "minecraft:gold_block", 0); + add(expectedNames, expectedRemaps, Blocks.iron_block, "minecraft:iron_block", 0); + add(expectedNames, expectedRemaps, Blocks.brick_block, "minecraft:brick_block", 0); + add(expectedNames, expectedRemaps, Blocks.bookshelf, "minecraft:bookshelf", 0); + add(expectedNames, expectedRemaps, Blocks.mossy_cobblestone, "minecraft:mossy_cobblestone", 0); + add(expectedNames, expectedRemaps, Blocks.obsidian, "minecraft:obsidian", 0); + add(expectedNames, expectedRemaps, Blocks.diamond_block, "minecraft:diamond_block", 0); + add(expectedNames, expectedRemaps, Blocks.ice, "minecraft:ice", 0); + add(expectedNames, expectedRemaps, Blocks.snow, "minecraft:snow", 0); + add(expectedNames, expectedRemaps, Blocks.clay, "minecraft:clay", 0); + add(expectedNames, expectedRemaps, Blocks.netherrack, "minecraft:netherrack", 0); + add(expectedNames, expectedRemaps, Blocks.soul_sand, "minecraft:soul_sand", 0); + add(expectedNames, expectedRemaps, Blocks.glowstone, "minecraft:glowstone", 0); + add(expectedNames, expectedRemaps, Blocks.stonebrick, "minecraft:stonebrick", 3); + add(expectedNames, expectedRemaps, Blocks.nether_brick, "minecraft:nether_brick", 0); + add(expectedNames, expectedRemaps, Blocks.end_stone, "minecraft:end_stone", 0); + add(expectedNames, expectedRemaps, Blocks.emerald_block, "minecraft:emerald_block", 0); + add(expectedNames, expectedRemaps, Blocks.redstone_block, "minecraft:redstone_block", 0); + add(expectedNames, expectedRemaps, Blocks.quartz_block, "minecraft:quartz_block", 0); + add(expectedNames, expectedRemaps, Blocks.stained_hardened_clay, "minecraft:stained_hardened_clay", 15); + add(expectedNames, expectedRemaps, Blocks.hardened_clay, "minecraft:hardened_clay", 0); + add(expectedNames, expectedRemaps, Blocks.coal_block, "minecraft:coal_block", 0); + add(expectedNames, expectedRemaps, Blocks.packed_ice, "minecraft:packed_ice", 0); + add(expectedNames, expectedRemaps, Blocks.stained_glass, "minecraft:stained_glass", 15); + add(expectedNames, expectedRemaps, Blocks.grass, "minecraft:grass", 0); + add(expectedNames, expectedRemaps, Blocks.mycelium, "minecraft:mycelium", 0); + expectedNames.add(MissingMicroMaterial.key()); + for (int meta = 16; meta < 32; meta++) { + expectedNames.add( + codechicken.microblock.BlockMicroMaterial + .materialKey(ForgeMultipartFunctionalTestMod.illuminatedLamp, meta)); + } + Collections.sort(expectedNames); + + Tuple2[] idMap = MicroMaterialRegistry.getIdMap(); + List actualNames = new ArrayList<>(idMap.length); + for (Tuple2 entry : idMap) { + actualNames.add(entry._1()); + if ("minecraft:grass".equals(entry._1())) { + assertEquals(GrassMicroMaterial.class, entry._2().getClass()); + } else if ("minecraft:mycelium".equals(entry._1())) { + assertEquals(TopMicroMaterial.class, entry._2().getClass()); + } else if (MissingMicroMaterial.key().equals(entry._1())) { + assertSame(MissingMicroMaterial$.MODULE$, entry._2()); + } else if (entry._1().startsWith("ForgeMultipartTests:illuminated_lamp_")) { + assertEquals(codechicken.multipart.examples.IlluminatedMicroMaterial.class, entry._2().getClass()); + } else { + assertEquals(BlockMicroMaterial.class, entry._2().getClass(), entry._1()); + } + } + + assertEquals(121, expectedNames.size()); + assertEquals(expectedNames, actualNames); + assertEquals(expectedRemaps, materialRemaps()); + } + + private static void add(List names, Map remaps, Block block, String registeredName, + int maxMeta) { + add(names, remaps, block, registeredName, maxMeta, block.getUnlocalizedName()); + } + + private static List expectedPartialBounds(int side, int size) { + double thickness = size / 8d; + double width = 1 / 8d; + return transform( + side, + Arrays.asList( + new Cuboid6(0, 0, 0, width, thickness, 1), + new Cuboid6(1 - width, 0, 0, 1, thickness, 1), + new Cuboid6(width, 0, 0, 1 - width, thickness, width), + new Cuboid6(width, 0, 1 - width, 1 - width, thickness, 1))); + } + + private static Cuboid6 expectedHollowOcclusionBound(int side, int size) { + return new Cuboid6(1 / 8d, 0, 1 / 8d, 7 / 8d, size / 8d, 7 / 8d) + .apply(Rotation.sideRotations[side].at(Vector3.center)); + } + + private static List expectedCollisionBounds(int side, int partSize, int hollowSize) { + double d1 = 0.5 - hollowSize / 32d; + double d2 = 0.5 + hollowSize / 32d; + double thickness = partSize / 8d; + return transform( + side, + Arrays.asList( + new Cuboid6(0, 0, 0, 1, thickness, d1), + new Cuboid6(0, 0, d2, 1, thickness, 1), + new Cuboid6(0, 0, d1, d1, thickness, d2), + new Cuboid6(d2, 0, d1, 1, thickness, d2))); + } + + private static List expectedOcclusionBoxes(int side, int partSize, int hollowSize) { + Cuboid6 c = expectedHollowOcclusionBound(side, partSize); + double d1 = 0.5 - hollowSize / 32d; + double d2 = 0.5 + hollowSize / 32d; + double x1 = c.min.x; + double x2 = c.max.x; + double y1 = c.min.y; + double y2 = c.max.y; + double z1 = c.min.z; + double z2 = c.max.z; + + switch (side) { + case 0: + case 1: + return Arrays.asList( + new Cuboid6(d2, y1, d1, x2, y2, d2), + new Cuboid6(x1, y1, d1, d1, y2, d2), + new Cuboid6(x1, y1, d2, x2, y2, z2), + new Cuboid6(x1, y1, z1, x2, y2, d1)); + case 2: + case 3: + return Arrays.asList( + new Cuboid6(d1, d2, z1, d2, y2, z2), + new Cuboid6(d1, y1, z1, d2, d1, z2), + new Cuboid6(d2, y1, z1, x2, y2, z2), + new Cuboid6(x1, y1, z1, d1, y2, z2)); + case 4: + case 5: + return Arrays.asList( + new Cuboid6(x1, d1, d2, x2, d2, z2), + new Cuboid6(x1, d1, z1, x2, d2, d1), + new Cuboid6(x1, d2, z1, x2, y2, z2), + new Cuboid6(x1, y1, z1, x2, d1, z2)); + default: + throw new AssertionError(side); + } + } + + private static List transform(int side, List bounds) { + List transformed = new ArrayList<>(bounds.size()); + for (Cuboid6 bound : bounds) { + transformed.add(bound.apply(Rotation.sideRotations[side].at(Vector3.center))); + } + return transformed; + } + + private static Cuboid6 expectedFaceBounds(int side, double thickness) { + switch (side) { + case 0: + return new Cuboid6(0, 0, 0, 1, thickness, 1); + case 1: + return new Cuboid6(0, 1 - thickness, 0, 1, 1, 1); + case 2: + return new Cuboid6(0, 0, 0, 1, 1, thickness); + case 3: + return new Cuboid6(0, 0, 1 - thickness, 1, 1, 1); + case 4: + return new Cuboid6(0, 0, 0, thickness, 1, 1); + case 5: + return new Cuboid6(1 - thickness, 0, 0, 1, 1, 1); + default: + throw new AssertionError(side); + } + } + + private static Cuboid6 expectedCornerBounds(int corner, double size) { + double minX = (corner & 4) == 0 ? 0 : 1 - size; + double minY = (corner & 1) == 0 ? 0 : 1 - size; + double minZ = (corner & 2) == 0 ? 0 : 1 - size; + return new Cuboid6(minX, minY, minZ, minX + size, minY + size, minZ + size); + } + + private static Cuboid6 expectedEdgeBounds(int edge, double size) { + switch (edge >> 2) { + case 0: + return axisBounds((edge & 2) == 0 ? 0 : 1 - size, 0, (edge & 1) == 0 ? 0 : 1 - size, size, 1, size); + case 1: + return axisBounds((edge & 1) == 0 ? 0 : 1 - size, (edge & 2) == 0 ? 0 : 1 - size, 0, size, size, 1); + case 2: + return axisBounds(0, (edge & 1) == 0 ? 0 : 1 - size, (edge & 2) == 0 ? 0 : 1 - size, 1, size, size); + default: + throw new AssertionError(edge); + } + } + + private static Cuboid6 expectedPostBounds(int axis, int size) { + double min = 0.5 - size / 16d; + double width = size / 8d; + switch (axis) { + case 0: + return axisBounds(min, 0, min, width, 1, width); + case 1: + return axisBounds(min, min, 0, width, width, 1); + case 2: + return axisBounds(0, min, min, 1, width, width); + default: + throw new AssertionError(axis); + } + } + + private static Cuboid6 axisBounds(double minX, double minY, double minZ, double sizeX, double sizeY, double sizeZ) { + return new Cuboid6(minX, minY, minZ, minX + sizeX, minY + sizeY, minZ + sizeZ); + } + + private static int countPopulated(Cuboid6[] bounds) { + int populated = 0; + for (Cuboid6 bound : bounds) { + if (bound != null) { + populated++; + } + } + return populated; + } + + private static int countPopulated(scala.collection.Seq[] bounds) { + int populated = 0; + for (scala.collection.Seq bound : bounds) { + if (bound != null) { + populated++; + } + } + return populated; + } + + private static void assertCuboids(Iterable expected, Iterable actual) { + Iterator expectedIterator = expected.iterator(); + Iterator actualIterator = actual.iterator(); + while (expectedIterator.hasNext()) { + assertTrue(actualIterator.hasNext()); + assertCuboid(expectedIterator.next(), actualIterator.next()); + } + assertFalse(actualIterator.hasNext()); + } + + private static void assertCuboid(Cuboid6 expected, Cuboid6 actual) { + assertEquals(expected.min.x, actual.min.x, 1e-12); + assertEquals(expected.min.y, actual.min.y, 1e-12); + assertEquals(expected.min.z, actual.min.z, 1e-12); + assertEquals(expected.max.x, actual.max.x, 1e-12); + assertEquals(expected.max.y, actual.max.y, 1e-12); + assertEquals(expected.max.z, actual.max.z, 1e-12); + } + + private static void add(List names, Map remaps, Block block, String registeredName, + int maxMeta, String oldName) { + for (int meta = 0; meta <= maxMeta; meta++) { + String suffix = meta == 0 ? "" : "_" + meta; + names.add(registeredName + suffix); + remaps.put(oldName + suffix, registeredName + suffix); + } + } + + @SuppressWarnings("unchecked") + private static Map partFactories() throws Exception { + Field field = MultiPartRegistry.class.getDeclaredField("typeMap"); + field.setAccessible(true); + return (Map) field.get(null); + } + + @SuppressWarnings("unchecked") + private static Map materialRemaps() throws Exception { + Field field = MicroMaterialRegistry.class.getDeclaredField("remap"); + field.setAccessible(true); + return (Map) field.get(null); + } + + private static final class ConnectorPart extends TMultiPart implements TSlottedPart, ISidedHollowConnect { + + private int size; + + @Override + public String getType() { + return "multipart_test:hollow_connector"; + } + + @Override + public int getSlotMask() { + return 1 << 6; + } + + @Override + public int getHollowSize(int side) { + return size; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/EdgeMicroblockTraitsFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/EdgeMicroblockTraitsFunctionalTest.java new file mode 100644 index 0000000..57e9595 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/EdgeMicroblockTraitsFunctionalTest.java @@ -0,0 +1,132 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicInteger; + +import net.minecraft.nbt.NBTTagCompound; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutputWrapper; +import codechicken.lib.vec.Cuboid6; +import codechicken.microblock.EdgeMicroClass; +import codechicken.microblock.EdgeMicroClass$; +import codechicken.microblock.EdgeMicroblock; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockGenerator; + +class EdgeMicroblockTraitsFunctionalTest { + + @Test + void generatedEdgeKeepsClassIdentityAndAllEightyFourBounds() { + Microblock part = MicroblockGenerator.create(EdgeMicroClass$.MODULE$, 0, false); + EdgeMicroblock edgePart = (EdgeMicroblock) part; + assertSame(EdgeMicroClass$.MODULE$, edgePart.microClass()); + assertSame(EdgeMicroClass$.MODULE$, part.microClass()); + assertEquals("mcr_edge", part.getType()); + int[][] axisBits = { { 2, 0, 1 }, { 1, 2, 0 }, { 0, 1, 2 } }; + for (int size = 1; size <= 7; size++) { + for (int edge = 0; edge < 12; edge++) { + part.setShape(size, edge + 15); + assertEquals(size, part.getSize()); + assertEquals(edge + 15, edgePart.getSlot()); + assertEquals(1 << (edge + 15), edgePart.getSlotMask()); + assertFalse(edgePart.conductsRedstone()); + Cuboid6 bounds = edgePart.getBounds(); + assertSame(EdgeMicroClass.aBounds()[size * 16 + edge], bounds); + double distance = size / 8D; + double[] min = { bounds.min.x, bounds.min.y, bounds.min.z }; + double[] max = { bounds.max.x, bounds.max.y, bounds.max.z }; + for (int axis = 0; axis < 3; axis++) { + int bit = axisBits[edge / 4][axis]; + boolean positive = (edge & bit) != 0; + assertEquals(positive ? 1 - distance : 0, min[axis], 1e-12); + assertEquals(bit == 0 || positive ? 1 : distance, max[axis], 1e-12); + } + } + } + } + + @Test + void boundsUseSignedShapeIndexAndTheLiveReplaceableArray() { + Microblock part = MicroblockGenerator.create(EdgeMicroClass$.MODULE$, 0, false); + EdgeMicroblock edge = (EdgeMicroblock) part; + for (int shape : new int[] { 0, 12, 28, 127 }) { + part.shape_$eq((byte) shape); + assertNull(edge.getBounds()); + } + for (int shape = -128; shape < 0; shape++) { + part.shape_$eq((byte) shape); + assertThrows(ArrayIndexOutOfBoundsException.class, edge::getBounds); + } + Cuboid6[] original = EdgeMicroClass.aBounds(); + Cuboid6[] replacement = new Cuboid6[256]; + Cuboid6 sentinel = new Cuboid6(0.1, 0.2, 0.3, 0.4, 0.5, 0.6); + replacement[35] = sentinel; + part.setShape(2, 18); + try { + EdgeMicroClass.aBounds_$eq(replacement); + assertSame(sentinel, edge.getBounds()); + replacement[35] = null; + assertNull(edge.getBounds()); + EdgeMicroClass.aBounds_$eq(new Cuboid6[1]); + assertThrows(ArrayIndexOutOfBoundsException.class, edge::getBounds); + EdgeMicroClass.aBounds_$eq(null); + assertThrows(NullPointerException.class, edge::getBounds); + } finally { + EdgeMicroClass.aBounds_$eq(original); + } + assertSame(original[35], edge.getBounds()); + } + + @Test + void generatedEdgesKeepThePackedShapeInNbtAndDescriptions() { + Microblock part = MicroblockGenerator.create(EdgeMicroClass$.MODULE$, 0, false); + Microblock loaded = MicroblockGenerator.create(EdgeMicroClass$.MODULE$, 0, false); + ByteArrayOutputStream prefixBytes = new ByteArrayOutputStream(); + MicroMaterialRegistry.writeMaterialID(new MCDataOutputWrapper(new DataOutputStream(prefixBytes)), 0); + byte[] prefix = prefixBytes.toByteArray(); + for (int size = 1; size <= 7; size++) { + for (int edge = 0; edge < 12; edge++) { + byte shape = (byte) (size * 16 + edge); + part.setShape(size, edge + 15); + NBTTagCompound tag = new NBTTagCompound(); + part.save(tag); + assertEquals(shape, tag.getByte("shape")); + assertEquals(MicroMaterialRegistry.materialName(0), tag.getString("material")); + loaded.load(tag); + assertEquals(shape, loaded.shape()); + assertEquals(0, loaded.material()); + assertEquals(edge + 15, ((EdgeMicroblock) loaded).getSlot()); + assertSame(part.getBounds(), loaded.getBounds()); + + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + part.writeDesc(new MCDataOutputWrapper(new DataOutputStream(bytes))); + byte[] expected = Arrays.copyOf(prefix, prefix.length + 1); + expected[prefix.length] = shape; + assertArrayEquals(expected, bytes.toByteArray()); + AtomicInteger reads = new AtomicInteger(); + MCDataInput input = (MCDataInput) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, args) -> { + assertEquals("readByte", method.getName()); + reads.incrementAndGet(); + return shape; + }); + loaded.setShape(2, 15); + loaded.readDesc(input); + assertEquals(1, reads.get()); + assertEquals(shape, loaded.shape()); + assertEquals(edge + 15, ((EdgeMicroblock) loaded).getSlot()); + } + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ExpectedErrorLog.java b/src/functionalTest/java/codechicken/multipart/test/ExpectedErrorLog.java new file mode 100644 index 0000000..0d9b15e --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ExpectedErrorLog.java @@ -0,0 +1,40 @@ +package codechicken.multipart.test; + +import java.lang.reflect.Array; +import java.lang.reflect.Proxy; + +import org.apache.logging.log4j.Logger; + +import codechicken.multipart.handler.MultipartProxy; + +/** + * Runs an action with ForgeMultipart's logger detached, for tests that deliberately drive a path which logs at ERROR. + * Those lines are correct behaviour, but in a green run they read as failures. + * + *

+ * The swap is global and not thread safe; callers run on the server thread inside one synchronous call. + */ +final class ExpectedErrorLog { + + /** A reflective proxy rather than a subclass, so it does not depend on Forge's log4j-api version. */ + private static final Logger SILENT = (Logger) Proxy + .newProxyInstance(Logger.class.getClassLoader(), new Class[] { Logger.class }, (proxy, method, args) -> { + Class returnType = method.getReturnType(); + if (returnType == String.class) return ""; + if (returnType == void.class || !returnType.isPrimitive()) return null; + // Boxed zero/false for any primitive return, without enumerating them. + return Array.get(Array.newInstance(returnType, 1), 0); + }); + + private ExpectedErrorLog() {} + + static void silence(Runnable action) { + Logger original = MultipartProxy.logger(); + MultipartProxy.logger_$eq(SILENT); + try { + action.run(); + } finally { + MultipartProxy.logger_$eq(original); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/FaceMicroblockTraitsFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/FaceMicroblockTraitsFunctionalTest.java new file mode 100644 index 0000000..a23d020 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/FaceMicroblockTraitsFunctionalTest.java @@ -0,0 +1,105 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.lang.reflect.Proxy; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; +import codechicken.microblock.FaceMicroClass; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.FaceMicroblock; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockGenerator; +import scala.Tuple2; + +class FaceMicroblockTraitsFunctionalTest { + + @Test + void generatedFaceSelectsFactoryBoundsForEverySupportedShape() { + Microblock part = MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false); + FaceMicroblock face = (FaceMicroblock) part; + assertSame(FaceMicroClass$.MODULE$, face.microClass()); + assertSame(FaceMicroClass$.MODULE$, part.microClass()); + for (int size = 1; size <= 7; size++) { + for (int side = 0; side < 6; side++) { + part.setShape(size, side); + Cuboid6 bounds = face.getBounds(); + assertSame(FaceMicroClass.aBounds()[size << 4 | side], bounds); + double thickness = size / 8D; + int axis = side / 2 == 0 ? 1 : side / 2 == 1 ? 2 : 0; + double[] min = { bounds.min.x, bounds.min.y, bounds.min.z }; + double[] max = { bounds.max.x, bounds.max.y, bounds.max.z }; + for (int coordinate = 0; coordinate < 3; coordinate++) { + assertEquals(coordinate == axis && (side & 1) != 0 ? 1 - thickness : 0, min[coordinate], 1e-12); + assertEquals(coordinate == axis && (side & 1) == 0 ? thickness : 1, max[coordinate], 1e-12); + } + } + } + } + + @Test + void boundsLookupKeepsSignedIndexingNullEntriesAndLiveArrayReplacement() { + Microblock part = MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false); + FaceMicroblock face = (FaceMicroblock) part; + part.shape_$eq((byte) 0); + assertNull(face.getBounds()); + part.shape_$eq((byte) 127); + assertNull(face.getBounds()); + for (int shape = -128; shape < 0; shape++) { + part.shape_$eq((byte) shape); + assertThrows(ArrayIndexOutOfBoundsException.class, face::getBounds); + } + Cuboid6[] original = FaceMicroClass.aBounds(); + Cuboid6[] replacement = new Cuboid6[256]; + Cuboid6 sentinel = new Cuboid6(0.2, 0.3, 0.4, 0.5, 0.6, 0.7); + replacement[35] = sentinel; + part.shape_$eq((byte) 35); + try { + FaceMicroClass.aBounds_$eq(replacement); + assertSame(sentinel, face.getBounds()); + replacement[35] = null; + assertNull(face.getBounds()); + FaceMicroClass.aBounds_$eq(new Cuboid6[1]); + assertThrows(ArrayIndexOutOfBoundsException.class, face::getBounds); + } finally { + FaceMicroClass.aBounds_$eq(original); + } + assertSame(original[35], face.getBounds()); + } + + @Test + void solidityDelegatesToCurrentMaterialAndIgnoresTheSide() { + Microblock part = MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false); + FaceMicroblock face = (FaceMicroblock) part; + Tuple2[] materials = MicroMaterialRegistry.getIdMap(); + Tuple2 original = materials[0]; + AtomicBoolean solid = new AtomicBoolean(); + AtomicInteger calls = new AtomicInteger(); + IMicroMaterial material = (IMicroMaterial) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { IMicroMaterial.class }, + (proxy, method, args) -> { + assertEquals("isSolid", method.getName()); + calls.incrementAndGet(); + return solid.get(); + }); + try { + materials[0] = new Tuple2<>(original._1(), material); + for (boolean value : new boolean[] { false, true }) { + solid.set(value); + for (int side : new int[] { -1, 0, 1, 2, 3, 4, 5, 6 }) assertEquals(value, face.solid(side)); + } + assertEquals(16, calls.get()); + materials[0] = new Tuple2<>(original._1(), null); + assertThrows(NullPointerException.class, () -> face.solid(0)); + } finally { + materials[0] = original; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ForgeEnvironmentSmokeTest.java b/src/functionalTest/java/codechicken/multipart/test/ForgeEnvironmentSmokeTest.java new file mode 100644 index 0000000..1da1a4f --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ForgeEnvironmentSmokeTest.java @@ -0,0 +1,695 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Modifier; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.BitSet; +import java.util.Collections; +import java.util.LinkedList; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.fluids.IFluidHandler; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.data.MCDataOutputWrapper; +import codechicken.lib.vec.Cuboid6; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.HollowMicroClass$; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockGenerator; +import codechicken.multipart.JPartialOcclusion; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.TFacePart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.TileMultipartClient; +import codechicken.multipart.asm.MultipartMixinFactory; +import codechicken.multipart.scalatraits.JInventoryTile; +import codechicken.multipart.scalatraits.TFluidHandlerTile; +import codechicken.multipart.scalatraits.TIInventoryTile; +import codechicken.multipart.scalatraits.TRandomDisplayTickTile; +import codechicken.multipart.scalatraits.TSlottedTile; +import codechicken.multipart.scalatraits.TTileChangeTile; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.immutable.Nil$; + +class ForgeEnvironmentSmokeTest { + + @Test + void renderIdRemainsUninitializedOnTheDedicatedServerAndSharesBlockState() { + int previous = TileMultipart.renderID(); + assertEquals(-1, previous); + assertEquals(previous, TileMultipart.getRenderID()); + try { + TileMultipart.renderID_$eq(37); + assertEquals(37, codechicken.multipart.handler.MultipartProxy.block().getRenderType()); + assertEquals(37, codechicken.multipart.TileMultipart$.MODULE$.renderID()); + assertEquals(37, TileMultipart.getRenderID()); + TileMultipart.setRenderID(38); + assertEquals(38, codechicken.multipart.handler.MultipartProxy.block().getRenderType()); + assertEquals(38, TileMultipart.renderID()); + } finally { + TileMultipart.renderID_$eq(previous); + } + } + + @Test + void reachesServerStartedWithWorldAndMultipartModsLoaded() { + assertTrue(ForgeMultipartFunctionalTestMod.preInitialized); + assertTrue(ForgeMultipartFunctionalTestMod.initialized); + assertTrue(ForgeMultipartFunctionalTestMod.postInitialized); + assertTrue(ForgeMultipartFunctionalTestMod.serverAboutToStart); + assertTrue(ForgeMultipartFunctionalTestMod.serverStarted); + assertTrue(FMLCommonHandler.instance().getSide().isServer()); + assertTrue(Loader.isModLoaded("ForgeMultipart")); + assertTrue(Loader.isModLoaded("ForgeMicroblock")); + assertTrue(Loader.isModLoaded("McMultipart")); + + MinecraftServer server = MinecraftServer.getServer(); + assertNotNull(server); + assertNotNull(server.worldServers); + assertTrue(server.worldServers.length > 0); + assertNotNull(server.worldServers[0]); + } + + /** + * Microblock classes are generated by ASM at runtime. TFacePart's members are now Java interface defaults rather + * than Scala trait forwarders, so a generated class inherits them instead of declaring its own; this checks the JVM + * resolves them for a class that never existed at compile time. + */ + @Test + void generatedMicroblockInheritsFacePartDefaults() { + Microblock face = MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false); + Microblock hollow = MicroblockGenerator.create(HollowMicroClass$.MODULE$, 0, false); + + assertTrue(face instanceof TFacePart); + assertEquals(0, ((TFacePart) face).redstoneConductionMap()); + + // HollowMicroblock overrides both members, so its generated class must not pick up the defaults. + assertTrue(hollow instanceof TFacePart); + assertEquals(0x10, ((TFacePart) hollow).redstoneConductionMap()); + assertFalse(((TFacePart) hollow).solid(0)); + } + + @Test + void generatedMicroblockInitializesAndDispatchesAnExternalScalaTrait() throws Exception { + BitSet traits = new BitSet(); + traits.set(FaceMicroClass$.MODULE$.baseTraitId()); + traits.set(ForgeMultipartFunctionalTestMod.externalScalaMicroblockTraitId); + Seq arguments = JavaConversions.asScalaBuffer(Collections.singletonList(0)).toList(); + + Microblock microblock = (Microblock) MicroblockGenerator.construct(traits, arguments); + Class trait = Class.forName("codechicken.multipart.test.ExternalScalaMicroblockFixture"); + + assertTrue(trait.isInterface()); + assertTrue(trait.isInstance(microblock)); + assertTrue(microblock.shouldRenderDynamic()); + assertEquals(41, microblock.getLightValue()); + assertEquals(41, ((Number) microblock.getClass().getMethod("fixtureState").invoke(microblock)).intValue()); + } + + /** + * Part registration needs FML's active mod container, so none of this is reachable from a plain JVM test. Startup + * exercises both overloads downstream depends on: Content registers through the deprecated IPartFactory array form, + * and each microblock class registers through the IPartFactory2 varargs form. + */ + @Test + void registryResolvesPartsRegisteredThroughBothFactoryOverloads() throws Exception { + assertTrue(MultiPartRegistry.loaded(), "Registration must be closed once the server has started"); + + // mc_torch comes from the deprecated IPartFactory array overload. + TMultiPart torch = MultiPartRegistry.loadPart("mc_torch", null); + assertNotNull(torch); + assertEquals("mc_torch", torch.getType()); + + // mcr_face comes from the IPartFactory2 varargs overload. Its factory reads the tag, so it needs a real one; + // an absent material name resolves to the missing-material placeholder rather than failing. + TMultiPart face = MultiPartRegistry.loadPart("mcr_face", new NBTTagCompound()); + assertNotNull(face); + assertEquals("mcr_face", face.getType()); + + assertNotNull(MultiPartRegistry.getModContainer("mc_torch")); + assertNotNull(MultiPartRegistry.getModContainer("mcr_face")); + } + + @Test + void partIdsRoundTripThroughTheRegistryCarrier() { + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + MCDataOutput output = new MCDataOutputWrapper(new DataOutputStream(bytes)); + TMultiPart torch = MultiPartRegistry.loadPart("mc_torch", null); + MultiPartRegistry.writePartID(output, torch); + + TMultiPart read = MultiPartRegistry.readPart(input(bytes.toByteArray())); + + assertNotNull(read); + assertEquals("mc_torch", read.getType()); + } + + /** CodeChickenLib has no stream-backed MCDataInput, so the carrier reads are proxied. */ + private static MCDataInput input(byte[] bytes) { + DataInputStream data = new DataInputStream(new ByteArrayInputStream(bytes)); + return (MCDataInput) Proxy.newProxyInstance( + MCDataInput.class.getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, arguments) -> { + switch (method.getName()) { + case "readUByte": + return (short) data.readUnsignedByte(); + case "readUShort": + return data.readUnsignedShort(); + case "readInt": + return data.readInt(); + default: + throw new AssertionError("Unexpected read method: " + method.getName()); + } + }); + } + + @Test + void generatesAndCachesSlottedTileClass() throws Exception { + int traitId = MultipartMixinFactory.getId(TSlottedTile.class.getName().replace('.', '/')); + assertFalse(traitId < 0); + + BitSet traits = new BitSet(); + traits.set(traitId); + Object first = MultipartMixinFactory.construct(traits, Nil$.MODULE$); + Object second = MultipartMixinFactory.construct(traits, Nil$.MODULE$); + Class trait = Class.forName("codechicken.multipart.scalatraits.TSlottedTile"); + + assertTrue(first instanceof TileMultipart); + assertTrue(first instanceof TSlottedTile); + assertTrue(trait.isInterface()); + assertNotSame(first, second); + assertSame(first.getClass(), second.getClass()); + assertEquals(0, trait.getDeclaredFields().length); + Set signatures = new TreeSet<>(); + for (java.lang.reflect.Method method : trait.getDeclaredMethods()) { + signatures.add(method.getName() + org.objectweb.asm.Type.getMethodDescriptor(method)); + } + assertEquals( + new TreeSet<>( + Arrays.asList( + "bindPart(Lcodechicken/multipart/TMultiPart;)V", + "canAddPart(Lcodechicken/multipart/TMultiPart;)Z", + "clearParts()V", + "codechicken$multipart$scalatraits$TSlottedTile$$super$bindPart" + + "(Lcodechicken/multipart/TMultiPart;)V", + "codechicken$multipart$scalatraits$TSlottedTile$$super$canAddPart" + + "(Lcodechicken/multipart/TMultiPart;)Z", + "codechicken$multipart$scalatraits$TSlottedTile$$super$clearParts()V", + "codechicken$multipart$scalatraits$TSlottedTile$$super$copyFrom" + + "(Lcodechicken/multipart/TileMultipart;)V", + "codechicken$multipart$scalatraits$TSlottedTile$$super$partRemoved" + + "(Lcodechicken/multipart/TMultiPart;I)V", + "copyFrom(Lcodechicken/multipart/TileMultipart;)V", + "partMap(I)Lcodechicken/multipart/TMultiPart;", + "partRemoved(Lcodechicken/multipart/TMultiPart;I)V", + "refreshPartSlots(Lcodechicken/multipart/TMultiPart;)V", + "v_partMap()[Lcodechicken/multipart/TMultiPart;", + "v_partMap_$eq([Lcodechicken/multipart/TMultiPart;)V")), + signatures); + + TMultiPart[] firstMap = (TMultiPart[]) trait.getMethod("v_partMap").invoke(first); + TMultiPart[] secondMap = (TMultiPart[]) trait.getMethod("v_partMap").invoke(second); + assertEquals(27, firstMap.length); + assertEquals(27, secondMap.length); + assertNotSame(firstMap, secondMap, "Each generated tile must run the trait initializer"); + assertEquals(TMultiPart[].class, first.getClass().getDeclaredField("v_partMap").getType()); + + TMultiPart[] replacement = new TMultiPart[27]; + trait.getMethod("v_partMap_$eq", TMultiPart[].class).invoke(first, (Object) replacement); + assertSame(replacement, trait.getMethod("v_partMap").invoke(first)); + } + + @Test + void generatesAndCachesTileChangeTileClass() throws Exception { + int traitId = MultipartMixinFactory.getId(TTileChangeTile.class.getName().replace('.', '/')); + assertFalse(traitId < 0); + + BitSet traits = new BitSet(); + traits.set(traitId); + Object first = MultipartMixinFactory.construct(traits, Nil$.MODULE$); + Object second = MultipartMixinFactory.construct(traits, Nil$.MODULE$); + Class trait = Class.forName("codechicken.multipart.scalatraits.TTileChangeTile"); + + assertTrue(first instanceof TileMultipart); + assertTrue(first instanceof TTileChangeTile); + assertTrue(trait.isInterface()); + assertNotSame(first, second); + assertSame(first.getClass(), second.getClass()); + assertEquals(0, trait.getDeclaredFields().length); + Set signatures = new TreeSet<>(); + for (java.lang.reflect.Method method : trait.getDeclaredMethods()) { + signatures.add(method.getName() + org.objectweb.asm.Type.getMethodDescriptor(method)); + } + String prefix = "codechicken$multipart$scalatraits$TTileChangeTile$$super$"; + assertEquals( + new TreeSet<>( + Arrays.asList( + "bindPart(Lcodechicken/multipart/TMultiPart;)V", + "clearParts()V", + "copyFrom(Lcodechicken/multipart/TileMultipart;)V", + "getWeakChanges()Z", + "onNeighborTileChange(III)V", + "partRemoved(Lcodechicken/multipart/TMultiPart;I)V", + "weakTileChanges()Z", + "weakTileChanges_$eq(Z)V", + prefix + "bindPart(Lcodechicken/multipart/TMultiPart;)V", + prefix + "clearParts()V", + prefix + "copyFrom(Lcodechicken/multipart/TileMultipart;)V", + prefix + "onNeighborTileChange(III)V", + prefix + "partRemoved(Lcodechicken/multipart/TMultiPart;I)V")), + signatures); + + assertEquals(boolean.class, first.getClass().getDeclaredField("weakTileChanges").getType()); + trait.getMethod("weakTileChanges_$eq", boolean.class).invoke(first, true); + assertEquals(true, trait.getMethod("weakTileChanges").invoke(first)); + assertEquals(false, trait.getMethod("weakTileChanges").invoke(second), "State is per tile"); + } + + @Test + void generatesAndCachesFluidHandlerTileClass() throws Exception { + int traitId = MultipartMixinFactory.getId(TFluidHandlerTile.class.getName().replace('.', '/')); + assertFalse(traitId < 0); + + BitSet traits = new BitSet(); + traits.set(traitId); + Object first = MultipartMixinFactory.construct(traits, Nil$.MODULE$); + Object second = MultipartMixinFactory.construct(traits, Nil$.MODULE$); + Class trait = Class.forName("codechicken.multipart.scalatraits.TFluidHandlerTile"); + + assertTrue(first instanceof TileMultipart); + assertTrue(first instanceof IFluidHandler); + assertTrue(trait.isInterface()); + assertArrayEquals(new Class[] { IFluidHandler.class }, trait.getInterfaces()); + assertNotSame(first, second); + assertSame(first.getClass(), second.getClass()); + assertEquals(0, trait.getDeclaredFields().length); + Set signatures = new TreeSet<>(); + for (java.lang.reflect.Method method : trait.getDeclaredMethods()) { + signatures.add(method.getName() + org.objectweb.asm.Type.getMethodDescriptor(method)); + } + String prefix = "codechicken$multipart$scalatraits$TFluidHandlerTile$$super$"; + assertEquals( + new TreeSet<>( + Arrays.asList( + "bindPart(Lcodechicken/multipart/TMultiPart;)V", + "canDrain(Lnet/minecraftforge/common/util/ForgeDirection;" + + "Lnet/minecraftforge/fluids/Fluid;)Z", + "canFill(Lnet/minecraftforge/common/util/ForgeDirection;" + + "Lnet/minecraftforge/fluids/Fluid;)Z", + "clearParts()V", + "copyFrom(Lcodechicken/multipart/TileMultipart;)V", + "drain(Lnet/minecraftforge/common/util/ForgeDirection;IZ)" + + "Lnet/minecraftforge/fluids/FluidStack;", + "drain(Lnet/minecraftforge/common/util/ForgeDirection;" + + "Lnet/minecraftforge/fluids/FluidStack;Z)" + + "Lnet/minecraftforge/fluids/FluidStack;", + "fill(Lnet/minecraftforge/common/util/ForgeDirection;" + + "Lnet/minecraftforge/fluids/FluidStack;Z)I", + "getTankInfo(Lnet/minecraftforge/common/util/ForgeDirection;)" + + "[Lnet/minecraftforge/fluids/FluidTankInfo;", + "partRemoved(Lcodechicken/multipart/TMultiPart;I)V", + "tankList()Ljava/util/LinkedList;", + "tankList_$eq(Ljava/util/LinkedList;)V", + prefix + "bindPart(Lcodechicken/multipart/TMultiPart;)V", + prefix + "clearParts()V", + prefix + "copyFrom(Lcodechicken/multipart/TileMultipart;)V", + prefix + "partRemoved(Lcodechicken/multipart/TMultiPart;I)V")), + signatures); + + assertEquals(LinkedList.class, first.getClass().getDeclaredField("tankList").getType()); + LinkedList firstList = (LinkedList) trait.getMethod("tankList").invoke(first); + LinkedList secondList = (LinkedList) trait.getMethod("tankList").invoke(second); + assertNotSame(firstList, secondList, "State is per tile"); + + LinkedList replacement = new LinkedList<>(); + trait.getMethod("tankList_$eq", LinkedList.class).invoke(first, replacement); + assertSame(replacement, trait.getMethod("tankList").invoke(first)); + } + + @Test + void generatesAndCachesInventoryTileClassWithBothPublicTraitInterfaces() throws Exception { + int traitId = MultipartMixinFactory.getId(JInventoryTile.class.getName().replace('.', '/')); + assertFalse(traitId < 0); + + BitSet traits = new BitSet(); + traits.set(traitId); + Object first = MultipartMixinFactory.construct(traits, Nil$.MODULE$); + Object second = MultipartMixinFactory.construct(traits, Nil$.MODULE$); + Class inventoryTrait = Class.forName("codechicken.multipart.scalatraits.TIInventoryTile"); + Class javaTrait = Class.forName("codechicken.multipart.scalatraits.JInventoryTile"); + + assertTrue(first instanceof TileMultipart); + assertTrue(first instanceof TIInventoryTile); + assertTrue(first instanceof ISidedInventory); + assertTrue(javaTrait.isInstance(first)); + assertTrue(inventoryTrait.isInterface()); + assertTrue(javaTrait.isInterface()); + assertArrayEquals(new Class[] { ISidedInventory.class }, inventoryTrait.getInterfaces()); + assertArrayEquals(new Class[] { TIInventoryTile.class }, javaTrait.getInterfaces()); + assertNotSame(first, second); + assertSame(first.getClass(), second.getClass()); + assertEquals(0, inventoryTrait.getDeclaredFields().length); + assertEquals(0, javaTrait.getDeclaredFields().length); + + Set inventorySignatures = new TreeSet<>(); + for (java.lang.reflect.Method method : inventoryTrait.getDeclaredMethods()) { + inventorySignatures.add(method.getName() + org.objectweb.asm.Type.getMethodDescriptor(method)); + } + String inventoryPrefix = "codechicken$multipart$scalatraits$TIInventoryTile$$super$"; + assertEquals( + new TreeSet<>( + Arrays.asList( + "bindPart(Lcodechicken/multipart/TMultiPart;)V", + "canExtractItem(ILnet/minecraft/item/ItemStack;I)Z", + "canInsertItem(ILnet/minecraft/item/ItemStack;I)Z", + "clearParts()V", + "closeInventory()V", + "copyFrom(Lcodechicken/multipart/TileMultipart;)V", + "decrStackSize(II)Lnet/minecraft/item/ItemStack;", + "getAccessibleSlotsFromSide(I)[I", + "getInventoryName()Ljava/lang/String;", + "getInventoryStackLimit()I", + "getSizeInventory()I", + "getStackInSlot(I)Lnet/minecraft/item/ItemStack;", + "getStackInSlotOnClosing(I)Lnet/minecraft/item/ItemStack;", + "hasCustomInventoryName()Z", + "invList()Ljava/util/LinkedList;", + "invList_$eq(Ljava/util/LinkedList;)V", + "isItemValidForSlot(ILnet/minecraft/item/ItemStack;)Z", + "isUseableByPlayer(Lnet/minecraft/entity/player/EntityPlayer;)Z", + "openInventory()V", + "partRemoved(Lcodechicken/multipart/TMultiPart;I)V", + "rebuildSlotMap()V", + "setInventorySlotContents(ILnet/minecraft/item/ItemStack;)V", + "slotMap()[Lscala/Tuple2;", + "slotMap_$eq([Lscala/Tuple2;)V", + inventoryPrefix + "bindPart(Lcodechicken/multipart/TMultiPart;)V", + inventoryPrefix + "clearParts()V", + inventoryPrefix + "copyFrom(Lcodechicken/multipart/TileMultipart;)V", + inventoryPrefix + "partRemoved(Lcodechicken/multipart/TMultiPart;I)V")), + inventorySignatures); + + Set javaSignatures = new TreeSet<>(); + for (java.lang.reflect.Method method : javaTrait.getDeclaredMethods()) { + javaSignatures.add(method.getName() + org.objectweb.asm.Type.getMethodDescriptor(method)); + } + String javaPrefix = "codechicken$multipart$scalatraits$JInventoryTile$$"; + assertEquals( + new TreeSet<>( + Arrays.asList( + "bindPart(Lcodechicken/multipart/TMultiPart;)V", + "canExtractItem(ILnet/minecraft/item/ItemStack;I)Z", + "canInsertItem(ILnet/minecraft/item/ItemStack;I)Z", + "clearParts()V", + "closeInventory()V", + "copyFrom(Lcodechicken/multipart/TileMultipart;)V", + "decrStackSize(II)Lnet/minecraft/item/ItemStack;", + "getAccessibleSlotsFromSide(I)[I", + "getInventoryName()Ljava/lang/String;", + "getInventoryStackLimit()I", + "getSizeInventory()I", + "getStackInSlot(I)Lnet/minecraft/item/ItemStack;", + "getStackInSlotOnClosing(I)Lnet/minecraft/item/ItemStack;", + "hasCustomInventoryName()Z", + "invList()Ljava/util/LinkedList;", + "invList_$eq(Ljava/util/LinkedList;)V", + "isItemValidForSlot(ILnet/minecraft/item/ItemStack;)Z", + "isUseableByPlayer(Lnet/minecraft/entity/player/EntityPlayer;)Z", + "openInventory()V", + "partRemoved(Lcodechicken/multipart/TMultiPart;I)V", + "rebuildSlotMap()V", + "refreshInventorySlots()V", + "setInventorySlotContents(ILnet/minecraft/item/ItemStack;)V", + "slotMap()[Lscala/Tuple2;", + "slotMap_$eq([Lscala/Tuple2;)V", + javaPrefix + "invList()Ljava/util/LinkedList;", + javaPrefix + "invList_$eq(Ljava/util/LinkedList;)V", + javaPrefix + "slotMap()[Lscala/Tuple2;", + javaPrefix + "slotMap_$eq([Lscala/Tuple2;)V", + inventoryPrefix + "bindPart(Lcodechicken/multipart/TMultiPart;)V", + inventoryPrefix + "clearParts()V", + inventoryPrefix + "copyFrom(Lcodechicken/multipart/TileMultipart;)V", + inventoryPrefix + "partRemoved(Lcodechicken/multipart/TMultiPart;I)V", + javaPrefix + "super$bindPart(Lcodechicken/multipart/TMultiPart;)V", + javaPrefix + "super$clearParts()V", + javaPrefix + "super$copyFrom(Lcodechicken/multipart/TileMultipart;)V", + javaPrefix + "super$partRemoved(Lcodechicken/multipart/TMultiPart;I)V")), + javaSignatures); + + String fieldPrefix = "codechicken$multipart$scalatraits$JInventoryTile$$"; + java.lang.reflect.Field listField = first.getClass().getDeclaredField(fieldPrefix + "invList"); + java.lang.reflect.Field mapField = first.getClass().getDeclaredField(fieldPrefix + "slotMap"); + assertEquals(LinkedList.class, listField.getType()); + assertEquals(scala.Tuple2[].class, mapField.getType()); + assertTrue(Modifier.isPrivate(listField.getModifiers())); + assertTrue(Modifier.isPrivate(mapField.getModifiers())); + + LinkedList firstList = (LinkedList) javaTrait.getMethod("invList").invoke(first); + LinkedList secondList = (LinkedList) javaTrait.getMethod("invList").invoke(second); + Object[] firstMap = (Object[]) javaTrait.getMethod("slotMap").invoke(first); + Object[] secondMap = (Object[]) javaTrait.getMethod("slotMap").invoke(second); + assertTrue(firstList.isEmpty()); + assertEquals(0, firstMap.length); + assertNotSame(firstList, secondList, "Each generated tile must initialize its inventory list"); + assertNotSame(firstMap, secondMap, "Each generated tile must initialize its slot map"); + + LinkedList replacementList = new LinkedList<>(); + scala.Tuple2[] replacementMap = new scala.Tuple2[0]; + javaTrait.getMethod("invList_$eq", LinkedList.class).invoke(first, replacementList); + javaTrait.getMethod("slotMap_$eq", scala.Tuple2[].class).invoke(first, (Object) replacementMap); + assertSame(replacementList, javaTrait.getMethod("invList").invoke(first)); + assertSame(replacementMap, javaTrait.getMethod("slotMap").invoke(first)); + } + + @Test + void generatesClientAndRandomDisplayTickTraitsWithTheirExactHierarchy() throws Exception { + int clientTraitId = MultipartMixinFactory.getId(TileMultipartClient.class.getName().replace('.', '/')); + int randomTraitId = MultipartMixinFactory.getId(TRandomDisplayTickTile.class.getName().replace('.', '/')); + assertFalse(clientTraitId < 0); + assertFalse(randomTraitId < 0); + + BitSet clientTraits = new BitSet(); + clientTraits.set(clientTraitId); + Object first = MultipartMixinFactory.construct(clientTraits, Nil$.MODULE$); + Object second = MultipartMixinFactory.construct(clientTraits, Nil$.MODULE$); + BitSet randomTraits = (BitSet) clientTraits.clone(); + randomTraits.set(randomTraitId); + Object randomTile = MultipartMixinFactory.construct(randomTraits, Nil$.MODULE$); + Class clientTrait = Class.forName("codechicken.multipart.TileMultipartClient"); + Class randomTrait = Class.forName("codechicken.multipart.scalatraits.TRandomDisplayTickTile"); + + assertTrue(first instanceof TileMultipart); + assertTrue(first instanceof TileMultipartClient); + assertTrue(randomTile instanceof TileMultipartClient); + assertTrue(randomTile instanceof TRandomDisplayTickTile); + assertTrue(clientTrait.isInterface()); + assertTrue(randomTrait.isInterface()); + assertEquals(0, clientTrait.getInterfaces().length); + assertArrayEquals(new Class[] { TileMultipartClient.class }, randomTrait.getInterfaces()); + assertNotSame(first, second); + assertSame(first.getClass(), second.getClass()); + assertNotSame(first.getClass(), randomTile.getClass()); + assertEquals(0, clientTrait.getDeclaredFields().length); + assertEquals(0, randomTrait.getDeclaredFields().length); + + org.objectweb.asm.tree.ClassNode clientNode = codechicken.multipart.asm.ASMMixinCompiler$.MODULE$ + .classNode("codechicken/multipart/TileMultipartClient"); + org.objectweb.asm.tree.ClassNode randomNode = codechicken.multipart.asm.ASMMixinCompiler$.MODULE$ + .classNode("codechicken/multipart/scalatraits/TRandomDisplayTickTile"); + assertTrue((clientNode.access & org.objectweb.asm.Opcodes.ACC_INTERFACE) != 0); + assertTrue((randomNode.access & org.objectweb.asm.Opcodes.ACC_INTERFACE) != 0); + assertEquals(Collections.emptyList(), clientNode.interfaces); + assertEquals(Collections.singletonList("codechicken/multipart/TileMultipartClient"), randomNode.interfaces); + assertEquals(0, clientNode.fields.size()); + assertEquals(0, randomNode.fields.size()); + + Set clientSignatures = new TreeSet<>(); + for (org.objectweb.asm.tree.MethodNode method : clientNode.methods) { + clientSignatures.add(method.name + method.desc); + } + String prefix = "codechicken$multipart$TileMultipartClient$$"; + assertEquals( + new TreeSet<>( + Arrays.asList( + prefix + "cachedRenderBounds()Lnet/minecraft/util/AxisAlignedBB;", + prefix + "cachedRenderBounds_$eq(Lnet/minecraft/util/AxisAlignedBB;)V", + prefix + "dynamicCache()[Lcodechicken/multipart/TMultiPart;", + prefix + "dynamicCache_$eq([Lcodechicken/multipart/TMultiPart;)V", + prefix + "staticCache()[Lcodechicken/multipart/TMultiPart;", + prefix + "staticCache_$eq([Lcodechicken/multipart/TMultiPart;)V", + prefix + "super$markRender()V", + "getRenderBoundingBox()Lnet/minecraft/util/AxisAlignedBB;", + "hasDynamicParts()Z", + "hasDynamicParts_$eq(Z)V", + "markRender()V", + "randomDisplayTick(Ljava/util/Random;)V", + "renderDynamic(Lcodechicken/lib/vec/Vector3;FI)V", + "renderStatic(Lnet/minecraft/world/IBlockAccess;Lcodechicken/lib/vec/Vector3;" + + "Lnet/minecraft/client/renderer/RenderBlocks;)Z", + "shouldRenderInPass(I)Z", + "updateRenderCache()V")), + clientSignatures); + + Set randomSignatures = new TreeSet<>(); + for (org.objectweb.asm.tree.MethodNode method : randomNode.methods) { + randomSignatures.add(method.name + method.desc); + } + assertEquals(new TreeSet<>(Arrays.asList("randomDisplayTick(Ljava/util/Random;)V")), randomSignatures); + + assertGeneratedField(first, prefix + "cachedRenderBounds", net.minecraft.util.AxisAlignedBB.class); + assertGeneratedField(first, prefix + "staticCache", TMultiPart[].class); + assertGeneratedField(first, prefix + "dynamicCache", TMultiPart[].class); + assertGeneratedField(first, "hasDynamicParts", boolean.class); + } + + private static void assertGeneratedField(Object tile, String name, Class type) throws Exception { + java.lang.reflect.Field field = tile.getClass().getDeclaredField(name); + assertEquals(type, field.getType()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + } + + @Test + void generatedJavaTraitOverridesPartialOcclusion() throws Exception { + PartialPart existing = new PartialPart(voxel(0)); + TileMultipart tile = MultipartHelper.createTileFromParts(Collections.singletonList(existing)); + TileMultipart second = MultipartHelper + .createTileFromParts(Collections.singletonList(new PartialPart(voxel(2)))); + Class trait = Class.forName("codechicken.multipart.scalatraits.TPartialOcclusionTile"); + + assertTrue(trait.isInterface(), "The registered Java mixin class is rewritten to a trait interface"); + assertTrue(trait.isInstance(tile)); + assertSame(tile.getClass(), second.getClass(), "The Java trait combination must keep using the class cache"); + assertEquals(0, trait.getDeclaredFields().length); + Set signatures = new TreeSet<>(); + for (java.lang.reflect.Method method : trait.getDeclaredMethods()) { + signatures.add(method.getName() + org.objectweb.asm.Type.getMethodDescriptor(method)); + } + assertEquals( + new TreeSet<>( + Arrays.asList( + "codechicken$multipart$scalatraits$TPartialOcclusionTile$$super$occlusionTest" + + "(Lscala/collection/Seq;Lcodechicken/multipart/TMultiPart;)Z", + "occlusionTest(Lscala/collection/Seq;Lcodechicken/multipart/TMultiPart;)Z", + "partialOcclusionTest(Lscala/collection/Seq;)Z")), + signatures); + assertEquals( + boolean.class, + tile.getClass().getMethod("partialOcclusionTest", scala.collection.Seq.class).getReturnType()); + assertTrue(tile.canAddPart(new PartialPart(voxel(1)))); + assertFalse(tile.canAddPart(new PartialPart(voxel(0)))); + assertTrue(tile.occlusionTest(tile.partList(), new PartialPart(voxel(1)))); + assertFalse(tile.occlusionTest(tile.partList(), new PartialPart(voxel(0)))); + } + + @Test + void javaOcclusionQueryDispatchesThroughTheGeneratedPartialTrait() { + PartialPart existing = new PartialPart(voxel(0)); + PartialPart overlapping = new PartialPart(voxel(0)); + PartialPart disjoint = new PartialPart(voxel(1)); + TileMultipart tile = MultipartHelper.createTileFromParts(Collections.singletonList(existing)); + + assertTrue( + new TileMultipart().testOcclusion(Collections.singletonList(existing), overlapping), + "Pair tests alone allow these parts; the generated aggregate check must reject them"); + assertFalse(tile.testOcclusion(Collections.singletonList(existing), overlapping)); + assertTrue(tile.testOcclusion(Collections.singletonList(existing), disjoint)); + assertEquals(Collections.singletonList(existing), tile.jPartList()); + assertSame(tile, existing.tile()); + assertNull(overlapping.tile()); + assertNull(disjoint.tile()); + } + + @Test + void generatedServerPassThroughDelegatesCopiesAndAllowsOnlyOneImplementor() throws Exception { + PassThroughPart part = new PassThroughPart(); + TileMultipart tile = MultipartHelper.createTileFromParts(Collections.singletonList(part)); + + assertTrue(tile instanceof GeneratorPassThroughFixture); + GeneratorPassThroughFixture api = (GeneratorPassThroughFixture) tile; + assertEquals(12, api.transform(5)); + assertEquals("part:value", api.transform("value")); + assertSame(part, api.implementation()); + assertFalse(tile.canAddPart(new PassThroughPart())); + + TileMultipart copy = (TileMultipart) tile.getClass().getDeclaredConstructor().newInstance(); + copy.from(tile); + assertSame(part, ((GeneratorPassThroughFixture) copy).implementation()); + assertSame(copy, part.tile()); + + copy.partRemoved(part, 0); + assertTrue(copy.canAddPart(new PassThroughPart()), "Removing the delegate must clear the generated impl field"); + } + + private static Cuboid6 voxel(int x) { + return new Cuboid6(x / 8d, 0, 0, (x + 1) / 8d, 1 / 8d, 1 / 8d); + } + + private static final class PartialPart extends TMultiPart implements JPartialOcclusion { + + private final Cuboid6 box; + + private PartialPart(Cuboid6 box) { + this.box = box; + } + + @Override + public String getType() { + return "partial_fixture"; + } + + @Override + public Iterable getPartialOcclusionBoxes() { + return Collections.singletonList(box); + } + } + + private static final class PassThroughPart extends TMultiPart implements GeneratorPassThroughFixture { + + @Override + public String getType() { + return "pass_through_fixture"; + } + + @Override + public int transform(int value) { + return value + 7; + } + + @Override + public String transform(String value) { + return "part:" + value; + } + + @Override + public TMultiPart implementation() { + return this; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ForgeMultipartFunctionalTestMod.java b/src/functionalTest/java/codechicken/multipart/test/ForgeMultipartFunctionalTestMod.java new file mode 100644 index 0000000..0760761 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ForgeMultipartFunctionalTestMod.java @@ -0,0 +1,136 @@ +package codechicken.multipart.test; + +import java.io.File; +import java.io.PrintWriter; +import java.nio.file.FileSystems; +import java.nio.file.Path; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.ChatComponentText; + +import org.junit.platform.engine.discovery.DiscoverySelectors; +import org.junit.platform.launcher.Launcher; +import org.junit.platform.launcher.LauncherDiscoveryRequest; +import org.junit.platform.launcher.LauncherSession; +import org.junit.platform.launcher.TestPlan; +import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder; +import org.junit.platform.launcher.core.LauncherFactory; +import org.junit.platform.launcher.listeners.SummaryGeneratingListener; +import org.junit.platform.launcher.listeners.TestExecutionSummary; +import org.junit.platform.reporting.legacy.xml.LegacyXmlReportGeneratingListener; + +import codechicken.microblock.MicroblockGenerator; +import codechicken.multipart.MultipartGenerator; +import codechicken.multipart.examples.BlockConversionExample; +import codechicken.multipart.examples.CustomTileTraitExample; +import codechicken.multipart.examples.IlluminatedMicroblockExample; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.registry.GameRegistry; + +@Mod( + modid = "ForgeMultipartTests", + name = "ForgeMultipart Functional Tests", + version = "1.0", + dependencies = "required-after:ForgeMultipart", + acceptableRemoteVersions = "*") +public final class ForgeMultipartFunctionalTestMod { + + static boolean preInitialized; + static boolean initialized; + static boolean postInitialized; + static boolean serverAboutToStart; + static boolean serverStarted; + static int externalScalaMicroblockTraitId; + static Block illuminatedLamp; + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + illuminatedLamp = new Block(Material.glass) {}; + GameRegistry.registerBlock(illuminatedLamp, "illuminated_lamp"); + preInitialized = true; + } + + @Mod.EventHandler + public void init(FMLInitializationEvent event) { + PartRegistrationFunctionalTest.registerDuringInit(); + MultipartGenerator.registerPassThroughInterface(GeneratorPassThroughFixture.class.getName(), false, true); + CustomTileTraitExample.register(); + externalScalaMicroblockTraitId = MicroblockGenerator + .registerTrait("codechicken.multipart.test.ExternalScalaMicroblockFixture"); + IlluminatedMicroblockExample.registerMaterials(illuminatedLamp); + BlockConversionExample.register(illuminatedLamp); + initialized = true; + } + + @Mod.EventHandler + public void postInit(FMLPostInitializationEvent event) { + postInitialized = true; + } + + @Mod.EventHandler + public void serverAboutToStart(FMLServerAboutToStartEvent event) { + serverAboutToStart = true; + } + + @Mod.EventHandler + public void serverStarted(FMLServerStartedEvent event) { + serverStarted = true; + MinecraftServer server = MinecraftServer.getServer(); + server.addChatMessage(new ChatComponentText("Running ForgeMultipart functional tests...")); + + if (Boolean.getBoolean("forgemultipart.profileFunctionalTests")) { + ForgeMultipartProfileWorkload.run(); + } + + TestExecutionSummary summary = runTests(); + if (summary.getTestsFoundCount() == 0) { + throw new IllegalStateException("No ForgeMultipart functional tests were discovered"); + } + if (summary.getTotalFailureCount() > 0) { + throw new IllegalStateException( + "ForgeMultipart functional tests failed; check junit-out and the server log"); + } + + server.addChatMessage(new ChatComponentText("ForgeMultipart functional tests passed")); + server.initiateShutdown(); + } + + private static TestExecutionSummary runTests() { + System.setProperty("junit.platform.reporting.open.xml.enabled", "false"); + Path reportDirectory = FileSystems.getDefault().getPath("./junit-out/").toAbsolutePath(); + File reportDirectoryFile = reportDirectory.toFile(); + reportDirectoryFile.mkdirs(); + File[] oldReports = reportDirectoryFile.listFiles((directory, name) -> name.endsWith(".xml")); + if (oldReports != null) { + for (File oldReport : oldReports) { + oldReport.delete(); + } + } + + LauncherDiscoveryRequest discovery = LauncherDiscoveryRequestBuilder.request() + .selectors(DiscoverySelectors.selectPackage("codechicken.multipart.test")).build(); + SummaryGeneratingListener summaryListener = new SummaryGeneratingListener(); + PrintWriter stderr = new PrintWriter(System.err, true); + LegacyXmlReportGeneratingListener xmlListener = new LegacyXmlReportGeneratingListener(reportDirectory, stderr); + + try (LauncherSession session = LauncherFactory.openSession()) { + Launcher launcher = session.getLauncher(); + TestPlan plan = launcher.discover(discovery); + launcher.registerTestExecutionListeners(summaryListener, xmlListener); + launcher.execute(plan); + } + + TestExecutionSummary summary = summaryListener.getSummary(); + summary.printFailuresTo(stderr, 32); + summary.printTo(stderr); + stderr.flush(); + return summary; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ForgeMultipartProfileWorkload.java b/src/functionalTest/java/codechicken/multipart/test/ForgeMultipartProfileWorkload.java new file mode 100644 index 0000000..89fdab8 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ForgeMultipartProfileWorkload.java @@ -0,0 +1,323 @@ +package codechicken.multipart.test; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.PrintWriter; +import java.lang.management.ManagementFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.util.ForgeDirection; + +import codechicken.multipart.BlockMultipart; +import codechicken.multipart.IRedstonePart; +import codechicken.multipart.IRedstoneTile; +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.runtime.AbstractFunction1; +import scala.runtime.BoxedUnit; + +/** Fixed workload used only by the opt-in JFR baseline run. */ +final class ForgeMultipartProfileWorkload { + + private static final int PART_COUNT = 8; + private static final int WARMUP_ITERATIONS = 1_000_000; + private static final int PROFILE_ITERATIONS = 50_000_000; + private static volatile long sink; + + private ForgeMultipartProfileWorkload() {} + + static void run() { + List tickingParts = new ArrayList<>(); + for (int i = 0; i < PART_COUNT; i++) { + tickingParts.add(new ProfilePart()); + } + TileMultipart tickingTile = MultipartHelper.createTileFromParts(tickingParts); + ProfileBlockAccess blockAccess = new ProfileBlockAccess(tickingTile); + + List redstoneParts = new ArrayList<>(); + for (int i = 0; i < PART_COUNT; i++) { + redstoneParts.add(new RedstoneProfilePart(i)); + } + TileMultipart redstoneTile = MultipartHelper.createTileFromParts(redstoneParts); + IRedstoneTile redstone = (IRedstoneTile) redstoneTile; + CountingFunction operation = new CountingFunction(); + com.sun.management.ThreadMXBean allocationBean = allocationBean(); + long threadId = Thread.currentThread().getId(); + + profileUpdateEntity(tickingTile, WARMUP_ITERATIONS); + profileOperate(tickingTile, operation, WARMUP_ITERATIONS); + profileLightValue(tickingTile, WARMUP_ITERATIONS); + profileGetTile(blockAccess, WARMUP_ITERATIONS); + profileRedstone(redstoneTile, redstone, WARMUP_ITERATIONS); + + long updateStartMillis = System.currentTimeMillis(); + long updateStartBytes = allocationBean.getThreadAllocatedBytes(threadId); + long updateStart = System.nanoTime(); + profileUpdateEntity(tickingTile, PROFILE_ITERATIONS); + long updateNanos = System.nanoTime() - updateStart; + long updateBytes = allocationBean.getThreadAllocatedBytes(threadId) - updateStartBytes; + + long operateStartMillis = System.currentTimeMillis(); + long operateStartBytes = allocationBean.getThreadAllocatedBytes(threadId); + long operateStart = System.nanoTime(); + profileOperate(tickingTile, operation, PROFILE_ITERATIONS); + long operateNanos = System.nanoTime() - operateStart; + long operateBytes = allocationBean.getThreadAllocatedBytes(threadId) - operateStartBytes; + + long lightStartMillis = System.currentTimeMillis(); + long lightStartBytes = allocationBean.getThreadAllocatedBytes(threadId); + long lightStart = System.nanoTime(); + long lightChecksum = profileLightValue(tickingTile, PROFILE_ITERATIONS); + long lightNanos = System.nanoTime() - lightStart; + long lightBytes = allocationBean.getThreadAllocatedBytes(threadId) - lightStartBytes; + + long getTileStartMillis = System.currentTimeMillis(); + long getTileStartBytes = allocationBean.getThreadAllocatedBytes(threadId); + long getTileStart = System.nanoTime(); + long getTileChecksum = profileGetTile(blockAccess, PROFILE_ITERATIONS); + long getTileNanos = System.nanoTime() - getTileStart; + long getTileBytes = allocationBean.getThreadAllocatedBytes(threadId) - getTileStartBytes; + + long redstoneStartMillis = System.currentTimeMillis(); + long redstoneStartBytes = allocationBean.getThreadAllocatedBytes(threadId); + long redstoneStart = System.nanoTime(); + long redstoneChecksum = profileRedstone(redstoneTile, redstone, PROFILE_ITERATIONS); + long redstoneNanos = System.nanoTime() - redstoneStart; + long redstoneBytes = allocationBean.getThreadAllocatedBytes(threadId) - redstoneStartBytes; + + long updateChecksum = 0; + for (TMultiPart part : tickingParts) { + updateChecksum += ((ProfilePart) part).updates; + } + sink = updateChecksum + operation.applications + lightChecksum + getTileChecksum + redstoneChecksum; + writeResults( + updateStartMillis, + updateNanos, + updateBytes, + operateStartMillis, + operateNanos, + operateBytes, + lightStartMillis, + lightNanos, + lightBytes, + getTileStartMillis, + getTileNanos, + getTileBytes, + redstoneStartMillis, + redstoneNanos, + redstoneBytes, + sink); + } + + private static void profileUpdateEntity(TileMultipart tile, int iterations) { + for (int i = 0; i < iterations; i++) { + tile.updateEntity(); + } + } + + private static void profileOperate(TileMultipart tile, CountingFunction operation, int iterations) { + for (int i = 0; i < iterations; i++) { + tile.operate(operation); + } + } + + private static long profileLightValue(TileMultipart tile, int iterations) { + long checksum = 0; + for (int i = 0; i < iterations; i++) { + checksum += tile.getLightValue(); + } + return checksum; + } + + private static long profileGetTile(IBlockAccess world, int iterations) { + long checksum = 0; + for (int i = 0; i < iterations; i++) { + if (BlockMultipart.getTile(world, 0, 0, 0) != null) { + checksum++; + } + } + return checksum; + } + + private static long profileRedstone(TileMultipart tile, IRedstoneTile redstone, int iterations) { + long checksum = 0; + for (int i = 0; i < iterations; i++) { + int side = i % 6; + checksum += tile.strongPowerLevel(side); + checksum += redstone.getConnectionMask(side); + checksum += redstone.weakPowerLevel(side, 0x1F); + } + return checksum; + } + + private static void writeResults(long updateStartMillis, long updateNanos, long updateBytes, + long operateStartMillis, long operateNanos, long operateBytes, long lightStartMillis, long lightNanos, + long lightBytes, long getTileStartMillis, long getTileNanos, long getTileBytes, long redstoneStartMillis, + long redstoneNanos, long redstoneBytes, long checksum) { + File output = new File("forgemultipart-profile.txt"); + try (PrintWriter writer = new PrintWriter(output)) { + writer.printf(Locale.ROOT, "java=%s%n", System.getProperty("java.runtime.version")); + writer.printf(Locale.ROOT, "parts=%d%n", PART_COUNT); + writer.printf(Locale.ROOT, "warmupIterations=%d%n", WARMUP_ITERATIONS); + writer.printf(Locale.ROOT, "profileIterations=%d%n", PROFILE_ITERATIONS); + writeTiming(writer, "updateEntity", updateStartMillis, updateNanos, updateBytes); + writeTiming(writer, "operate", operateStartMillis, operateNanos, operateBytes); + writeTiming(writer, "lightValue", lightStartMillis, lightNanos, lightBytes); + writeTiming(writer, "getTile", getTileStartMillis, getTileNanos, getTileBytes); + writeTiming(writer, "redstoneQueries", redstoneStartMillis, redstoneNanos, redstoneBytes); + writer.printf(Locale.ROOT, "checksum=%d%n", checksum); + } catch (FileNotFoundException e) { + throw new IllegalStateException("Could not write ForgeMultipart profile results", e); + } + } + + private static void writeTiming(PrintWriter writer, String name, long startMillis, long nanos, + long allocatedBytes) { + double seconds = nanos / 1_000_000_000d; + writer.printf(Locale.ROOT, "%s.startEpochMillis=%d%n", name, startMillis); + writer.printf(Locale.ROOT, "%s.nanos=%d%n", name, nanos); + writer.printf(Locale.ROOT, "%s.operationsPerSecond=%.0f%n", name, PROFILE_ITERATIONS / seconds); + writer.printf(Locale.ROOT, "%s.allocatedBytes=%d%n", name, allocatedBytes); + writer.printf( + Locale.ROOT, + "%s.allocatedBytesPerOperation=%.1f%n", + name, + allocatedBytes / (double) PROFILE_ITERATIONS); + } + + private static com.sun.management.ThreadMXBean allocationBean() { + java.lang.management.ThreadMXBean bean = ManagementFactory.getThreadMXBean(); + if (!(bean instanceof com.sun.management.ThreadMXBean)) { + throw new IllegalStateException("The profiling JVM does not expose thread allocation counters"); + } + com.sun.management.ThreadMXBean allocationBean = (com.sun.management.ThreadMXBean) bean; + if (!allocationBean.isThreadAllocatedMemorySupported()) { + throw new IllegalStateException("The profiling JVM does not support thread allocation counters"); + } + if (!allocationBean.isThreadAllocatedMemoryEnabled()) { + allocationBean.setThreadAllocatedMemoryEnabled(true); + } + return allocationBean; + } + + private static class ProfilePart extends TMultiPart { + + private int updates; + + @Override + public String getType() { + return "profile_part"; + } + + @Override + public boolean doesTick() { + return true; + } + + @Override + public void update() { + updates++; + } + } + + private static final class RedstoneProfilePart extends ProfilePart implements IRedstonePart { + + private final int power; + + private RedstoneProfilePart(int power) { + this.power = power; + } + + @Override + public int strongPowerLevel(int side) { + return power + side; + } + + @Override + public int weakPowerLevel(int side) { + return power + side; + } + + @Override + public boolean canConnectRedstone(int side) { + return true; + } + } + + private static final class CountingFunction extends AbstractFunction1 { + + private long applications; + + @Override + public BoxedUnit apply(TMultiPart part) { + applications++; + return BoxedUnit.UNIT; + } + } + + private static final class ProfileBlockAccess implements IBlockAccess { + + private final TileEntity tile; + + private ProfileBlockAccess(TileEntity tile) { + this.tile = tile; + } + + @Override + public Block getBlock(int x, int y, int z) { + return null; + } + + @Override + public TileEntity getTileEntity(int x, int y, int z) { + return tile; + } + + @Override + public int getLightBrightnessForSkyBlocks(int x, int y, int z, int minimum) { + return 0; + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + return 0; + } + + @Override + public int isBlockProvidingPowerTo(int x, int y, int z, int direction) { + return 0; + } + + @Override + public boolean isAirBlock(int x, int y, int z) { + return false; + } + + @Override + public BiomeGenBase getBiomeGenForCoords(int x, int z) { + return null; + } + + @Override + public int getHeight() { + return 0; + } + + @Override + public boolean extendedLevelsInChunkCache() { + return false; + } + + @Override + public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean defaultValue) { + return defaultValue; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/GeneratorPassThroughFixture.java b/src/functionalTest/java/codechicken/multipart/test/GeneratorPassThroughFixture.java new file mode 100644 index 0000000..10f582b --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/GeneratorPassThroughFixture.java @@ -0,0 +1,13 @@ +package codechicken.multipart.test; + +import codechicken.multipart.TMultiPart; + +/** Representative external tile API for generated pass-through characterization. */ +public interface GeneratorPassThroughFixture { + + int transform(int value); + + String transform(String value); + + TMultiPart implementation(); +} diff --git a/src/functionalTest/java/codechicken/multipart/test/GrassMicroMaterialFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/GrassMicroMaterialFunctionalTest.java new file mode 100644 index 0000000..a4c395f --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/GrassMicroMaterialFunctionalTest.java @@ -0,0 +1,63 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.init.Blocks; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.GrassMicroMaterial; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.TopMicroMaterial; +import codechicken.microblock.TopMicroMaterial$; + +class GrassMicroMaterialFunctionalTest { + + @Test + void dedicatedServerKeepsTheCommonRenderingSurfaceAndRegisteredMaterials() throws Exception { + GrassMicroMaterial grass = (GrassMicroMaterial) MicroMaterialRegistry.getMaterial("minecraft:grass"); + TopMicroMaterial mycelium = (TopMicroMaterial) MicroMaterialRegistry.getMaterial("minecraft:mycelium"); + assertSame(Blocks.grass, grass.block()); + assertEquals(0, grass.meta()); + assertEquals("minecraft:grass", grass.blockKey()); + assertSame(Blocks.mycelium, mycelium.block()); + assertEquals(0, mycelium.meta()); + assertEquals("minecraft:mycelium", mycelium.blockKey()); + + assertEquals( + new TreeSet<>(Arrays.asList("loadIcons", "renderMicroFace", "sideIconT", "sideIconT_$eq")), + publicDeclaredMethodNames(GrassMicroMaterial.class)); + assertEquals( + new TreeSet<>(Arrays.asList("$lessinit$greater$default$2", "renderMicroFace")), + publicDeclaredMethodNames(TopMicroMaterial.class)); + assertEquals( + new TreeSet<>(Arrays.asList("$lessinit$greater$default$2")), + publicDeclaredMethodNames(TopMicroMaterial$.class)); + + Field overlay = GrassMicroMaterial.class.getDeclaredField("sideIconT"); + assertFalse(Modifier.isStatic(overlay.getModifiers())); + assertSame(TopMicroMaterial$.MODULE$, TopMicroMaterial$.class.getField("MODULE$").get(null)); + assertEquals(0, TopMicroMaterial.$lessinit$greater$default$2()); + assertTrue(TopMicroMaterial.class.isInstance(mycelium)); + } + + private static Set publicDeclaredMethodNames(Class type) { + Set names = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + names.add(method.getName()); + } + } + return names; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/HollowMicroblockClientFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/HollowMicroblockClientFunctionalTest.java new file mode 100644 index 0000000..8dd8258 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/HollowMicroblockClientFunctionalTest.java @@ -0,0 +1,308 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.List; + +import net.minecraft.util.IIcon; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.HollowMicroClass$; +import codechicken.microblock.HollowMicroblock$class; +import codechicken.microblock.HollowMicroblockClient; +import codechicken.microblock.HollowMicroblockClient$class; +import codechicken.microblock.ISidedHollowConnect; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.Microblock; +import codechicken.microblock.TMicroOcclusionClient$class; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.Function5; +import scala.runtime.AbstractFunction5; +import scala.runtime.BoxedUnit; + +class HollowMicroblockClientFunctionalTest { + + @Test + void realBoundsAndLiveCenterConnectorDriveClientMaskAndRimsOnAllFortyTwoShapes() { + ClientProbe part = new ClientProbe(MicroMaterialRegistry.materialID("minecraft:stone")); + SlotTile tile = new SlotTile(); + part.bind(tile); + for (int size = 1; size <= 7; size++) { + for (int side = 0; side < 6; side++) { + part.setShape(size, side); + for (int opening : new int[] { 1, 8, 11 }) { + tile.connector.size = opening; + part.recalcBounds(); + assertEquals(opening << 8, part.renderMask()); + assertEquals(side, tile.connector.side); + Cuboid6 physical = part.getBounds(); + assertNotSame(physical, part.renderBounds()); + assertBounds(physical, part.renderBounds()); + int[] calls = { 0 }; + double[] volume = { 0 }; + part.renderHollow( + new Vector3(), + 0, + part.renderBounds(), + 0, + false, + new AbstractFunction5() { + + @Override + public BoxedUnit apply(Vector3 pos, IMicroMaterial material, Object pass, Cuboid6 box, + Object mask) { + assertSame(part.getIMaterial(), material); + assertEquals(0, pass); + // The first two callbacks draw internal walls; the last four span the rim volume. + if (calls[0]++ >= 2) volume[0] += (box.max.x - box.min.x) * (box.max.y - box.min.y) + * (box.max.z - box.min.z); + return BoxedUnit.UNIT; + } + }); + assertEquals(6, calls[0]); + assertEquals(size / 8D * (1 - opening / 16D * (opening / 16D)), volume[0], 1e-12); + } + tile.connected = false; + part.recalcBounds(); + assertEquals(8 << 8, part.renderMask()); + tile.connected = true; + } + } + } + + @Test + void occlusionClientRefreshesClippingAndMasksWithLiveStoneAndGlassNeighbors() { + int stone = MicroMaterialRegistry.materialID("minecraft:stone"); + int glass = MicroMaterialRegistry.materialID("minecraft:glass"); + assertNotEquals(stone, glass); + ClientProbe part = new ClientProbe(stone); + ClientProbe neighbor = new ClientProbe(stone); + SlotTile tile = new SlotTile(); + part.bind(tile); + tile.connector.size = 8; + part.setShape(2, 4); + neighbor.setShape(1, 0); + tile.neighbor = neighbor; + TMicroOcclusionClient$class.recalcBounds(part); + assertEquals(1, part.renderMask()); + assertEquals(0, part.renderBounds().min.y); + Cuboid6 original = part.getBounds().copy(); + neighbor.setShape(4, 0); + part.recalcBounds(); + assertEquals(8 << 8, part.renderMask()); + assertEquals(0.5, part.renderBounds().min.y); + assertBounds(original, part.getBounds()); + neighbor.material_$eq(glass); + TMicroOcclusionClient$class.recalcBounds(part); + assertEquals(0, part.renderMask()); + assertBounds(original, part.renderBounds()); + part.material_$eq(glass); + neighbor.material_$eq(stone); + neighbor.setShape(1, 0); + TMicroOcclusionClient$class.recalcBounds(part); + assertEquals(0.125, part.renderBounds().min.y); + assertEquals(0, part.renderMask()); + tile.neighbor = null; + TMicroOcclusionClient$class.recalcBounds(part); + assertNotSame(part.getBounds(), part.renderBounds()); + assertBounds(original, part.renderBounds()); + assertEquals(0, part.renderMask()); + } + + private static void assertBounds(Cuboid6 expected, Cuboid6 actual) { + assertArrayEquals( + new double[] { expected.min.x, expected.min.y, expected.min.z, expected.max.x, expected.max.y, + expected.max.z }, + new double[] { actual.min.x, actual.min.y, actual.min.z, actual.max.x, actual.max.y, actual.max.z }, + 1e-12); + } + + private static final class Connector extends TMultiPart implements ISidedHollowConnect { + + int size; + int side; + + @Override + public String getType() { + return "test:hollow_connector"; + } + + @Override + public int getHollowSize(int side) { + this.side = side; + return size; + } + } + + private static final class SlotTile extends TileMultipart { + + final Connector connector = new Connector(); + boolean connected = true; + TMultiPart neighbor; + + @Override + public TMultiPart partMap(int slot) { + return slot == 0 ? neighbor : slot == 6 && connected ? connector : null; + } + } + + /** Uses client helpers with real Forge factories; the dedicated server strips client factory creation. */ + private static final class ClientProbe extends Microblock implements HollowMicroblockClient { + + Cuboid6 bounds; + int mask; + + ClientProbe(int material) { + super(material); + HollowMicroblockClient$class.$init$(this); + } + + @Override + public HollowMicroClass$ microClass() { + return HollowMicroClass$.MODULE$; + } + + @Override + public int itemClassID() { + return microClass().getClassId(); + } + + @Override + public int redstoneConductionMap() { + return HollowMicroblock$class.redstoneConductionMap(this); + } + + @Override + public int getSlotMask() { + return 1 << getSlot(); + } + + @Override + public boolean edgeCornerOcclusionTest(codechicken.microblock.TMicroOcclusion edge, + codechicken.microblock.TMicroOcclusion corner) { + return codechicken.microblock.TMicroOcclusion$class.edgeCornerOcclusionTest(this, edge, corner); + } + + @Override + public List getCollisionBoxes() { + return HollowMicroblock$class.getCollisionBoxes(this); + } + + @Override + public List getSubParts() { + return HollowMicroblock$class.getSubParts(this); + } + + @Override + public Cuboid6 getBounds() { + return HollowMicroblock$class.getBounds(this); + } + + @Override + public int getSlot() { + return getShape(); + } + + @Override + public int getHollowSize() { + return HollowMicroblock$class.getHollowSize(this); + } + + @Override + public List getPartialOcclusionBoxes() { + return HollowMicroblock$class.getPartialOcclusionBoxes(this); + } + + @Override + public Iterable getOcclusionBoxes() { + return HollowMicroblock$class.getOcclusionBoxes(this); + } + + @Override + public boolean allowCompleteOcclusion() { + return true; + } + + @Override + public boolean solid(int side) { + return false; + } + + @Override + public Cuboid6 renderBounds() { + return bounds; + } + + @Override + public void renderBounds_$eq(Cuboid6 value) { + bounds = value; + } + + @Override + public int renderMask() { + return mask; + } + + @Override + public void renderMask_$eq(int value) { + mask = value; + } + + @Override + public int getPriorityClass() { + return 0; + } + + @Override + public IIcon getBrokenIcon(int side) { + throw new AssertionError("icon lookup"); + } + + @Override + public void recalcBounds() { + HollowMicroblockClient$class.recalcBounds(this); + } + + @Override + public void render(Vector3 pos, int pass) { + HollowMicroblockClient$class.render(this, pos, pass); + } + + @Override + public void renderHollow(Vector3 pos, int pass, Cuboid6 c, int sideMask, boolean face, + Function5 f) { + HollowMicroblockClient$class.renderHollow(this, pos, pass, c, sideMask, face, f); + } + + public void codechicken$microblock$HollowMicroblockClient$$super$recalcBounds() { + TMicroOcclusionClient$class.recalcBounds(this); + } + + public boolean codechicken$microblock$HollowMicroblock$$super$occlusionTest(TMultiPart other) { + return super.occlusionTest(other); + } + + public boolean codechicken$microblock$TMicroOcclusion$$super$occlusionTest(TMultiPart other) { + return super.occlusionTest(other); + } + + public void codechicken$microblock$TMicroOcclusionClient$$super$onAdded() { + super.onAdded(); + } + + public void codechicken$microblock$TMicroOcclusionClient$$super$onPartChanged(TMultiPart other) { + super.onPartChanged(other); + } + + public void codechicken$microblock$TMicroOcclusionClient$$super$read(MCDataInput packet) { + super.read(packet); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/HollowMicroblockTraitsFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/HollowMicroblockTraitsFunctionalTest.java new file mode 100644 index 0000000..d38b9fe --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/HollowMicroblockTraitsFunctionalTest.java @@ -0,0 +1,248 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + +import net.minecraft.nbt.NBTTagCompound; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutputWrapper; +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.vec.Cuboid6; +import codechicken.microblock.FaceMicroClass; +import codechicken.microblock.HollowMicroClass$; +import codechicken.microblock.HollowMicroblock; +import codechicken.microblock.ISidedHollowConnect; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockGenerator; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.MatchError; +import scala.collection.JavaConversions; +import scala.collection.Seq; + +class HollowMicroblockTraitsFunctionalTest { + + @Test + void generatedHollowsKeepAllThicknessesOrientationsAndLiveConnectorOpenings() { + Microblock part = create(); + HollowMicroblock hollow = (HollowMicroblock) part; + Connector connector = new Connector(); + part.bind(new TileMultipart() { + + @Override + public TMultiPart partMap(int slot) { + assertEquals(6, slot); + return connector; + } + }); + assertSame(HollowMicroClass$.MODULE$, part.microClass()); + assertEquals("mcr_hllw", part.getType()); + for (int thickness = 1; thickness <= 7; thickness++) { + for (int side = 0; side < 6; side++) { + part.setShape(thickness, side); + for (int opening : new int[] { 0, 1, 8, 11 }) { + connector.size = opening; + assertEquals(opening, hollow.getHollowSize()); + assertEquals(side, connector.lastSide); + double t = thickness / 8D; + double gap = opening / 16D; + assertEquals(t * (1 - gap * gap), volume(hollow.getCollisionBoxes()), 1e-12); + assertEquals(t * (0.75 * 0.75 - gap * gap), volume(hollow.getOcclusionBoxes()), 1e-12); + assertEquals(t * (1 - 0.75 * 0.75), volume(hollow.getPartialOcclusionBoxes()), 1e-12); + int axis = new int[] { 1, 2, 0 }[side / 2]; + List collision = hollow.getCollisionBoxes(); + List subparts = hollow.getSubParts(); + assertEquals(4, collision.size()); + assertEquals(4, subparts.size()); + for (int i = 0; i < 4; i++) { + Cuboid6 box = collision.get(i); + double[] min = { box.min.x, box.min.y, box.min.z }; + double[] max = { box.max.x, box.max.y, box.max.z }; + assertEquals((side & 1) == 0 ? 0 : 1 - t, min[axis], 1e-12); + assertEquals((side & 1) == 0 ? t : 1, max[axis], 1e-12); + assertBox(box, subparts.get(i)); + assertEquals(0, subparts.get(i).data); + if (opening > 0) { + boolean missesCenter = false; + for (int j = 0; j < 3; j++) if (j != axis) missesCenter |= max[j] < 0.5 || min[j] > 0.5; + assertTrue(missesCenter, "central connector must fit through the hollow cover"); + } + } + assertSame(FaceMicroClass.aBounds()[thickness * 16 + side], part.getBounds()); + } + } + } + } + + @Test + @SuppressWarnings("unchecked") + void partialBoxesRemainLiveJavaViewsAndBoundsKeepSignedIndexFailures() { + Microblock part = create(); + HollowMicroblock hollow = (HollowMicroblock) part; + HollowMicroClass$ factory = HollowMicroClass$.MODULE$; + Cuboid6[] bounds = FaceMicroClass.aBounds(); + Seq[] partial = factory.pBoxes(); + Cuboid6 sentinel = new Cuboid6(0.1, 0.2, 0.3, 0.4, 0.5, 0.6); + part.setShape(3, 0); + try { + Cuboid6[] replacementBounds = new Cuboid6[256]; + replacementBounds[48] = sentinel; + FaceMicroClass.aBounds_$eq(replacementBounds); + assertSame(sentinel, part.getBounds()); + Seq[] replacement = (Seq[]) new Seq[256]; + List backing = new ArrayList<>(Arrays.asList(sentinel)); + replacement[48] = JavaConversions.asScalaBuffer(backing); + factory.pBoxes_$eq(replacement); + List view = hollow.getPartialOcclusionBoxes(); + assertSame(sentinel, view.get(0)); + backing.add(Cuboid6.full); + assertEquals(2, view.size()); + view.remove(0); + assertSame(Cuboid6.full, backing.get(0)); + replacement[48] = null; + List nullView = hollow.getPartialOcclusionBoxes(); + assertNotNull(nullView); + assertThrows(NullPointerException.class, nullView::size); + part.shape_$eq((byte) 0); + assertNull(part.getBounds()); + for (int shape = -128; shape < 0; shape++) { + part.shape_$eq((byte) shape); + assertThrows(ArrayIndexOutOfBoundsException.class, part::getBounds); + assertThrows(ArrayIndexOutOfBoundsException.class, hollow::getPartialOcclusionBoxes); + } + part.setShape(3, 0); + factory.pBoxes_$eq((Seq[]) new Seq[1]); + assertThrows(ArrayIndexOutOfBoundsException.class, hollow::getPartialOcclusionBoxes); + factory.pBoxes_$eq(null); + FaceMicroClass.aBounds_$eq(null); + assertThrows(NullPointerException.class, hollow::getPartialOcclusionBoxes); + assertThrows(NullPointerException.class, part::getBounds); + } finally { + factory.pBoxes_$eq(partial); + FaceMicroClass.aBounds_$eq(bounds); + } + } + + @Test + void normalBoxesUseLiveBoundsAndKeepNullIndexAndInvalidSlotFailureOrder() { + Microblock part = create(); + HollowMicroblock hollow = (HollowMicroblock) part; + HollowMicroClass$ factory = HollowMicroClass$.MODULE$; + Cuboid6[] original = factory.occBounds(); + Cuboid6[] replacement = new Cuboid6[256]; + replacement[48] = new Cuboid6(0.1, 0.2, 0.3, 0.9, 0.8, 0.7); + try { + factory.occBounds_$eq(replacement); + part.setShape(3, 0); + List boxes = (List) hollow.getOcclusionBoxes(); + assertEquals(4, boxes.size()); + assertBox(new Cuboid6(0.75, 0.2, 0.25, 0.9, 0.8, 0.75), boxes.get(0)); + assertThrows(UnsupportedOperationException.class, () -> boxes.set(0, Cuboid6.full)); + replacement[48].max.x = 0.8; + assertEquals(0.8, hollow.getOcclusionBoxes().iterator().next().max.x); + assertEquals(0.9, boxes.get(0).max.x); + for (int slot = 6; slot < 16; slot++) { + part.setShape(3, slot); + assertThrows(NullPointerException.class, hollow::getOcclusionBoxes); + replacement[48 + slot] = Cuboid6.full; + assertEquals( + Integer.toString(slot) + " (of class java.lang.Integer)", + assertThrows(MatchError.class, hollow::getOcclusionBoxes).getMessage()); + } + part.shape_$eq((byte) -1); + assertThrows(ArrayIndexOutOfBoundsException.class, hollow::getOcclusionBoxes); + factory.occBounds_$eq(null); + assertThrows(NullPointerException.class, hollow::getOcclusionBoxes); + } finally { + factory.occBounds_$eq(original); + } + } + + @Test + void allFortyTwoShapesKeepMaterialAndPackedNbtAndDescriptionBytes() { + Microblock part = create(); + Microblock loaded = create(); + ByteArrayOutputStream prefixBytes = new ByteArrayOutputStream(); + MicroMaterialRegistry.writeMaterialID(new MCDataOutputWrapper(new DataOutputStream(prefixBytes)), 0); + byte[] prefix = prefixBytes.toByteArray(); + for (int thickness = 1; thickness <= 7; thickness++) { + for (int side = 0; side < 6; side++) { + byte shape = (byte) (thickness * 16 + side); + part.setShape(thickness, side); + NBTTagCompound tag = new NBTTagCompound(); + part.save(tag); + assertEquals(shape, tag.getByte("shape")); + assertEquals(MicroMaterialRegistry.materialName(0), tag.getString("material")); + loaded.load(tag); + assertEquals(shape, loaded.shape()); + assertEquals(0, loaded.material()); + assertSame(part.getBounds(), loaded.getBounds()); + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + part.writeDesc(new MCDataOutputWrapper(new DataOutputStream(bytes))); + byte[] expected = Arrays.copyOf(prefix, prefix.length + 1); + expected[prefix.length] = shape; + assertArrayEquals(expected, bytes.toByteArray()); + AtomicInteger reads = new AtomicInteger(); + MCDataInput input = (MCDataInput) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, args) -> { + assertEquals("readByte", method.getName()); + reads.incrementAndGet(); + return shape; + }); + loaded.setShape(1, 0); + loaded.readDesc(input); + assertEquals(1, reads.get()); + assertEquals(shape, loaded.shape()); + assertSame(part.getBounds(), loaded.getBounds()); + } + } + } + + private static Microblock create() { + return MicroblockGenerator.create(HollowMicroClass$.MODULE$, 0, false); + } + + private static double volume(Iterable boxes) { + double result = 0; + for (Cuboid6 box : boxes) result += (box.max.x - box.min.x) * (box.max.y - box.min.y) * (box.max.z - box.min.z); + return result; + } + + private static void assertBox(Cuboid6 expected, Cuboid6 actual) { + assertArrayEquals( + new double[] { expected.min.x, expected.min.y, expected.min.z, expected.max.x, expected.max.y, + expected.max.z }, + new double[] { actual.min.x, actual.min.y, actual.min.z, actual.max.x, actual.max.y, actual.max.z }, + 1e-12); + } + + private static final class Connector extends TMultiPart implements ISidedHollowConnect { + + int size; + int lastSide; + + @Override + public String getType() { + return "test:hollow_connector"; + } + + @Override + public int getHollowSize(int side) { + lastSide = side; + return size; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/IlluminatedMicroblockFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/IlluminatedMicroblockFunctionalTest.java new file mode 100644 index 0000000..a189e93 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/IlluminatedMicroblockFunctionalTest.java @@ -0,0 +1,228 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.nbt.NBTTagCompound; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.CornerMicroClass$; +import codechicken.microblock.EdgeMicroClass$; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.HollowMicroClass$; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockClass; +import codechicken.microblock.MicroblockGenerator; +import codechicken.microblock.PostMicroClass$; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.examples.IlluminatedMicroMaterial; +import codechicken.multipart.examples.IlluminatedMicroblockExample; +import codechicken.multipart.examples.IlluminatedMicroblockTrait; + +class IlluminatedMicroblockFunctionalTest { + + @Test + void registeredJavaMaterialComposesWithEveryShapeAndKeepsPersistenceAndClassCaching() throws Exception { + assertTrue(IlluminatedMicroblockTrait.class.isInterface()); + assertThrows( + NoSuchMethodException.class, + () -> IlluminatedMicroblockTrait.class + .getDeclaredMethod("renderDynamic", Vector3.class, float.class, int.class)); + for (int meta = 16; meta < 32; meta++) { + IlluminatedMicroMaterial material = (IlluminatedMicroMaterial) MicroMaterialRegistry + .getMaterial(BlockMicroMaterial.materialKey(ForgeMultipartFunctionalTestMod.illuminatedLamp, meta)); + assertSame(ForgeMultipartFunctionalTestMod.illuminatedLamp, material.block()); + assertEquals(meta, material.meta()); + BitSet server = new BitSet(); + server.set(10000); + BitSet client = (BitSet) server.clone(); + material.addTraits(server, FaceMicroClass$.MODULE$, false); + material.addTraits(client, FaceMicroClass$.MODULE$, true); + assertEquals(server, client); + assertEquals(2, server.cardinality()); + } + for (MicroblockClass factory : families()) { + Microblock first = create(factory, 19); + Microblock second = create(factory, 31); + assertTrue(first instanceof IlluminatedMicroblockTrait); + assertSame(factory, first.microClass()); + assertSame(first.getClass(), second.getClass()); + assertNotSame(first, second); + assertTrue(first.shouldRenderDynamic()); + assertNull(first.tile()); + first.setShape(3, slot(factory)); + NBTTagCompound tag = new NBTTagCompound(); + first.save(tag); + assertEquals( + BlockMicroMaterial.materialKey(ForgeMultipartFunctionalTestMod.illuminatedLamp, 19), + tag.getString("material")); + second.load(tag); + assertEquals(first.shape(), second.shape()); + assertEquals(first.material(), second.material()); + } + List seenMetadata = new ArrayList<>(); + Block lamp = new Block(Material.glass) { + + @Override + public int getHarvestLevel(int metadata) { + seenMetadata.add(metadata); + return metadata; + } + }; + for (int meta = 16; meta < 32; meta++) { + assertEquals(meta - 16, new IlluminatedMicroMaterial(lamp, meta, 0).getCutterStrength()); + } + assertEquals(16, seenMetadata.size()); + } + + @Test + void lightAggregationUsesOnlyTraitMembersWithReferenceRoundingAndNoDetachedFilter() { + Microblock first = create(FaceMicroClass$.MODULE$, 16); + Microblock second = create(CornerMicroClass$.MODULE$, 17); + Microblock plain = FaceMicroClass$.MODULE$.create(false, MicroMaterialRegistry.materialID("minecraft:stone")); + TileMultipart tile = new TileMultipart(); + first.bind(tile); + first.setShape(1, 0); + second.setShape(2, 7); + tile.setPartList(Arrays.asList(first, plain, second)); + try { + IlluminatedMicroblockExample.dimLampParts = () -> true; + assertEquals(5, first.getLightValue()); + assertNull(second.tile(), "Detached siblings are deliberately included by jPartList traversal"); + second.setShape(7, 7); + assertEquals(15, first.getLightValue()); + tile.setPartList(Arrays.asList(plain)); + assertEquals(0, first.getLightValue()); + IlluminatedMicroblockExample.dimLampParts = () -> false; + assertEquals(0, first.getLightValue()); + tile.setPartList(Arrays.asList(second)); + assertEquals(15, first.getLightValue()); + first.bind(null); + assertThrows(NullPointerException.class, first::getLightValue); + } finally { + IlluminatedMicroblockExample.dimLampParts = () -> false; + } + } + + @Test + void haloGeometryCopiesCollisionBoundsAndKeepsHollowOpeningOnEverySide() { + for (MicroblockClass factory : new MicroblockClass[] { FaceMicroClass$.MODULE$, CornerMicroClass$.MODULE$, + EdgeMicroClass$.MODULE$, PostMicroClass$.MODULE$ }) { + Microblock part = create(factory, 16); + part.setShape(2, slot(factory)); + List original = new ArrayList<>(); + for (Cuboid6 box : part.getCollisionBoxes()) original.add(box.copy()); + List halo = IlluminatedMicroblockExample.haloBoxes(part); + assertEquals(original.size(), halo.size()); + int i = 0; + for (Cuboid6 box : part.getCollisionBoxes()) { + assertBox(original.get(i), box); + assertBox(original.get(i).copy().expand(0.025), halo.get(i)); + i++; + } + } + Microblock hollow = create(HollowMicroClass$.MODULE$, 18); + for (int side = 0; side < 6; side++) { + hollow.setShape(2, side); + List halo = IlluminatedMicroblockExample.haloBoxes(hollow); + assertEquals(4, halo.size()); + // Default opening width is 8/16. These golden local bounds include the reference's trimmed middle strips. + Cuboid6[] local = { new Cuboid6(-0.025, -0.025, -0.025, 1.025, 0.275, 0.275), + new Cuboid6(-0.025, -0.025, 0.725, 1.025, 0.275, 1.025), + new Cuboid6(-0.025, -0.025, 0.275, 0.275, 0.275, 0.725), + new Cuboid6(0.725, -0.025, 0.275, 1.025, 0.275, 0.725) }; + for (int i = 0; i < 4; i++) { + assertBox(local[i].apply(Rotation.sideRotations[side].at(Vector3.center)), halo.get(i)); + } + } + } + + @Test + void retainedClientMethodCompilesAndSubmitsHaloWithoutAClientOrGpu() throws Exception { + // Exercise the actual compiled client body with a uniquely named compiler probe. This does not simulate a + // physical + // client. + try { + ClassNode input = ASMHelper.createClassNode( + Launch.classLoader.getClassBytes("codechicken.multipart.examples.IlluminatedMicroblockTrait"), + 0); + input.name = "codechicken/multipart/test/IlluminatedClientProbe"; + MethodNode render = input.methods.stream().map(m -> (MethodNode) m) + .filter(m -> m.name.equals("renderDynamic")).findFirst().get(); + assertTrue(render.visibleAnnotations.stream().anyMatch(a -> a.desc.endsWith("/SideOnly;"))); + render.visibleAnnotations.clear(); // Keep just this body for the headless compiler probe. + MixinClassesFunctionalTest.COMPILER.registerJavaTrait(input); + Class composite = MixinClassesFunctionalTest.COMPILER.mixinClasses( + "codechicken/multipart/test/IlluminatedClientComposite", + "codechicken/microblock/Microblock", + MixinClassesFunctionalTest.seq("codechicken/microblock/FaceMicroblock", input.name)); + Microblock part = (Microblock) composite.getConstructor(int.class).newInstance( + MicroMaterialRegistry.materialID( + BlockMicroMaterial.materialKey(ForgeMultipartFunctionalTestMod.illuminatedLamp, 21))); + part.setShape(2, 0); + TileMultipart tile = new TileMultipart(); + tile.xCoord = 4; + tile.yCoord = 5; + tile.zCoord = 6; + part.bind(tile); + List submitted = new ArrayList<>(); + IlluminatedMicroblockExample.haloRenderer = (x, y, z, colour, bounds) -> { + assertEquals(Arrays.asList(4, 5, 6, 5), Arrays.asList(x, y, z, colour)); + submitted.add(bounds); + }; + java.lang.reflect.Method method = composite + .getDeclaredMethod("renderDynamic", Vector3.class, float.class, int.class); + method.invoke(part, new Vector3(99, 99, 99), 0.5F, 1); + assertTrue(submitted.isEmpty()); + method.invoke(part, new Vector3(99, 99, 99), 0.5F, 0); + assertEquals(1, submitted.size()); + assertBox(IlluminatedMicroblockExample.haloBoxes(part).get(0), submitted.get(0)); + } finally { + IlluminatedMicroblockExample.haloRenderer = null; + } + } + + private static int slot(MicroblockClass factory) { + if (factory == CornerMicroClass$.MODULE$) return 7; + if (factory == EdgeMicroClass$.MODULE$) return 15; + return 0; + } + + private static MicroblockClass[] families() { + return new MicroblockClass[] { FaceMicroClass$.MODULE$, HollowMicroClass$.MODULE$, CornerMicroClass$.MODULE$, + EdgeMicroClass$.MODULE$, PostMicroClass$.MODULE$ }; + } + + private static Microblock create(MicroblockClass factory, int meta) { + return MicroblockGenerator.create( + factory, + MicroMaterialRegistry.materialID( + BlockMicroMaterial.materialKey(ForgeMultipartFunctionalTestMod.illuminatedLamp, meta)), + false); + } + + private static void assertBox(Cuboid6 expected, Cuboid6 actual) { + assertEquals(expected.min.x, actual.min.x, 1e-9); + assertEquals(expected.min.y, actual.min.y, 1e-9); + assertEquals(expected.min.z, actual.min.z, 1e-9); + assertEquals(expected.max.x, actual.max.x, 1e-9); + assertEquals(expected.max.y, actual.max.y, 1e-9); + assertEquals(expected.max.z, actual.max.z, 1e-9); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/JavaTraitRegistrationFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/JavaTraitRegistrationFunctionalTest.java new file mode 100644 index 0000000..7746716 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/JavaTraitRegistrationFunctionalTest.java @@ -0,0 +1,436 @@ +package codechicken.multipart.test; + +import static codechicken.multipart.test.MixinClassesFunctionalTest.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TypeInsnNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import cpw.mods.fml.common.asm.transformers.SideTransformer; +import scala.MatchError; +import scala.collection.JavaConversions; + +class JavaTraitRegistrationFunctionalTest { + + private static final String ROOT = "codechicken/multipart/test/javatrait/"; + + @Test + void rejectsInterfacesThenInnerClassesWithoutPublishing() throws Exception { + try (Scope scope = new Scope()) { + ClassNode input = input("Rejected", "java/lang/Object"); + input.access |= ACC_INTERFACE | ACC_ABSTRACT; + input.visitInnerClass(input.name + "$Nested", input.name, "Nested", ACC_PUBLIC); + assertFailure( + input, + "Cannot register java interface " + input.name + + " as a mixin trait. Try register passThroughInterface"); + input.access &= ~ACC_INTERFACE; + assertFailure( + input, + "Inner classes are not permitted for " + input.name + " as a java mixin trait. Use scala"); + assertFalse(scope.bytes.contains(input.name)); + assertFalse(scope.bytes.contains(input.name + "$class")); + assertFalse(scope.mixins.contains(input.name)); + } + } + + @Test + void executesInitializationFieldAccessVirtualSelfCallsAndSuperDispatchWithoutMutatingInput() throws Exception { + try (Scope scope = new Scope()) { + ClassNode parent = base("JavaBase"); + scope.define(parent); + ClassNode input = input("Executable", parent.name); + input.sourceFile = "OriginalJavaTrait.java"; + input.visitField(ACC_PRIVATE, "count", "I", null, null); + MethodNode constructor = method(input, ""); + constructor.instructions.remove(constructor.instructions.getLast()); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitIntInsn(BIPUSH, 12); + constructor.visitFieldInsn(PUTFIELD, input.name, "count", "I"); + constructor.visitInsn(RETURN); + constructor.visitMaxs(2, 1); + MethodVisitor increment = input + .visitMethod(ACC_PROTECTED, "increment", "(I)I", null, new String[] { "java/io/IOException" }); + increment.visitVarInsn(ALOAD, 0); + increment.visitInsn(DUP); + increment.visitFieldInsn(GETFIELD, input.name, "count", "I"); + increment.visitVarInsn(ILOAD, 1); + increment.visitInsn(IADD); + increment.visitFieldInsn(PUTFIELD, input.name, "count", "I"); + increment.visitVarInsn(ALOAD, 0); + increment.visitFieldInsn(GETFIELD, input.name, "count", "I"); + increment.visitInsn(IRETURN); + increment.visitMaxs(3, 2); + MethodVisitor call = input.visitMethod(ACC_PUBLIC, "call", "()I", null, null); + call.visitVarInsn(ALOAD, 0); + call.visitInsn(ICONST_3); + call.visitMethodInsn(INVOKEVIRTUAL, input.name, "increment", "(I)I", false); + call.visitInsn(IRETURN); + call.visitMaxs(2, 1); + MethodVisitor score = input.visitMethod(ACC_PUBLIC, "score", "()I", null, null); + score.visitVarInsn(ALOAD, 0); + score.visitMethodInsn(INVOKESPECIAL, parent.name, "score", "()I", false); + score.visitInsn(ICONST_2); + score.visitInsn(IADD); + score.visitInsn(IRETURN); + score.visitMaxs(2, 1); + byte[] before = ASMHelper.createBytes(input, 0); + COMPILER.internalDefine(input.name, before); + COMPILER.registerJavaTrait(input); + assertArrayEquals(before, ASMHelper.createBytes(input, 0)); + MixinInfo info = COMPILER.getMixinInfo(input.name).get(); + assertEquals(parent.name, info.parent()); + assertEquals(Arrays.asList("score()I"), JavaConversions.seqAsJavaList(info.supers())); + assertEquals(Arrays.asList("increment(I)I", "call()I", "score()I"), signatures(info)); + assertEquals("OriginalJavaTrait.java", COMPILER.classNode(input.name + "$class").sourceFile); + Object result = COMPILER.mixinClasses(ROOT + "ExecutableComposite", parent.name, seq(input.name)) + .getConstructor(int.class).newInstance(20); + assertEquals(15, result.getClass().getMethod("call").invoke(result)); + assertEquals(18, result.getClass().getMethod("call").invoke(result)); + assertEquals(22, result.getClass().getMethod("score").invoke(result)); + assertEquals(18, result.getClass().getMethod(input.name.replace('/', '$') + "$$count").invoke(result)); + assertArrayEquals( + new Class[] { java.io.IOException.class }, + result.getClass().getMethod("increment", int.class).getExceptionTypes()); + } + } + + @Test + void matchingAccessorsAreSkippedBeforeConversionIncludingAnOtherwiseInvalidBody() throws Exception { + try (Scope scope = new Scope()) { + ClassNode parent = base("AccessorJavaBase"); + scope.define(parent); + ClassNode input = input("Accessor", parent.name); + input.visitField(ACC_PUBLIC, "value", "I", null, null); + MethodVisitor getter = input.visitMethod(ACC_PUBLIC, "value", "()I", null, null); + getter.visitInsn(ICONST_1); + getter.visitIntInsn(NEWARRAY, T_INT); + getter.visitInsn(ARETURN); + getter.visitMaxs(1, 1); + constant(input, "value", "(I)I", 91, ACC_PUBLIC); + constant(input, "hidden", "()I", 6, ACC_PRIVATE); + COMPILER.registerJavaTrait(input); + MixinInfo info = COMPILER.getMixinInfo(input.name).get(); + assertEquals(Arrays.asList("value(I)I"), signatures(info)); + ClassNode helper = COMPILER.classNode(input.name + "$class"); + assertEquals(ACC_PRIVATE | ACC_STATIC, method(helper, "hidden").access); + assertEquals(1, helper.methods.stream().filter(m -> ((MethodNode) m).name.equals("value")).count()); + Object result = COMPILER.mixinClasses(ROOT + "AccessorComposite", parent.name, seq(input.name)) + .getConstructor(int.class).newInstance(0); + result.getClass().getMethod("value_$eq", int.class).invoke(result, 28); + assertEquals(28, result.getClass().getMethod("value").invoke(result)); + assertEquals(91, result.getClass().getMethod("value", int.class).invoke(result, 8)); + } + } + + @Test + void parentTraitsRetainTheirBaseAndDeduplicateTheImplementedInterface() throws Exception { + try (Scope scope = new Scope()) { + ClassNode parent = base("ParentJavaBase"); + scope.define(parent); + ClassNode first = input("Parent", parent.name); + constant(first, "fromParent", "()I", 17, ACC_PUBLIC); + COMPILER.registerJavaTrait(first); + MixinInfo firstInfo = COMPILER.getMixinInfo(first.name).get(); + ClassNode second = input("Child", first.name); + second.interfaces.add(first.name); + constant(second, "fromChild", "()I", 23, ACC_PUBLIC); + COMPILER.registerJavaTrait(second); + MixinInfo childInfo = COMPILER.getMixinInfo(second.name).get(); + assertEquals(parent.name, childInfo.parent()); + assertEquals(1, childInfo.parentTraits().size()); + assertSame(firstInfo, childInfo.parentTraits().apply(0)); + assertEquals(Arrays.asList(first.name), COMPILER.classNode(second.name).interfaces); + Object value = COMPILER.mixinClasses(ROOT + "ChildComposite", parent.name, seq(second.name)) + .getConstructor(int.class).newInstance(9); + assertEquals(17, value.getClass().getMethod("fromParent").invoke(value)); + assertEquals(23, value.getClass().getMethod("fromChild").invoke(value)); + assertEquals(9, value.getClass().getMethod("score").invoke(value)); + } + } + + @Test + void childTraitSuperCallDispatchesToRegisteredParentTrait() throws Exception { + try (Scope scope = new Scope()) { + ClassNode parent = base("SuperChildJavaBase"); + scope.define(parent); + ClassNode first = input("SuperParent", parent.name); + constant(first, "score", "()I", 17, ACC_PUBLIC); + COMPILER.registerJavaTrait(first); + ClassNode second = input("SuperChild", first.name); + MethodVisitor score = second.visitMethod(ACC_PUBLIC, "score", "()I", null, null); + score.visitVarInsn(ALOAD, 0); + score.visitMethodInsn(INVOKESPECIAL, first.name, "score", "()I", false); + score.visitInsn(ICONST_1); + score.visitInsn(IADD); + score.visitInsn(IRETURN); + score.visitMaxs(2, 1); + COMPILER.internalDefine(second.name, ASMHelper.createBytes(second, 0)); + COMPILER.registerJavaTrait(second); + Object value = COMPILER.mixinClasses(ROOT + "SuperChildComposite", parent.name, seq(second.name)) + .getConstructor(int.class).newInstance(9); + assertEquals(18, value.getClass().getMethod("score").invoke(value)); + } + } + + @Test + void childTraitSuperCallFallsBackToBaseWhenParentTraitDoesNotOverride() throws Exception { + try (Scope scope = new Scope()) { + ClassNode parent = base("SuperBaseChildJavaBase"); + scope.define(parent); + ClassNode first = input("SuperBaseParent", parent.name); + constant(first, "fromParent", "()I", 17, ACC_PUBLIC); + COMPILER.registerJavaTrait(first); + ClassNode second = input("SuperBaseChild", first.name); + MethodVisitor score = second.visitMethod(ACC_PUBLIC, "score", "()I", null, null); + score.visitVarInsn(ALOAD, 0); + score.visitMethodInsn(INVOKESPECIAL, first.name, "score", "()I", false); + score.visitInsn(ICONST_1); + score.visitInsn(IADD); + score.visitInsn(IRETURN); + score.visitMaxs(2, 1); + COMPILER.internalDefine(second.name, ASMHelper.createBytes(second, 0)); + COMPILER.registerJavaTrait(second); + Object value = COMPILER.mixinClasses(ROOT + "SuperBaseChildComposite", parent.name, seq(second.name)) + .getConstructor(int.class).newInstance(9); + assertEquals(10, value.getClass().getMethod("score").invoke(value)); + } + } + + @Test + void sideOnlyAnnotationsStripOppositeJavaMembersAndInitializationOnTheServer() throws Exception { + try (Scope scope = new Scope()) { + ClassNode parent = base("SideJavaBase"); + scope.define(parent); + ClassNode input = input("SideOnly", parent.name); + input.visitField(ACC_PRIVATE, "clientVisibleField", "I", null, null) + .visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", true) + .visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "CLIENT"); + input.visitField(ACC_PRIVATE, "clientInvisibleField", "I", null, null) + .visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", false) + .visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "CLIENT"); + input.visitField(ACC_PRIVATE, "serverField", "I", null, null) + .visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", true) + .visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "SERVER"); + MethodNode constructor = method(input, ""); + constructor.visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", true) + .visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "CLIENT"); + constructor.instructions.remove(constructor.instructions.getLast()); + initialize(constructor, input.name, "clientVisibleField", 11); + initialize(constructor, input.name, "clientInvisibleField", 13); + initialize(constructor, input.name, "serverField", 17); + constructor.visitInsn(RETURN); + constructor.visitMaxs(2, 1); + constant(input, "clientVisible", "()I", 37, ACC_PUBLIC); + method(input, "clientVisible").visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", true) + .visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "CLIENT"); + constant(input, "clientInvisible", "()I", 41, ACC_PUBLIC); + method(input, "clientInvisible").visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", false) + .visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "CLIENT"); + MethodVisitor clientInvalid = input.visitMethod(ACC_PUBLIC, "clientInvalid", "()[I", null, null); + clientInvalid.visitInsn(ICONST_1); + clientInvalid.visitIntInsn(NEWARRAY, T_INT); + clientInvalid.visitInsn(ARETURN); + clientInvalid.visitMaxs(1, 1); + clientInvalid.visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", true) + .visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "CLIENT"); + constant(input, "serverVisible", "()I", 43, ACC_PUBLIC); + method(input, "serverVisible").visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", true) + .visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "SERVER"); + COMPILER.registerJavaTrait(input); + MixinInfo info = COMPILER.getMixinInfo(input.name).get(); + assertEquals(Arrays.asList("serverVisible()I"), signatures(info)); + assertEquals(1, info.fields().size()); + assertEquals("serverField", info.fields().apply(0).name()); + Object value = COMPILER.mixinClasses(ROOT + "SideComposite", parent.name, seq(input.name)) + .getConstructor(int.class).newInstance(0); + assertThrows(NoSuchMethodException.class, () -> value.getClass().getMethod("clientVisible")); + assertThrows(NoSuchMethodException.class, () -> value.getClass().getMethod("clientInvisible")); + assertThrows(NoSuchMethodException.class, () -> value.getClass().getMethod("clientInvalid")); + assertEquals(43, value.getClass().getMethod("serverVisible").invoke(value)); + String fieldPrefix = input.name.replace('/', '$') + "$$"; + assertThrows( + NoSuchMethodException.class, + () -> value.getClass().getMethod(fieldPrefix + "clientVisibleField")); + assertThrows( + NoSuchMethodException.class, + () -> value.getClass().getMethod(fieldPrefix + "clientInvisibleField")); + assertEquals(0, value.getClass().getMethod(fieldPrefix + "serverField").invoke(value)); + } + } + + @Test + void alreadyStrippedForgeConstructorStillSuppliesAnEmptyMixinInitializer() throws Exception { + try (Scope scope = new Scope()) { + ClassNode parent = base("PrestrippedSideJavaBase"); + scope.define(parent); + ClassNode input = input("PrestrippedSide", parent.name); + input.visitField(ACC_PRIVATE, "state", "I", null, null); + MethodNode constructor = method(input, ""); + constructor.visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", true) + .visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "CLIENT"); + constructor.instructions.remove(constructor.instructions.getLast()); + initialize(constructor, input.name, "state", 29); + constructor.visitInsn(RETURN); + constructor.visitMaxs(2, 1); + constant(input, "available", "()I", 47, ACC_PUBLIC); + ClassNode stripped = ASMHelper.createClassNode( + new SideTransformer().transform(input.name, input.name, ASMHelper.createBytes(input, 0)), + 0); + assertTrue(stripped.methods.stream().noneMatch(m -> ((MethodNode) m).name.equals(""))); + COMPILER.registerJavaTrait(stripped); + Object value = COMPILER.mixinClasses(ROOT + "PrestrippedSideComposite", parent.name, seq(input.name)) + .getConstructor(int.class).newInstance(7); + assertEquals(7, value.getClass().getMethod("score").invoke(value)); + assertEquals(47, value.getClass().getMethod("available").invoke(value)); + assertEquals(0, value.getClass().getMethod(input.name.replace('/', '$') + "$$state").invoke(value)); + } + } + + @Test + void constructorArgumentsStaticInitializersAndInvalidSuperSequencesFailBeforePublishing() throws Exception { + try (Scope scope = new Scope()) { + ClassNode args = input("Arguments", "java/lang/Object"); + method(args, "").desc = "(I)V"; + assertFailure(args, "Constructor arguments are not permitted " + args.name + " as a mixin trait"); + ClassNode statics = input("StaticInitializer", "java/lang/Object"); + constant(statics, "earlier", "()I", 5, ACC_PUBLIC); + MethodVisitor clinit = statics.visitMethod(ACC_STATIC, "", "()V", null, null); + clinit.visitInsn(RETURN); + assertFailure(statics, "Static initialisers are not permitted " + statics.name + " as a mixin trait"); + ClassNode invalid = input("InvalidConstructor", "java/lang/Object"); + MethodNode constructor = method(invalid, ""); + constructor.instructions.remove(constructor.instructions.getFirst()); + IllegalArgumentException failure = assertThrows( + IllegalArgumentException.class, + () -> COMPILER.registerJavaTrait(invalid)); + assertTrue(failure.getMessage().startsWith("Invalid constructor insn sequence " + invalid.name + "\n")); + for (ClassNode node : Arrays.asList(args, statics, invalid)) { + assertFalse(scope.bytes.contains(node.name)); + assertFalse(scope.bytes.contains(node.name + "$class")); + assertFalse(scope.mixins.contains(node.name)); + } + } + } + + @Test + void primitiveArrayAndForeignFieldFailuresRetainTheirOriginalTypesAndInput() throws Exception { + try (Scope scope = new Scope()) { + ClassNode arrays = input("PrimitiveArray", "java/lang/Object"); + MethodVisitor array = arrays.visitMethod(ACC_PUBLIC, "array", "()[I", null, null); + array.visitInsn(ICONST_1); + array.visitIntInsn(NEWARRAY, T_INT); + array.visitInsn(ARETURN); + array.visitMaxs(1, 1); + byte[] before = ASMHelper.createBytes(arrays, 0); + assertEquals( + "188 (of class java.lang.Integer)", + assertThrows(MatchError.class, () -> COMPILER.registerJavaTrait(arrays)).getMessage()); + assertArrayEquals(before, ASMHelper.createBytes(arrays, 0)); + ClassNode foreign = input("ForeignField", "java/lang/Object"); + MethodVisitor read = foreign.visitMethod(ACC_PUBLIC, "read", "(Ljava/awt/Point;)I", null, null); + read.visitVarInsn(ALOAD, 1); + read.visitFieldInsn(GETFIELD, "java/awt/Point", "x", "I"); + read.visitInsn(IRETURN); + read.visitMaxs(1, 2); + assertEquals( + "key not found: x", + assertThrows(java.util.NoSuchElementException.class, () -> COMPILER.registerJavaTrait(foreign)) + .getMessage()); + assertFalse(scope.mixins.contains(arrays.name)); + assertFalse(scope.mixins.contains(foreign.name)); + } + } + + @Test + void inheritedVirtualCallsKeepTheExistingDescriptorShapedCast() throws Exception { + try (Scope scope = new Scope()) { + ClassNode parent = base("InheritedJavaBase"); + scope.define(parent); + ClassNode input = input("Inherited", parent.name); + MethodVisitor read = input.visitMethod(ACC_PUBLIC, "read", "()I", null, null); + read.visitVarInsn(ALOAD, 0); + read.visitMethodInsn(INVOKEVIRTUAL, input.name, "score", "()I", false); + read.visitInsn(IRETURN); + read.visitMaxs(1, 1); + COMPILER.internalDefine(input.name, ASMHelper.createBytes(input, 0)); + InvocationTargetException failure = assertThrows( + InvocationTargetException.class, + () -> COMPILER.registerJavaTrait(input)); + assertInstanceOf(ClassFormatError.class, failure.getCause()); + ClassNode helper = COMPILER.classNode(input.name + "$class"); + MethodNode output = method(helper, "read"); + AbstractInsnNode cast = output.instructions.getFirst().getNext(); + assertEquals("L" + parent.name + ";", ((TypeInsnNode) cast).desc); + assertEquals(parent.name, ((MethodInsnNode) cast.getNext()).owner); + assertFalse(scope.mixins.contains(input.name)); + } + } + + @Test + void definitionFailureKeepsHelperAndByteCachesButDoesNotPublishMixinMetadata() throws Exception { + try (Scope scope = new Scope()) { + ClassNode input = input("AlreadyLoaded", "java/lang/Object"); + scope.define(input); + InvocationTargetException failure = assertThrows( + InvocationTargetException.class, + () -> COMPILER.registerJavaTrait(input)); + assertInstanceOf(LinkageError.class, failure.getCause()); + assertTrue(scope.bytes.contains(input.name + "$class")); + assertEquals(ACC_PUBLIC | ACC_INTERFACE | ACC_ABSTRACT, COMPILER.classNode(input.name).access); + assertFalse(scope.mixins.contains(input.name)); + assertNotNull(scope.loader.findClass((input.name + "$class").replace('/', '.'))); + } + } + + private static ClassNode input(String suffix, String parent) { + ClassNode node = node(ROOT + suffix, parent, ACC_PUBLIC); + MethodVisitor constructor = node.visitMethod(ACC_PUBLIC, "", "()V", null, null); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitMethodInsn(INVOKESPECIAL, parent, "", "()V", false); + constructor.visitInsn(RETURN); + constructor.visitMaxs(1, 1); + return node; + } + + private static void constant(ClassNode node, String name, String desc, int value, int access) { + MethodVisitor method = node.visitMethod(access, name, desc, null, null); + method.visitLdcInsn(value); + method.visitInsn(IRETURN); + method.visitMaxs(1, desc.equals("(I)I") ? 2 : 1); + } + + private static void initialize(MethodVisitor constructor, String owner, String field, int value) { + constructor.visitVarInsn(ALOAD, 0); + constructor.visitLdcInsn(value); + constructor.visitFieldInsn(PUTFIELD, owner, field, "I"); + } + + private static MethodNode method(ClassNode node, String name) { + return (MethodNode) node.methods.stream().filter(m -> ((MethodNode) m).name.equals(name)).findFirst().get(); + } + + private static List signatures(MixinInfo info) { + return JavaConversions.seqAsJavaList(info.methods()).stream().map(m -> m.name + m.desc) + .collect(Collectors.toList()); + } + + private static void assertFailure(ClassNode input, String message) { + assertEquals( + message, + assertThrows(IllegalArgumentException.class, () -> COMPILER.registerJavaTrait(input)).getMessage()); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MicroRecipeFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MicroRecipeFunctionalTest.java new file mode 100644 index 0000000..5f8dbb5 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MicroRecipeFunctionalTest.java @@ -0,0 +1,229 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.ItemMicroPart; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MicroRecipe; +import codechicken.microblock.Saw; +import codechicken.microblock.handler.MicroblockProxy; +import scala.Tuple3; + +/** + * Recipe behavior needs Forge startup because the item and material registries are initialized by the mod lifecycle. + */ +class MicroRecipeFunctionalTest { + + @Test + void cuttingStoneUsesTheRealMaterialInsteadOfTheMissingPlaceholder() { + int material = MicroMaterialRegistry.materialID("minecraft:stone"); + InventoryCrafting crafting = grid(); + crafting.setInventorySlotContents(0, new ItemStack(new TestSaw(100))); + crafting.setInventorySlotContents(3, new ItemStack(Blocks.stone)); + assertEquals(material, MicroRecipe.findMaterial(crafting.getStackInSlot(3))); + assertMicro(MicroRecipe.getCraftingResult(crafting), 2, 0, 4, material); + crafting.setInventorySlotContents(3, MicroRecipe.getCraftingResult(crafting)); + assertMicro(MicroRecipe.getCraftingResult(crafting), 2, 0, 2, material); + } + + @Test + void cuttingDarkOakLogsAndLeavesRetainsTheirMetadata() { + for (Block block : new Block[] { Blocks.log2, Blocks.leaves2 }) { + String name = BlockMicroMaterial.materialKey(block, 1); + assertTrue(MicroMaterialRegistry.getMaterial(name) instanceof BlockMicroMaterial); + int material = MicroMaterialRegistry.materialID(name); + InventoryCrafting crafting = grid(); + crafting.setInventorySlotContents(0, new ItemStack(new TestSaw(100))); + crafting.setInventorySlotContents(3, new ItemStack(block, 1, 1)); + assertMicro(MicroRecipe.getCraftingResult(crafting), 2, 0, 4, material); + ItemStack restored = MicroRecipe.create(1, 0, 8, material); + assertSame(Item.getItemFromBlock(block), restored.getItem()); + assertEquals(1, restored.getItemDamage()); + } + } + + @Test + void recipeMetadataMaterialLookupAndCreationRoundTrip() { + int material = glassMaterial(); + ItemStack recipeOutput = MicroRecipe.getRecipeOutput(); + + assertEquals(9, MicroRecipe.getRecipeSize()); + assertMicro(recipeOutput, 1, 0, 1, MicroMaterialRegistry.materialID("minecraft:stone")); + + ItemStack source = MicroMaterialRegistry.getMaterial(material).getItem(); + ItemStack fullBlock = MicroRecipe.create(3, 0, 8, material); + assertNotSame(source, fullBlock); + assertEquals(3, fullBlock.stackSize); + assertEquals(material, MicroRecipe.findMaterial(fullBlock)); + assertEquals(0, MicroRecipe.microClass(fullBlock)); + assertEquals(8, MicroRecipe.microSize(fullBlock)); + + ItemStack tagged = source.copy(); + tagged.setTagCompound((NBTTagCompound) recipeOutput.getTagCompound().copy()); + assertEquals(-1, MicroRecipe.findMaterial(tagged)); + } + + @Test + void hollowRecipeWinsOverTheSimultaneouslyValidGluingRecipe() { + int material = glassMaterial(); + InventoryCrafting crafting = grid(); + for (int slot = 0; slot < 9; slot++) { + if (slot != 4) { + crafting.setInventorySlotContents(slot, micro(0, 1, material)); + } + } + + assertMicro(MicroRecipe.getHollowResult(crafting), 8, 1, 1, material); + assertStack(MicroRecipe.getGluingResult(crafting), 1, 0, 8, material); + assertMicro(MicroRecipe.getCraftingResult(crafting), 8, 1, 1, material); + assertTrue(MicroRecipe.matches(crafting, null)); + assertFalse(MicroRecipe.matches(grid(), null)); + } + + @Test + void gluingHandlesCoverHollowEdgeAndCornerForms() { + int material = glassMaterial(); + + assertMicro(MicroRecipe.getGluingResult(filled(2, 0, 1, material)), 1, 0, 2, material); + assertMicro(MicroRecipe.getGluingResult(filled(2, 1, 1, material)), 1, 1, 2, material); + assertMicro(MicroRecipe.getGluingResult(filled(2, 2, 1, material)), 1, 3, 1, material); + assertMicro(MicroRecipe.getGluingResult(filled(4, 2, 1, material)), 1, 0, 1, material); + assertMicro(MicroRecipe.getGluingResult(filled(2, 3, 1, material)), 1, 0, 1, material); + assertStack(MicroRecipe.getGluingResult(filled(2, 0, 4, material)), 1, 0, 8, material); + + InventoryCrafting mixedEdges = grid(); + mixedEdges.setInventorySlotContents(0, micro(2, 1, material)); + mixedEdges.setInventorySlotContents(1, micro(2, 2, material)); + assertNull(MicroRecipe.getGluingResult(mixedEdges)); + assertNull(MicroRecipe.getGluingResult(filled(1, 0, 1, material))); + } + + @Test + void thinningCutsRawMaterialsAndMicroblocksVertically() { + int material = glassMaterial(); + TestSaw firstSaw = new TestSaw(100); + TestSaw laterSaw = new TestSaw(100); + InventoryCrafting raw = grid(); + raw.setInventorySlotContents(0, new ItemStack(firstSaw)); + raw.setInventorySlotContents(3, MicroMaterialRegistry.getMaterial(material).getItem()); + raw.setInventorySlotContents(8, new ItemStack(laterSaw)); + + Tuple3 found = MicroRecipe.getSaw(raw); + assertSame(firstSaw, found._1()); + assertEquals(0, ((Number) found._2()).intValue()); + assertEquals(0, ((Number) found._3()).intValue()); + raw.setInventorySlotContents(8, null); + + assertStack(MicroRecipe.getThinningResult(raw), 2, 0, 4, material); + assertStack(MicroRecipe.getCraftingResult(raw), 2, 0, 4, material); + + InventoryCrafting hollow = grid(); + hollow.setInventorySlotContents(1, new ItemStack(firstSaw)); + hollow.setInventorySlotContents(4, micro(1, 4, material)); + assertMicro(MicroRecipe.getThinningResult(hollow), 2, 1, 2, material); + hollow.setInventorySlotContents(8, micro(0, 1, material)); + assertNull(MicroRecipe.getThinningResult(hollow)); + } + + @Test + void splittingMapsEachSupportedClassHorizontally() { + int material = glassMaterial(); + TestSaw saw = new TestSaw(100); + int[][] mappings = { { 0, 3 }, { 1, 3 }, { 3, 2 } }; + + for (int[] mapping : mappings) { + InventoryCrafting crafting = grid(); + crafting.setInventorySlotContents(3, new ItemStack(saw)); + crafting.setInventorySlotContents(4, micro(mapping[0], 2, material)); + assertMicro(MicroRecipe.getSplittingResult(crafting), 2, mapping[1], 2, material); + assertMicro(MicroRecipe.getCraftingResult(crafting), 2, mapping[1], 2, material); + } + + InventoryCrafting unsupported = grid(); + unsupported.setInventorySlotContents(0, new ItemStack(saw)); + unsupported.setInventorySlotContents(1, micro(2, 1, material)); + assertNull(MicroRecipe.getSplittingResult(unsupported)); + } + + @Test + void hollowFillTurnsExactlyOneHollowPartBackIntoACover() { + int material = glassMaterial(); + InventoryCrafting crafting = grid(); + crafting.setInventorySlotContents(8, micro(1, 4, material)); + + assertMicro(MicroRecipe.getHollowFillResult(crafting), 1, 0, 4, material); + assertMicro(MicroRecipe.getCraftingResult(crafting), 1, 0, 4, material); + + crafting.setInventorySlotContents(0, micro(1, 4, material)); + assertNull(MicroRecipe.getHollowFillResult(crafting)); + } + + private static int glassMaterial() { + return MicroRecipe.findMaterial(new ItemStack(Blocks.glass)); + } + + private static ItemStack micro(int microClass, int size, int material) { + return ItemMicroPart.create(microClass << 8 | size, material); + } + + private static InventoryCrafting filled(int count, int microClass, int size, int material) { + InventoryCrafting crafting = grid(); + for (int slot = 0; slot < count; slot++) { + crafting.setInventorySlotContents(slot, micro(microClass, size, material)); + } + return crafting; + } + + private static InventoryCrafting grid() { + return new InventoryCrafting(new Container() { + + @Override + public boolean canInteractWith(EntityPlayer player) { + return false; + } + }, 3, 3); + } + + private static void assertMicro(ItemStack stack, int amount, int microClass, int size, int material) { + assertSame(MicroblockProxy.itemMicro(), stack.getItem()); + assertStack(stack, amount, microClass, size, material); + } + + private static void assertStack(ItemStack stack, int amount, int microClass, int size, int material) { + assertEquals(amount, stack.stackSize); + assertEquals(microClass, MicroRecipe.microClass(stack)); + assertEquals(size, MicroRecipe.microSize(stack)); + assertEquals(material, MicroRecipe.microMaterial(stack)); + } + + private static final class TestSaw extends Item implements Saw { + + private final int strength; + + private TestSaw(int strength) { + this.strength = strength; + } + + @Override + public int getCuttingStrength(ItemStack item) { + return strength; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MicroblockEventHandlerFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MicroblockEventHandlerFunctionalTest.java new file mode 100644 index 0000000..1081755 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MicroblockEventHandlerFunctionalTest.java @@ -0,0 +1,31 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.util.Map; + +import net.minecraftforge.common.MinecraftForge; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.handler.MicroblockEventHandler; +import codechicken.microblock.handler.MicroblockEventHandler$; +import cpw.mods.fml.common.eventhandler.EventBus; + +class MicroblockEventHandlerFunctionalTest { + + @Test + void dedicatedServerRegistersTheCompanionAfterStrippingClientHandlers() throws Exception { + assertEquals(0, MicroblockEventHandler.class.getDeclaredMethods().length); + assertEquals(0, MicroblockEventHandler$.class.getDeclaredMethods().length); + assertTrue(listenerOwners(MinecraftForge.EVENT_BUS).containsKey(MicroblockEventHandler$.MODULE$)); + } + + private static Map listenerOwners(EventBus bus) throws Exception { + Field ownersField = EventBus.class.getDeclaredField("listenerOwners"); + ownersField.setAccessible(true); + return (Map) ownersField.get(bus); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MicroblockGeneratorFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MicroblockGeneratorFunctionalTest.java new file mode 100644 index 0000000..bb0425f --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MicroblockGeneratorFunctionalTest.java @@ -0,0 +1,250 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Proxy; +import java.util.BitSet; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; + +import net.minecraft.nbt.NBTTagCompound; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.CornerMicroClass$; +import codechicken.microblock.EdgeMicroClass$; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.FaceMicroblock; +import codechicken.microblock.HollowMicroClass$; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockClass; +import codechicken.microblock.MicroblockGenerator; +import codechicken.microblock.MicroblockGenerator$; +import codechicken.microblock.PostMicroClass$; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.examples.MicroblockCreationExample; +import scala.Tuple2; + +class MicroblockGeneratorFunctionalTest { + + @Test + void externalMaterialTraitComposesWithEveryBuiltInShapeAndReusesClasses() throws Exception { + Tuple2[] materials = MicroMaterialRegistry.getIdMap(); + Tuple2 original = materials[0]; + IMicroMaterial material = (IMicroMaterial) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { IMicroMaterial.class, MicroblockGenerator.IGeneratedMaterial.class }, + (proxy, method, args) -> { + if ("addTraits".equals(method.getName())) { + ((BitSet) args[0]).set(ForgeMultipartFunctionalTestMod.externalScalaMicroblockTraitId); + } + return defaultValue(method.getReturnType()); + }); + materials[0] = new Tuple2<>(original._1(), material); + try { + Class trait = Class.forName("codechicken.multipart.test.ExternalScalaMicroblockFixture"); + for (MicroblockClass factory : new MicroblockClass[] { FaceMicroClass$.MODULE$, HollowMicroClass$.MODULE$, + CornerMicroClass$.MODULE$, EdgeMicroClass$.MODULE$, PostMicroClass$.MODULE$ }) { + Microblock first = MicroblockGenerator.create(factory, 0, false); + Microblock second = MicroblockGenerator.create(factory, 0, false); + assertSame(factory, first.microClass()); + assertSame(first.getClass(), second.getClass()); + assertNotSame(first, second); + assertTrue(trait.isInstance(first)); + assertTrue(first.shouldRenderDynamic()); + assertEquals(41, first.getLightValue()); + assertEquals(0, first.material()); + assertNull(first.tile()); + } + } finally { + materials[0] = original; + MicroblockGenerator.freshBitSet(); + } + } + + @Test + void javaExampleCapturesSourceShapeBeforeMaterialCallbacksRun() { + Microblock source = MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false); + source.shape_$eq((byte) 0x25); + Tuple2[] materials = MicroMaterialRegistry.getIdMap(); + Tuple2 original = materials[0]; + IMicroMaterial material = (IMicroMaterial) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { IMicroMaterial.class, MicroblockGenerator.IGeneratedMaterial.class }, + (proxy, method, args) -> { + if ("addTraits".equals(method.getName())) source.shape_$eq((byte) 0x51); + return defaultValue(method.getReturnType()); + }); + materials[0] = new Tuple2<>(original._1(), material); + try { + Microblock created = MicroblockCreationExample.recreateForSide(source, false); + assertEquals(0x25, created.shape()); + assertEquals(0x51, source.shape(), "Material callbacks can have side effects"); + } finally { + materials[0] = original; + MicroblockGenerator.freshBitSet(); + } + } + + @Test + void javaExamplePreservesEveryShapeByteWithoutCopyingBindingsOrChangingTheSource() { + Microblock source = MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false); + TileMultipart sourceTile = new TileMultipart(); + source.bind(sourceTile); + for (int shape = Byte.MIN_VALUE; shape <= Byte.MAX_VALUE; shape++) { + source.shape_$eq((byte) shape); + Microblock created = MicroblockCreationExample.recreateForSide(source, false); + assertNotSame(source, created); + assertSame(source.getClass(), created.getClass()); + assertSame(source.microClass(), created.microClass()); + assertEquals(source.material(), created.material()); + assertEquals((byte) shape, created.shape()); + assertNull(created.tile()); + assertSame(sourceTile, source.tile()); + assertEquals((byte) shape, source.shape()); + } + } + + @Test + void staticAndCompanionReflectionCreateFreshPartsBeforeCallerOwnedShapeLoading() throws Exception { + MicroblockClass factory = FaceMicroClass$.MODULE$; + int material = MicroMaterialRegistry.materialID("minecraft:stone"); + Microblock source = factory.create(false, material); + source.shape_$eq((byte) 0x25); + TileMultipart sourceTile = new TileMultipart(); + source.bind(sourceTile); + for (Class owner : new Class[] { MicroblockGenerator.class, MicroblockGenerator$.class }) { + Object receiver = owner == MicroblockGenerator.class ? null : MicroblockGenerator$.MODULE$; + Microblock created = (Microblock) owner.getMethod("create", MicroblockClass.class, int.class, boolean.class) + .invoke(receiver, factory, material, false); + assertNotSame(source, created); + assertSame(source.getClass(), created.getClass()); + assertSame(factory, created.microClass()); + assertEquals(material, created.material()); + assertEquals(0, created.shape()); + assertNull(created.tile()); + created.shape_$eq(source.shape()); + assertEquals(0x25, created.shape()); + NBTTagCompound tag = new NBTTagCompound(); + tag.setString("material", "minecraft:stone"); + tag.setByte("shape", (byte) 0x31); + created.load(tag); + assertEquals(0x31, created.shape()); + assertEquals(material, created.material()); + assertNull(created.tile()); + assertSame(sourceTile, source.tile()); + assertEquals(0x25, source.shape()); + } + } + + @Test + void materialCallbackFailurePropagatesAndTheNextCreationClearsScratch() { + Tuple2[] materials = MicroMaterialRegistry.getIdMap(); + Tuple2 original = materials[0]; + IllegalStateException failure = new IllegalStateException("material trait failure"); + BitSet scratch = MicroblockGenerator.getBitSet(); + IMicroMaterial material = (IMicroMaterial) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { IMicroMaterial.class, MicroblockGenerator.IGeneratedMaterial.class }, + (proxy, method, args) -> { + if ("addTraits".equals(method.getName())) { + assertSame(scratch, args[0]); + assertSame(FaceMicroClass$.MODULE$, args[1]); + assertEquals(Boolean.FALSE, args[2]); + ((BitSet) args[0]).set(2048); + throw failure; + } + return defaultValue(method.getReturnType()); + }); + materials[0] = new Tuple2<>(original._1(), material); + try { + assertSame( + failure, + assertThrows( + IllegalStateException.class, + () -> MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false))); + assertTrue(scratch.get(2048)); + assertSame( + failure, + assertThrows( + IllegalStateException.class, + () -> MicroblockGenerator$.MODULE$.create(FaceMicroClass$.MODULE$, 0, false))); + materials[0] = original; + Microblock created = MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false); + assertFalse(scratch.get(2048)); + assertSame(FaceMicroClass$.MODULE$, created.microClass()); + assertNull(created.tile()); + } finally { + materials[0] = original; + MicroblockGenerator.freshBitSet(); + } + } + + @Test + void generatedMaterialAddsExternalScalaTraitBeforeConstruction() throws Exception { + Tuple2[] materials = MicroMaterialRegistry.getIdMap(); + Tuple2 original = materials[0]; + AtomicInteger calls = new AtomicInteger(); + AtomicReference callbackBits = new AtomicReference<>(); + AtomicReference initialTraits = new AtomicReference<>(); + + IMicroMaterial material = (IMicroMaterial) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { IMicroMaterial.class, MicroblockGenerator.IGeneratedMaterial.class }, + (proxy, method, args) -> { + if ("addTraits".equals(method.getName())) { + calls.incrementAndGet(); + BitSet traits = (BitSet) args[0]; + callbackBits.set(traits); + initialTraits.set((BitSet) traits.clone()); + assertSame(FaceMicroClass$.MODULE$, args[1]); + assertEquals(Boolean.FALSE, args[2]); + traits.set(ForgeMultipartFunctionalTestMod.externalScalaMicroblockTraitId); + } + return defaultValue(method.getReturnType()); + }); + + BitSet scratch = MicroblockGenerator.freshBitSet(); + scratch.set(2048); + materials[0] = new Tuple2<>(original._1(), material); + try { + Microblock generated = MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false); + + BitSet expectedInitial = new BitSet(); + expectedInitial.set(FaceMicroClass$.MODULE$.baseTraitId()); + assertEquals(1, calls.get()); + assertSame(scratch, callbackBits.get()); + assertEquals(expectedInitial, initialTraits.get()); + assertFalse(initialTraits.get().get(2048)); + assertTrue(generated instanceof FaceMicroblock); + assertTrue( + Class.forName("codechicken.multipart.test.ExternalScalaMicroblockFixture").isInstance(generated)); + assertEquals(0, generated.material()); + assertTrue(generated.shouldRenderDynamic()); + assertEquals(41, generated.getLightValue()); + } finally { + materials[0] = original; + MicroblockGenerator.freshBitSet(); + } + } + + private static Object defaultValue(Class type) { + if (type == boolean.class) return false; + if (type == byte.class) return (byte) 0; + if (type == short.class) return (short) 0; + if (type == int.class) return 0; + if (type == long.class) return 0L; + if (type == float.class) return 0F; + if (type == double.class) return 0D; + if (type == char.class) return (char) 0; + return null; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MicroblockModFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MicroblockModFunctionalTest.java new file mode 100644 index 0000000..78308d0 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MicroblockModFunctionalTest.java @@ -0,0 +1,37 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.handler.MicroblockMod; +import codechicken.microblock.handler.MicroblockMod$; +import codechicken.microblock.handler.MicroblockProxy; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; + +class MicroblockModFunctionalTest { + + @Test + void fmlUsesTheCompanionAndCompletesTheMicroblockLifecycle() { + ModContainer container = Loader.instance().getIndexedModList().get("ForgeMicroblock"); + assertNotNull(container); + assertSame(MicroblockMod$.MODULE$, container.getMod()); + + assertNotNull(MicroblockProxy.logger()); + assertNotNull(MicroblockProxy.itemMicro()); + assertNotNull(MicroblockProxy.sawStone()); + assertNotNull(MicroblockProxy.sawIron()); + assertNotNull(MicroblockProxy.sawDiamond()); + assertNotNull(MicroblockProxy.stoneRod()); + assertNotNull(MicroMaterialRegistry.getIdMap()); + assertTrue(MicroMaterialRegistry.getIdMap().length > 0); + assertNotNull(MicroMaterialRegistry.getMaterial(MicroMaterialRegistry.getMissingId())); + assertTrue(MicroMaterialRegistry.getMaxCuttingStrength() >= 3); + assertNull(MicroblockMod.angelicaCompat()); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MicroblockPacketHandlerFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MicroblockPacketHandlerFunctionalTest.java new file mode 100644 index 0000000..f153584 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MicroblockPacketHandlerFunctionalTest.java @@ -0,0 +1,86 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.util.FakePlayerFactory; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.packet.PacketCustom; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.handler.MicroblockSPH; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import scala.Tuple2; + +class MicroblockPacketHandlerFunctionalTest { + + @Test + void javaEnumerationUsesTheSameIdsAsTheInitializedRegistryAndHandshake() { + PacketCustom outgoing = new PacketCustom("test", 1); + MicroMaterialRegistry.writeIDMap(outgoing); + PacketCustom incoming = new PacketCustom(outgoing.getByteBuf().copy()); + int count = MicroMaterialRegistry.materialCount(); + assertTrue(count > 0); + assertEquals(count, incoming.readInt()); + for (int id = 0; id < count; id++) { + String name = MicroMaterialRegistry.materialName(id); + assertEquals(name, incoming.readString()); + assertEquals(id, MicroMaterialRegistry.materialID(name)); + assertNotNull(MicroMaterialRegistry.getMaterial(id)); + assertSame(MicroMaterialRegistry.getMaterial(name), MicroMaterialRegistry.getMaterial(id)); + } + assertEquals(0, incoming.getByteBuf().readableBytes()); + } + + @Test + void sendsTheCompleteMaterialIdMapDuringTheServerHandshake() { + MinecraftServer server = MinecraftServer.getServer(); + WorldServer world = server.worldServers[0]; + EntityPlayerMP player = FakePlayerFactory.getMinecraft(world); + NetHandlerPlayServer previousHandler = player.playerNetServerHandler; + + RecordingNetHandler handler = new RecordingNetHandler(server, player); + try { + MicroblockSPH.handshakeRecieved(handler); + } finally { + player.playerNetServerHandler = previousHandler; + } + + FMLProxyPacket sent = assertInstanceOf(FMLProxyPacket.class, handler.sent); + assertEquals("ForgeMicroblock", sent.channel()); + + PacketCustom payload = new PacketCustom(sent.payload().copy()); + assertEquals(1, payload.getType()); + Tuple2[] materials = MicroMaterialRegistry.getIdMap(); + assertEquals(materials.length, payload.readInt()); + for (Tuple2 material : materials) { + assertEquals(material._1(), payload.readString()); + } + assertEquals(0, payload.getByteBuf().readableBytes()); + } + + private static final class RecordingNetHandler extends NetHandlerPlayServer { + + private Packet sent; + + private RecordingNetHandler(MinecraftServer server, EntityPlayerMP player) { + super(server, new NetworkManager(false), player); + } + + @Override + public void sendPacket(Packet packet) { + assertNotNull(packet); + sent = packet; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MicroblockPlacementFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MicroblockPlacementFunctionalTest.java new file mode 100644 index 0000000..d7f2c64 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MicroblockPlacementFunctionalTest.java @@ -0,0 +1,299 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.util.FakePlayerFactory; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.lib.vec.BlockCoord; +import codechicken.microblock.AdditionPlacement; +import codechicken.microblock.CommonMicroblock; +import codechicken.microblock.EdgePlacement$; +import codechicken.microblock.EdgePlacementGrid$; +import codechicken.microblock.ExecutablePlacement; +import codechicken.microblock.ExpandingPlacement; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.FacePlacement$; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockClass; +import codechicken.microblock.MicroblockPlacement; +import codechicken.microblock.MicroblockPlacement$; +import codechicken.microblock.PlacementGrid; +import codechicken.microblock.PlacementProperties; +import codechicken.microblock.PostMicroClass$; +import codechicken.microblock.PostMicroblock; +import codechicken.multipart.ControlKeyModifer; +import codechicken.multipart.TileMultipart; +import scala.Tuple2; + +class MicroblockPlacementFunctionalTest { + + private static final BlockCoord EXTERNAL_POS = new BlockCoord(160, 200, 160); + private static final BlockCoord INTERNAL_POS = new BlockCoord(164, 200, 160); + private static final BlockCoord EXPAND_POS = new BlockCoord(168, 200, 160); + private static final BlockCoord CUSTOM_POS = new BlockCoord(172, 200, 160); + private static final BlockCoord POST_POS = new BlockCoord(176, 200, 160); + private static final BlockCoord POST_EXPAND_POS = new BlockCoord(180, 200, 160); + + private WorldServer world; + private EntityPlayer player; + private int material; + + @BeforeEach + void setUp() { + world = MinecraftServer.getServer().worldServers[0]; + assertNotNull(world); + player = FakePlayerFactory.getMinecraft(world); + assertNotNull(player); + player.setSneaking(false); + ControlKeyModifer.map().clear(); + material = MicroMaterialRegistry.materialID("minecraft:stone"); + assertTrue(material >= 0); + clearPositions(); + } + + @AfterEach + void tearDown() { + player.setSneaking(false); + ControlKeyModifer.map().clear(); + clearPositions(); + } + + @Test + void selectsPlacesAndConsumesAnExternalFace() { + world.setBlock(EXTERNAL_POS.x, EXTERNAL_POS.y, EXTERNAL_POS.z, Blocks.stone); + MovingObjectPosition hit = hit(EXTERNAL_POS, 1.0); + + MicroblockPlacement decision = new MicroblockPlacement(player, hit, 1, material, true, FacePlacement$.MODULE$); + ExecutablePlacement placement = decision.apply(); + + AdditionPlacement addition = assertInstanceOf(AdditionPlacement.class, placement); + BlockCoord target = EXTERNAL_POS.copy().offset(1); + assertEquals(target, addition.pos()); + assertEquals(0, slot(addition.part())); + assertSame(player, decision.player()); + assertSame(hit, decision.hit()); + assertSame(world, decision.world()); + assertSame(FaceMicroClass$.MODULE$, decision.mcrClass()); + assertEquals(EXTERNAL_POS, decision.pos()); + assertEquals(0, decision.slot()); + assertEquals(1, decision.oslot()); + assertEquals(1.0, decision.d()); + assertFalse(decision.internal()); + assertFalse(decision.oppMod()); + + ItemStack stack = new ItemStack(net.minecraft.init.Items.stick, 3); + addition.place(world, player, stack); + addition.consume(world, player, stack); + + TileMultipart tile = TileMultipart.getTile(world, target); + assertNotNull(tile); + assertSame(addition.part(), tile.jPartList().get(0)); + assertEquals(2, stack.stackSize); + } + + @Test + void selectsTheInternalOrOppositeSlotFromTheControlModifier() { + player.setSneaking(true); + TileMultipart tile = TileMultipart.addPart(world, INTERNAL_POS, face(1, 2)); + + MicroblockPlacement normal = new MicroblockPlacement( + player, + hit(INTERNAL_POS, 0.25), + 1, + material, + true, + FacePlacement$.MODULE$); + AdditionPlacement normalPlacement = assertInstanceOf(AdditionPlacement.class, normal.apply()); + assertTrue(normal.internal()); + assertFalse(normal.doExpand()); + assertEquals(0, slot(normalPlacement.part())); + normalPlacement.place(world, player, new ItemStack(net.minecraft.init.Items.stick)); + assertSame(normalPlacement.part(), tile.partMap(0)); + + clear(INTERNAL_POS); + tile = TileMultipart.addPart(world, INTERNAL_POS, face(1, 2)); + ControlKeyModifer.map().put(player, true); + + MicroblockPlacement opposite = new MicroblockPlacement( + player, + hit(INTERNAL_POS, 0.25), + 1, + material, + true, + FacePlacement$.MODULE$); + AdditionPlacement oppositePlacement = assertInstanceOf(AdditionPlacement.class, opposite.apply()); + assertTrue(opposite.oppMod()); + assertEquals(1, slot(oppositePlacement.part())); + oppositePlacement.place(world, player, new ItemStack(net.minecraft.init.Items.stick)); + assertSame(oppositePlacement.part(), tile.partMap(1)); + } + + @Test + void expandsTheHitPartInPlaceAndConsumesOneItem() { + Microblock original = face(1, 0); + TileMultipart tile = TileMultipart.addPart(world, EXPAND_POS, original); + ExtendedMOP hit = indexedHit(EXPAND_POS, 0.25, 0); + + MicroblockPlacement decision = new MicroblockPlacement(player, hit, 1, material, true, FacePlacement$.MODULE$); + ExpandingPlacement placement = assertInstanceOf(ExpandingPlacement.class, decision.apply()); + assertTrue(decision.internal()); + assertTrue(decision.doExpand()); + assertEquals(2, placement.part().getSize()); + assertEquals(0, slot(placement.part())); + + ItemStack stack = new ItemStack(net.minecraft.init.Items.stick, 3); + placement.place(world, player, stack); + placement.consume(world, player, stack); + + assertSame(original, tile.jPartList().get(0)); + assertEquals(2, original.getSize()); + assertEquals(0, slot(original)); + assertEquals(2, stack.stackSize); + } + + @Test + void customPlacementWinsEvenWhenTheGridRejectsTheHit() { + world.setBlock(CUSTOM_POS.x, CUSTOM_POS.y, CUSTOM_POS.z, Blocks.stone); + ExecutablePlacement marker = new AdditionPlacement(CUSTOM_POS, null); + PlacementProperties properties = new PlacementProperties() { + + @Override + public int opposite(int slot, int side) { + return slot; + } + + @Override + public MicroblockClass microClass() { + return FaceMicroClass$.MODULE$; + } + + @Override + public PlacementGrid placementGrid() { + return EdgePlacementGrid$.MODULE$; + } + + @Override + public ExecutablePlacement customPlacement(MicroblockPlacement placement) { + return marker; + } + }; + + ExecutablePlacement result = MicroblockPlacement$.MODULE$ + .apply(player, hit(CUSTOM_POS, 1.0), 2, material, false, properties); + + assertSame(marker, result); + } + + @Test + void edgeCustomPlacementCreatesOnlyEvenPostsAtTheGridCentre() { + world.setBlock(POST_POS.x, POST_POS.y, POST_POS.z, Blocks.stone); + MovingObjectPosition centreHit = hit(POST_POS, 1.0); + + MicroblockPlacement odd = new MicroblockPlacement(player, centreHit, 1, material, true, EdgePlacement$.MODULE$); + assertEquals(-1, odd.slot()); + assertNull(odd.apply()); + + MicroblockPlacement even = new MicroblockPlacement( + player, + centreHit, + 2, + material, + true, + EdgePlacement$.MODULE$); + AdditionPlacement placement = assertInstanceOf(AdditionPlacement.class, even.apply()); + assertEquals(POST_POS.copy().offset(1), placement.pos()); + assertInstanceOf(PostMicroblock.class, placement.part()); + assertSame(PostMicroClass$.MODULE$, placement.part().microClass()); + assertEquals(2, placement.part().getSize()); + assertEquals(0, placement.part().getShape()); + } + + @Test + void edgeCustomPlacementExpandsAMatchingPostInPlace() { + Microblock original = PostMicroClass$.MODULE$.create(false, material); + original.setShape(2, 0); + TileMultipart tile = TileMultipart.addPart(world, POST_EXPAND_POS, original); + + MicroblockPlacement decision = new MicroblockPlacement( + player, + indexedHit(POST_EXPAND_POS, 0.25, 0), + 2, + material, + true, + EdgePlacement$.MODULE$); + ExpandingPlacement placement = assertInstanceOf(ExpandingPlacement.class, decision.apply()); + assertTrue(decision.internal()); + assertTrue(decision.doExpand()); + assertEquals(4, placement.part().getSize()); + assertEquals(0, placement.part().getShape()); + + placement.place(world, player, new ItemStack(net.minecraft.init.Items.stick)); + assertSame(original, tile.jPartList().get(0)); + assertEquals(4, original.getSize()); + assertEquals(0, original.getShape()); + } + + private Microblock face(int size, int slot) { + Microblock part = FaceMicroClass$.MODULE$.create(false, material); + part.setShape(size, slot); + return part; + } + + private static int slot(Microblock part) { + return ((CommonMicroblock) part).getSlot(); + } + + private static MovingObjectPosition hit(BlockCoord pos, double relativeY) { + return new MovingObjectPosition( + pos.x, + pos.y, + pos.z, + 1, + Vec3.createVectorHelper(pos.x + 0.5, pos.y + relativeY, pos.z + 0.5)); + } + + private static ExtendedMOP indexedHit(BlockCoord pos, double relativeY, int index) { + return new ExtendedMOP( + pos.x, + pos.y, + pos.z, + 1, + Vec3.createVectorHelper(pos.x + 0.5, pos.y + relativeY, pos.z + 0.5), + new Tuple2(index, null)); + } + + private void clearPositions() { + clear(EXTERNAL_POS); + clear(EXTERNAL_POS.copy().offset(1)); + clear(INTERNAL_POS); + clear(EXPAND_POS); + clear(CUSTOM_POS); + clear(POST_POS); + clear(POST_POS.copy().offset(1)); + clear(POST_EXPAND_POS); + } + + private void clear(BlockCoord pos) { + world.removeTileEntity(pos.x, pos.y, pos.z); + world.setBlockToAir(pos.x, pos.y, pos.z); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MicroblockProxyFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MicroblockProxyFunctionalTest.java new file mode 100644 index 0000000..1c57239 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MicroblockProxyFunctionalTest.java @@ -0,0 +1,105 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.util.List; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.oredict.OreDictionary; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.MicroRecipe$; +import codechicken.microblock.handler.MicroblockProxy; +import codechicken.microblock.handler.MicroblockProxy$; +import codechicken.microblock.handler.MicroblockProxy_clientImpl; +import codechicken.microblock.handler.MicroblockProxy_serverImpl; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import scala.collection.Iterator; + +class MicroblockProxyFunctionalTest { + + @Test + void dedicatedServerStripsClientLifecycleAndResolvesTheCompanionToServerMethods() throws Exception { + assertSame(MicroblockProxy$.MODULE$, MicroblockProxy$.class.getField("MODULE$").get(null)); + assertThrows(NoSuchMethodError.class, () -> MicroblockProxy.init()); + assertThrows(NoSuchMethodError.class, () -> MicroblockProxy.postInit()); + assertThrows(NoClassDefFoundError.class, () -> MicroblockProxy_clientImpl.class.getDeclaredMethods()); + + MethodHandles.Lookup lookup = MethodHandles.lookup(); + MethodHandle init = lookup.findVirtual(MicroblockProxy$.class, "init", MethodType.methodType(void.class)); + MethodHandle postInit = lookup + .findVirtual(MicroblockProxy$.class, "postInit", MethodType.methodType(void.class)); + assertSame(MicroblockProxy_serverImpl.class, lookup.revealDirect(init).getDeclaringClass()); + assertSame(MicroblockProxy_serverImpl.class, lookup.revealDirect(postInit).getDeclaringClass()); + + assertNotNull(MicroblockProxy.itemMicro()); + assertNotNull(MicroblockProxy.sawStone()); + assertNotNull(MicroblockProxy.sawIron()); + assertNotNull(MicroblockProxy.sawDiamond()); + assertNotNull(MicroblockProxy.stoneRod()); + assertEquals(3, MicroblockProxy$.MODULE$.saws().size()); + } + + @Test + void registersItemsOreSawOrderAndRecipes() { + assertFalse(Loader.isModLoaded("dreamcraft")); + assertSame(MicroblockProxy.itemMicro(), GameRegistry.findItem("ForgeMicroblock", "microblock")); + assertSame(MicroblockProxy.sawStone(), GameRegistry.findItem("ForgeMicroblock", "sawStone")); + assertSame(MicroblockProxy.sawIron(), GameRegistry.findItem("ForgeMicroblock", "sawIron")); + assertSame(MicroblockProxy.sawDiamond(), GameRegistry.findItem("ForgeMicroblock", "sawDiamond")); + assertSame(MicroblockProxy.stoneRod(), GameRegistry.findItem("ForgeMicroblock", "stoneRod")); + + assertTrue(containsItem(OreDictionary.getOres("rodStone"), MicroblockProxy.stoneRod())); + + Iterator saws = MicroblockProxy$.MODULE$.saws().iterator(); + assertSame(MicroblockProxy.sawStone(), saws.next()); + assertSame(MicroblockProxy.sawIron(), saws.next()); + assertSame(MicroblockProxy.sawDiamond(), saws.next()); + assertFalse(saws.hasNext()); + + @SuppressWarnings("unchecked") + List recipes = CraftingManager.getInstance().getRecipeList(); + int microRecipe = recipes.indexOf(MicroRecipe$.MODULE$); + int stoneRod = recipeIndex(recipes, MicroblockProxy.stoneRod(), 4); + int sawStone = recipeIndex(recipes, MicroblockProxy.sawStone(), 1); + int sawIron = recipeIndex(recipes, MicroblockProxy.sawIron(), 1); + int sawDiamond = recipeIndex(recipes, MicroblockProxy.sawDiamond(), 1); + assertTrue(microRecipe >= 0); + assertTrue(stoneRod >= 0); + assertTrue(sawStone >= 0); + assertTrue(sawIron >= 0); + assertTrue(sawDiamond >= 0); + } + + private static boolean containsItem(List stacks, Item item) { + for (ItemStack stack : stacks) { + if (stack.getItem() == item) { + return true; + } + } + return false; + } + + private static int recipeIndex(List recipes, Item item, int stackSize) { + for (int index = 0; index < recipes.size(); index++) { + ItemStack output = recipes.get(index).getRecipeOutput(); + if (output != null && output.getItem() == item && output.stackSize == stackSize) { + return index; + } + } + return -1; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MicroblockTraitsFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MicroblockTraitsFunctionalTest.java new file mode 100644 index 0000000..a05d9d1 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MicroblockTraitsFunctionalTest.java @@ -0,0 +1,87 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.CommonMicroblock; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockClient; +import codechicken.microblock.MicroblockClient$class; +import codechicken.microblock.MicroblockGenerator; + +class MicroblockTraitsFunctionalTest { + + @Test + void generatedCommonTraitUsesMaterialShapeBoundsAndClass() { + int material = MicroMaterialRegistry.materialID("minecraft:stone"); + Microblock part = MicroblockGenerator.create(FaceMicroClass$.MODULE$, material, false); + CommonMicroblock common = (CommonMicroblock) part; + assertFalse(part instanceof MicroblockClient); + assertEquals(material, part.material()); + assertEquals(0, part.shape()); + for (int side = 0; side < 6; side++) { + part.setShape(3, side); + assertEquals(side, common.getSlot()); + assertEquals(1 << side, common.getSlotMask()); + assertSame(FaceMicroClass$.MODULE$, common.microClass()); + assertEquals(FaceMicroClass$.MODULE$.getClassId(), part.itemClassID()); + assertEquals(1, common.getPartialOcclusionBoxes().size()); + assertSame(part.getBounds(), common.getPartialOcclusionBoxes().get(0)); + } + } + + @Test + void absentMaterialReachesTheClientOnlyStoneLookupOnTheServer() { + // getBrokenIcon only needs the Microblock base cast; a proxy would not satisfy that contract. + MissingMaterialClient part = new MissingMaterialClient(); + for (int side : new int[] { -1, 0, 5, 12 }) { + // Forge strips Block.getIcon on a dedicated server; reaching it proves the fallback was selected. + NoSuchMethodError error = assertThrows( + NoSuchMethodError.class, + () -> MicroblockClient$class.getBrokenIcon(part, side)); + assertTrue(error.getMessage().contains("net.minecraft.block.Block.getIcon(II)")); + } + assertEquals(4, part.materialReads); + } + + private static final class MissingMaterialClient extends Microblock implements MicroblockClient { + + int materialReads; + + MissingMaterialClient() { + super(-1); + } + + @Override + public codechicken.microblock.MicroMaterialRegistry.IMicroMaterial getIMaterial() { + materialReads++; + return null; + } + + @Override + public codechicken.microblock.MicroblockClass microClass() { + return FaceMicroClass$.MODULE$; + } + + @Override + public int itemClassID() { + return 0; + } + + @Override + public codechicken.lib.vec.Cuboid6 getBounds() { + return codechicken.lib.vec.Cuboid6.full; + } + + @Override + public net.minecraft.util.IIcon getBrokenIcon(int side) { + return MicroblockClient$class.getBrokenIcon(this, side); + } + + @Override + public void render(codechicken.lib.vec.Vector3 pos, int pass) {} + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MissingMicroMaterialFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MissingMicroMaterialFunctionalTest.java new file mode 100644 index 0000000..c6c11ec --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MissingMicroMaterialFunctionalTest.java @@ -0,0 +1,53 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.stream.Collectors; + +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MissingMicroMaterial; +import codechicken.microblock.MissingMicroMaterial$; + +class MissingMicroMaterialFunctionalTest { + + private static final Set CLIENT_METHODS = Arrays + .stream(new String[] { "getBreakingIcon", "loadIcons", "renderMicroFace" }).collect(Collectors.toSet()); + + @Test + void dedicatedServerRegistersTheCompanionAfterStrippingClientState() { + assertSame(MissingMicroMaterial$.MODULE$, MicroMaterialRegistry.getMaterial(MissingMicroMaterial.key())); + assertSame( + MissingMicroMaterial$.MODULE$, + MicroMaterialRegistry.getMaterial(MicroMaterialRegistry.getMissingId())); + + ItemStack item = MissingMicroMaterial$.MODULE$.getItem(); + assertSame(Item.getItemFromBlock(Blocks.stone), item.getItem()); + assertEquals(1, item.stackSize); + assertEquals(0, item.getItemDamage()); + + assertFalse(publicMethodNames(MissingMicroMaterial.class).stream().anyMatch(CLIENT_METHODS::contains)); + assertFalse(publicMethodNames(MissingMicroMaterial$.class).stream().anyMatch(CLIENT_METHODS::contains)); + assertFalse( + Arrays.stream(MissingMicroMaterial$.class.getDeclaredFields()) + .filter(field -> !Modifier.isStatic(field.getModifiers())).map(Field::getName) + .anyMatch("icon"::equals)); + } + + private static Set publicMethodNames(Class type) { + return Arrays.stream(type.getDeclaredMethods()).filter(method -> Modifier.isPublic(method.getModifiers())) + .map(Method::getName).collect(Collectors.toSet()); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MixinClassesFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MixinClassesFunctionalTest.java new file mode 100644 index 0000000..9bade29 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MixinClassesFunctionalTest.java @@ -0,0 +1,376 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.util.Arrays; +import java.util.HashMap; + +import net.minecraft.launchwrapper.LaunchClassLoader; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.multipart.asm.ASMMixinCompiler$; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.FieldMixin; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import codechicken.multipart.asm.DebugPrinter$; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.mutable.Map; + +class MixinClassesFunctionalTest { + + static final ASMMixinCompiler$ COMPILER = ASMMixinCompiler$.MODULE$; + static final String PREFIX = "codechicken/multipart/test/composition/"; + + @Test + void emptyTraitsResolveTheBaseAndIgnoreTheGeneratedName() throws Exception { + try (Scope scope = new Scope()) { + Class base = scope.define(base("EmptyBase")); + assertSame(base, COMPILER.mixinClasses(null, Type.getInternalName(base), seq())); + assertSame(base, COMPILER.mixinClasses("ignored", base.getName(), seq())); + assertFalse(scope.bytes.contains("ignored")); + } + } + + @Test + void diamondParentsInitializeOnceAndSuperCallsFollowLinearization() throws Exception { + try (Scope scope = new Scope()) { + ClassNode base = base("DiamondBase"); + scope.define(base); + MixinInfo parent = scope.trait("Parent", base.name, seq(), 1); + MixinInfo left = scope.trait("Left", base.name, seq(parent), 10); + MixinInfo right = scope.trait("Right", base.name, seq(parent), 100); + Object value = COMPILER.mixinClasses(PREFIX + "Diamond", base.name, seq(left.name(), right.name())) + .getConstructor(int.class).newInstance(7); + assertEquals("BParentLeftRight", value.getClass().getField("trace").get(value)); + assertEquals(118, value.getClass().getMethod("score").invoke(value)); + assertEquals("Right", value.getClass().getMethod("winner").invoke(value)); + assertEquals( + Arrays.asList(left.name().replace('/', '.'), right.name().replace('/', '.')), + Arrays.asList( + value.getClass().getInterfaces()[0].getName(), + value.getClass().getInterfaces()[1].getName())); + Object reversed = COMPILER.mixinClasses(PREFIX + "Reversed", base.name, seq(right.name(), left.name())) + .getConstructor(int.class).newInstance(3); + assertEquals("BParentRightLeft", reversed.getClass().getField("trace").get(reversed)); + assertEquals(114, reversed.getClass().getMethod("score").invoke(reversed)); + assertEquals("Left", reversed.getClass().getMethod("winner").invoke(reversed)); + } + } + + @Test + void selectedConstructorForwardsArgumentsAndDoesNotCopyExceptionsOrOtherOverloads() throws Exception { + try (Scope scope = new Scope()) { + ClassNode base = base("ConstructorBase"); + scope.define(base); + MixinInfo trait = scope.trait("ConstructorTrait", base.name, seq(), 2); + Class result = COMPILER.mixinClasses(PREFIX + "Constructor", base.name, seq(trait.name())); + assertEquals(1, result.getDeclaredConstructors().length); + assertArrayEquals(new Class[0], result.getConstructor(int.class).getExceptionTypes()); + Object value = result.getConstructor(int.class).newInstance(41); + assertEquals(43, result.getMethod("score").invoke(value)); + assertThrows(NoSuchMethodException.class, result::getConstructor); + } + } + + @Test + void fieldsRetainPrivateStorageMangledAccessorsAndNarrowValueCategories() throws Exception { + try (Scope scope = new Scope()) { + ClassNode base = base("FieldsBase"); + scope.define(base); + FieldMixin[] fields = { new FieldMixin("flag", "Z", ACC_PUBLIC), new FieldMixin("byteValue", "B", 0), + new FieldMixin("shortValue", "S", 0), new FieldMixin("charValue", "C", 0), + new FieldMixin("integer", "I", ACC_PRIVATE), new FieldMixin("real", "F", 0), + new FieldMixin("object", "Ljava/lang/Object;", 0), new FieldMixin("array", "[I", 0) }; + MixinInfo trait = scope.trait("FieldsTrait", base.name, seq(), 1, fields); + Class result = COMPILER.mixinClasses(PREFIX + "Fields", base.name, seq(trait.name())); + Object first = result.getConstructor(int.class).newInstance(0); + Object second = result.getConstructor(int.class).newInstance(0); + Object marker = new Object(); + Object[] values = { true, (byte) -12, (short) 1234, '\u03bb', -99, 1.25F, marker, new int[] { 2, 7 } }; + Class[] types = { boolean.class, byte.class, short.class, char.class, int.class, float.class, + Object.class, int[].class }; + for (int i = 0; i < fields.length; i++) { + String name = fields[i].accessName(trait.name()); + assertEquals(Modifier.PRIVATE, result.getDeclaredField(name).getModifiers()); + Method setter = result.getMethod(name + "_$eq", types[i]); + Method getter = result.getMethod(name); + Object initial = getter.invoke(second); + setter.invoke(first, values[i]); + assertEquals(values[i], getter.invoke(first)); + assertEquals(initial, getter.invoke(second)); + } + assertThrows(NoSuchMethodException.class, () -> result.getMethod("integer")); + } + } + + @Test + void wideFieldGettersRetainTheExistingStackOverflowVerificationFailure() throws Exception { + for (String descriptor : Arrays.asList("J", "D")) { + try (Scope scope = new Scope()) { + ClassNode base = base("WideBase" + descriptor); + scope.define(base); + MixinInfo trait = scope + .trait("WideTrait" + descriptor, base.name, seq(), 1, new FieldMixin("wide", descriptor, 0)); + Class generated = COMPILER.mixinClasses(PREFIX + "Wide" + descriptor, base.name, seq(trait.name())); + VerifyError failure = assertThrows(VerifyError.class, () -> generated.getConstructor(int.class)); + assertTrue(failure.getMessage().contains("Operand stack overflow")); + ClassNode output = COMPILER.classNode(PREFIX + "Wide" + descriptor); + MethodNode getter = (MethodNode) output.methods.stream() + .filter(m -> ((MethodNode) m).name.equals("wide")).findFirst().get(); + assertEquals(1, getter.maxStack); + } + } + } + + @Test + void covariantBridgeDispatchesToTheWinningTraitAndKeepsItsOwnExceptions() throws Exception { + try (Scope scope = new Scope()) { + ClassNode base = base("CovariantBase"); + MethodVisitor value = base.visitMethod( + ACC_PUBLIC, + "winner", + "()Ljava/lang/Object;", + null, + new String[] { "java/io/IOException" }); + value.visitLdcInsn("base"); + value.visitInsn(ARETURN); + value.visitMaxs(1, 1); + Class baseClass = scope.define(base); + MixinInfo trait = scope.trait("CovariantTrait", base.name, seq(), 1); + Class result = COMPILER.mixinClasses(PREFIX + "Covariant", base.name, seq(trait.name())); + Object instance = result.getConstructor(int.class).newInstance(0); + assertEquals("CovariantTrait", baseClass.getMethod("winner").invoke(instance)); + Method bridge = Arrays.stream(result.getDeclaredMethods()).filter(Method::isBridge).findFirst().get(); + assertTrue(bridge.isSynthetic()); + assertEquals(Object.class, bridge.getReturnType()); + assertArrayEquals(new Class[] { java.io.IOException.class }, bridge.getExceptionTypes()); + assertArrayEquals( + new Class[] { IllegalStateException.class }, + result.getMethod("winner").getExceptionTypes()); + } + } + + @Test + void missingMixinFailsBeforeBaseLookupAndMissingConstructorBeforeDefinition() throws Exception { + try (Scope scope = new Scope()) { + java.util.NoSuchElementException missing = assertThrows( + java.util.NoSuchElementException.class, + () -> COMPILER.mixinClasses(PREFIX + "Missing", "missing/base", seq("missing/trait"))); + assertTrue(missing.getMessage().contains("missing/trait")); + assertFalse(scope.info.contains("missing/base")); + ClassNode base = base("NoConstructorBase"); + base.methods.clear(); + scope.define(base); + MixinInfo trait = scope.trait("NoConstructorTrait", base.name, seq(), 1); + assertEquals( + "None.get", + assertThrows( + java.util.NoSuchElementException.class, + () -> COMPILER.mixinClasses(PREFIX + "NoConstructor", base.name, seq(trait.name()))) + .getMessage()); + assertFalse(scope.bytes.contains(PREFIX + "NoConstructor")); + } + } + + @Test + void missingSuperFailsBeforeDefinitionButDuplicateInterfacesReachTheJvmAndCache() throws Exception { + try (Scope scope = new Scope()) { + ClassNode base = base("FailureBase"); + scope.define(base); + MixinInfo trait = scope.trait("FailureTrait", base.name, seq(), 1); + MixinInfo invalid = new MixinInfo( + trait.name(), + trait.parent(), + trait.parentTraits(), + trait.fields(), + trait.methods(), + seq("absent()I")); + scope.mixins.put(trait.name(), invalid); + assertEquals( + "None.get", + assertThrows( + java.util.NoSuchElementException.class, + () -> COMPILER.mixinClasses(PREFIX + "MissingSuper", base.name, seq(trait.name()))) + .getMessage()); + assertFalse(scope.bytes.contains(PREFIX + "MissingSuper")); + scope.mixins.put(trait.name(), trait); + InvocationTargetException failure = assertThrows( + InvocationTargetException.class, + () -> COMPILER.mixinClasses(PREFIX + "Duplicate", base.name, seq(trait.name(), trait.name()))); + assertInstanceOf(ClassFormatError.class, failure.getCause()); + assertTrue(scope.bytes.contains(PREFIX + "Duplicate")); + assertEquals( + Arrays.asList(trait.name(), trait.name()), + COMPILER.classNode(PREFIX + "Duplicate").interfaces); + } + } + + static ClassNode base(String suffix) { + ClassNode node = node(PREFIX + suffix, "java/lang/Object", ACC_PUBLIC); + node.visitField(ACC_PUBLIC, "trace", "Ljava/lang/String;", null, null); + node.visitField(ACC_PUBLIC, "seed", "I", null, null); + MethodVisitor constructor = node + .visitMethod(ACC_PUBLIC, "", "(I)V", null, new String[] { "java/io/IOException" }); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V", false); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitLdcInsn("B"); + constructor.visitFieldInsn(PUTFIELD, node.name, "trace", "Ljava/lang/String;"); + constructor.visitVarInsn(ALOAD, 0); + constructor.visitVarInsn(ILOAD, 1); + constructor.visitFieldInsn(PUTFIELD, node.name, "seed", "I"); + constructor.visitInsn(RETURN); + constructor.visitMaxs(2, 2); + MethodVisitor empty = node.visitMethod(ACC_PUBLIC, "", "()V", null, null); + empty.visitVarInsn(ALOAD, 0); + empty.visitInsn(ICONST_0); + empty.visitMethodInsn(INVOKESPECIAL, node.name, "", "(I)V", false); + empty.visitInsn(RETURN); + empty.visitMaxs(2, 1); + MethodVisitor score = node.visitMethod(ACC_PUBLIC, "score", "()I", null, null); + score.visitVarInsn(ALOAD, 0); + score.visitFieldInsn(GETFIELD, node.name, "seed", "I"); + score.visitInsn(IRETURN); + score.visitMaxs(1, 1); + return node; + } + + static ClassNode node(String name, String parent, int access) { + ClassNode node = new ClassNode(); + node.visit(V1_6, access, name, null, parent, null); + return node; + } + + @SafeVarargs + static Seq seq(T... values) { + return JavaConversions.asScalaBuffer(Arrays.asList(values)).toList(); + } + + static Field field(Class owner, String name) throws Exception { + Field field = owner.getDeclaredField(name); + field.setAccessible(true); + return field; + } + + static class Scope implements AutoCloseable { + + final Field loaderField = field(ASMMixinCompiler$.class, "cl"); + final Object previousLoader = loaderField.get(COMPILER); + final LaunchClassLoader loader = new LaunchClassLoader(new URL[0]) { + + @Override + public Class findClass(String name) throws ClassNotFoundException { + Class loaded = findLoadedClass(name); + return loaded == null ? super.findClass(name) : loaded; + } + }; + final Map bytes = cache("traitByteMap"); + final Map info = cache("infoCache"); + final Map mixins = cache("mixinMap"); + final java.util.Map oldBytes = new HashMap<>(JavaConversions.mapAsJavaMap(bytes)); + final java.util.Map oldInfo = new HashMap<>(JavaConversions.mapAsJavaMap(info)); + final java.util.Map oldMixins = new HashMap<>(JavaConversions.mapAsJavaMap(mixins)); + final Field debug = field(DebugPrinter$.class, "debug"); + final boolean oldDebug = DebugPrinter$.MODULE$.debug(); + final Field counter = field(DebugPrinter$.class, "permGenUsed"); + final int oldCounter = counter.getInt(DebugPrinter$.MODULE$); + + Scope() throws Exception { + loaderField.set(COMPILER, loader); + debug.setBoolean(DebugPrinter$.MODULE$, true); + } + + Class define(ClassNode node) { + return COMPILER.define(node.name, ASMHelper.createBytes(node, 0)); + } + + MixinInfo trait(String suffix, String base, Seq parents, int increment, FieldMixin... fields) { + String name = PREFIX + suffix; + ClassNode contract = node(name, "java/lang/Object", ACC_PUBLIC | ACC_INTERFACE | ACC_ABSTRACT); + for (MixinInfo parent : JavaConversions.seqAsJavaList(parents)) contract.interfaces.add(parent.name()); + MethodNode score = (MethodNode) contract.visitMethod(ACC_PUBLIC | ACC_ABSTRACT, "score", "()I", null, null); + MethodNode winner = (MethodNode) contract.visitMethod( + ACC_PUBLIC | ACC_ABSTRACT, + "winner", + "()Ljava/lang/String;", + null, + new String[] { "java/lang/IllegalStateException" }); + String superName = name.replace('/', '$') + "$$super$score"; + contract.visitMethod(ACC_PUBLIC | ACC_ABSTRACT, superName, "()I", null, null); + for (FieldMixin f : fields) { + contract.visitMethod(ACC_PUBLIC | ACC_ABSTRACT, f.accessName(name), "()" + f.desc(), null, null); + contract.visitMethod( + ACC_PUBLIC | ACC_ABSTRACT, + f.accessName(name) + "_$eq", + "(" + f.desc() + ")V", + null, + null); + } + define(contract); + ClassNode helper = node(name + "$class", "java/lang/Object", ACC_PUBLIC); + MethodVisitor init = helper.visitMethod(ACC_PUBLIC | ACC_STATIC, "$init$", "(L" + name + ";)V", null, null); + init.visitVarInsn(ALOAD, 0); + init.visitTypeInsn(CHECKCAST, base); + init.visitInsn(DUP); + init.visitFieldInsn(GETFIELD, base, "trace", "Ljava/lang/String;"); + init.visitLdcInsn(suffix); + init.visitMethodInsn( + INVOKEVIRTUAL, + "java/lang/String", + "concat", + "(Ljava/lang/String;)Ljava/lang/String;", + false); + init.visitFieldInsn(PUTFIELD, base, "trace", "Ljava/lang/String;"); + init.visitInsn(RETURN); + init.visitMaxs(3, 1); + MethodVisitor value = helper.visitMethod(ACC_PUBLIC | ACC_STATIC, "score", "(L" + name + ";)I", null, null); + value.visitVarInsn(ALOAD, 0); + value.visitMethodInsn(INVOKEINTERFACE, name, superName, "()I", true); + value.visitLdcInsn(increment); + value.visitInsn(IADD); + value.visitInsn(IRETURN); + value.visitMaxs(2, 1); + MethodVisitor winning = helper + .visitMethod(ACC_PUBLIC | ACC_STATIC, "winner", "(L" + name + ";)Ljava/lang/String;", null, null); + winning.visitLdcInsn(suffix); + winning.visitInsn(ARETURN); + winning.visitMaxs(1, 1); + define(helper); + MixinInfo result = new MixinInfo(name, base, parents, seq(fields), seq(score, winner), seq("score()I")); + mixins.put(name, result); + return result; + } + + @SuppressWarnings("unchecked") + private Map cache(String name) throws Exception { + return (Map) field(ASMMixinCompiler$.class, name).get(COMPILER); + } + + @Override + public void close() throws Exception { + loaderField.set(COMPILER, previousLoader); + debug.setBoolean(DebugPrinter$.MODULE$, oldDebug); + counter.setInt(DebugPrinter$.MODULE$, oldCounter); + bytes.clear(); + oldBytes.forEach(bytes::put); + info.clear(); + oldInfo.forEach(info::put); + mixins.clear(); + oldMixins.forEach(mixins::put); + loader.close(); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MultipartCompatiblityFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MultipartCompatiblityFunctionalTest.java new file mode 100644 index 0000000..ffaa7a4 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MultipartCompatiblityFunctionalTest.java @@ -0,0 +1,61 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.Locale; + +import net.minecraft.block.Block; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.handler.MCPCCompatModule; +import codechicken.multipart.handler.MultipartCompatiblity; +import cpw.mods.fml.common.FMLCommonHandler; +import scala.Function4; +import scala.runtime.AbstractFunction4; + +class MultipartCompatiblityFunctionalTest { + + @Test + void loadLeavesTheCallbackUntouchedOutsideMcpc() { + assertFalse(FMLCommonHandler.instance().getModName().toLowerCase(Locale.ROOT).contains("mcpc")); + Function4 original = MultipartCompatiblity.canAddPart(); + Function4 replacement = new DenyPlacement(); + try { + MultipartCompatiblity.canAddPart_$eq(replacement); + MultipartCompatiblity.load(); + assertSame(replacement, MultipartCompatiblity.canAddPart()); + } finally { + MultipartCompatiblity.canAddPart_$eq(original); + } + } + + @Test + void missingMcpcHookIsLoggedAndLeavesTheCallbackUntouched() { + assertThrows( + NoSuchMethodException.class, + () -> World.class.getDeclaredMethod("canPlaceMultipart", Block.class, int.class, int.class, int.class)); + Function4 original = MultipartCompatiblity.canAddPart(); + Function4 replacement = new DenyPlacement(); + try { + MultipartCompatiblity.canAddPart_$eq(replacement); + // The absent hook is reported at ERROR; that is the behaviour under test. + ExpectedErrorLog.silence(() -> assertDoesNotThrow(MCPCCompatModule::load)); + assertSame(replacement, MultipartCompatiblity.canAddPart()); + } finally { + MultipartCompatiblity.canAddPart_$eq(original); + } + } + + private static final class DenyPlacement extends AbstractFunction4 { + + @Override + public Object apply(World world, Object x, Object y, Object z) { + return Boolean.FALSE; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MultipartEventHandlerFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MultipartEventHandlerFunctionalTest.java new file mode 100644 index 0000000..2e10a81 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MultipartEventHandlerFunctionalTest.java @@ -0,0 +1,130 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.util.List; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraft.world.chunk.Chunk; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.common.util.FakePlayerFactory; +import net.minecraftforge.event.world.ChunkDataEvent; +import net.minecraftforge.event.world.ChunkWatchEvent; +import net.minecraftforge.event.world.WorldEvent; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.handler.MultipartEventHandler; +import codechicken.multipart.handler.MultipartEventHandler$; +import codechicken.multipart.handler.MultipartSPH$; +import codechicken.multipart.handler.MultipartSaveLoad; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.EventBus; +import cpw.mods.fml.common.gameevent.TickEvent; + +class MultipartEventHandlerFunctionalTest { + + @Test + void bothEventBusesUseTheCompanionIdentity() throws Exception { + assertSame(MultipartEventHandler$.MODULE$, registeredCompanion(FMLCommonHandler.instance().bus())); + assertSame(MultipartEventHandler$.MODULE$, registeredCompanion(MinecraftForge.EVENT_BUS)); + } + + @Test + @SuppressWarnings({ "rawtypes", "unchecked" }) + void chunkLoadAndWorldUnloadMaintainTransientServerState() { + WorldServer world = world(); + World originalLoadingWorld = MultipartSaveLoad.loadingWorld(); + scala.collection.mutable.Map updates = MultipartSPH$.MODULE$ + .codechicken$multipart$handler$MultipartSPH$$updateMap(); + try { + MultipartSaveLoad.loadingWorld_$eq(null); + Chunk chunk = new Chunk(world, 75, 75); + + MultipartEventHandler.tileEntityLoad(new ChunkDataEvent.Load(chunk, new NBTTagCompound())); + + assertSame(world, MultipartSaveLoad.loadingWorld()); + MultipartSPH$.MODULE$.getTileStream(world, new BlockCoord(1200, 70, 1200)); + assertTrue(updates.contains(world)); + + MultipartEventHandler.worldUnLoad(new WorldEvent.Unload(world)); + + assertNull(MultipartSaveLoad.loadingWorld()); + assertFalse(updates.contains(world)); + } finally { + updates.remove(world); + MultipartSaveLoad.loadingWorld_$eq(originalLoadingWorld); + } + } + + @Test + @SuppressWarnings({ "rawtypes", "unchecked" }) + void watchChangesAreAppliedOnlyAtTheEndOfTheServerTick() { + WorldServer world = world(); + FakePlayer player = FakePlayerFactory.getMinecraft(world); + assertNotNull(player); + player.setEntityId(-123456789); + Integer playerId = player.getEntityId(); + ChunkCoordIntPair chunk = new ChunkCoordIntPair(0, 0); + scala.collection.mutable.Map newWatchers = MultipartSPH$.MODULE$ + .codechicken$multipart$handler$MultipartSPH$$newWatchers(); + scala.collection.mutable.HashMap chunkWatchers = MultipartSPH$.MODULE$ + .codechicken$multipart$handler$MultipartSPH$$chunkWatchers(); + List players = MinecraftServer.getServer().getConfigurationManager().playerEntityList; + + newWatchers.remove(playerId); + chunkWatchers.remove(playerId); + players.add(player); + try { + MultipartEventHandler.chunkWatch(new ChunkWatchEvent.Watch(chunk, player)); + assertTrue(newWatchers.contains(playerId)); + + MultipartEventHandler.serverTick(new TickEvent.ServerTickEvent(TickEvent.Phase.START)); + assertTrue(newWatchers.contains(playerId)); + assertFalse(chunkWatchers.contains(playerId)); + + MultipartEventHandler.serverTick(new TickEvent.ServerTickEvent(TickEvent.Phase.END)); + assertFalse(newWatchers.contains(playerId)); + assertTrue(((scala.collection.Set) chunkWatchers.apply(playerId)).contains(chunk)); + + MultipartEventHandler.chunkUnWatch(new ChunkWatchEvent.UnWatch(chunk, player)); + assertFalse(chunkWatchers.contains(playerId)); + } finally { + players.remove(player); + newWatchers.remove(playerId); + chunkWatchers.remove(playerId); + } + } + + private static Object registeredCompanion(EventBus bus) throws Exception { + Field listenersField = EventBus.class.getDeclaredField("listeners"); + listenersField.setAccessible(true); + Map listeners = (Map) listenersField.get(bus); + for (Object target : listeners.keySet()) { + if (target == MultipartEventHandler$.MODULE$) { + return target; + } + } + return null; + } + + private static WorldServer world() { + WorldServer world = MinecraftServer.getServer().worldServers[0]; + assertNotNull(world); + assertFalse(world.isRemote); + return world; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MultipartGeneratorFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MultipartGeneratorFunctionalTest.java new file mode 100644 index 0000000..802562f --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MultipartGeneratorFunctionalTest.java @@ -0,0 +1,319 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Base64; +import java.util.BitSet; +import java.util.Collections; +import java.util.Objects; +import java.util.Scanner; + +import net.minecraft.init.Blocks; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultipartGenerator; +import codechicken.multipart.MultipartGenerator$; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TSlottedPart; +import codechicken.multipart.TileCache; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.TileMultipartClient; +import codechicken.multipart.asm.MultipartMixinFactory; +import codechicken.multipart.handler.MultipartProxy; +import codechicken.multipart.handler.MultipartSaveLoad; +import codechicken.multipart.minecraft.TorchPart; +import codechicken.multipart.scalatraits.TSlottedTile; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.mutable.Map; + +public class MultipartGeneratorFunctionalTest { + + @Test + void cachesCompleteHierarchySeparatelyPerSideAndKeepsFirstRegistration() { + MultipartGenerator$ generator = MultipartGenerator$.MODULE$; + String root = RootMarker.class.getName(); + String slotted = "codechicken.multipart.scalatraits.TSlottedTile"; + String redstone = "codechicken.multipart.scalatraits.TRedstoneTile"; + String tileChange = "codechicken.multipart.scalatraits.TTileChangeTile"; + MultipartGenerator.registerTrait(root, redstone, slotted); + HierarchyPart part = new HierarchyPart(); + BitSet server = generator.codechicken$multipart$MultipartGenerator$$traitsForPart(part, false); + BitSet client = generator.codechicken$multipart$MultipartGenerator$$traitsForPart(part, true); + assertEquals(bits(slotted), server); + assertEquals(bits(redstone), client); + assertNotSame(server, client); + assertSame( + server, + generator.codechicken$multipart$MultipartGenerator$$traitsForPart(new HierarchyPart(), false)); + + // Deliberate duplicate: both sides log at ERROR and keep the first registration. + ExpectedErrorLog.silence(() -> MultipartGenerator.registerTrait(root, slotted, redstone)); + assertEquals(slotted.replace('.', '/'), map(false).apply(root.replace('.', '/'))); + assertEquals(redstone.replace('.', '/'), map(true).apply(root.replace('.', '/'))); + MultipartGenerator.registerTrait(LateMarker.class.getName(), tileChange, null); + assertSame(client, generator.codechicken$multipart$MultipartGenerator$$traitsForPart(part, true)); + assertEquals(bits(redstone), client, "Late registration does not invalidate an already-cached part class"); + BitSet fresh = bits(redstone, tileChange); + assertEquals( + fresh, + generator.codechicken$multipart$MultipartGenerator$$traitsForPart(new FreshHierarchyPart(), true)); + assertEquals( + bits(slotted), + generator.codechicken$multipart$MultipartGenerator$$traitsForPart(new FreshHierarchyPart(), false)); + + String missing = "codechicken.multipart.test.NonexistentGeneratorTrait"; + assertThrows( + ClassNotFoundException.class, + () -> MultipartGenerator.registerTrait(FailedMarker.class.getName(), null, missing)); + assertEquals( + missing.replace('.', '/'), + map(false).apply(FailedMarker.class.getName().replace('.', '/')), + "The reference records a side mapping before resolving its trait class"); + String passThrough = GeneratorPassThroughFixture.class.getName().replace('.', '/'); + assertTrue(map(false).contains(passThrough)); + assertFalse(map(true).contains(passThrough)); + } + + @Test + void reusesOnlyExactTraitSetsAndSnapshotsRegisteredClasses() { + MultipartGenerator$ generator = MultipartGenerator$.MODULE$; + BitSet registration = new BitSet(); + generator.registerTileClass(RegisteredTile.class, registration); + registration.set(4095); + BitSet scratch = MultipartGenerator.getBitSet(); + scratch.set(4095); + RegisteredTile registered = new RegisteredTile(); + assertSame(registered, generator.generateCompositeTile(registered, parts(), false)); + assertSame(scratch, MultipartGenerator.getBitSet()); + assertTrue(scratch.isEmpty(), "Every construction clears the reused scratch set"); + assertEquals("savedMultipart", MultipartSaveLoad.getClassToNameMap().get(RegisteredTile.class)); + + SlottedPart slotted = new SlottedPart(); + TileMultipart plain = generator.generateCompositeTile(null, parts(), false); + assertSame(plain, generator.generateCompositeTile(plain, parts(new PlainPart()), false)); + TileMultipart upgraded = generator.generateCompositeTile(plain, parts(slotted), false); + assertNotSame(plain, upgraded); + assertTrue(upgraded instanceof TSlottedTile); + assertSame( + upgraded, + generator.generateCompositeTile(upgraded, parts(slotted, new PlainPart(), slotted), false)); + assertSame( + upgraded.getClass(), + generator.generateCompositeTile(null, parts(new PlainPart(), slotted), false).getClass()); + TileMultipart client = generator.generateCompositeTile(upgraded, parts(slotted), true); + assertTrue(client instanceof TileMultipartClient); + assertNotSame(upgraded, client); + assertSame(client, generator.generateCompositeTile(client, parts(slotted), true)); + assertThrows( + java.util.NoSuchElementException.class, + () -> generator.generateCompositeTile(new UnregisteredTile(), parts(), false)); + } + + @Test + void upgradesAndDowngradesLiveTilesWithoutLosingParts() { + World world = MinecraftServer.getServer().worldServers[0]; + BlockCoord pos = new BlockCoord(48, 200, 48); + world.getChunkFromBlockCoords(pos.x, pos.z); + world.setBlockToAir(pos.x, pos.y, pos.z); + PlainPart first = new PlainPart(); + SlottedPart second = new SlottedPart(); + try { + TileMultipart plain = TileMultipart.addPart(world, pos, first); + TileMultipart upgraded = TileMultipart.addPart(world, pos, second); + assertNotSame(plain, upgraded); + assertTrue(plain.isInvalid()); + assertTrue(upgraded instanceof TSlottedTile); + assertSame(upgraded, world.getTileEntity(pos.x, pos.y, pos.z)); + assertEquals(Arrays.asList(first, second), upgraded.jPartList()); + assertSame(upgraded, first.tile()); + assertSame(second, upgraded.partMap(3)); + + TileMultipart downgraded = upgraded.remPart(second); + assertTrue(upgraded.isInvalid()); + assertNotSame(upgraded, downgraded); + assertSame(plain.getClass(), downgraded.getClass()); + assertSame(downgraded, world.getTileEntity(pos.x, pos.y, pos.z)); + assertSame(downgraded, first.tile()); + assertEquals(Collections.singletonList(first), downgraded.jPartList()); + } finally { + world.setBlockToAir(pos.x, pos.y, pos.z); + } + } + + @Test + void convertsVanillaBlockBeforeAppendingTheNewPart() { + World world = MinecraftServer.getServer().worldServers[0]; + BlockCoord pos = new BlockCoord(50, 200, 48); + world.getChunkFromBlockCoords(pos.x, pos.z); + world.setBlock(pos.x, pos.y - 1, pos.z, Blocks.stone, 0, 0); + world.setBlock(pos.x, pos.y, pos.z, Blocks.torch, 5, 0); + PlainPart added = new PlainPart(); + try { + TileMultipart tile = TileMultipart.addPart(world, pos, added); + assertSame(MultipartProxy.block(), world.getBlock(pos.x, pos.y, pos.z)); + assertSame(tile, world.getTileEntity(pos.x, pos.y, pos.z)); + assertEquals(2, tile.partList().size()); + assertTrue(tile.partList().apply(0) instanceof TorchPart); + assertSame(added, tile.partList().apply(1)); + assertSame(tile, tile.partList().apply(0).tile()); + } finally { + world.setBlockToAir(pos.x, pos.y, pos.z); + world.setBlockToAir(pos.x, pos.y - 1, pos.z); + } + } + + @Test + void clientAdditionsReplaceStaleConvertibleBlocksWithoutConvertingThem() { + World world = MinecraftServer.getServer().worldServers[0]; + BlockCoord pos = new BlockCoord(51, 200, 48); + world.getChunkFromBlockCoords(pos.x, pos.z); + world.setBlock(pos.x, pos.y - 1, pos.z, Blocks.stone, 0, 0); + world.setBlock(pos.x, pos.y, pos.z, Blocks.torch, 5, 0); + boolean wasRemote = world.isRemote; + TileCache.FlaggedTile cached = TileCache.map().get(pos); + try { + // The server-started test event is synchronous; restore the side before any server tick. + world.isRemote = true; + PlainPart first = new PlainPart(); + TileMultipart tile = MultipartGenerator$.MODULE$.addPart(world, pos, first); + assertTrue(tile instanceof TileMultipartClient); + assertSame(MultipartProxy.block(), world.getBlock(pos.x, pos.y, pos.z)); + assertSame(tile, world.getTileEntity(pos.x, pos.y, pos.z)); + assertEquals(Collections.singletonList(first), tile.jPartList()); + assertSame(tile, first.tile()); + + PlainPart second = new PlainPart(); + assertSame(tile, MultipartGenerator$.MODULE$.addPart(world, pos, second)); + assertEquals(Arrays.asList(first, second), tile.jPartList()); + assertSame(tile, second.tile()); + } finally { + world.isRemote = wasRemote; + world.setBlockToAir(pos.x, pos.y, pos.z); + world.setBlockToAir(pos.x, pos.y - 1, pos.z); + if (cached == null) TileCache.map().remove(pos); + else TileCache.map().put(pos, cached); + } + } + + @Test + void frozenScalaConsumerLinksCompanionGenerationAndDefaultPassThroughRegistration() throws Exception { + byte[] bytes; + try (InputStream stream = Objects.requireNonNull( + getClass().getResourceAsStream("/compat/ReferenceScalaMultipartGeneratorConsumer.class.b64")); + Scanner scanner = new Scanner(stream, StandardCharsets.UTF_8.name())) { + bytes = Base64.getMimeDecoder().decode(scanner.useDelimiter("\\A").next()); + } + Class type = new FixtureClassLoader(MultipartGenerator.class.getClassLoader()).define(bytes); + Object consumer = type.getDeclaredConstructor().newInstance(); + type.getMethod("register", String.class).invoke(consumer, FrozenPassThrough.class.getName()); + String key = FrozenPassThrough.class.getName().replace('.', '/'); + assertTrue(map(false).contains(key)); + assertEquals(map(false).apply(key), map(true).apply(key)); + Seq parts = parts(new PassThroughPart()); + TileMultipart tile = (TileMultipart) type + .getMethod("create", TileEntity.class, scala.collection.Iterable.class, boolean.class) + .invoke(consumer, null, parts, false); + tile.loadParts(parts); + assertEquals(37, ((FrozenPassThrough) tile).value()); + } + + private static Map map(boolean client) { + return MultipartGenerator$.MODULE$.codechicken$multipart$MultipartGenerator$$interfaceTraitMap(client); + } + + private static BitSet bits(String... names) { + BitSet bits = new BitSet(); + for (String name : names) bits.set(MultipartMixinFactory.getId(name.replace('.', '/'))); + return bits; + } + + private static Seq parts(TMultiPart... parts) { + return JavaConversions.asScalaBuffer(Arrays.asList(parts)).toList(); + } + + public interface RootMarker { + } + + public interface ChildMarker extends RootMarker { + } + + public interface LateMarker { + } + + public interface FailedMarker { + } + + public interface FrozenPassThrough { + + int value(); + } + + public static class PlainPart extends TMultiPart { + + @Override + public String getType() { + return "mc_torch"; + } + + @Override + public boolean doesTick() { + return false; + } + } + + public static class ParentPart extends PlainPart implements ChildMarker { + } + + public static class HierarchyPart extends ParentPart implements LateMarker { + } + + public static class FreshHierarchyPart extends HierarchyPart { + } + + public static class SlottedPart extends PlainPart implements TSlottedPart { + + @Override + public int getSlotMask() { + return 1 << 3; + } + } + + public static class PassThroughPart extends PlainPart implements FrozenPassThrough { + + @Override + public int value() { + return 37; + } + } + + public static class RegisteredTile extends TileMultipart { + } + + public static class UnregisteredTile extends TileMultipart { + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytes) { + return defineClass(null, bytes, 0, bytes.length); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MultipartHelperFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MultipartHelperFunctionalTest.java new file mode 100644 index 0000000..6c29d47 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MultipartHelperFunctionalTest.java @@ -0,0 +1,214 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.packet.PacketCustom; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.TileMultipartClient; +import codechicken.multipart.examples.PartRegistrationExample; +import codechicken.multipart.examples.PartRegistrationExample.ExamplePart; +import codechicken.multipart.handler.MultipartSPH; +import codechicken.multipart.handler.MultipartSaveLoad; +import codechicken.multipart.minecraft.ButtonPart; +import codechicken.multipart.minecraft.TorchPart; +import io.netty.buffer.ByteBuf; +import scala.collection.JavaConversions; + +/** + * The half of MultipartHelper a plain JVM test cannot reach. Tile construction runs the ASM generator, the NBT path + * needs the save/load hooks, and the packet path needs a loaded chunk. + */ +class MultipartHelperFunctionalTest { + + @Test + void buildsATileAroundTheGivenParts() { + TMultiPart torch = MultiPartRegistry.loadPart("mc_torch", null); + assertNotNull(torch); + + TileMultipart tile = MultipartHelper.createTileFromParts(Collections.singletonList(torch)); + + assertNotNull(tile); + assertEquals(1, tile.jPartList().size()); + assertSame(torch, tile.jPartList().get(0)); + assertSame(tile, torch.tile()); + } + + /** + * Multipart tiles all save themselves under the id "savedMultipart", which is the whole reason this entry point + * exists: the tile has to be rebuilt from NBT without waiting for the ChunkLoad event. + */ + @Test + void rebuildsAnOrderedSlottedTileFromItsOwnNbtAndPublishesTheLoadingWorld() { + World world = world(); + TileMultipart saved = mixedTile(); + + NBTTagCompound tag = new NBTTagCompound(); + saved.writeToNBT(tag); + assertEquals("savedMultipart", tag.getString("id")); + NBTTagList savedParts = tag.getTagList("parts", 10); + assertEquals(2, savedParts.tagCount()); + assertEquals("mc_torch", savedParts.getCompoundTagAt(0).getString("id")); + assertEquals(5, savedParts.getCompoundTagAt(0).getByte("meta")); + assertEquals("mc_button", savedParts.getCompoundTagAt(1).getString("id")); + assertEquals(1, savedParts.getCompoundTagAt(1).getByte("meta")); + + MultipartSaveLoad.loadingWorld_$eq(null); + TileEntity loaded = MultipartHelper.createTileFromNBT(world, tag); + + TileMultipart tile = assertInstanceOf(TileMultipart.class, loaded); + assertEquals(2, tile.jPartList().size()); + assertEquals("mc_torch", tile.jPartList().get(0).getType()); + assertEquals("mc_button", tile.jPartList().get(1).getType()); + assertSame(tile.jPartList().get(0), tile.partMap(0)); + assertSame(tile.jPartList().get(1), tile.partMap(4)); + assertSame(world, MultipartSaveLoad.loadingWorld()); + } + + @Test + void buildsAWorldlessClientPreviewFromSavedNbt() { + NBTTagCompound tag = previewTag(37); + + TileMultipart tile = MultipartHelper.createPreviewTileFromNBT(null, tag); + + assertTrue(tile instanceof TileMultipartClient); + assertNull(tile.getWorldObj()); + assertEquals(31, tile.xCoord); + assertEquals(72, tile.yCoord); + assertEquals(-9, tile.zCoord); + assertEquals(1, tile.jPartList().size()); + ExamplePart part = assertInstanceOf(ExamplePart.class, tile.jPartList().get(0)); + assertSame(tile, part.tile()); + assertEquals(37, part.value()); + } + + @Test + void rejectsServerWorldsBeforeConstructingPreviewParts() { + assertThrows( + IllegalArgumentException.class, + () -> MultipartHelper.createPreviewTileFromNBT(world(), previewTag(37))); + } + + @Test + void writesTheExactMixedPartChunkDescriptionPacket() { + World world = world(); + Chunk chunk = world.getChunkFromChunkCoords(1, 2); + TileMultipart tile = mixedTile(); + tile.xCoord = 18; + tile.yCoord = 200; + tile.zCoord = 35; + + PacketCustom packet = MultipartSPH.getDescPacket(chunk, Collections.singletonList(tile).iterator()); + ByteBuf buffer = packet.getByteBuf(); + byte[] actual = new byte[buffer.writerIndex()]; + buffer.getBytes(0, actual); + + // type | chunk x/z | tile count | local x/y/z | part count | torch id/meta | button id/meta + assertArrayEquals( + new byte[] { 2, 0, 0, 0, 1, 0, 0, 0, 2, 0, 1, 2, 0, 0, 0, (byte) 200, 3, 2, 3, 5, 0, 1 }, + actual); + } + + /** The id guard runs before anything else, so a foreign tag must not disturb the loading world. */ + @Test + void leavesTheLoadingWorldAloneForATagItDoesNotOwn() { + World world = world(); + MultipartSaveLoad.loadingWorld_$eq(world); + + NBTTagCompound tag = new NBTTagCompound(); + tag.setString("id", "somethingElse"); + + assertNull(MultipartHelper.createTileFromNBT(null, tag)); + assertSame(world, MultipartSaveLoad.loadingWorld()); + } + + @Test + void registersATileConverterOntoTheSaveLoadList() { + MarkerConverter converter = new MarkerConverter(); + + MultipartHelper.registerTileConverter(converter); + + List converters = JavaConversions.seqAsJavaList(MultipartSaveLoad.converters()); + assertTrue(converters.contains(converter), "registerTileConverter must append to MultipartSaveLoad.converters"); + } + + /** Needs a loaded chunk. With no players watching, the send itself is a no-op, but the packet is still built. */ + @Test + void sendsADescPacketForATileInALoadedChunk() { + World world = world(); + TMultiPart torch = MultiPartRegistry.loadPart("mc_torch", null); + TileMultipart tile = MultipartHelper.createTileFromParts(Collections.singletonList(torch)); + tile.setWorldObj(world); + tile.xCoord = 0; + tile.yCoord = 64; + tile.zCoord = 0; + + assertNotNull(world.getChunkFromBlockCoords(0, 0)); + assertDoesNotThrow(() -> MultipartHelper.sendDescPacket(world, tile)); + } + + private static World world() { + World world = MinecraftServer.getServer().worldServers[0]; + assertNotNull(world); + return world; + } + + private static TileMultipart mixedTile() { + return MultipartHelper.createTileFromParts(Arrays.asList(new TorchPart(5), new ButtonPart(1))); + } + + private static NBTTagCompound previewTag(int value) { + NBTTagCompound part = new NBTTagCompound(); + part.setString("id", PartRegistrationExample.PART_TYPE); + part.setInteger("value", value); + NBTTagList parts = new NBTTagList(); + parts.appendTag(part); + + NBTTagCompound tile = new NBTTagCompound(); + tile.setString("id", "savedMultipart"); + tile.setInteger("x", 31); + tile.setInteger("y", 72); + tile.setInteger("z", -9); + tile.setTag("parts", parts); + return tile; + } + + /** Matches only its own tile class, so registering it cannot affect any real chunk load. */ + private static final class MarkerTile extends TileEntity { + } + + private static final class MarkerConverter extends MultipartHelper.IPartTileConverter { + + MarkerConverter() { + super(MarkerTile.class); + } + + @Override + public TMultiPart convertOne(MarkerTile tile) { + return null; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MultipartMixinFactoryFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MultipartMixinFactoryFunctionalTest.java new file mode 100644 index 0000000..d4d46e4 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MultipartMixinFactoryFunctionalTest.java @@ -0,0 +1,145 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_TRANSIENT; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.INSTANCEOF; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.NOP; +import static org.objectweb.asm.Opcodes.PUTFIELD; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.V1_6; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.JumpInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TypeInsnNode; +import org.objectweb.asm.tree.VarInsnNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.multipart.asm.MultipartMixinFactory$; + +class MultipartMixinFactoryFunctionalTest { + + private static final String TILE = "codechicken/multipart/TileMultipart"; + private static final String COPY_DESC = "(L" + TILE + ";)V"; + + @Test + void leavesEmptyAndTransientOnlyTraitsUntouched() { + for (boolean transientField : new boolean[] { false, true }) { + ClassNode node = trait(); + if (transientField) node.visitField(ACC_PUBLIC | ACC_TRANSIENT, "cache", "I", null, null); + byte[] before = ASMHelper.createBytes(node, 0); + + MultipartMixinFactory$.MODULE$.autoCompleteJavaTrait(node); + + assertEquals(0, node.methods.size()); + assertArrayEquals(before, ASMHelper.createBytes(node, 0)); + } + } + + @Test + void preservesAnExistingCopyFromWithoutEmittingAnything() { + ClassNode node = trait(); + node.visitField(ACC_PUBLIC, "saved", "I", null, null); + MethodNode existing = new MethodNode(ACC_PUBLIC, "copyFrom", COPY_DESC, null, null); + existing.visitInsn(NOP); + existing.visitInsn(RETURN); + existing.visitMaxs(0, 2); + node.methods.add(existing); + byte[] before = ASMHelper.createBytes(node, 0); + + MultipartMixinFactory$.MODULE$.autoCompleteJavaTrait(node); + + assertEquals(1, node.methods.size()); + assertSame(existing, node.methods.get(0)); + assertArrayEquals(before, ASMHelper.createBytes(node, 0)); + } + + @Test + void emitsSuperCallThenTypeGuardAndOnlyNonTransientFieldCopies() { + ClassNode node = trait(); + node.visitField(ACC_PUBLIC, "first", "I", null, null); + node.visitField(ACC_PUBLIC | ACC_TRANSIENT, "cache", "I", null, null); + node.visitField(ACC_PUBLIC, "second", "Ljava/lang/String;", null, null); + + MultipartMixinFactory$.MODULE$.autoCompleteJavaTrait(node); + + assertEquals(1, node.methods.size()); + MethodNode copy = node.methods.get(0); + assertEquals("copyFrom", copy.name); + assertEquals(COPY_DESC, copy.desc); + assertEquals(ACC_PUBLIC, copy.access); + assertEquals(2, copy.maxStack); + assertEquals(2, copy.maxLocals); + List opcodes = new ArrayList<>(); + List locals = new ArrayList<>(); + List fields = new ArrayList<>(); + for (AbstractInsnNode instruction : copy.instructions.toArray()) { + if (instruction.getOpcode() >= 0) opcodes.add(instruction.getOpcode()); + if (instruction instanceof VarInsnNode) locals.add(((VarInsnNode) instruction).var); + if (instruction instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instruction; + assertEquals(TILE, call.owner); + assertEquals("copyFrom", call.name); + assertEquals(COPY_DESC, call.desc); + } + if (instruction instanceof TypeInsnNode) { + assertEquals(node.name, ((TypeInsnNode) instruction).desc); + } + if (instruction instanceof JumpInsnNode) { + assertEquals(RETURN, ((JumpInsnNode) instruction).label.getNext().getOpcode()); + } + if (instruction instanceof FieldInsnNode) { + FieldInsnNode field = (FieldInsnNode) instruction; + assertEquals(node.name, field.owner); + fields.add(field.name + ':' + field.desc); + } + } + assertEquals( + Arrays.asList( + ALOAD, + ALOAD, + INVOKESPECIAL, + ALOAD, + INSTANCEOF, + IFEQ, + ALOAD, + ALOAD, + GETFIELD, + PUTFIELD, + ALOAD, + ALOAD, + GETFIELD, + PUTFIELD, + RETURN), + opcodes); + assertEquals(Arrays.asList(0, 1, 1, 0, 1, 0, 1), locals); + assertEquals( + Arrays.asList("first:I", "first:I", "second:Ljava/lang/String;", "second:Ljava/lang/String;"), + fields); + + byte[] before = ASMHelper.createBytes(node, 0); + MultipartMixinFactory$.MODULE$.autoCompleteJavaTrait(node); + assertArrayEquals(before, ASMHelper.createBytes(node, 0), "A second completion must not duplicate copyFrom"); + } + + private static ClassNode trait() { + ClassNode node = new ClassNode(); + node.visit(V1_6, ACC_PUBLIC, "test/CopyFromFixture", null, TILE, null); + return node; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MultipartModFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MultipartModFunctionalTest.java new file mode 100644 index 0000000..e42a3bf --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MultipartModFunctionalTest.java @@ -0,0 +1,57 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.ControlKeyModifer; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.handler.MultipartMod; +import codechicken.multipart.handler.MultipartMod$; +import codechicken.multipart.handler.MultipartProxy; +import codechicken.multipart.handler.MultipartSaveLoad; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; + +class MultipartModFunctionalTest { + + @Test + void fmlUsesTheCompanionAndCompletesTheMultipartLifecycle() { + ModContainer container = Loader.instance().getIndexedModList().get("ForgeMultipart"); + assertNotNull(container); + assertSame(MultipartMod$.MODULE$, container.getMod()); + assertTrue(MultiPartRegistry.loaded()); + assertNotNull(MultipartProxy.block()); + assertNotNull(MultipartProxy.logger()); + } + + @Test + void serverStoppedClearsTransientWorldAndControlState() { + World originalWorld = MultipartSaveLoad.loadingWorld(); + Map controls = ControlKeyModifer.map(); + Map originalControls = new HashMap<>(controls); + try { + MultipartSaveLoad.loadingWorld_$eq(MinecraftServer.getServer().worldServers[0]); + controls.put(null, Boolean.TRUE); + + MultipartMod.serverStopped(null); + + assertNull(MultipartSaveLoad.loadingWorld()); + assertTrue(controls.isEmpty()); + } finally { + MultipartSaveLoad.loadingWorld_$eq(originalWorld); + controls.clear(); + controls.putAll(originalControls); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MultipartProxyFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MultipartProxyFunctionalTest.java new file mode 100644 index 0000000..799a44f --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MultipartProxyFunctionalTest.java @@ -0,0 +1,40 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.handler.MultipartProxy; +import codechicken.multipart.handler.MultipartProxy$; +import codechicken.multipart.handler.MultipartProxy_clientImpl; +import codechicken.multipart.handler.MultipartProxy_serverImpl; + +class MultipartProxyFunctionalTest { + + @Test + void dedicatedServerStripsClientOverridesAndResolvesTheCompanionToServerMethods() throws Exception { + assertSame(MultipartProxy$.MODULE$, MultipartProxy$.class.getField("MODULE$").get(null)); + assertEquals(0, MultipartProxy_clientImpl.class.getDeclaredMethods().length); + assertThrows(NoSuchMethodException.class, () -> MultipartProxy.class.getDeclaredMethod("postInit")); + assertThrows( + NoSuchMethodException.class, + () -> MultipartProxy.class.getDeclaredMethod("onTileClassBuilt", Class.class)); + + assertSame(MultipartProxy_serverImpl.class, MultipartProxy$.class.getMethod("postInit").getDeclaringClass()); + assertSame( + MultipartProxy_serverImpl.class, + MultipartProxy$.class.getMethod("onTileClassBuilt", Class.class).getDeclaringClass()); + assertSame(MultipartProxy_serverImpl.class, MultipartProxy$.class.getMethod("init").getDeclaringClass()); + + assertNotNull(MultipartProxy.block()); + assertEquals("tile.multipart", MultipartProxy.block().getUnlocalizedName()); + assertNotNull(MultipartProxy.config()); + assertNotNull(MultipartProxy.logger()); + assertSame(MultipartProxy.block(), MultipartProxy$.MODULE$.block()); + assertSame(MultipartProxy.config(), MultipartProxy$.MODULE$.config()); + assertSame(MultipartProxy.logger(), MultipartProxy$.MODULE$.logger()); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MultipartRendererFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MultipartRendererFunctionalTest.java new file mode 100644 index 0000000..743aed2 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MultipartRendererFunctionalTest.java @@ -0,0 +1,270 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.List; + +import net.minecraft.tileentity.TileEntity; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; +import org.objectweb.asm.commons.Remapper; +import org.objectweb.asm.commons.RemappingMethodAdapter; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.lib.vec.Vector3; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.TileMultipartClient; +import codechicken.multipart.asm.MultipartMixinFactory; +import scala.collection.JavaConversions; +import scala.collection.immutable.Nil$; + +/** Executes the shipped renderer method against real generated client tiles, replacing only its GL/pass services. */ +class MultipartRendererFunctionalTest { + + @BeforeEach + void resetRenderState() { + RenderServices.events.clear(); + RenderServices.INSTANCE.useNormals = false; + RenderServices.dynamicCalls = 0; + RenderServices.position = null; + } + + @Test + void nonemptyStaticTileReturnsWithoutTouchingRenderState() throws Exception { + TileMultipart tile = newClientTile(); + RecordingPart part = new RecordingPart(); + setParts(tile, part); + setField(tile, "hasDynamicParts", false); + + render(tile); + + assertTrue(RenderServices.events.isEmpty()); + assertEquals(0, RenderServices.dynamicCalls); + } + + @Test + void dynamicTileInitializesStateAndDispatchesWithTheSameCoordinatesFrameAndPass() throws Exception { + TileMultipart tile = newClientTile(); + RecordingPart part = new RecordingPart(); + setParts(tile, part); + setField(tile, "hasDynamicParts", true); + setField(tile, "codechicken$multipart$TileMultipartClient$$dynamicCache", new TMultiPart[] { part }); + + render(tile); + + assertEquals(Arrays.asList("instance", "reset", "lightmap", "pass", "tile"), RenderServices.events); + assertEquals(1, RenderServices.dynamicCalls); + assertEquals(1.25, RenderServices.position.x); + assertEquals(-2.5, RenderServices.position.y); + assertEquals(3.75, RenderServices.position.z); + assertEquals(0.625F, RenderServices.frame); + assertEquals(1, RenderServices.pass); + assertTrue(RenderServices.INSTANCE.useNormals); + } + + @Test + void emptyTileShortCircuitsEvenWithADynamicFlagAndCache() throws Exception { + TileMultipart tile = newClientTile(); + RecordingPart part = new RecordingPart(); + setField(tile, "hasDynamicParts", true); + setField(tile, "codechicken$multipart$TileMultipartClient$$dynamicCache", new TMultiPart[] { part }); + + render(tile); + + assertTrue(RenderServices.events.isEmpty()); + assertEquals(0, RenderServices.dynamicCalls); + } + + @Test + void rejectsTilesWithoutTheClientTraitBeforeTouchingRenderState() throws Exception { + assertThrows(ClassCastException.class, () -> render(new TileMultipart())); + assertTrue(RenderServices.events.isEmpty()); + } + + private static TileMultipart newClientTile() throws Exception { + assertTrue( + TileMultipartClient.class.isInterface(), + "Exercise the transformed runtime type, not the Java input"); + BitSet traits = new BitSet(); + traits.set(MultipartMixinFactory.getId(TileMultipartClient.class.getName().replace('.', '/'))); + TileMultipart generated = (TileMultipart) MultipartMixinFactory.construct(traits, Nil$.MODULE$); + // Keep the real generated interface/flag getter. Drawing is recorded because Forge strips the actual + // TMultiPart.renderDynamic method on this dedicated server. + ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS); + String parent = Type.getInternalName(generated.getClass()); + writer.visit(V1_8, ACC_PUBLIC, "codechicken/multipart/test/RendererRecordingTile", null, parent, null); + MethodVisitor init = writer.visitMethod(ACC_PUBLIC, "", "()V", null, null); + init.visitCode(); + init.visitVarInsn(ALOAD, 0); + init.visitMethodInsn(INVOKESPECIAL, parent, "", "()V", false); + init.visitInsn(RETURN); + init.visitMaxs(0, 0); + init.visitEnd(); + String descriptor = "(Lcodechicken/lib/vec/Vector3;FI)V"; + MethodVisitor draw = writer.visitMethod(ACC_PUBLIC, "renderDynamic", descriptor, null, null); + draw.visitCode(); + draw.visitVarInsn(ALOAD, 1); + draw.visitVarInsn(FLOAD, 2); + draw.visitVarInsn(ILOAD, 3); + draw.visitMethodInsn(INVOKESTATIC, Type.getInternalName(RenderServices.class), "draw", descriptor, false); + draw.visitInsn(RETURN); + draw.visitMaxs(0, 0); + draw.visitEnd(); + writer.visitEnd(); + return (TileMultipart) new BodyLoader().define(writer.toByteArray()).getConstructor().newInstance(); + } + + private static void setParts(TileMultipart tile, TMultiPart... parts) { + tile.partList_$eq(JavaConversions.asScalaBuffer(Arrays.asList(parts)).toList()); + } + + private static void setField(TileMultipart tile, String name, Object value) throws Exception { + Field field = tile.getClass().getSuperclass().getDeclaredField(name); + field.setAccessible(true); + field.set(tile, value); + } + + private static void render(TileEntity tile) throws Exception { + Object renderer = RendererBody.TYPE.getConstructor().newInstance(); + try { + RendererBody.METHOD.invoke(renderer, tile, 1.25, -2.5, 3.75, 0.625F); + } catch (InvocationTargetException failure) { + Throwable cause = failure.getCause(); + if (cause instanceof Error) throw (Error) cause; + if (cause instanceof Exception) throw (Exception) cause; + throw new AssertionError(cause); + } + } + + private static final class RendererBody { + + static final Class TYPE; + static final Method METHOD; + + static { + try { + // Loading the client-only TESR class on a server is forbidden. Copy its actual method body without + // changing any tile casts, field accesses or invocation opcodes; only rendering services are replaced. + ClassNode source = new ClassNode(); + try (InputStream input = MultipartRendererFunctionalTest.class + .getResourceAsStream("/codechicken/multipart/MultipartRenderer$.class")) { + assertNotNull(input); + new ClassReader(input).accept(source, ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES); + } + ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); + String name = "codechicken/multipart/test/HeadlessMultipartRenderer"; + writer.visit(V1_8, ACC_PUBLIC, name, null, "java/lang/Object", null); + MethodVisitor init = writer.visitMethod(ACC_PUBLIC, "", "()V", null, null); + init.visitCode(); + init.visitVarInsn(ALOAD, 0); + init.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V", false); + init.visitInsn(RETURN); + init.visitMaxs(0, 0); + init.visitEnd(); + boolean found = false; + for (MethodNode method : source.methods) { + if (!method.name.equals("renderTileEntityAt")) continue; + assertFalse(found); + found = true; + MethodVisitor target = writer.visitMethod(ACC_PUBLIC, method.name, method.desc, null, null); + method.accept(new RemappingMethodAdapter(ACC_PUBLIC, method.desc, target, new Remapper() { + + @Override + public String map(String internalName) { + if (internalName.equals("codechicken/lib/render/CCRenderState") + || internalName.equals("net/minecraftforge/client/MinecraftForgeClient")) + return Type.getInternalName(RenderServices.class); + return internalName; + } + })); + } + assertTrue(found); + writer.visitEnd(); + TYPE = new BodyLoader().define(writer.toByteArray()); + METHOD = TYPE.getMethod( + "renderTileEntityAt", + TileEntity.class, + double.class, + double.class, + double.class, + float.class); + } catch (Exception failure) { + throw new ExceptionInInitializerError(failure); + } + } + } + + private static final class BodyLoader extends ClassLoader { + + BodyLoader() { + super(MultipartRendererFunctionalTest.class.getClassLoader()); + } + + Class define(byte[] bytes) { + return defineClass(null, bytes, 0, bytes.length); + } + } + + public static final class RenderServices { + + static final RenderServices INSTANCE = new RenderServices(); + static final List events = new ArrayList<>(); + public boolean useNormals; + static int dynamicCalls; + static Vector3 position; + static float frame; + static int pass; + + public static void draw(Vector3 position, float frame, int pass) { + assertTrue(INSTANCE.useNormals); + events.add("tile"); + dynamicCalls++; + RenderServices.position = position; + RenderServices.frame = frame; + RenderServices.pass = pass; + } + + public static RenderServices instance() { + events.add("instance"); + return INSTANCE; + } + + public void resetInstance() { + events.add("reset"); + useNormals = false; + } + + public void pullLightmapInstance() { + events.add("lightmap"); + } + + public static int getRenderPass() { + events.add("pass"); + return 1; + } + } + + private static final class RecordingPart extends TMultiPart { + + @Override + public String getType() { + return "renderer-regression"; + } + + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/MultipartSaveLoadFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/MultipartSaveLoadFunctionalTest.java new file mode 100644 index 0000000..b4d45fa --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/MultipartSaveLoadFunctionalTest.java @@ -0,0 +1,295 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Scanner; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraft.world.chunk.Chunk; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.handler.MultipartSaveLoad; +import codechicken.multipart.handler.MultipartSaveLoad$; +import codechicken.multipart.minecraft.ButtonPart; +import codechicken.multipart.minecraft.TorchPart; + +class MultipartSaveLoadFunctionalTest { + + @Test + void referenceScalaConsumerStillLinksToTheCompanionState() throws Exception { + World original = MultipartSaveLoad.loadingWorld(); + World world = world(); + try { + Class fixtureClass = new FixtureClassLoader(MultipartSaveLoad.class.getClassLoader()) + .define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + fixtureClass.getMethod("loadingWorld_$eq", World.class).invoke(fixture, world); + + assertSame(world, MultipartSaveLoad.loadingWorld()); + assertSame(world, MultipartSaveLoad$.MODULE$.loadingWorld()); + assertSame(world, fixtureClass.getMethod("loadingWorld").invoke(fixture)); + assertSame(MultipartSaveLoad.converters(), MultipartSaveLoad$.MODULE$.converters()); + } finally { + MultipartSaveLoad.loadingWorld_$eq(original); + } + } + + @Test + void hooksTheDummyTileAndGeneratedTileNamesIntoVanillaMaps() { + MultipartSaveLoad.hookLoader(); + + NBTTagCompound saved = new NBTTagCompound(); + saved.setString("id", "savedMultipart"); + saved.setInteger("x", 7); + saved.setInteger("y", 8); + saved.setInteger("z", 9); + TileEntity dummy = TileEntity.createAndLoadEntity(saved); + + assertNotNull(dummy); + assertEquals("codechicken.multipart.handler.MultipartSaveLoad$TileNBTContainer", dummy.getClass().getName()); + assertSame(saved, tag(dummy)); + assertEquals(7, dummy.xCoord); + assertEquals(8, dummy.yCoord); + assertEquals(9, dummy.zCoord); + + MultipartSaveLoad.registerTileClass(RegisteredTile.class); + assertEquals("savedMultipart", MultipartSaveLoad.getClassToNameMap().get(RegisteredTile.class)); + NBTTagCompound registered = new NBTTagCompound(); + new RegisteredTile().writeToNBT(registered); + assertEquals("savedMultipart", registered.getString("id")); + } + + @Test + void leavesUnclaimedTilesRemovesEmptyConversionsAndUsesTheFirstMatch() { + World world = world(); + Chunk chunk = new Chunk(world, 40, 40); + UnclaimedTile unclaimed = tile(new UnclaimedTile(), world); + ConvertedTile converted = tile(new ConvertedTile(), world); + converted.xCoord = 642; + converted.yCoord = 64; + converted.zCoord = 642; + DeletedTile deleted = tile(new DeletedTile(), world); + ChunkPosition unclaimedPosition = put(chunk, 1, unclaimed); + ChunkPosition convertedPosition = put(chunk, 2, converted); + ChunkPosition deletedPosition = put(chunk, 3, deleted); + + RecordingConverter first = new RecordingConverter(); + RejectingSecondConverter second = new RejectingSecondConverter(); + MultipartHelper.registerTileConverter(first); + MultipartHelper.registerTileConverter(second); + MultipartHelper.registerTileConverter(new DeletingConverter()); + + MultipartSaveLoad.loadTiles(chunk); + + assertSame(world, MultipartSaveLoad.loadingWorld()); + assertSame(unclaimed, chunk.chunkTileEntityMap.get(unclaimedPosition)); + assertFalse(chunk.chunkTileEntityMap.containsKey(deletedPosition)); + TileMultipart replacement = assertInstanceOf( + TileMultipart.class, + chunk.chunkTileEntityMap.get(convertedPosition)); + assertSame(world, replacement.getWorldObj()); + assertEquals(converted.xCoord, replacement.xCoord); + assertEquals(converted.yCoord, replacement.yCoord); + assertEquals(converted.zCoord, replacement.zCoord); + NBTTagCompound saved = new NBTTagCompound(); + replacement.writeToNBT(saved); + assertEquals(converted.xCoord, saved.getInteger("x")); + assertEquals(converted.yCoord, saved.getInteger("y")); + assertEquals(converted.zCoord, saved.getInteger("z")); + assertEquals(1, replacement.jPartList().size()); + assertSame(first.part, replacement.jPartList().get(0)); + assertEquals(1, first.calls); + assertEquals(0, second.calls); + } + + @Test + void rebuildsSavedDummyTilesAndLeavesForeignDummiesUntouched() { + World world = world(); + Chunk chunk = new Chunk(world, 41, 41); + TileMultipart savedTile = MultipartHelper + .createTileFromParts(Arrays.asList(new TorchPart(5), new ButtonPart(1))); + NBTTagCompound savedTag = new NBTTagCompound(); + savedTile.writeToNBT(savedTag); + TileEntity savedDummy = dummy(savedTag, world); + ChunkPosition savedPosition = put(chunk, 1, savedDummy); + + NBTTagCompound foreignTag = new NBTTagCompound(); + foreignTag.setString("id", "foreign"); + TileEntity foreignDummy = dummy(foreignTag, world); + ChunkPosition foreignPosition = put(chunk, 2, foreignDummy); + + MultipartSaveLoad.loadTiles(chunk); + + TileMultipart rebuilt = assertInstanceOf(TileMultipart.class, chunk.chunkTileEntityMap.get(savedPosition)); + assertSame(world, rebuilt.getWorldObj()); + assertEquals(2, rebuilt.jPartList().size()); + assertEquals("mc_torch", rebuilt.jPartList().get(0).getType()); + assertEquals("mc_button", rebuilt.jPartList().get(1).getType()); + assertSame(foreignDummy, chunk.chunkTileEntityMap.get(foreignPosition)); + } + + @Test + void rebuildsTilesFromAStandaloneCubeMapWithTheEventWorld() { + World world = world(); + TileMultipart savedTile = MultipartHelper.createTileFromParts(Arrays.asList(new TorchPart(5))); + savedTile.xCoord = 5; + savedTile.yCoord = 70; + savedTile.zCoord = 6; + NBTTagCompound savedTag = new NBTTagCompound(); + savedTile.writeToNBT(savedTag); + ChunkPosition position = new ChunkPosition(5, 70, 6); + Map tiles = new HashMap<>(); + tiles.put(position, dummy(savedTag, null)); + + MultipartSaveLoad.loadTiles(world, tiles); + + TileMultipart rebuilt = assertInstanceOf(TileMultipart.class, tiles.get(position)); + assertSame(world, MultipartSaveLoad.loadingWorld()); + assertSame(world, rebuilt.getWorldObj()); + assertEquals(5, rebuilt.xCoord); + assertEquals(70, rebuilt.yCoord); + assertEquals(6, rebuilt.zCoord); + assertEquals("mc_torch", rebuilt.jPartList().get(0).getType()); + } + + private static TileEntity dummy(NBTTagCompound tag, World world) { + try { + TileEntity dummy = (TileEntity) Class + .forName("codechicken.multipart.handler.MultipartSaveLoad$TileNBTContainer") + .getDeclaredConstructor().newInstance(); + dummy.readFromNBT(tag); + dummy.setWorldObj(world); + return dummy; + } catch (ReflectiveOperationException e) { + throw new AssertionError(e); + } + } + + private static Object tag(TileEntity tile) { + try { + return tile.getClass().getMethod("tag").invoke(tile); + } catch (ReflectiveOperationException e) { + throw new AssertionError(e); + } + } + + private static T tile(T tile, World world) { + tile.setWorldObj(world); + return tile; + } + + private static ChunkPosition put(Chunk chunk, int offset, TileEntity tile) { + ChunkPosition position = new ChunkPosition(chunk.xPosition * 16 + offset, 64, chunk.zPosition * 16 + offset); + chunk.chunkTileEntityMap.put(position, tile); + return position; + } + + private static WorldServer world() { + WorldServer world = MinecraftServer.getServer().worldServers[0]; + assertNotNull(world); + assertFalse(world.isRemote); + return world; + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + MultipartSaveLoadFunctionalTest.class + .getResourceAsStream("/compat/ReferenceScalaMultipartSaveLoadConsumer.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } + + private static class RegisteredTile extends TileEntity { + } + + private static final class UnclaimedTile extends TileEntity { + } + + private static final class ConvertedTile extends TileEntity { + } + + private static final class DeletedTile extends TileEntity { + } + + private static final class RecordingConverter extends MultipartHelper.IPartTileConverter { + + private final TMultiPart part = new TorchPart(3); + private int calls; + + private RecordingConverter() { + super(ConvertedTile.class); + } + + @Override + public TMultiPart convertOne(ConvertedTile tile) { + calls++; + return part; + } + } + + private static final class RejectingSecondConverter extends MultipartHelper.IPartTileConverter { + + private int calls; + + private RejectingSecondConverter() { + super(ConvertedTile.class); + } + + @Override + public TMultiPart convertOne(ConvertedTile tile) { + calls++; + return new ButtonPart(1); + } + } + + private static final class DeletingConverter extends MultipartHelper.IPartTileConverter { + + private DeletingConverter() { + super(DeletedTile.class); + } + + @Override + public Iterable convertMulti(DeletedTile tile) { + return Collections.emptyList(); + } + + @Override + public TMultiPart convertOne(DeletedTile tile) { + throw new AssertionError("convertMulti supplies the deletion result"); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/PacketSchedulerFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/PacketSchedulerFunctionalTest.java new file mode 100644 index 0000000..34a2b93 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/PacketSchedulerFunctionalTest.java @@ -0,0 +1,210 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.multipart.IScheduledPacketPart; +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.PacketScheduler; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** + * schedulePacket needs a part bound to a tile in a non-remote world, and sendScheduled needs a real write stream, so + * none of this runs headless. Tests execute inside the server-started event, so no tick can interleave and flush the + * map between a schedule and a send. + */ +class PacketSchedulerFunctionalTest { + + @Test + void repeatedSchedulesAccumulateIntoOneMask() { + RecordingPart part = boundPart(1); + + PacketScheduler.schedulePacket(part, 0x1L); + PacketScheduler.schedulePacket(part, 0x2L); + PacketScheduler.schedulePacket(part, 0x2L); + sendScheduled(); + + assertEquals(Collections.singletonList(0x3L), part.written, "masks are OR-ed, and the part is written once"); + } + + @Test + void sendingClearsTheScheduleSoTheNextTickWritesNothing() { + RecordingPart part = boundPart(1); + PacketScheduler.schedulePacket(part, 0x5L); + + sendScheduled(); + sendScheduled(); + + assertEquals(Collections.singletonList(0x5L), part.written); + } + + @Test + void callbacksCanScheduleAnotherPartDuringTheFlush() { + RecordingPart first = boundPart(1, 0); + RecordingPart second = boundPart(1, 1); + // These hashes place the new entry in a bucket still ahead of Scala's original traversal. + RecordingPart added = boundPart(1, 3); + first.onWrite = () -> PacketScheduler.schedulePacket(added, 0x4L); + second.onWrite = first.onWrite; + try { + PacketScheduler.schedulePacket(first, 0x1L); + PacketScheduler.schedulePacket(second, 0x2L); + sendScheduled(); + + assertEquals(Collections.singletonList(0x1L), first.written); + assertEquals(Collections.singletonList(0x2L), second.written); + assertEquals(Collections.singletonList(0x4L), added.written); + sendScheduled(); + assertEquals(1, first.written.size()); + assertEquals(1, second.written.size()); + assertEquals(1, added.written.size()); + } finally { + first.tile_$eq(null); + second.tile_$eq(null); + added.tile_$eq(null); + sendScheduled(); + } + } + + @Test + void callbacksMergeMasksIntoEntriesThatHaveNotBeenWrittenYet() { + RecordingPart first = boundPart(1, 0); + RecordingPart second = boundPart(1, 1); + first.onWrite = () -> PacketScheduler.schedulePacket(second, 0x4L); + second.onWrite = () -> PacketScheduler.schedulePacket(first, 0x8L); + try { + PacketScheduler.schedulePacket(first, 0x1L); + PacketScheduler.schedulePacket(second, 0x2L); + sendScheduled(); + + assertEquals(1, first.written.size()); + assertEquals(1, second.written.size()); + assertTrue( + first.written.get(0) == 0x9L && second.written.get(0) == 0x2L + || first.written.get(0) == 0x1L && second.written.get(0) == 0x6L, + "Whichever part is visited second must receive the mask added by the first callback"); + sendScheduled(); + assertEquals(1, first.written.size()); + assertEquals(1, second.written.size()); + } finally { + first.tile_$eq(null); + second.tile_$eq(null); + sendScheduled(); + } + } + + @Test + void aPartThatLostItsTileIsSkippedButStillCleared() { + RecordingPart part = boundPart(1); + PacketScheduler.schedulePacket(part, 0x7L); + part.tile_$eq(null); + + sendScheduled(); + + assertTrue(part.written.isEmpty(), "a part with no tile must be skipped"); + } + + @Test + void everyDocumentedMaskWidthIsAccepted() { + for (int width : new int[] { 1, 2, 4, 8 }) { + RecordingPart part = boundPart(width); + PacketScheduler.schedulePacket(part, 0x1L); + + sendScheduled(); + + assertEquals(Collections.singletonList(0x1L), part.written, "maskWidth " + width + " must be accepted"); + } + } + + /** The reference matches on 1, 2, 4 and 8 with no fallback, so anything else fails rather than writing nothing. */ + @Test + void anUndocumentedMaskWidthIsRejected() { + RecordingPart part = boundPart(3); + PacketScheduler.schedulePacket(part, 0x1L); + + assertThrows(RuntimeException.class, PacketSchedulerFunctionalTest::sendScheduled); + + // Leave no scheduled entry behind for the tests that follow. + part.tile_$eq(null); + try { + sendScheduled(); + } catch (RuntimeException ignored) { + // already drained + } + } + + // The only place sendScheduled's owner is named. + private static void sendScheduled() { + PacketScheduler.sendScheduled(); + } + + private static RecordingPart boundPart(int maskWidth) { + return boundPart(maskWidth, 0); + } + + private static RecordingPart boundPart(int maskWidth, int hash) { + RecordingPart part = new RecordingPart(maskWidth, hash); + TileMultipart tile = MultipartHelper.createTileFromParts(Collections.singletonList(part)); + assertNotNull(tile); + World world = MinecraftServer.getServer().worldServers[0]; + assertNotNull(world); + tile.setWorldObj(world); + tile.xCoord = 1100; + tile.yCoord = 70; + tile.zCoord = 1100; + return part; + } + + private static final class RecordingPart extends TMultiPart implements IScheduledPacketPart { + + private final int maskWidth; + private final int hash; + final List written = new ArrayList<>(); + Runnable onWrite; + + RecordingPart(int maskWidth, int hash) { + this.maskWidth = maskWidth; + this.hash = hash; + } + + @Override + public int hashCode() { + return hash; + } + + @Override + public String getType() { + return "test:scheduled"; + } + + @Override + public int maskWidth() { + return maskWidth; + } + + @Override + public void writeScheduled(long mask, MCDataOutput packet) { + written.add(mask); + if (onWrite != null) { + onWrite.run(); + } + } + + @Override + public void readScheduled(long mask, MCDataInput packet) {} + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/PartConverterFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/PartConverterFunctionalTest.java new file mode 100644 index 0000000..a0afba7 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/PartConverterFunctionalTest.java @@ -0,0 +1,181 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultiPartRegistry.IPartConverter; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.examples.BlockConversionExample; + +class PartConverterFunctionalTest { + + @Test + void javaExampleRegistersConvertsAndPreservesStateThroughNbtAndPackets() { + World world = MinecraftServer.getServer().worldServers[0]; + BlockCoord pos = new BlockCoord(60, 200, 48); + Block source = ForgeMultipartFunctionalTestMod.illuminatedLamp; + world.getChunkFromBlockCoords(pos.x, pos.z); + BlockConversionExample converter = (BlockConversionExample) MultiPartRegistry + .getPartFactory(BlockConversionExample.PART_TYPE); + assertEquals(Collections.singletonList(source), converter.blockTypes()); + try { + world.setBlock(pos.x, pos.y, pos.z, Blocks.stone, 0, 0); + assertNull(converter.convert(world, pos)); + world.setBlock(pos.x, pos.y, pos.z, source, 11, 0); + TMultiPart converted = MultiPartRegistry.convertBlock(world, pos, source); + assertTrue(converted instanceof BlockConversionExample.ConvertedPart); + assertNull(converted.tile()); + assertNotSame(converted, MultiPartRegistry.convertBlock(world, pos, source)); + assertSame(source, world.getBlock(pos.x, pos.y, pos.z)); + NBTTagCompound saved = new NBTTagCompound(); + converted.save(saved); + assertEquals(11, saved.getInteger("metadata")); + + TMultiPart restored = MultiPartRegistry.loadPart(converted.getType(), saved); + assertNotSame(converted, restored); + assertNull(restored.tile()); + restored.load(saved); + NBTTagCompound copy = new NBTTagCompound(); + restored.save(copy); + assertEquals(saved, copy); + + PacketCustom outgoing = new PacketCustom("test", 1); + MultiPartRegistry.writePartID(outgoing, converted); + converted.writeDesc(outgoing); + outgoing.writeByte(37); + PacketCustom incoming = new PacketCustom(outgoing.getByteBuf().copy()); + TMultiPart client = MultiPartRegistry.readPart(incoming); + assertNotSame(converted, client); + assertNull(client.tile()); + client.readDesc(incoming); + copy = new NBTTagCompound(); + client.save(copy); + assertEquals(saved, copy); + assertEquals(37, incoming.readUByte()); + + TMultiPart added = new MultipartGeneratorFunctionalTest.PlainPart(); + assertTrue(TileMultipart.canPlacePart(world, pos, added)); + TileMultipart installed = TileMultipart.addPart(world, pos, added); + TMultiPart committed = installed.jPartList().get(0); + assertEquals(converted.getType(), committed.getType()); + assertNotSame(converted, committed); + copy = new NBTTagCompound(); + committed.save(copy); + assertEquals(saved, copy); + assertSame(installed, committed.tile()); + assertSame(installed, world.getTileEntity(pos.x, pos.y, pos.z)); + } finally { + world.setBlockToAir(pos.x, pos.y, pos.z); + } + } + + @Test + void probesLeaveOriginalTileIntactAndCommitRunsConversionHooksInOrder() { + World world = MinecraftServer.getServer().worldServers[0]; + BlockCoord pos = new BlockCoord(58, 200, 48); + world.getChunkFromBlockCoords(pos.x, pos.z); + world.setBlock(pos.x, pos.y, pos.z, Blocks.chest, 0, 0); + TileEntity original = world.getTileEntity(pos.x, pos.y, pos.z); + List events = new ArrayList<>(); + List attempts = new ArrayList<>(); + MultiPartRegistry.registerConverter(new IPartConverter() { + + @Override + public Iterable blockTypes() { + return Collections.singletonList(Blocks.chest); + } + + @Override + public TMultiPart convert(World supplied, BlockCoord location) { + if (supplied != world || !pos.equals(location)) return null; + assertSame(original, world.getTileEntity(pos.x, pos.y, pos.z)); + TMultiPart part = new MultipartGeneratorFunctionalTest.PlainPart() { + + @Override + public void invalidateConvertedTile() { + assertSame(original, world.getTileEntity(pos.x, pos.y, pos.z)); + assertSame(Blocks.chest, world.getBlock(pos.x, pos.y, pos.z)); + events.add("invalidate"); + } + + @Override + public void onConverted() { + assertSame(tile(), world.getTileEntity(pos.x, pos.y, pos.z)); + assertTrue(original.isInvalid()); + events.add("converted"); + super.onConverted(); + } + + @Override + public void onAdded() { + events.add("converted-added"); + super.onAdded(); + } + }; + attempts.add(part); + return part; + } + }); + try { + TMultiPart direct = MultiPartRegistry.convertBlock(world, pos, Blocks.chest); + assertNull(direct.tile()); + TMultiPart rejected = new MultipartGeneratorFunctionalTest.PlainPart() { + + @Override + public boolean occlusionTest(TMultiPart other) { + return false; + } + }; + assertFalse(TileMultipart.canPlacePart(world, pos, rejected)); + TMultiPart added = new MultipartGeneratorFunctionalTest.PlainPart() { + + @Override + public void onAdded() { + events.add("new-added"); + super.onAdded(); + } + }; + assertTrue(TileMultipart.canPlacePart(world, pos, added)); + assertEquals(3, attempts.size()); + assertTrue(events.isEmpty()); + assertSame(original, world.getTileEntity(pos.x, pos.y, pos.z)); + assertFalse(original.isInvalid()); + assertNull(added.tile()); + TileMultipart installed = TileMultipart.addPart(world, pos, added); + assertEquals(4, attempts.size()); + assertEquals(Arrays.asList("invalidate", "converted", "converted-added", "new-added"), events); + assertSame(installed, world.getTileEntity(pos.x, pos.y, pos.z)); + assertSame(attempts.get(3), installed.jPartList().get(0)); + assertSame(added, installed.jPartList().get(1)); + for (int i = 0; i < 3; i++) { + assertNotSame(attempts.get(i), attempts.get(3)); + } + assertSame(installed, TileMultipart.getOrConvertTile(world, pos)); + assertEquals(4, attempts.size(), "An installed tile bypasses converters"); + } finally { + world.setBlockToAir(pos.x, pos.y, pos.z); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/PartFactoryLookupFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/PartFactoryLookupFunctionalTest.java new file mode 100644 index 0000000..d612b52 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/PartFactoryLookupFunctionalTest.java @@ -0,0 +1,92 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.util.function.Function; + +import net.minecraft.nbt.NBTTagCompound; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockClass; +import codechicken.microblock.MicroblockClient; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultiPartRegistry$; +import codechicken.multipart.MultiPartRegistry.IPartFactory2; +import codechicken.multipart.examples.PartFactoryLookupExample; +import cpw.mods.fml.relauncher.ReflectionHelper; +import scala.Option; + +class PartFactoryLookupFunctionalTest { + + @Test + void javaFactoriesSupportMicroblockConstructionAndLoading() throws Exception { + checkMicroblocks(MultiPartRegistry::getPartFactory); + assertSame( + MultiPartRegistry.getPartFactory("mcr_face"), + MultiPartRegistry.class.getMethod("getPartFactory", String.class).invoke(null, "mcr_face")); + assertNull( + MultiPartRegistry.class.getMethod("getPartFactory", String.class).invoke(null, "test:no_such_factory")); + } + + @Test + void javaExampleRejectsUnsupportedTypesAndCreatesFreshUnboundMicroblocks() { + int material = MicroMaterialRegistry.materialID("minecraft:stone"); + assertNull(PartFactoryLookupExample.createMicroblock("test:no_such_factory", false, material)); + assertNull(PartFactoryLookupExample.createMicroblock("mc_torch", false, material)); + Microblock part = PartFactoryLookupExample.createMicroblock("mcr_face", false, material); + assertSame(MultiPartRegistry.getPartFactory("mcr_face"), part.microClass()); + assertEquals(material, part.material()); + assertFalse(part instanceof MicroblockClient); + assertNull(part.tile()); + assertNotSame(part, PartFactoryLookupExample.createMicroblock("mcr_face", false, material)); + } + + @Test + @SuppressWarnings("unchecked") + void reflectedFactoriesSupportMicroblockConstructionAndLoading() throws Exception { + Field field = ReflectionHelper + .findField(MultiPartRegistry$.class, "codechicken$multipart$MultiPartRegistry$$typeMap"); + scala.collection.mutable.Map map = (scala.collection.mutable.Map) field + .get(MultiPartRegistry$.MODULE$); + checkMicroblocks(name -> { + Option factory = map.get(name); + return factory.isEmpty() ? null : factory.get(); + }); + } + + private static void checkMicroblocks(Function lookup) throws Exception { + assertNull(lookup.apply("test:no_such_factory")); + assertFalse(lookup.apply("mc_torch") instanceof MicroblockClass); + int material = MicroMaterialRegistry.materialID("minecraft:stone"); + for (String name : new String[] { "mcr_face", "mcr_hllw", "mcr_cnr", "mcr_edge", "mcr_post" }) { + IPartFactory2 factory = lookup.apply(name); + assertTrue(factory instanceof MicroblockClass); + assertSame(factory, lookup.apply(new String(name))); + Microblock part = (Microblock) MicroblockClass.class.getMethod("create", boolean.class, int.class) + .invoke(factory, false, material); + assertSame(factory, part.microClass()); + assertEquals(name, part.getType()); + assertEquals(material, part.material()); + assertFalse(part instanceof MicroblockClient); + assertNull(part.tile()); + assertNotSame(part, ((MicroblockClass) factory).create(false, material)); + NBTTagCompound tag = new NBTTagCompound(); + tag.setString("id", name); + tag.setString("material", "minecraft:stone"); + tag.setByte("shape", (byte) 0x21); + part.load(tag); + assertEquals(0x21, part.shape()); + assertEquals(material, part.material()); + assertNull(part.tile(), "Factory construction and NBT load do not bind a part"); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/PartRegistrationFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/PartRegistrationFunctionalTest.java new file mode 100644 index 0000000..5a7162e --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/PartRegistrationFunctionalTest.java @@ -0,0 +1,293 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.function.BiConsumer; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultiPartRegistry$; +import codechicken.multipart.MultiPartRegistry.IPartFactory; +import codechicken.multipart.MultiPartRegistry.IPartFactory2; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.examples.PartRegistrationExample; +import codechicken.multipart.examples.PartRegistrationExample.ExamplePart; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.runtime.AbstractFunction2; + +class PartRegistrationFunctionalTest { + + private static final BlockCoord EXAMPLE_POS = new BlockCoord(42, 200, 32); + + private static final List> ENTRIES = Arrays.asList( + (factory, types) -> MultiPartRegistry.registerParts(factory, types), + (factory, types) -> MultiPartRegistry$.MODULE$.registerParts(factory, types), + (factory, types) -> MultiPartRegistry.registerParts(factory, seq(types)), + (factory, types) -> MultiPartRegistry$.MODULE$.registerParts(factory, seq(types)), + MultiPartRegistry::registerPartFactory); + private static final IPartFactory2 FACTORY = new IPartFactory2() { + + @Override + public TMultiPart createPart(String name, NBTTagCompound nbt) { + factoryCalls++; + return new Part(name, false, nbt, null, -1); + } + + @Override + public TMultiPart createPart(String name, MCDataInput packet) { + factoryCalls++; + return new Part(name, true, null, packet, packet == null ? -1 : packet.readUByte()); + } + }; + private static int factoryCalls; + private static int callsAfterRegistration; + private static ModContainer owner; + private static IllegalStateException duplicateFailure; + private static NullPointerException nullArrayFailure; + + static void registerDuringInit() { + owner = Loader.instance().activeModContainer(); + for (int i = 0; i < ENTRIES.size(); i++) { + String[] types = { type(i) }; + ENTRIES.get(i).accept(FACTORY, types); + types[0] = "test:registration_mutated_array"; + } + IPartFactory oldFactory = (name, client) -> new Part(name, client, null, null, -1); + MultiPartRegistry.registerParts(oldFactory, "test:registration_boolean_static"); + MultiPartRegistry$.MODULE$.registerParts(oldFactory, "test:registration_boolean_companion"); + AbstractFunction2 function = new AbstractFunction2() { + + @Override + public TMultiPart apply(String name, Object client) { + return oldFactory.createPart(name, (Boolean) client); + } + }; + MultiPartRegistry.registerParts(function, seq("test:registration_function_static")); + MultiPartRegistry$.MODULE$.registerParts(function, seq("test:registration_function_companion")); + for (int i = 0; i < ENTRIES.size(); i++) { + final int entry = i; + duplicateFailure = assertThrows( + IllegalStateException.class, + () -> ENTRIES.get(entry).accept( + FACTORY, + new String[] { type(entry) + "_prefix", type(entry), type(entry) + "_tail" })); + } + nullArrayFailure = assertThrows( + NullPointerException.class, + () -> MultiPartRegistry.registerParts(FACTORY, (String[]) null)); + callsAfterRegistration = factoryCalls; + PartRegistrationExample.register(); + } + + @Test + void javaExampleRegistersDuringInitAndCreatesFreshUnboundPartsOnBothPaths() { + TMultiPart server = MultiPartRegistry.loadPart(PartRegistrationExample.PART_TYPE, new NBTTagCompound()); + TMultiPart another = MultiPartRegistry.loadPart(PartRegistrationExample.PART_TYPE, new NBTTagCompound()); + PacketCustom packet = packet(server); + TMultiPart client = MultiPartRegistry.readPart(packet); + assertEquals(PartRegistrationExample.PART_TYPE, server.getType()); + assertEquals(server.getType(), client.getType()); + assertNotSame(server, another); + assertNotSame(server, client); + assertNull(server.tile()); + assertNull(client.tile()); + assertSame(owner, MultiPartRegistry.getModContainer(server.getType())); + assertEquals(17, packet.readUByte(), "This example has no constructor discriminator"); + } + + @Test + void javaExamplePlacesPersistsSynchronizesAndRemovesState() { + World world = MinecraftServer.getServer().worldServers[0]; + world.getChunkFromBlockCoords(EXAMPLE_POS.x, EXAMPLE_POS.z); + world.setBlockToAir(EXAMPLE_POS.x, EXAMPLE_POS.y, EXAMPLE_POS.z); + try { + TileMultipart tile = PartRegistrationExample.place(world, EXAMPLE_POS, 7); + assertNotNull(tile); + ExamplePart part = (ExamplePart) tile.jPartList().get(0); + assertSame(tile, part.tile()); + assertEquals(7, part.value()); + assertFalse(part.doesTick()); + + part.setValue(23); + assertEquals(23, part.value()); + + NBTTagCompound saved = new NBTTagCompound(); + tile.writeToNBT(saved); + TileMultipart loaded = TileMultipart.createFromNBT(saved); + assertNotNull(loaded); + assertEquals(23, ((ExamplePart) loaded.jPartList().get(0)).value()); + + PacketCustom description = new PacketCustom("test", 1); + part.writeDesc(description); + ExamplePart client = new ExamplePart(); + client.readDesc(new PacketCustom(description.getByteBuf().copy())); + assertEquals(23, client.value()); + + TileMultipart current = part.tile(); + assertNull(current.remPart(part), "Removing the last part leaves no replacement tile"); + assertNull(part.tile()); + assertTrue(world.isAirBlock(EXAMPLE_POS.x, EXAMPLE_POS.y, EXAMPLE_POS.z)); + } finally { + world.setBlockToAir(EXAMPLE_POS.x, EXAMPLE_POS.y, EXAMPLE_POS.z); + } + } + + @Test + void registrationIsLazyOwnedByTheActiveModAndDoesNotRetainTheArray() { + assertEquals("ForgeMultipartTests", owner.getModId()); + assertEquals(0, callsAfterRegistration); + assertTrue(MultiPartRegistry.required()); + assertTrue(MultiPartRegistry.loaded()); + for (int i = 0; i < ENTRIES.size(); i++) { + assertSame(owner, MultiPartRegistry.getModContainer(type(i))); + } + assertThrows( + NoSuchElementException.class, + () -> MultiPartRegistry.getModContainer("test:registration_mutated_array")); + } + + @Test + void typedFactoriesKeepNbtIdentityAndTheSharedPacketCursor() { + for (int i = 0; i < ENTRIES.size(); i++) { + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setInteger("value", 23); + Part server = (Part) MultiPartRegistry.loadPart(type(i), nbt); + assertFalse(server.client); + assertSame(nbt, server.nbt); + assertEquals(0, server.loads); + server.load(nbt); + assertEquals(1, server.loads); + assertEquals(23, server.value); + assertNotSame(server, MultiPartRegistry.loadPart(type(i), nbt)); + PacketCustom packet = packet(server); + Part client = (Part) MultiPartRegistry.readPart(packet); + assertTrue(client.client); + assertSame(packet, client.packet); + assertEquals(17, client.discriminator); + assertEquals(0, client.reads); + client.readDesc(packet); + assertEquals(1, client.reads); + assertEquals(23, client.value); + assertEquals(0, packet.getByteBuf().readableBytes()); + assertNull(server.tile()); + assertNull(client.tile()); + } + } + + @Test + void booleanAndScalaFunctionAdaptersKeepTheSideAndLeavePayloadConsumptionToThePart() { + for (String suffix : Arrays + .asList("boolean_static", "boolean_companion", "function_static", "function_companion")) { + String name = "test:registration_" + suffix; + Part server = (Part) MultiPartRegistry.loadPart(name, new NBTTagCompound()); + assertFalse(server.client); + PacketCustom packet = packet(server); + Part client = (Part) MultiPartRegistry.readPart(packet); + assertTrue(client.client); + assertEquals(name, client.getType()); + assertEquals(17, packet.readUByte(), "Legacy adapters must not consume the description payload"); + assertEquals(23, packet.readUByte()); + + Part preview = (Part) MultiPartRegistry.getPartFactory(name) + .createPartForClientPreview(name, new NBTTagCompound()); + assertTrue(preview.client); + assertNull(preview.nbt); + assertNull(preview.packet); + } + } + + @Test + void duplicateRegistrationKeepsThePrefixAndClosedRegistryGuardsKeepTheirOrdering() { + assertTrue(duplicateFailure.getMessage().contains("already registered")); + assertTrue(nullArrayFailure instanceof NullPointerException); + for (int i = 0; i < ENTRIES.size(); i++) { + assertSame(owner, MultiPartRegistry.getModContainer(type(i) + "_prefix")); + final String tail = type(i) + "_tail"; + assertThrows(NoSuchElementException.class, () -> MultiPartRegistry.getModContainer(tail)); + final BiConsumer entry = ENTRIES.get(i); + assertEquals( + "Parts must be registered in the init methods.", + assertThrows(IllegalStateException.class, () -> entry.accept(null, new String[0])).getMessage()); + } + assertThrows(IllegalStateException.class, () -> MultiPartRegistry.registerParts(FACTORY, (String[]) null)); + assertThrows(NullPointerException.class, () -> MultiPartRegistry.registerParts(FACTORY, (Seq) null)); + assertThrows( + NullPointerException.class, + () -> MultiPartRegistry$.MODULE$.registerParts(FACTORY, (Seq) null)); + } + + private static String type(int index) { + return "test:registration_" + index; + } + + private static Seq seq(String... types) { + return JavaConversions.asScalaBuffer(Arrays.asList(types)).toList(); + } + + private static PacketCustom packet(TMultiPart part) { + PacketCustom outgoing = new PacketCustom("test", 1); + MultiPartRegistry.writePartID(outgoing, part); + outgoing.writeByte(17); + outgoing.writeByte(23); + return new PacketCustom(outgoing.getByteBuf().copy()); + } + + private static final class Part extends TMultiPart { + + private final String name; + private final boolean client; + private final NBTTagCompound nbt; + private final MCDataInput packet; + private final int discriminator; + private int loads; + private int reads; + private int value; + + private Part(String name, boolean client, NBTTagCompound nbt, MCDataInput packet, int discriminator) { + this.name = name; + this.client = client; + this.nbt = nbt; + this.packet = packet; + this.discriminator = discriminator; + } + + @Override + public String getType() { + return name; + } + + @Override + public void load(NBTTagCompound tag) { + loads++; + value = tag.getInteger("value"); + } + + @Override + public void readDesc(MCDataInput data) { + reads++; + value = data.readUByte(); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/PostMicroblockClientFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/PostMicroblockClientFunctionalTest.java new file mode 100644 index 0000000..9a058e8 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/PostMicroblockClientFunctionalTest.java @@ -0,0 +1,212 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.List; + +import net.minecraft.util.IIcon; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockGenerator; +import codechicken.microblock.PostMicroClass$; +import codechicken.microblock.PostMicroblock; +import codechicken.microblock.PostMicroblock$class; +import codechicken.microblock.PostMicroblockClient; +import codechicken.microblock.PostMicroblockClient$class; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.collection.mutable.ArrayBuffer; + +class PostMicroblockClientFunctionalTest { + + @Test + void realCoverAndPostBoundsSplitAndResetAcrossAllAxes() { + int material = MicroMaterialRegistry.materialID("minecraft:stone"); + int[] longAxes = { 1, 2, 0 }; + for (int axis = 0; axis < 3; axis++) { + ClientProbe part = new ClientProbe(material); + assertNull(part.renderBounds1()); + assertNull(part.renderBounds2()); + part.setShape(2, axis); + Microblock crossing = MicroblockGenerator.create(PostMicroClass$.MODULE$, material, false); + crossing.setShape(4, (axis + 1) % 3); + Microblock low = MicroblockGenerator.create(FaceMicroClass$.MODULE$, material, false); + Microblock high = MicroblockGenerator.create(FaceMicroClass$.MODULE$, material, false); + low.setShape(1, axis * 2); + high.setShape(1, axis * 2 + 1); + SlotTile tile = new SlotTile(); + tile.slots[axis * 2] = low; + tile.slots[axis * 2 + 1] = high; + ArrayBuffer parts = new ArrayBuffer<>(); + parts.$plus$eq(part); + parts.$plus$eq(low); + parts.$plus$eq(high); + parts.$plus$eq(crossing); + tile.partList_$eq(parts); + part.bind(tile); + Cuboid6 physical = part.getBounds().copy(); + part.onAdded(); + assertEquals(0.125, coordinate(part.renderBounds1().min, longAxes[axis]), 1e-12); + assertEquals(0.25, coordinate(part.renderBounds1().max, longAxes[axis]), 1e-12); + assertEquals(0.75, coordinate(part.renderBounds2().min, longAxes[axis]), 1e-12); + // The second segment is copied from physical bounds, after face clipping of only the first segment. + assertEquals(1, coordinate(part.renderBounds2().max, longAxes[axis]), 1e-12); + assertBounds(physical, part.getBounds()); + parts.remove(3); + part.onPartChanged(crossing); + assertNull(part.renderBounds2()); + assertEquals(0.125, coordinate(part.renderBounds1().min, longAxes[axis]), 1e-12); + assertEquals(0.875, coordinate(part.renderBounds1().max, longAxes[axis]), 1e-12); + tile.slots[axis * 2] = null; + tile.slots[axis * 2 + 1] = null; + part.onPartChanged(low); + assertBounds(physical, part.renderBounds1()); + assertNotSame(part.getBounds(), part.renderBounds1()); + } + } + + private static void assertBounds(Cuboid6 expected, Cuboid6 actual) { + assertArrayEquals( + new double[] { expected.min.x, expected.min.y, expected.min.z, expected.max.x, expected.max.y, + expected.max.z }, + new double[] { actual.min.x, actual.min.y, actual.min.z, actual.max.x, actual.max.y, actual.max.z }, + 1e-12); + } + + private static double coordinate(Vector3 vector, int axis) { + return axis == 0 ? vector.x : axis == 1 ? vector.y : vector.z; + } + + private static final class SlotTile extends TileMultipart { + + final TMultiPart[] slots = new TMultiPart[6]; + + @Override + public TMultiPart partMap(int slot) { + return slots[slot]; + } + } + + /** + * Executes client geometry with real Forge factories without requesting the stripped client factory entry point. + */ + private static final class ClientProbe extends Microblock implements PostMicroblockClient { + + private Cuboid6 first; + private Cuboid6 second; + + ClientProbe(int material) { + super(material); + PostMicroblockClient$class.$init$(this); + } + + @Override + public Cuboid6 renderBounds1() { + return first; + } + + @Override + public void renderBounds1_$eq(Cuboid6 value) { + first = value; + } + + @Override + public Cuboid6 renderBounds2() { + return second; + } + + @Override + public void renderBounds2_$eq(Cuboid6 value) { + second = value; + } + + @Override + public PostMicroClass$ microClass() { + return PostMicroClass$.MODULE$; + } + + @Override + public Cuboid6 getBounds() { + return PostMicroblock$class.getBounds(this); + } + + @Override + public List getOcclusionBoxes() { + return PostMicroblock$class.getOcclusionBoxes(this); + } + + @Override + public List getPartialOcclusionBoxes() { + return getOcclusionBoxes(); + } + + @Override + public int itemClassID() { + return PostMicroblock$class.itemClassID(this); + } + + @Override + public float getResistanceFactor() { + return PostMicroblock$class.getResistanceFactor(this); + } + + @Override + public IIcon getBrokenIcon(int side) { + throw new AssertionError("GPU icon lookup"); + } + + @Override + public void render(Vector3 pos, int pass) { + PostMicroblockClient$class.render(this, pos, pass); + } + + @Override + public void recalcBounds() { + PostMicroblockClient$class.recalcBounds(this); + } + + @Override + public void shrinkFace(int side) { + PostMicroblockClient$class.shrinkFace(this, side); + } + + @Override + public void shrinkPost(PostMicroblock post) { + PostMicroblockClient$class.shrinkPost(this, post); + } + + @Override + public boolean thisShrinks(PostMicroblock post) { + return PostMicroblockClient$class.thisShrinks(this, post); + } + + @Override + public void onAdded() { + PostMicroblockClient$class.onAdded(this); + } + + @Override + public void onPartChanged(TMultiPart part) { + PostMicroblockClient$class.onPartChanged(this, part); + } + + public void codechicken$microblock$PostMicroblockClient$$super$onAdded() { + super.onAdded(); + } + + public void codechicken$microblock$PostMicroblockClient$$super$read(MCDataInput packet) { + super.read(packet); + } + + public boolean codechicken$microblock$PostMicroblock$$super$occlusionTest(TMultiPart part) { + return super.occlusionTest(part); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/PostMicroblockTraitsFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/PostMicroblockTraitsFunctionalTest.java new file mode 100644 index 0000000..80588aa --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/PostMicroblockTraitsFunctionalTest.java @@ -0,0 +1,174 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicInteger; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutputWrapper; +import codechicken.lib.vec.Cuboid6; +import codechicken.microblock.EdgeMicroClass; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockGenerator; +import codechicken.microblock.PostMicroClass; +import codechicken.microblock.PostMicroClass$; +import codechicken.microblock.PostMicroblock; + +class PostMicroblockTraitsFunctionalTest { + + @Test + void generatedPostsKeepAllNineBoundsTorchSupportAndEdgeItems() { + Microblock part = createPost(); + PostMicroblock post = (PostMicroblock) part; + assertSame(PostMicroClass$.MODULE$, post.microClass()); + assertSame(PostMicroClass$.MODULE$, part.microClass()); + assertEquals("mcr_post", part.getType()); + assertEquals(0.5F, post.getResistanceFactor()); + assertFalse(post.allowCompleteOcclusion()); + int[] longAxes = { 1, 2, 0 }; + for (int size : new int[] { 2, 4, 6 }) { + for (int axis = 0; axis < 3; axis++) { + part.setShape(size, axis); + assertEquals(size, part.getSize()); + assertEquals(axis, part.getShape()); + assertEquals(axis == 0, part.canPlaceTorchOnTop()); + assertEquals(EdgeMicroClass.getClassId(), part.itemClassID()); + Cuboid6 bounds = part.getBounds(); + assertSame(PostMicroClass.aBounds()[size * 16 + axis], bounds); + double[] min = { bounds.min.x, bounds.min.y, bounds.min.z }; + double[] max = { bounds.max.x, bounds.max.y, bounds.max.z }; + for (int coordinate = 0; coordinate < 3; coordinate++) { + assertEquals(coordinate == longAxes[axis] ? 0 : 0.5 - size / 16D, min[coordinate], 1e-12); + assertEquals(coordinate == longAxes[axis] ? 1 : 0.5 + size / 16D, max[coordinate], 1e-12); + } + assertSame(bounds, post.getOcclusionBoxes().get(0)); + assertSame(bounds, post.getPartialOcclusionBoxes().get(0)); + int volume = 0; + for (ItemStack drop : part.getDrops()) { + assertEquals(EdgeMicroClass.getClassId(), drop.getItemDamage() >> 8); + volume += (drop.getItemDamage() & 255) * drop.stackSize; + } + assertEquals(size, volume); + ItemStack pick = part.pickItem(null); + assertEquals(EdgeMicroClass.getClassId(), pick.getItemDamage() >> 8); + assertEquals(size == 4 ? 4 : 2, pick.getItemDamage() & 255); + } + } + } + + @Test + void boundsKeepSignedIndexFailuresAndLiveArrayReplacement() { + Microblock part = createPost(); + for (int shape : new int[] { 0, 16, 35, 127 }) { + part.shape_$eq((byte) shape); + assertNull(part.getBounds()); + } + for (int shape = -128; shape < 0; shape++) { + part.shape_$eq((byte) shape); + assertThrows(ArrayIndexOutOfBoundsException.class, part::getBounds); + } + Cuboid6[] original = PostMicroClass.aBounds(); + Cuboid6[] replacement = new Cuboid6[256]; + Cuboid6 sentinel = new Cuboid6(0.1, 0.2, 0.3, 0.4, 0.5, 0.6); + replacement[65] = sentinel; + part.setShape(4, 1); + try { + PostMicroClass.aBounds_$eq(replacement); + assertSame(sentinel, part.getBounds()); + replacement[65] = null; + assertNull(part.getBounds()); + PostMicroClass.aBounds_$eq(new Cuboid6[1]); + assertThrows(ArrayIndexOutOfBoundsException.class, part::getBounds); + PostMicroClass.aBounds_$eq(null); + assertThrows(NullPointerException.class, part::getBounds); + } finally { + PostMicroClass.aBounds_$eq(original); + } + assertSame(original[65], part.getBounds()); + } + + @Test + void generatedPostsKeepPackedAxisAndMaterialInNbtAndDescriptions() { + Microblock part = createPost(); + Microblock loaded = createPost(); + ByteArrayOutputStream prefixBytes = new ByteArrayOutputStream(); + MicroMaterialRegistry.writeMaterialID(new MCDataOutputWrapper(new DataOutputStream(prefixBytes)), 0); + byte[] prefix = prefixBytes.toByteArray(); + for (int size : new int[] { 2, 4, 6 }) { + for (int axis = 0; axis < 3; axis++) { + byte shape = (byte) (size * 16 + axis); + part.setShape(size, axis); + NBTTagCompound tag = new NBTTagCompound(); + part.save(tag); + assertEquals(shape, tag.getByte("shape")); + assertEquals(MicroMaterialRegistry.materialName(0), tag.getString("material")); + loaded.load(tag); + assertEquals(shape, loaded.shape()); + assertEquals(0, loaded.material()); + assertSame(part.getBounds(), loaded.getBounds()); + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + part.writeDesc(new MCDataOutputWrapper(new DataOutputStream(bytes))); + byte[] expected = Arrays.copyOf(prefix, prefix.length + 1); + expected[prefix.length] = shape; + assertArrayEquals(expected, bytes.toByteArray()); + AtomicInteger reads = new AtomicInteger(); + MCDataInput input = (MCDataInput) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, args) -> { + assertEquals("readByte", method.getName()); + reads.incrementAndGet(); + return shape; + }); + loaded.setShape(4, 0); + loaded.readDesc(input); + assertEquals(1, reads.get()); + assertEquals(shape, loaded.shape()); + assertSame(part.getBounds(), loaded.getBounds()); + } + } + } + + @Test + void generatedOcclusionAllowsCrossingPostsAndOnlyAlignedOrNonOverlappingCovers() { + Microblock part = createPost(); + Microblock other = createPost(); + Microblock face = MicroblockGenerator.create(FaceMicroClass$.MODULE$, 0, false); + for (int size : new int[] { 2, 4, 6 }) { + for (int axis = 0; axis < 3; axis++) { + part.setShape(size, axis); + for (int otherSize : new int[] { 2, 4, 6 }) { + for (int otherAxis = 0; otherAxis < 3; otherAxis++) { + other.setShape(otherSize, otherAxis); + assertEquals(axis != otherAxis, part.occlusionTest(other)); + } + } + for (int coverSize = 1; coverSize <= 7; coverSize++) { + for (int side = 0; side < 6; side++) { + face.setShape(coverSize, side); + boolean expected = side / 2 == axis || coverSize / 8D <= 0.5 - size / 16D; + assertEquals( + expected, + part.occlusionTest(face), + "size=" + size + ", axis=" + axis + ", cover=" + coverSize + ", side=" + side); + } + } + } + } + } + + private static Microblock createPost() { + return MicroblockGenerator.create(PostMicroClass$.MODULE$, 0, false); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ProxyLoggerFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ProxyLoggerFunctionalTest.java new file mode 100644 index 0000000..fab56b1 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ProxyLoggerFunctionalTest.java @@ -0,0 +1,22 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.handler.MicroblockProxy; +import codechicken.multipart.handler.MultipartProxy; + +/** + * Both proxies publish a logger during preInit, and code across both packages logs through them directly now that the + * package-object aliases are gone. A plain JVM test only ever sees the uninitialised null, so this is the one place the + * real instances are observable. + */ +class ProxyLoggerFunctionalTest { + + @Test + void bothProxiesPublishALoggerDuringPreInit() { + assertNotNull(MultipartProxy.logger(), "MultipartProxy.logger is set in preInit"); + assertNotNull(MicroblockProxy.logger(), "MicroblockProxy.logger is set in preInit"); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/RawTileTraitCalls.java b/src/functionalTest/java/codechicken/multipart/test/RawTileTraitCalls.java new file mode 100644 index 0000000..d167d82 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/RawTileTraitCalls.java @@ -0,0 +1,20 @@ +package codechicken.multipart.test; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.scalatraits.TRedstoneTile; +import codechicken.multipart.scalatraits.TSlottedTile; + +/** Deliberately unsafe dev-jar callers: runtime traits are interfaces, unlike these raw Java compiler inputs. */ +public final class RawTileTraitCalls { + + private RawTileTraitCalls() {} + + public static int openConnections(TileMultipart tile, int side) { + return ((TRedstoneTile) tile).openConnections(side); + } + + public static TMultiPart[] slots(TileMultipart tile) { + return ((TSlottedTile) tile).v_partMap; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/RedstoneInteractionsFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/RedstoneInteractionsFunctionalTest.java new file mode 100644 index 0000000..0b60087 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/RedstoneInteractionsFunctionalTest.java @@ -0,0 +1,184 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Collections; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.IRedstonePart; +import codechicken.multipart.IRedstoneTile; +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.RedstoneInteractions; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** World-dependent redstone routing and the generated tile selected by the IRedstonePart marker. */ +class RedstoneInteractionsFunctionalTest { + + private static final BlockCoord HOST = new BlockCoord(40, 200, 40); + private static final BlockCoord EAST = new BlockCoord(41, 200, 40); + private static final BlockCoord WIRE = new BlockCoord(44, 200, 40); + + @Test + void vanillaConnectionMasksPreserveEverySpecialCaseAfterBlocksInitialize() { + World world = world(); + ConnectableBlock connectable = new ConnectableBlock(true); + + assertEquals(6, RedstoneInteractions.fullVanillaBlocks().size()); + assertTrue(RedstoneInteractions.fullVanillaBlocks().contains(Blocks.redstone_torch)); + assertTrue(RedstoneInteractions.fullVanillaBlocks().contains(Blocks.unlit_redstone_torch)); + assertTrue(RedstoneInteractions.fullVanillaBlocks().contains(Blocks.lever)); + assertTrue(RedstoneInteractions.fullVanillaBlocks().contains(Blocks.stone_button)); + assertTrue(RedstoneInteractions.fullVanillaBlocks().contains(Blocks.wooden_button)); + assertTrue(RedstoneInteractions.fullVanillaBlocks().contains(Blocks.redstone_block)); + + assertEquals(0x1F, RedstoneInteractions.vanillaConnectionMask(Blocks.redstone_torch, world, 1, 2, 3, 0, false)); + assertEquals(0, RedstoneInteractions.vanillaConnectionMask(Blocks.redstone_wire, world, 1, 2, 3, 0, true)); + assertEquals(4, RedstoneInteractions.vanillaConnectionMask(Blocks.redstone_wire, world, 1, 2, 3, 2, false)); + assertEquals(0x1F, RedstoneInteractions.vanillaConnectionMask(Blocks.redstone_wire, world, 1, 2, 3, 2, true)); + assertEquals(4, RedstoneInteractions.vanillaConnectionMask(Blocks.powered_repeater, world, 1, 2, 3, 2, false)); + assertEquals(0, RedstoneInteractions.vanillaConnectionMask(Blocks.powered_repeater, world, 1, 2, 3, 4, false)); + assertEquals(0x1F, RedstoneInteractions.vanillaConnectionMask(connectable, world, 1, 2, 3, 5, false)); + assertEquals(1, connectable.lastSide, "Side 5 is translated to vanilla side 1"); + assertEquals( + 0, + RedstoneInteractions.vanillaConnectionMask(new ConnectableBlock(false), world, 1, 2, 3, 5, false)); + assertEquals( + 0x1F, + RedstoneInteractions.vanillaConnectionMask(new ConnectableBlock(false), world, 1, 2, 3, 5, true)); + } + + @Test + void partPowerUsesTheGeneratedRedstoneTileAndNeighborConnector() { + World world = world(); + clear(world, HOST); + clear(world, EAST); + RedstonePart part = new RedstonePart(); + TileMultipart tile = MultipartHelper.createTileFromParts(Collections.singletonList(part)); + ConnectorTile connector = new ConnectorTile(); + + try { + tile.setWorldObj(world); + tile.xCoord = HOST.x; + tile.yCoord = HOST.y; + tile.zCoord = HOST.z; + assertTrue(tile instanceof IRedstoneTile); + + assertTrue(world.setBlock(EAST.x, EAST.y, EAST.z, Blocks.chest, 0, 3)); + world.setTileEntity(EAST.x, EAST.y, EAST.z, connector); + assertSame(connector, world.getTileEntity(EAST.x, EAST.y, EAST.z)); + + assertEquals(431, RedstoneInteractions.getPowerTo(part, 5)); + assertEquals(4, connector.lastSide); + assertEquals(0x1F, connector.lastMask); + assertEquals(207, RedstoneInteractions.getPower(world, EAST.x, EAST.y, EAST.z, 2, 7)); + } finally { + clear(world, HOST); + clear(world, EAST); + } + } + + @Test + void vanillaWirePowerUsesMetadataWhenIndirectPowerIsLower() { + World world = world(); + clear(world, WIRE); + world.setBlockToAir(WIRE.x, WIRE.y - 1, WIRE.z); + + try { + assertTrue(world.setBlock(WIRE.x, WIRE.y - 1, WIRE.z, Blocks.stone, 0, 3)); + assertTrue(world.setBlock(WIRE.x, WIRE.y, WIRE.z, Blocks.redstone_wire, 12, 2)); + world.setBlockMetadataWithNotify(WIRE.x, WIRE.y, WIRE.z, 12, 2); + + assertEquals(12, RedstoneInteractions.getPower(world, WIRE.x, WIRE.y, WIRE.z, 1, 0x1F)); + assertEquals(0, RedstoneInteractions.getPower(world, WIRE.x, WIRE.y, WIRE.z, 1, 0)); + } finally { + clear(world, WIRE); + world.setBlockToAir(WIRE.x, WIRE.y - 1, WIRE.z); + } + } + + private static World world() { + World world = MinecraftServer.getServer().worldServers[0]; + world.getChunkFromBlockCoords(HOST.x, HOST.z); + return world; + } + + private static void clear(World world, BlockCoord pos) { + world.removeTileEntity(pos.x, pos.y, pos.z); + world.setBlockToAir(pos.x, pos.y, pos.z); + } + + private static final class RedstonePart extends TMultiPart implements IRedstonePart { + + @Override + public String getType() { + return "test:redstone"; + } + + @Override + public boolean doesTick() { + return false; + } + + @Override + public int strongPowerLevel(int side) { + return 0; + } + + @Override + public int weakPowerLevel(int side) { + return 0; + } + + @Override + public boolean canConnectRedstone(int side) { + return true; + } + } + + private static final class ConnectorTile extends TileEntity implements codechicken.multipart.IRedstoneConnector { + + private int lastSide = -1; + private int lastMask = -1; + + @Override + public int getConnectionMask(int side) { + return 0; + } + + @Override + public int weakPowerLevel(int side, int mask) { + lastSide = side; + lastMask = mask; + return side * 100 + mask; + } + } + + private static final class ConnectableBlock extends Block { + + private final boolean connects; + private int lastSide = -1; + + private ConnectableBlock(boolean connects) { + super(Material.rock); + this.connects = connects; + } + + @Override + public boolean canConnectRedstone(net.minecraft.world.IBlockAccess world, int x, int y, int z, int side) { + lastSide = side; + return connects; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/SavedTickLoadingFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/SavedTickLoadingFunctionalTest.java new file mode 100644 index 0000000..e2ade22 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/SavedTickLoadingFunctionalTest.java @@ -0,0 +1,70 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.lang.reflect.Field; +import java.util.List; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.chunk.Chunk; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.world.ChunkExtension; +import codechicken.multipart.TickScheduler; +import codechicken.multipart.TileMultipart; + +class SavedTickLoadingFunctionalTest { + + @Test + @SuppressWarnings("unchecked") + void missingPartsKeepSurvivingTicksAtTheirOriginalIndices() throws Exception { + NBTTagList parts = new NBTTagList(); + for (String type : new String[] { "test:missing-part", "mc_button", "mc_button" }) { + NBTTagCompound part = new NBTTagCompound(); + part.setString("id", type); + part.setByte("meta", (byte) 1); + parts.appendTag(part); + } + NBTTagCompound savedTile = new NBTTagCompound(); + savedTile.setTag("parts", parts); + TileMultipart[] loaded = new TileMultipart[1]; + ExpectedErrorLog.silence(() -> loaded[0] = TileMultipart.createFromNBT(savedTile)); + TileMultipart tile = loaded[0]; + assertEquals(2, tile.jPartList().size()); + + Chunk chunk = new Chunk(null, 0, 0); + chunk.chunkTileEntityMap.put(new ChunkPosition(0, 0, 0), tile); + NBTTagList ticks = new NBTTagList(); + for (int index : new int[] { 0, 1, 2, 99 }) { + NBTTagCompound tick = new NBTTagCompound(); + tick.setByte("i", (byte) index); + tick.setLong("time", index + 10); + ticks.appendTag(tick); + } + NBTTagCompound data = new NBTTagCompound(); + data.setTag("multipartTicks", ticks); + ChunkExtension scheduler = TickScheduler.createChunkExtension(chunk, TickScheduler.createWorldExtension(null)); + scheduler.loadData(data); + + Field tickList = scheduler.getClass().getDeclaredField("tickList"); + tickList.setAccessible(true); + List restored = (List) tickList.get(scheduler); + assertEquals(2, restored.size()); + assertSame(tile.jPartList().get(0), restored.get(0).part()); + assertEquals(11, restored.get(0).time()); + assertSame(tile.jPartList().get(1), restored.get(1).part()); + assertEquals(12, restored.get(1).time()); + + tile.onChunkLoad(); + NBTTagCompound resaved = new NBTTagCompound(); + scheduler.saveData(resaved); + scheduler.loadData(resaved); + restored = (List) tickList.get(scheduler); + assertEquals(2, restored.size()); + assertSame(tile.jPartList().get(0), restored.get(0).part()); + assertSame(tile.jPartList().get(1), restored.get(1).part()); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/ScalaTraitRegistrationFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/ScalaTraitRegistrationFunctionalTest.java new file mode 100644 index 0000000..8a6ed24 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/ScalaTraitRegistrationFunctionalTest.java @@ -0,0 +1,492 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.io.InputStream; +import java.lang.reflect.Field; +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.NoSuchElementException; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.asm.ASMMixinCompiler; +import codechicken.multipart.asm.ASMMixinCompiler$; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.FieldMixin; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import codechicken.multipart.asm.ScalaSigReader; +import codechicken.multipart.asm.ScalaSignature; +import codechicken.multipart.asm.ScalaSignature.Bytes$; +import cpw.mods.fml.relauncher.FMLLaunchHandler; +import scala.Option; +import scala.collection.Iterator; +import scala.collection.Seq; +import scala.collection.immutable.IndexedSeq; +import scala.collection.immutable.IndexedSeq$; +import scala.collection.immutable.Map.Map1; +import scala.collection.mutable.Builder; +import scala.collection.mutable.Map; + +class ScalaTraitRegistrationFunctionalTest { + + private static final ASMMixinCompiler$ COMPILER = ASMMixinCompiler$.MODULE$; + private static final String PREFIX = "codechicken/multipart/test/registration/"; + private static final int TRAIT = 0x02000000; + private static final int METHOD = 0x200; + private static final int ACCESSOR = 0x08000000; + + @Test + void registersRealScalaFieldsMethodsParentsAndSideAnnotations() throws Exception { + String pkg = "codechicken/multipart/test/"; + try (Scope scope = new Scope()) { + for (String name : Arrays.asList( + "RegistrationParentA", + "RegistrationParentB", + "RegistrationInterface", + "ScalaTraitRegistrationFixture")) { + scope.remember(pkg + name); + ClassNode node = raw(pkg + name); + ScalaSignature sig = ScalaSigReader.read(ScalaSigReader.ann(node).get()); + scope.cache.put(node.name, scalaInfo(node, sig, sig.findClass(node.name.replace('/', '.')).get())); + } + ClassNode node = raw(pkg + "ScalaTraitRegistrationFixture"); + MixinInfo info = ASMMixinCompiler.registerScalaTrait(node); + assertEquals(node.name, info.name()); + assertEquals("java/lang/Object", info.parent()); + assertEquals(Arrays.asList(pkg + "RegistrationParentA", pkg + "RegistrationParentB"), parentNames(info)); + assertFalse(COMPILER.getMixinInfo(pkg + "RegistrationInterface").isDefined()); + assertEquals(Arrays.asList("count:I:1", "hidden:I:2"), fields(info)); + List expected = new ArrayList<>( + Arrays.asList( + "concrete()I", + "overloaded(I)I", + "overloaded(Ljava/lang/String;)I", + "protectedMethod()I", + "toString()Ljava/lang/String;", + FMLLaunchHandler.side().isServer() ? "serverOnly()I" : "clientOnly()I")); + List actual = methods(info); + Collections.sort(expected); + Collections.sort(actual); + assertEquals(expected, actual); + for (MethodNode method : values(info.methods())) assertTrue(node.methods.contains(method)); + assertEquals(Arrays.asList("toString()Ljava/lang/String;"), values(info.supers())); + assertSame(info, COMPILER.getMixinInfo(node.name).get()); + node.methods.clear(); + node.interfaces = null; + assertSame(info, COMPILER.registerScalaTrait(node)); + } + } + + @Test + void preservesTheExistingPredefStringAliasDescriptorFailure() throws Exception { + String name = "codechicken/multipart/test/RegistrationAliasFixture"; + try (Scope scope = new Scope()) { + scope.remember(name); + ClassNode node = raw(name); + ScalaSignature sig = ScalaSigReader.read(ScalaSigReader.ann(node).get()); + scope.cache.put(name, scalaInfo(node, sig, sig.findClass(name.replace('/', '.')).get())); + IllegalArgumentException failure = assertThrows( + IllegalArgumentException.class, + () -> COMPILER.registerScalaTrait(node)); + assertEquals( + "Unable to add mixin trait " + name + + ": alias(Lscala/Predef/String;)I found in scala signature but not in class file. Most likely an obfuscation issue.", + failure.getMessage()); + assertFalse(COMPILER.getMixinInfo(name).isDefined()); + } + } + + @Test + void cachedValuesIncludingNullBypassMetadataAndMalformedNodes() throws Exception { + try (Scope scope = new Scope()) { + ClassNode node = node("cached"); + scope.remember(node.name); + MixinInfo cached = new MixinInfo("cached-value", null, null, null, null, null); + scope.mixins.put(node.name, cached); + node.interfaces = null; + node.methods = null; + assertSame(cached, COMPILER.registerScalaTrait(node)); + scope.mixins.put(node.name, null); + assertNull(COMPILER.registerScalaTrait(node)); + assertThrows(NullPointerException.class, () -> COMPILER.registerScalaTrait(null)); + } + } + + @Test + void resolvesAllParentsBeforeRegisteringAndPreservesOrderAndDuplicates() throws Exception { + try (Scope scope = new Scope()) { + List events = new ArrayList<>(); + Fixture first = scope.fixture("first", TRAIT, events); + Fixture second = scope.fixture("second", TRAIT, events); + Fixture plain = scope.fixture("plain", 0, events); + Fixture contract = scope.fixture("contract", TRAIT | 0x800, events); + String missing = PREFIX + "null-parent"; + scope.remember(missing); + scope.cache.put(missing, null); + ClassNode child = node("parent-list"); + List names = Arrays.asList( + first.node.name, + plain.node.name, + contract.node.name, + missing, + "java/lang/Runnable", + second.node.name, + first.node.name); + child.interfaces = new AbstractList() { + + @Override + public String get(int index) { + events.add("lookup:" + index); + return names.get(index); + } + + @Override + public int size() { + return names.size(); + } + }; + Seq parents = ASMMixinCompiler.getAndRegisterParentTraits(child); + assertEquals(Arrays.asList(first.node.name, second.node.name, first.node.name), names(parents)); + assertSame(parents.apply(0), parents.apply(2)); + assertEquals( + Arrays.asList( + "lookup:0", + "lookup:1", + "lookup:2", + "lookup:3", + "lookup:4", + "lookup:5", + "lookup:6", + "first:40", + "first:8", + "second:40", + "second:8"), + events); + assertFalse(COMPILER.getMixinInfo(plain.node.name).isDefined()); + assertFalse(COMPILER.getMixinInfo(contract.node.name).isDefined()); + } + } + + @Test + void parentLookupFailureHappensBeforeAnyRegistration() throws Exception { + try (Scope scope = new Scope()) { + List events = new ArrayList<>(); + Fixture first = scope.fixture("lookup-failure-first", TRAIT, events); + ClassNode child = node("lookup-failure-child"); + IllegalStateException failure = new IllegalStateException("second interface read"); + child.interfaces = new AbstractList() { + + @Override + public String get(int index) { + if (index == 0) return first.node.name; + throw failure; + } + + @Override + public int size() { + return 2; + } + }; + assertSame( + failure, + assertThrows(IllegalStateException.class, () -> COMPILER.getAndRegisterParentTraits(child))); + assertTrue(events.isEmpty()); + assertFalse(COMPILER.getMixinInfo(first.node.name).isDefined()); + } + } + + @Test + void failedRegistrationKeepsCompletedParentsButDoesNotCacheTheChild() throws Exception { + try (Scope scope = new Scope()) { + Fixture first = scope.fixture("partial-first"); + Fixture second = scope.fixture("partial-second"); + Fixture child = scope.fixture("partial-child"); + child.node.interfaces.addAll(Arrays.asList(first.node.name, second.node.name)); + second.entries.add(second.method("missing", METHOD, "()I")); + IllegalArgumentException failure = assertThrows( + IllegalArgumentException.class, + () -> COMPILER.registerScalaTrait(child.node)); + assertEquals( + "Unable to add mixin trait " + second.node.name + + ": missing()I found in scala signature but not in class file. Most likely an obfuscation issue.", + failure.getMessage()); + MixinInfo completed = COMPILER.getMixinInfo(first.node.name).get(); + assertFalse(COMPILER.getMixinInfo(second.node.name).isDefined()); + assertFalse(COMPILER.getMixinInfo(child.node.name).isDefined()); + second.node.methods.add(method("missing", "()I")); + MixinInfo result = COMPILER.registerScalaTrait(child.node); + assertSame(completed, result.parentTraits().apply(0)); + assertSame(second.node.methods.get(0), result.parentTraits().apply(1).methods().apply(0)); + } + } + + @Test + void preservesSymbolFilteringEqualityAndFirstExactMethodIdentity() throws Exception { + try (Scope scope = new Scope()) { + Fixture sig = scope.fixture("symbols"); + sig.entries.add(sig.method("parameter", 0x2000, null)); + sig.entries.add(sig.new MethodSymbol("foreign", sig.new ExternalSymbol("elsewhere"), METHOD, 0)); + sig.entries.add(sig.method("private", METHOD | 4, "()V")); + sig.entries.add(sig.method("deferred", METHOD | 0x100, "()V")); + sig.entries.add(sig.method("$init$", METHOD, "()V")); + sig.entries.add(sig.method("super$wide", METHOD | 4 | 0x100, "(JD)I")); + ScalaSignature.ClassSymbol equalOwner = sig.new ClassSymbol("symbols", sig.symbol.owner(), TRAIT, 0); + assertNotSame(sig.symbol, equalOwner); + assertEquals(sig.symbol, equalOwner); + sig.entries.add(sig.new MethodSymbol("chosen", equalOwner, METHOD, 0) { + + @Override + public String jDesc() { + return "(I)I"; + } + }); + sig.node.methods.add(method("chosen", "()I")); + MethodNode chosen = method("chosen", "(I)I"); + chosen.access = ACC_PRIVATE | ACC_ABSTRACT; + sig.node.methods.add(chosen); + sig.node.methods.add(method("chosen", "(I)I")); + MixinInfo info = COMPILER.registerScalaTrait(sig.node); + assertEquals(1, info.methods().size()); + assertSame(chosen, info.methods().apply(0)); + assertEquals(Arrays.asList("wide(JD)I"), values(info.supers())); + assertTrue(info.fields().isEmpty()); + } + } + + @Test + void sideFilteringPrecedesAccessorAndDescriptorReads() throws Exception { + try (Scope scope = new Scope()) { + Fixture sig = scope.fixture("side-filter"); + ScalaSignature.MethodSymbol excluded = sig.method("excluded", METHOD | ACCESSOR, null); + sig.entries.add(excluded); + sig.annotations.add( + sig.AnnotationInfo().apply( + excluded, + sig.new ThisType(sig.new ExternalSymbol("cpw.mods.fml.relauncher.SideOnly")), + new Map1<>("value", sig.new EnumLiteral(sig.new ExternalSymbol("unknown-side"))))); + MixinInfo info = COMPILER.registerScalaTrait(sig.node); + assertTrue(info.fields().isEmpty()); + assertTrue(info.methods().isEmpty()); + assertTrue(info.supers().isEmpty()); + } + } + + @Test + void fieldsUseTheLatestPrecedingAccessorAndTrimmedNames() throws Exception { + try (Scope scope = new Scope()) { + Fixture sig = scope.fixture("fields"); + sig.entries.add(sig.method("hidden", ACCESSOR, null)); + sig.entries.add(sig.method("hidden", ACCESSOR | 4, null)); + sig.entries.add(sig.method(" hidden ", 0, "J")); + sig.entries.add(sig.method("visible", ACCESSOR, null)); + sig.entries.add(sig.method("visible ", 4, "I")); + assertEquals(Arrays.asList("hidden:J:2", "visible:I:1"), fields(COMPILER.registerScalaTrait(sig.node))); + } + } + + @Test + void aFieldBeforeItsAccessorFailsWithoutPublishingMetadata() throws Exception { + try (Scope scope = new Scope()) { + Fixture sig = scope.fixture("missing-accessor"); + sig.entries.add(sig.method("value ", 0, "I")); + sig.entries.add(sig.method("value", ACCESSOR, null)); + assertThrows(NoSuchElementException.class, () -> COMPILER.registerScalaTrait(sig.node)); + assertFalse(COMPILER.getMixinInfo(sig.node.name).isDefined()); + } + } + + @Test + void parentNameCallbackRunsAfterMemberCollectionAndBeforeThePublicationKeyRead() throws Exception { + try (Scope scope = new Scope()) { + Fixture sig = scope.fixture("publication"); + String original = sig.node.name; + String changed = original + "Changed"; + scope.remember(changed); + ScalaSignature.ClassSymbol symbol = sig.new ClassSymbol("publication", sig.symbol.owner(), TRAIT, 0) { + + @Override + public String jParent() { + assertEquals(Arrays.asList("publication:40", "publication:8"), sig.events); + sig.node.name = changed; + return "chosen/Parent"; + } + }; + scope.cache.put(original, scalaInfo(sig.node, sig, symbol)); + MixinInfo info = COMPILER.registerScalaTrait(sig.node); + assertEquals(original, info.name()); + assertEquals("chosen/Parent", info.parent()); + assertFalse(COMPILER.getMixinInfo(original).isDefined()); + assertSame(info, COMPILER.getMixinInfo(changed).get()); + } + } + + @Test + void rejectsWrongOrNullMetadataWithoutCachingDefaults() throws Exception { + try (Scope scope = new Scope()) { + ClassNode wrong = node("wrong-metadata"); + scope.remember(wrong.name); + scope.cache.put(wrong.name, COMPILER.getClassInfo("java/lang/Runnable")); + assertThrows(ClassCastException.class, () -> COMPILER.registerScalaTrait(wrong)); + scope.cache.put(wrong.name, null); + assertThrows(NullPointerException.class, () -> COMPILER.registerScalaTrait(wrong)); + assertFalse(COMPILER.getMixinInfo(wrong.name).isDefined()); + } + } + + private static ClassNode raw(String name) throws Exception { + ClassNode node = new ClassNode(); + try (InputStream input = ScalaTraitRegistrationFunctionalTest.class + .getResourceAsStream("/" + name + ".class")) { + assertNotNull(input); + new ClassReader(input).accept(node, 0); + } + return node; + } + + private static ClassNode node(String name) { + ClassNode node = new ClassNode(); + node.name = PREFIX + name; + node.superName = "java/lang/Object"; + return node; + } + + private static MethodNode method(String name, String desc) { + return new MethodNode(ACC_PUBLIC, name, desc, null, null); + } + + private static ClassInfo scalaInfo(ClassNode node, ScalaSignature sig, ScalaSignature.ClassSymbolRef symbol) + throws Exception { + return (ClassInfo) Class.forName("codechicken.multipart.asm.ASMMixinCompiler$ClassInfo$ScalaClassInfo") + .getConstructor(ClassNode.class, ScalaSignature.class, ScalaSignature.ClassSymbolRef.class) + .newInstance(node, sig, symbol); + } + + private static List values(Seq sequence) { + List result = new ArrayList<>(); + Iterator iterator = sequence.iterator(); + while (iterator.hasNext()) result.add(iterator.next()); + return result; + } + + private static List parentNames(MixinInfo info) { + return names(info.parentTraits()); + } + + private static List names(Seq sequence) { + List result = new ArrayList<>(); + for (MixinInfo info : values(sequence)) result.add(info.name()); + return result; + } + + private static List methods(MixinInfo info) { + List result = new ArrayList<>(); + for (MethodNode method : values(info.methods())) result.add(method.name + method.desc); + return result; + } + + private static List fields(MixinInfo info) { + List result = new ArrayList<>(); + for (FieldMixin field : values(info.fields())) + result.add(field.name() + ":" + field.desc() + ":" + field.access()); + return result; + } + + private static class Fixture extends ScalaSignature { + + final ClassNode node; + final ClassSymbol symbol; + final List entries = new ArrayList<>(); + final List annotations = new ArrayList<>(); + final List events; + final String label; + + Fixture(String label, int flags, List events) { + super(Bytes$.MODULE$.apply(new byte[] { 5, 0, 0 })); + this.label = label; + this.events = events; + node = node(label); + symbol = new ClassSymbol(label, new ExternalSymbol(PREFIX.replace('/', '.')), flags, 0) { + + @Override + public String jParent() { + return "java/lang/Object"; + } + }; + } + + MethodSymbol method(String name, int flags, String descriptor) { + return new MethodSymbol(name, symbol, flags, 0) { + + @Override + public String jDesc() { + assertNotNull(descriptor, "This descriptor must not be read: " + name); + return descriptor; + } + }; + } + + @Override + @SuppressWarnings("unchecked") + public IndexedSeq collect(int id) { + events.add(label + ":" + id); + Builder> builder = IndexedSeq$.MODULE$.newBuilder(); + for (Object entry : id == 40 ? annotations : entries) builder.$plus$eq((T) entry); + return builder.result(); + } + } + + private static class Scope implements AutoCloseable { + + final Map cache = state("infoCache"); + final Map mixins = state("mixinMap"); + final java.util.Map> oldCache = new LinkedHashMap<>(); + final java.util.Map> oldMixins = new LinkedHashMap<>(); + + Scope() throws Exception {} + + void remember(String name) { + if (!oldCache.containsKey(name)) { + oldCache.put(name, cache.get(name)); + oldMixins.put(name, mixins.get(name)); + } + } + + Fixture fixture(String name) throws Exception { + return fixture(name, TRAIT, new ArrayList<>()); + } + + Fixture fixture(String name, int flags, List events) throws Exception { + Fixture fixture = new Fixture(name, flags, events); + remember(fixture.node.name); + cache.put(fixture.node.name, scalaInfo(fixture.node, fixture, fixture.symbol)); + return fixture; + } + + @Override + public void close() { + oldCache.forEach((key, old) -> restore(cache, key, old)); + oldMixins.forEach((key, old) -> restore(mixins, key, old)); + } + + private static void restore(Map map, String key, Option old) { + map.remove(key); + if (old.isDefined()) map.put(key, old.get()); + } + + @SuppressWarnings("unchecked") + private static Map state(String name) throws Exception { + Field field = ASMMixinCompiler$.class.getDeclaredField(name); + field.setAccessible(true); + return (Map) field.get(COMPILER); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/SideOnlyAnnotationFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/SideOnlyAnnotationFunctionalTest.java new file mode 100644 index 0000000..bb51024 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/SideOnlyAnnotationFunctionalTest.java @@ -0,0 +1,234 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.NoSuchElementException; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.tree.ClassNode; + +import codechicken.multipart.asm.ASMMixinCompiler; +import codechicken.multipart.asm.ASMMixinCompiler$; +import codechicken.multipart.asm.ScalaSigReader; +import codechicken.multipart.asm.ScalaSignature; +import codechicken.multipart.asm.ScalaSignature.AnnotationInfo; +import codechicken.multipart.asm.ScalaSignature.Bytes$; +import codechicken.multipart.asm.ScalaSignature.Literal; +import cpw.mods.fml.relauncher.FMLLaunchHandler; +import scala.collection.Iterator; +import scala.collection.immutable.IndexedSeq; +import scala.collection.immutable.IndexedSeq$; +import scala.collection.immutable.Map; +import scala.collection.immutable.Map$; +import scala.collection.immutable.Set; +import scala.collection.mutable.Builder; + +class SideOnlyAnnotationFunctionalTest { + + private static final String ANNOTATION = "cpw.mods.fml.relauncher.SideOnly"; + private static final String SIDE = "cpw.mods.fml.relauncher.Side."; + + @Test + void readsSideAnnotationsFromACompiledScalaSignature() throws Exception { + ClassNode node = new ClassNode(); + try (InputStream input = getClass() + .getResourceAsStream("/codechicken/multipart/test/SideOnlySignatureFixture.class")) { + assertNotNull(input); + new ClassReader(input).accept(node, 0); + } + ScalaSignature sig = ScalaSigReader.read(ScalaSigReader.ann(node).get()); + String excluded = FMLLaunchHandler.side().isServer() ? "clientOnly" : "serverOnly"; + assertEquals( + new HashSet<>(Arrays.asList("codechicken.multipart.test.SideOnlySignatureFixture." + excluded)), + values(ASMMixinCompiler.listSideOnly(sig))); + } + + @Test + void filtersExactNamesAndTheCurrentSideThenDeduplicatesOwnerNames() { + Fixture sig = new Fixture(); + String other = FMLLaunchHandler.side().isServer() ? "CLIENT" : "SERVER"; + sig.add(sig.annotation("duplicate", ANNOTATION, sig.enumValue(SIDE + other))); + sig.add(sig.annotation("duplicate", ANNOTATION, sig.enumValue(SIDE + other))); + sig.add(sig.annotation("current", ANNOTATION, sig.enumValue(SIDE + FMLLaunchHandler.side().name()))); + sig.add(sig.annotation("unknown", ANNOTATION, sig.enumValue(SIDE + "UNKNOWN"))); + sig.add(sig.annotation("null-enum-name", ANNOTATION, sig.enumValue(null))); + sig.add(sig.annotation(null, ANNOTATION, sig.enumValue(SIDE + other))); + sig.add(sig.annotation("not-exact", ANNOTATION + "Suffix", null)); + sig.add(sig.annotation("null-annotation-name", null, null)); + Set result = ASMMixinCompiler$.MODULE$.listSideOnly(sig); + assertEquals(new HashSet<>(Arrays.asList("duplicate", "unknown", "null-enum-name", null)), values(result)); + assertEquals(Arrays.asList("collect:40"), sig.events); + sig.entries.clear(); + assertTrue(ASMMixinCompiler.listSideOnly(sig).isEmpty()); + assertEquals(4, result.size()); + } + + @Test + void filtersEveryAnnotationBeforeReadingAnySelectedOwnerName() { + Fixture sig = new Fixture(); + String[] firstOwner = { "before" }; + ScalaSignature.ExternalSymbol owner = sig.new ExternalSymbol("unused") { + + @Override + public String full() { + sig.events.add("owner:first"); + return firstOwner[0]; + } + }; + ScalaSignature.ThisType firstType = sig.new ThisType(sig.new ExternalSymbol(ANNOTATION)) { + + @Override + public String name() { + sig.events.add("type:first"); + return super.name(); + } + }; + ScalaSignature.ThisType secondType = sig.new ThisType(sig.new ExternalSymbol(ANNOTATION)) { + + @Override + public String name() { + sig.events.add("type:second"); + firstOwner[0] = "after"; + return super.name(); + } + }; + ScalaSignature.ExternalSymbol secondOwner = sig.new ExternalSymbol("second") { + + @Override + public String full() { + sig.events.add("owner:second"); + return super.full(); + } + }; + Map values = new Map.Map1<>("value", sig.enumValue("other")); + sig.add(sig.AnnotationInfo().apply(owner, firstType, values)); + sig.add(sig.AnnotationInfo().apply(secondOwner, secondType, values)); + assertEquals(new HashSet<>(Arrays.asList("after", "second")), values(ASMMixinCompiler.listSideOnly(sig))); + assertEquals( + Arrays.asList("collect:40", "type:first", "type:second", "owner:first", "owner:second"), + sig.events); + } + + @Test + void aLaterPredicateFailurePreventsAllOwnerReadsAndPropagatesTheFailure() { + Fixture sig = new Fixture(); + ScalaSignature.ExternalSymbol owner = sig.new ExternalSymbol("first") { + + @Override + public String full() { + fail("Owner mapping must wait until filtering is complete"); + return null; + } + }; + sig.add( + sig.AnnotationInfo().apply( + owner, + sig.new ThisType(sig.new ExternalSymbol(ANNOTATION)), + new Map.Map1<>("value", sig.enumValue("other")))); + IllegalStateException failure = new IllegalStateException("annotation accessor failed"); + ScalaSignature.ThisType failing = sig.new ThisType(sig.new ExternalSymbol(ANNOTATION)) { + + @Override + public String name() { + throw failure; + } + }; + sig.add(sig.AnnotationInfo().apply(null, failing, null)); + assertSame(failure, assertThrows(IllegalStateException.class, () -> ASMMixinCompiler.listSideOnly(sig))); + } + + @Test + void preservesMissingWrongAndNullValueFailuresButShortCircuitsUnrelatedAnnotations() { + Fixture sig = new Fixture(); + sig.add(sig.AnnotationInfo().apply(null, sig.new ThisType(sig.new ExternalSymbol("unrelated")), null)); + sig.add( + sig.AnnotationInfo().apply( + null, + sig.new ThisType(sig.new ExternalSymbol(ANNOTATION)), + new Map.Map1<>("value", sig.enumValue(SIDE + FMLLaunchHandler.side().name())))); + assertTrue(ASMMixinCompiler.listSideOnly(sig).isEmpty()); + sig.entries.clear(); + sig.add( + sig.AnnotationInfo().apply( + sig.new ExternalSymbol("missing"), + sig.new ThisType(sig.new ExternalSymbol(ANNOTATION)), + Map$.MODULE$.empty())); + assertThrows(NoSuchElementException.class, () -> ASMMixinCompiler.listSideOnly(sig)); + sig.entries.clear(); + sig.add(sig.annotation("wrong", ANNOTATION, sig.new StringLiteral("CLIENT"))); + assertThrows(ClassCastException.class, () -> ASMMixinCompiler.listSideOnly(sig)); + sig.entries.clear(); + sig.add(sig.annotation("null-literal", ANNOTATION, null)); + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.listSideOnly(sig)); + sig.entries.clear(); + sig.add(sig.annotation("null-symbol", ANNOTATION, sig.new EnumLiteral(null))); + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.listSideOnly(sig)); + sig.entries.clear(); + sig.add( + sig.AnnotationInfo().apply( + null, + sig.new ThisType(sig.new ExternalSymbol(ANNOTATION)), + new Map.Map1<>("value", sig.enumValue("other")))); + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.listSideOnly(sig)); + } + + @Test + void handlesEmptyCollectionsAndRejectsNullInputsWithoutInventingDefaults() { + Fixture sig = new Fixture(); + assertTrue(ASMMixinCompiler.listSideOnly(sig).isEmpty()); + assertEquals(Arrays.asList("collect:40"), sig.events); + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.listSideOnly(null)); + sig.add(null); + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.listSideOnly(sig)); + sig.entries.clear(); + sig.add(sig.AnnotationInfo().apply(null, null, null)); + assertThrows(NullPointerException.class, () -> ASMMixinCompiler.listSideOnly(sig)); + } + + private static java.util.Set values(Set values) { + java.util.Set result = new HashSet<>(); + Iterator iterator = values.iterator(); + while (iterator.hasNext()) result.add(iterator.next()); + return result; + } + + private static class Fixture extends ScalaSignature { + + final List entries = new ArrayList<>(); + final List events = new ArrayList<>(); + + Fixture() { + super(Bytes$.MODULE$.apply(new byte[] { 5, 0, 0 })); + } + + void add(AnnotationInfo annotation) { + entries.add(annotation); + } + + EnumLiteral enumValue(String full) { + return new EnumLiteral(new ExternalSymbol(full)); + } + + AnnotationInfo annotation(String owner, String type, Literal value) { + return AnnotationInfo().apply( + new ExternalSymbol(owner), + new ThisType(new ExternalSymbol(type)), + new Map.Map1<>("value", value)); + } + + @Override + @SuppressWarnings("unchecked") + public IndexedSeq collect(int id) { + events.add("collect:" + id); + Builder> builder = IndexedSeq$.MODULE$.newBuilder(); + for (AnnotationInfo annotation : entries) builder.$plus$eq((T) annotation); + return builder.result(); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TFluidHandlerTileFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TFluidHandlerTileFunctionalTest.java new file mode 100644 index 0000000..27a9f2f --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TFluidHandlerTileFunctionalTest.java @@ -0,0 +1,302 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.LinkedList; +import java.util.List; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.asm.MultipartMixinFactory; +import codechicken.multipart.scalatraits.TFluidHandlerTile; +import scala.collection.immutable.Nil$; + +/** Consumer-visible state and behavior of the generated fluid-handler trait. */ +class TFluidHandlerTileFunctionalTest { + + @Test + void copyFromSharesACompatibleTankListAndKeepsItForAPlainSource() throws Exception { + TileMultipart source = newFluidTile(); + TileMultipart target = newFluidTile(); + RecordingFluidPart part = part("source", FluidRegistry.WATER, 0, 0); + source.bindPart(part); + + target.copyFrom(source); + assertSame(tankList(source), tankList(target)); + assertEquals(Arrays.asList(part), tankList(target)); + + LinkedList retained = new LinkedList<>(); + setTankList(target, retained); + target.copyFrom(new TileMultipart()); + assertSame(retained, tankList(target)); + } + + @Test + void bindRemoveAndClearTrackOnlyFluidPartsInOrder() throws Exception { + TileMultipart tile = newFluidTile(); + RecordingFluidPart first = part("first", FluidRegistry.WATER, 0, 0); + RecordingFluidPart second = part("second", FluidRegistry.LAVA, 0, 0); + PlainPart plain = new PlainPart(); + tile.addPart_do(first); + tile.addPart_do(plain); + tile.addPart_do(second); + + assertEquals(Arrays.asList(first, second), tankList(tile)); + tile.partRemoved(first, 0); + assertEquals(Arrays.asList(second), tankList(tile)); + tile.partRemoved(plain, 0); + assertEquals(Arrays.asList(second), tankList(tile)); + + tile.clearParts(); + assertTrue(tankList(tile).isEmpty()); + assertTrue(tile.jPartList().isEmpty()); + } + + @Test + void tankInfoIsFlattenedInPartOrder() { + TileMultipart tile = newFluidTile(); + RecordingFluidPart first = part("first", FluidRegistry.WATER, 0, 0); + RecordingFluidPart second = part("second", FluidRegistry.LAVA, 0, 0); + FluidTankInfo water = info(FluidRegistry.WATER, 100, 1000); + FluidTankInfo lava = info(FluidRegistry.LAVA, 200, 2000); + FluidTankInfo empty = new FluidTankInfo(null, 3000); + first.tankInfo = new FluidTankInfo[] { water, empty }; + second.tankInfo = new FluidTankInfo[] { lava }; + tile.bindPart(first); + tile.bindPart(second); + + assertArrayEquals(new FluidTankInfo[] { water, empty, lava }, fluid(tile).getTankInfo(ForgeDirection.UP)); + assertEquals(2, first.tankInfoCalls); + assertEquals(2, second.tankInfoCalls); + assertEquals(Arrays.asList(ForgeDirection.UP, ForgeDirection.UP), first.tankInfoDirections); + } + + @Test + void fillWalksEveryHandlerWithADecreasingCopy() { + TileMultipart tile = newFluidTile(); + RecordingFluidPart first = part("first", FluidRegistry.WATER, 300, 0); + RecordingFluidPart second = part("second", FluidRegistry.WATER, 500, 0); + RecordingFluidPart third = part("third", FluidRegistry.WATER, 1000, 0); + RecordingFluidPart afterFull = part("after", FluidRegistry.WATER, 100, 0); + tile.bindPart(first); + tile.bindPart(second); + tile.bindPart(third); + tile.bindPart(afterFull); + FluidStack offered = new FluidStack(FluidRegistry.WATER, 1000); + + assertEquals(1000, fluid(tile).fill(ForgeDirection.DOWN, offered, false)); + assertEquals(1000, offered.amount); + assertEquals(Arrays.asList(1000), first.fillAmounts); + assertEquals(Arrays.asList(700), second.fillAmounts); + assertEquals(Arrays.asList(200), third.fillAmounts); + assertEquals(Arrays.asList(0), afterFull.fillAmounts); + assertEquals(Arrays.asList(false), first.fillActions); + assertNotSame(offered, first.fillStacks.get(0)); + assertTrue(offered.isFluidEqual(first.fillStacks.get(0))); + } + + @Test + void fillAndDrainCapabilityChecksStopAtTheFirstMatch() { + TileMultipart tile = newFluidTile(); + RecordingFluidPart first = part("first", FluidRegistry.WATER, 0, 0); + RecordingFluidPart match = part("match", FluidRegistry.WATER, 0, 0); + RecordingFluidPart skipped = part("skipped", FluidRegistry.WATER, 0, 0); + match.canFill = true; + match.canDrain = true; + skipped.canFill = true; + skipped.canDrain = true; + tile.bindPart(first); + tile.bindPart(match); + tile.bindPart(skipped); + + assertTrue(fluid(tile).canFill(ForgeDirection.EAST, FluidRegistry.WATER)); + assertTrue(fluid(tile).canDrain(ForgeDirection.WEST, FluidRegistry.WATER)); + assertEquals(1, first.canFillCalls); + assertEquals(1, match.canFillCalls); + assertEquals(0, skipped.canFillCalls); + assertEquals(1, first.canDrainCalls); + assertEquals(1, match.canDrainCalls); + assertEquals(0, skipped.canDrainCalls); + } + + @Test + void amountDrainSimulatesThenCommitsOnlyMatchingFluid() { + TileMultipart tile = newFluidTile(); + RecordingFluidPart first = part("first", FluidRegistry.WATER, 0, 300); + RecordingFluidPart mismatch = part("mismatch", FluidRegistry.LAVA, 0, 400); + RecordingFluidPart last = part("last", FluidRegistry.WATER, 0, 500); + tile.bindPart(first); + tile.bindPart(mismatch); + tile.bindPart(last); + + FluidStack drained = fluid(tile).drain(ForgeDirection.NORTH, 700, true); + + assertEquals(FluidRegistry.WATER, drained.getFluid()); + assertEquals(700, drained.amount); + assertEquals(Arrays.asList(700, 700), first.amountDrainAmounts); + assertEquals(Arrays.asList(false, true), first.amountDrainActions); + assertEquals(Arrays.asList(400), mismatch.amountDrainAmounts); + assertEquals(Arrays.asList(false), mismatch.amountDrainActions); + assertEquals(Arrays.asList(400, 400), last.amountDrainAmounts); + assertEquals(Arrays.asList(false, true), last.amountDrainActions); + } + + @Test + void stackDrainUsesDecreasingCopiesWithoutCommittingSimulation() { + TileMultipart tile = newFluidTile(); + RecordingFluidPart first = part("first", FluidRegistry.WATER, 0, 200); + RecordingFluidPart mismatch = part("mismatch", FluidRegistry.LAVA, 0, 300); + RecordingFluidPart last = part("last", FluidRegistry.WATER, 0, 400); + tile.bindPart(first); + tile.bindPart(mismatch); + tile.bindPart(last); + FluidStack requested = new FluidStack(FluidRegistry.WATER, 500); + + FluidStack drained = fluid(tile).drain(ForgeDirection.SOUTH, requested, false); + + assertEquals(FluidRegistry.WATER, drained.getFluid()); + assertEquals(500, drained.amount); + assertEquals(500, requested.amount); + assertEquals(Arrays.asList(500), first.stackDrainAmounts); + assertEquals(Arrays.asList(300), mismatch.stackDrainAmounts); + assertEquals(Arrays.asList(300), last.stackDrainAmounts); + assertEquals(Arrays.asList(false), first.stackDrainActions); + assertEquals(Arrays.asList(false), mismatch.stackDrainActions); + assertEquals(Arrays.asList(false), last.stackDrainActions); + assertNotSame(requested, first.stackDrainStacks.get(0)); + assertTrue(requested.isFluidEqual(first.stackDrainStacks.get(0))); + } + + private static TileMultipart newFluidTile() { + int traitId = MultipartMixinFactory.getId(TFluidHandlerTile.class.getName().replace('.', '/')); + BitSet traits = new BitSet(); + traits.set(traitId); + return (TileMultipart) MultipartMixinFactory.construct(traits, Nil$.MODULE$); + } + + private static IFluidHandler fluid(TileMultipart tile) { + return (IFluidHandler) tile; + } + + @SuppressWarnings("unchecked") + private static LinkedList tankList(TileMultipart tile) throws Exception { + return (LinkedList) tile.getClass().getMethod("tankList").invoke(tile); + } + + private static void setTankList(TileMultipart tile, LinkedList list) throws Exception { + tile.getClass().getMethod("tankList_$eq", LinkedList.class).invoke(tile, list); + } + + private static RecordingFluidPart part(String name, Fluid fluid, int fillLimit, int drainLimit) { + return new RecordingFluidPart(name, fluid, fillLimit, drainLimit); + } + + private static FluidTankInfo info(Fluid fluid, int amount, int capacity) { + return new FluidTankInfo(new FluidStack(fluid, amount), capacity); + } + + private static class PlainPart extends TMultiPart { + + @Override + public String getType() { + return "fluid_test:plain"; + } + } + + private static final class RecordingFluidPart extends PlainPart implements IFluidHandler { + + private final String name; + private final Fluid drainedFluid; + private final int fillLimit; + private final int drainLimit; + private final List fillAmounts = new ArrayList<>(); + private final List fillActions = new ArrayList<>(); + private final List fillStacks = new ArrayList<>(); + private final List amountDrainAmounts = new ArrayList<>(); + private final List amountDrainActions = new ArrayList<>(); + private final List stackDrainAmounts = new ArrayList<>(); + private final List stackDrainActions = new ArrayList<>(); + private final List stackDrainStacks = new ArrayList<>(); + private final List tankInfoDirections = new ArrayList<>(); + private FluidTankInfo[] tankInfo = new FluidTankInfo[0]; + private boolean canFill; + private boolean canDrain; + private int tankInfoCalls; + private int canFillCalls; + private int canDrainCalls; + + private RecordingFluidPart(String name, Fluid drainedFluid, int fillLimit, int drainLimit) { + this.name = name; + this.drainedFluid = drainedFluid; + this.fillLimit = fillLimit; + this.drainLimit = drainLimit; + } + + @Override + public String getType() { + return "fluid_test:" + name; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + fillAmounts.add(resource.amount); + fillActions.add(doFill); + fillStacks.add(resource); + return Math.min(fillLimit, Math.max(0, resource.amount)); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + stackDrainAmounts.add(resource.amount); + stackDrainActions.add(doDrain); + stackDrainStacks.add(resource); + return drained(Math.min(drainLimit, resource.amount)); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + amountDrainAmounts.add(maxDrain); + amountDrainActions.add(doDrain); + return drained(Math.min(drainLimit, maxDrain)); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + canFillCalls++; + return canFill; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + canDrainCalls++; + return canDrain; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + tankInfoCalls++; + tankInfoDirections.add(from); + return tankInfo; + } + + private FluidStack drained(int amount) { + return amount > 0 ? new FluidStack(drainedFluid, amount) : null; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TIInventoryTileFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TIInventoryTileFunctionalTest.java new file mode 100644 index 0000000..507afb1 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TIInventoryTileFunctionalTest.java @@ -0,0 +1,445 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.BitSet; +import java.util.LinkedList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TSlottedPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.asm.MultipartMixinFactory; +import codechicken.multipart.examples.TileTraitAccessExample; +import codechicken.multipart.scalatraits.JInventoryTile; +import codechicken.multipart.scalatraits.TIInventoryTile; +import codechicken.multipart.scalatraits.TSlottedTile; +import scala.Tuple2; +import scala.collection.immutable.Nil$; + +/** Consumer-visible state and behavior of the generated inventory trait. */ +class TIInventoryTileFunctionalTest { + + @Test + void copyFromSharesACompatibleInventoryListAndRebuildsTheSlotMap() { + TileMultipart source = newInventoryTile(); + TileMultipart target = newInventoryTile(); + InventoryPart part = new InventoryPart("source", 2); + source.bindPart(part); + + TIInventoryTile sourceInventory = inventory(source); + TIInventoryTile targetInventory = inventory(target); + Tuple2[] sourceMap = sourceInventory.slotMap(); + target.copyFrom(source); + + assertSame(sourceInventory.invList(), targetInventory.invList()); + assertNotSame(sourceMap, targetInventory.slotMap()); + assertEquals(2, targetInventory.getSizeInventory()); + + LinkedList retainedList = targetInventory.invList(); + Tuple2[] retainedMap = targetInventory.slotMap(); + target.copyFrom(new TileMultipart()); + assertSame(retainedList, targetInventory.invList()); + assertSame(retainedMap, targetInventory.slotMap()); + } + + @Test + void bindRemoveAndClearTrackOnlyInventoriesInOrder() { + TileMultipart tile = newInventoryTile(); + InventoryPart first = new InventoryPart("first", 1); + InventoryPart second = new InventoryPart("second", 2); + PlainPart plain = new PlainPart(); + tile.addPart_do(first); + tile.addPart_do(plain); + tile.addPart_do(second); + + TIInventoryTile inventory = inventory(tile); + assertEquals(Arrays.asList(first, second), inventory.invList()); + assertEquals(3, inventory.getSizeInventory()); + + tile.partRemoved(first, 0); + assertEquals(Arrays.asList(second), inventory.invList()); + assertEquals(2, inventory.getSizeInventory()); + tile.partRemoved(plain, 0); + assertEquals(Arrays.asList(second), inventory.invList()); + + tile.clearParts(); + assertTrue(inventory.invList().isEmpty()); + assertEquals(0, inventory.slotMap().length); + assertTrue(tile.jPartList().isEmpty()); + } + + @Test + void flattenedSlotsRouteInventoryOperationsToLocalSlots() { + TileMultipart tile = newInventoryTile(); + InventoryPart first = new InventoryPart("first", 1); + InventoryPart second = new InventoryPart("second", 2); + ItemStack apple = new ItemStack(Items.apple); + ItemStack stick = new ItemStack(Items.stick); + ItemStack decremented = new ItemStack(Items.coal, 4); + ItemStack closing = new ItemStack(Items.bowl); + first.stacks[0] = apple; + second.stacks[1] = stick; + second.decrementResult = decremented; + second.closingResult = closing; + second.valid = false; + tile.bindPart(first); + tile.bindPart(second); + + TIInventoryTile inventory = inventory(tile); + assertEquals(3, inventory.getSizeInventory()); + assertSame(apple, inventory.getStackInSlot(0)); + assertSame(stick, inventory.getStackInSlot(2)); + assertSame(decremented, inventory.decrStackSize(1, 4)); + assertEquals(0, second.lastDecrementSlot); + assertEquals(4, second.lastDecrementAmount); + assertSame(closing, inventory.getStackInSlotOnClosing(2)); + assertEquals(1, second.lastClosingSlot); + + ItemStack replacement = new ItemStack(Items.diamond); + inventory.setInventorySlotContents(1, replacement); + assertSame(replacement, second.stacks[0]); + assertFalse(inventory.isItemValidForSlot(2, replacement)); + assertEquals(1, second.lastValiditySlot); + assertSame(replacement, second.lastValidityStack); + } + + @Test + void directTraitCallRebuildsTheMapAfterInventorySizeChanges() { + TileMultipart tile = newInventoryTile(); + InventoryPart part = new InventoryPart("resizable", 1); + tile.bindPart(part); + TIInventoryTile api = (TIInventoryTile) tile; + assertEquals(1, api.getSizeInventory()); + + part.resize(3); + api.rebuildSlotMap(); + + assertEquals(3, api.getSizeInventory()); + assertSame(part, api.slotMap()[2]._1()); + assertEquals(2, ((Number) api.slotMap()[2]._2()).intValue()); + } + + @Test + void supportedRefreshRebuildsTheMapAfterInventorySizeChanges() { + TileMultipart tile = newInventoryTile(); + InventoryPart first = new InventoryPart("first", 1); + InventoryPart resized = new InventoryPart("resized", 1); + tile.addPart_do(first); + tile.addPart_do(resized); + TIInventoryTile inventory = inventory(tile); + assertEquals(2, inventory.getSizeInventory()); + + resized.resize(3); + assertEquals(2, inventory.getSizeInventory(), "FMP cannot see a size change on its own"); + TileTraitAccessExample.refreshInventory(tile); + + assertEquals(4, inventory.getSizeInventory()); + assertEquals(Arrays.asList(first, resized), inventory.invList()); + assertSame(first, inventory.slotMap()[0]._1()); + assertSame(resized, inventory.slotMap()[3]._1()); + assertEquals(2, ((Number) inventory.slotMap()[3]._2()).intValue()); + assertEquals(Arrays.asList(first, resized), tile.jPartList()); + } + + @Test + void supportedRefreshDoesNothingWithoutTheInventoryCapability() { + TileMultipart plain = new TileMultipart(); + PlainPart part = new PlainPart(); + plain.addPart_do(part); + plain.refreshInventorySlots(); + assertEquals(Arrays.asList(part), plain.jPartList()); + + TileMultipart slotted = newTile(TSlottedTile.class); + SlottedInventoryPart slottedPart = new SlottedInventoryPart(1 << 2); + slotted.addPart_do(slottedPart); + slotted.refreshInventorySlots(); + assertFalse(slotted instanceof TIInventoryTile); + assertSame(slottedPart, slotted.partMap(2)); + assertEquals(Arrays.asList(slottedPart), slotted.jPartList()); + } + + @Test + void supportedRefreshLeavesOtherTraitCachesAlone() { + TileMultipart tile = newTile(JInventoryTile.class, TSlottedTile.class); + SlottedInventoryPart part = new SlottedInventoryPart(1 << 2); + tile.addPart_do(part); + TIInventoryTile inventory = inventory(tile); + + ((InventoryPart) part).resize(4); + tile.refreshInventorySlots(); + + assertEquals(Arrays.asList(part), inventory.invList(), "no inventory is added again"); + assertEquals(4, inventory.getSizeInventory()); + assertSame(part, tile.partMap(2)); + assertNull(tile.partMap(3)); + } + + @Test + void rebuildingQueriesEachInventorySizeOncePerPassAndPreservesSlotOrder() { + TIInventoryTile api = inventory(newInventoryTile()); + InventoryPart empty = new InventoryPart("empty", 0); + InventoryPart single = new InventoryPart("single", 1); + InventoryPart large = new InventoryPart("large", 54); + api.invList().addAll(Arrays.asList(empty, single, large)); + + api.rebuildSlotMap(); + + assertEquals(2, empty.sizeCalls); + assertEquals(2, single.sizeCalls); + assertEquals(2, large.sizeCalls); + assertEquals(55, api.getSizeInventory()); + assertSame(single, api.slotMap()[0]._1()); + assertEquals(0, api.slotMap()[0]._2()); + for (int slot = 0; slot < 54; slot++) { + assertSame(large, api.slotMap()[slot + 1]._1()); + assertEquals(slot, api.slotMap()[slot + 1]._2()); + } + } + + @Test + void tileInventoryMetadataAndLifecycleRemainFixed() { + TileMultipart tile = newInventoryTile(); + InventoryPart part = new InventoryPart("metadata", 1); + tile.bindPart(part); + TIInventoryTile inventory = inventory(tile); + + assertEquals("Multipart Inventory", inventory.getInventoryName()); + assertFalse(inventory.hasCustomInventoryName()); + assertEquals(64, inventory.getInventoryStackLimit()); + assertTrue(inventory.isUseableByPlayer(null)); + inventory.openInventory(); + inventory.closeInventory(); + assertEquals(0, part.openCalls); + assertEquals(0, part.closeCalls); + } + + @Test + void accessibleSlotsIncludePlainInventoriesAndRespectSidedRestrictionsWithGlobalOffsets() { + TileMultipart tile = newInventoryTile(); + InventoryPart plainFirst = new InventoryPart("plain_first", 2); + SidedInventoryPart sidedFirst = new SidedInventoryPart("sided_first", 1, new int[] { 0 }); + InventoryPart plainSecond = new InventoryPart("plain_second", 1); + SidedInventoryPart sidedSecond = new SidedInventoryPart("sided_second", 3, new int[] { 2, 0 }); + tile.bindPart(plainFirst); + tile.bindPart(sidedFirst); + tile.bindPart(plainSecond); + tile.bindPart(sidedSecond); + + assertArrayEquals(new int[] { 0, 1, 2, 3, 6, 4 }, inventory(tile).getAccessibleSlotsFromSide(5)); + assertEquals(5, sidedFirst.lastAccessibleSide); + assertEquals(5, sidedSecond.lastAccessibleSide); + } + + @Test + void sidedInsertAndExtractChecksReceiveLocalSlotsWhilePlainInventoriesAllowBoth() { + TileMultipart tile = newInventoryTile(); + InventoryPart plain = new InventoryPart("plain", 2); + SidedInventoryPart sided = new SidedInventoryPart("sided", 2, new int[0]); + sided.insertResult = false; + sided.extractResult = true; + tile.bindPart(plain); + tile.bindPart(sided); + TIInventoryTile inventory = inventory(tile); + ItemStack stack = new ItemStack(Items.apple); + + assertTrue(inventory.canInsertItem(1, stack, 3)); + assertTrue(inventory.canExtractItem(0, stack, 4)); + assertFalse(inventory.canInsertItem(3, stack, 5)); + assertTrue(inventory.canExtractItem(2, stack, 1)); + assertEquals(1, sided.lastInsertSlot); + assertEquals(5, sided.lastInsertSide); + assertEquals(0, sided.lastExtractSlot); + assertEquals(1, sided.lastExtractSide); + } + + private static TileMultipart newInventoryTile() { + return newTile(JInventoryTile.class); + } + + private static TileMultipart newTile(Class... traitInputs) { + BitSet traits = new BitSet(); + for (Class input : traitInputs) { + traits.set(MultipartMixinFactory.getId(input.getName().replace('.', '/'))); + } + return (TileMultipart) MultipartMixinFactory.construct(traits, Nil$.MODULE$); + } + + private static TIInventoryTile inventory(TileMultipart tile) { + return (TIInventoryTile) tile; + } + + private static class PlainPart extends TMultiPart { + + @Override + public String getType() { + return "inventory_test:plain"; + } + } + + private static class InventoryPart extends PlainPart implements IInventory { + + private final String name; + private ItemStack[] stacks; + private ItemStack decrementResult; + private ItemStack closingResult; + private boolean valid = true; + private int lastDecrementSlot = -1; + private int lastDecrementAmount = -1; + private int lastClosingSlot = -1; + private int lastValiditySlot = -1; + private ItemStack lastValidityStack; + private int openCalls; + private int closeCalls; + private int sizeCalls; + + private InventoryPart(String name, int size) { + this.name = name; + stacks = new ItemStack[size]; + } + + @Override + public String getType() { + return "inventory_test:" + name; + } + + @Override + public int getSizeInventory() { + sizeCalls++; + return stacks.length; + } + + @Override + public ItemStack getStackInSlot(int slot) { + return stacks[slot]; + } + + @Override + public ItemStack decrStackSize(int slot, int amount) { + lastDecrementSlot = slot; + lastDecrementAmount = amount; + return decrementResult; + } + + @Override + public ItemStack getStackInSlotOnClosing(int slot) { + lastClosingSlot = slot; + return closingResult; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + stacks[slot] = stack; + } + + @Override + public String getInventoryName() { + return name; + } + + @Override + public boolean hasCustomInventoryName() { + return true; + } + + @Override + public int getInventoryStackLimit() { + return 1; + } + + @Override + public void markDirty() {} + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return false; + } + + @Override + public void openInventory() { + openCalls++; + } + + @Override + public void closeInventory() { + closeCalls++; + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + lastValiditySlot = slot; + lastValidityStack = stack; + return valid; + } + + private void resize(int size) { + stacks = Arrays.copyOf(stacks, size); + } + } + + private static final class SlottedInventoryPart extends InventoryPart implements TSlottedPart { + + private final int slotMask; + + private SlottedInventoryPart(int slotMask) { + super("slotted", 1); + this.slotMask = slotMask; + } + + @Override + public int getSlotMask() { + return slotMask; + } + } + + private static final class SidedInventoryPart extends InventoryPart implements ISidedInventory { + + private final int[] accessibleSlots; + private boolean insertResult; + private boolean extractResult; + private int lastAccessibleSide = -1; + private int lastInsertSlot = -1; + private int lastInsertSide = -1; + private int lastExtractSlot = -1; + private int lastExtractSide = -1; + + private SidedInventoryPart(String name, int size, int[] accessibleSlots) { + super(name, size); + this.accessibleSlots = accessibleSlots; + } + + @Override + public int[] getAccessibleSlotsFromSide(int side) { + lastAccessibleSide = side; + return accessibleSlots; + } + + @Override + public boolean canInsertItem(int slot, ItemStack stack, int side) { + lastInsertSlot = slot; + lastInsertSide = side; + return insertResult; + } + + @Override + public boolean canExtractItem(int slot, ItemStack stack, int side) { + lastExtractSlot = slot; + lastExtractSide = side; + return extractResult; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TMicroOcclusionFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TMicroOcclusionFunctionalTest.java new file mode 100644 index 0000000..7ff82b1 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TMicroOcclusionFunctionalTest.java @@ -0,0 +1,85 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.CornerMicroClass$; +import codechicken.microblock.EdgeMicroClass$; +import codechicken.microblock.FaceMicroClass$; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.Microblock; +import codechicken.microblock.MicroblockGenerator; + +class TMicroOcclusionFunctionalTest { + + @Test + void generatedFacePairsRejectOnlyOpposingThicknessOverflowRegardlessOfMaterial() { + int stone = MicroMaterialRegistry.materialID("minecraft:stone"); + int glass = MicroMaterialRegistry.materialID("minecraft:glass"); + assertNotEquals(stone, glass); + Microblock first = MicroblockGenerator.create(FaceMicroClass$.MODULE$, stone, false); + for (int material : new int[] { stone, glass }) { + Microblock second = MicroblockGenerator.create(FaceMicroClass$.MODULE$, material, false); + for (int side = 0; side < 6; side++) { + for (int other = 0; other < 6; other++) { + for (int size = 1; size <= 7; size++) { + for (int otherSize = 1; otherSize <= 7; otherSize++) { + first.setShape(size, side); + second.setShape(otherSize, other); + boolean expected = other != (side ^ 1) || size + otherSize <= 8; + assertEquals( + expected, + first.occlusionTest(second), + "sides=" + side + "," + other + " sizes=" + size + "," + otherSize); + assertEquals(expected, second.occlusionTest(first)); + } + } + } + } + } + } + + @Test + void generatedCornerAndEdgePairsKeepMaterialBoundariesAndAxisRulesInBothDirections() { + int stone = MicroMaterialRegistry.materialID("minecraft:stone"); + int glass = MicroMaterialRegistry.materialID("minecraft:glass"); + assertNotEquals(stone, glass); + Microblock corner = MicroblockGenerator.create(CornerMicroClass$.MODULE$, stone, false); + Microblock edge = MicroblockGenerator.create(EdgeMicroClass$.MODULE$, stone, false); + int[] masks = { 6, 5, 3 }; + int[] edgePositions = { 0, 2, 4, 6, 0, 4, 1, 5, 0, 1, 2, 3 }; + for (int material : new int[] { stone, glass }) { + Microblock otherCorner = MicroblockGenerator.create(CornerMicroClass$.MODULE$, material, false); + Microblock otherEdge = MicroblockGenerator.create(EdgeMicroClass$.MODULE$, material, false); + for (int[] sizes : new int[][] { { 2, 6 }, { 3, 6 }, { 7, 7 } }) { + boolean restricted = material != stone && sizes[0] + sizes[1] > 8; + for (int c = 0; c < 8; c++) { + corner.setShape(sizes[0], 7 + c); + for (int other = 0; other < 8; other++) { + otherCorner.setShape(sizes[1], 7 + other); + int difference = Integer.bitCount(c ^ other); + assertBoth(!restricted || difference != 2, corner, otherCorner); + } + for (int e = 0; e < 12; e++) { + otherEdge.setShape(sizes[1], 15 + e); + assertBoth(!restricted || (c & masks[e / 4]) == edgePositions[e], corner, otherEdge); + } + } + for (int e = 0; e < 12; e++) { + edge.setShape(sizes[0], 15 + e); + for (int other = 0; other < 12; other++) { + otherEdge.setShape(sizes[1], 15 + other); + boolean oppositeParallel = e / 4 == other / 4 && (e % 4 + other % 4 == 3); + assertBoth(!restricted || !oppositeParallel, edge, otherEdge); + } + } + } + } + } + + private static void assertBoth(boolean expected, Microblock first, Microblock second) { + assertEquals(expected, first.occlusionTest(second)); + assertEquals(expected, second.occlusionTest(first)); + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TRedstoneTileFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TRedstoneTileFunctionalTest.java new file mode 100644 index 0000000..d4474e8 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TRedstoneTileFunctionalTest.java @@ -0,0 +1,267 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.init.Blocks; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Rotation; +import codechicken.multipart.IMaskedRedstonePart; +import codechicken.multipart.IRedstoneConnector; +import codechicken.multipart.IRedstoneTile; +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.PartMap; +import codechicken.multipart.TEdgePart; +import codechicken.multipart.TFacePart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.collection.JavaConversions; + +/** Consumer-visible shape and behavior of the generated redstone-tile trait. */ +class TRedstoneTileFunctionalTest { + + private static final String TRAIT_NAME = "codechicken.multipart.scalatraits.TRedstoneTile"; + private static final BlockCoord EAST = new BlockCoord(49, 200, 48); + + @Test + void generatedTraitKeepsItsRuntimeInterfaceAndClassCacheShape() throws Exception { + TileMultipart first = tile(new MaskedPowerPart(0x1F, 1, 2)); + TileMultipart second = tile(new MaskedPowerPart(0x1F, 3, 4)); + Class trait = Class.forName(TRAIT_NAME); + + assertTrue(trait.isInterface()); + assertArrayEquals(new Class[] { IRedstoneTile.class }, trait.getInterfaces()); + assertTrue(trait.isInstance(first)); + assertNotSame(first, second); + assertSame(first.getClass(), second.getClass()); + assertEquals(0, trait.getDeclaredFields().length); + + Set signatures = new TreeSet<>(); + for (Method method : trait.getDeclaredMethods()) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + assertEquals( + new TreeSet<>( + Arrays.asList( + "canConnectRedstone(I)Z", + "getConnectionMask(I)I", + "openConnections(I)I", + "redstoneConductionE(I)Z", + "redstoneConductionF(I)I", + "strongPowerLevel(I)I", + "weakPowerLevel(I)I", + "weakPowerLevel(II)I")), + signatures); + } + + @Test + void conductionAndPowerQueriesPreserveMasksAndMutableSeqInputs() throws Exception { + int side = 0; + int blockedEdge = PartMap.edgeBetween(side, Rotation.rotateSide(side & 6, 0)); + int openEdge = PartMap.edgeBetween(side, Rotation.rotateSide(side & 6, 2)); + FaceCoverPart face = new FaceCoverPart(side, 0x15); + EdgeCoverPart edge = new EdgeCoverPart(blockedEdge, false); + MaskedPowerPart edgePower = new MaskedPowerPart(0x04, 7, 8); + MaskedPowerPart centerPower = new MaskedPowerPart(0x10, 13, 12); + MaskedPowerPart blockedPower = new MaskedPowerPart(0x02, 99, 99); + PlainPart plain = new PlainPart(); + ArrayList parts = new ArrayList<>( + Arrays.asList(face, edge, edgePower, centerPower, blockedPower, plain)); + TileMultipart tile = MultipartHelper.createTileFromParts(parts); + IRedstoneTile redstone = (IRedstoneTile) tile; + Class trait = Class.forName(TRAIT_NAME); + + // Scala callers can replace partList with any Seq, not only the immutable List used by normal mutations. + tile.partList_$eq(JavaConversions.asScalaBuffer(parts)); + + assertEquals(0x15, invokeInt(trait, tile, "redstoneConductionF", side)); + assertFalse(invokeBoolean(trait, tile, "redstoneConductionE", blockedEdge)); + assertTrue(invokeBoolean(trait, tile, "redstoneConductionE", openEdge)); + assertEquals(0x14, redstone.openConnections(side)); + assertEquals(0x14, redstone.getConnectionMask(side)); + assertEquals(99, tile.strongPowerLevel(side)); + assertEquals(12, redstone.weakPowerLevel(side, 0x14)); + assertEquals(8, redstone.weakPowerLevel(side, 0x04)); + assertEquals(0, redstone.weakPowerLevel(side, 0x02)); + + assertEquals(1, edgePower.strongCalls); + assertEquals(1, centerPower.strongCalls); + assertEquals(1, blockedPower.strongCalls); + assertEquals(2, edgePower.weakCalls); + assertEquals(1, centerPower.weakCalls); + assertEquals(0, blockedPower.weakCalls); + } + + @Test + void worldFacingQueriesUseTheNeighborMaskAndVanillaSideMapping() { + World world = MinecraftServer.getServer().worldServers[0]; + world.getChunkFromBlockCoords(EAST.x, EAST.z); + clear(world, EAST); + MaskedPowerPart part = new MaskedPowerPart(0x04, 0, 11); + TileMultipart tile = tile(part); + MaskConnector connector = new MaskConnector(0x04); + + try { + tile.setWorldObj(world); + tile.xCoord = EAST.x - 1; + tile.yCoord = EAST.y; + tile.zCoord = EAST.z; + assertTrue(world.setBlock(EAST.x, EAST.y, EAST.z, Blocks.chest, 0, 3)); + world.setTileEntity(EAST.x, EAST.y, EAST.z, connector); + + assertEquals(11, tile.weakPowerLevel(5)); + assertEquals(4, connector.lastSide); + assertTrue(tile.canConnectRedstone(1), "Vanilla side 1 maps to multipart side 5"); + assertEquals(4, connector.lastSide); + + connector.mask = 0x08; + assertEquals(0, tile.weakPowerLevel(5)); + assertFalse(tile.canConnectRedstone(1)); + } finally { + clear(world, EAST); + } + } + + private static TileMultipart tile(TMultiPart... parts) { + return MultipartHelper.createTileFromParts(Arrays.asList(parts)); + } + + private static int invokeInt(Class trait, TileMultipart tile, String method, int argument) throws Exception { + return ((Number) trait.getMethod(method, int.class).invoke(tile, argument)).intValue(); + } + + private static boolean invokeBoolean(Class trait, TileMultipart tile, String method, int argument) + throws Exception { + return (Boolean) trait.getMethod(method, int.class).invoke(tile, argument); + } + + private static void clear(World world, BlockCoord pos) { + world.removeTileEntity(pos.x, pos.y, pos.z); + world.setBlockToAir(pos.x, pos.y, pos.z); + } + + private static class PlainPart extends TMultiPart { + + @Override + public String getType() { + return "redstone_test:plain"; + } + } + + private static final class FaceCoverPart extends PlainPart implements TFacePart { + + private final int side; + private final int conductionMap; + + private FaceCoverPart(int side, int conductionMap) { + this.side = side; + this.conductionMap = conductionMap; + } + + @Override + public int getSlotMask() { + return 1 << side; + } + + @Override + public int redstoneConductionMap() { + return conductionMap; + } + } + + private static final class EdgeCoverPart extends PlainPart implements TEdgePart { + + private final int slot; + private final boolean conducts; + + private EdgeCoverPart(int slot, boolean conducts) { + this.slot = slot; + this.conducts = conducts; + } + + @Override + public int getSlotMask() { + return 1 << slot; + } + + @Override + public boolean conductsRedstone() { + return conducts; + } + } + + private static final class MaskedPowerPart extends PlainPart implements IMaskedRedstonePart { + + private final int mask; + private final int strongPower; + private final int weakPower; + private int strongCalls; + private int weakCalls; + + private MaskedPowerPart(int mask, int strongPower, int weakPower) { + this.mask = mask; + this.strongPower = strongPower; + this.weakPower = weakPower; + } + + @Override + public int getConnectionMask(int side) { + return mask; + } + + @Override + public int strongPowerLevel(int side) { + strongCalls++; + return strongPower; + } + + @Override + public int weakPowerLevel(int side) { + weakCalls++; + return weakPower; + } + + @Override + public boolean canConnectRedstone(int side) { + return true; + } + } + + private static final class MaskConnector extends TileEntity implements IRedstoneConnector { + + private int mask; + private int lastSide = -1; + + private MaskConnector(int mask) { + this.mask = mask; + } + + @Override + public int getConnectionMask(int side) { + lastSide = side; + return mask; + } + + @Override + public int weakPowerLevel(int side, int mask) { + throw new AssertionError("Not used by tile output queries"); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TSlottedTileFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TSlottedTileFunctionalTest.java new file mode 100644 index 0000000..28a1755 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TSlottedTileFunctionalTest.java @@ -0,0 +1,286 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.BitSet; +import java.util.Objects; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TSlottedPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.asm.MultipartMixinFactory; +import codechicken.multipart.examples.TileTraitAccessExample; +import codechicken.multipart.scalatraits.TSlottedTile; +import scala.collection.immutable.Nil$; + +/** Consumer-visible state and behavior of the generated slotted-tile trait. */ +class TSlottedTileFunctionalTest { + + @Test + void cacheBindingDoesNotPlaceOrRebindThePartAndLeavesOldSlotsUntilExplicitlyCleared() throws Exception { + TileMultipart tile = newSlottedTile(); + TileMultipart owner = new TileMultipart(); + SlotPart part = new SlotPart(1 << 1); + part.bind(owner); + tile.bindPart(part); + assertTrue(tile.jPartList().isEmpty()); + assertSame(owner, part.tile()); + assertSame(part, tile.partMap(1)); + + part.slotMask = 1 << 5; + tile.bindPart(part); + assertSame(part, tile.partMap(1), "bindPart adds current slots; it does not remove the old mask"); + assertSame(part, tile.partMap(5)); + + TMultiPart[] slots = partMap(tile); + for (int i = 0; i < slots.length; i++) { + if (slots[i] == part) slots[i] = null; + } + tile.bindPart(part); + assertNull(tile.partMap(1)); + assertSame(part, tile.partMap(5)); + assertSame(owner, part.tile()); + assertTrue(tile.jPartList().isEmpty()); + } + + @Test + void copyFromSharesACompatibleSlotArrayAndKeepsItForAPlainSource() throws Exception { + TileMultipart source = newSlottedTile(); + TileMultipart target = newSlottedTile(); + TMultiPart[] sourceMap = new TMultiPart[27]; + sourceMap[4] = new PlainPart(); + setPartMap(source, sourceMap); + + target.copyFrom(source); + assertSame(sourceMap, partMap(target)); + + TMultiPart[] retained = new TMultiPart[27]; + setPartMap(target, retained); + target.copyFrom(new TileMultipart()); + assertSame(retained, partMap(target)); + } + + @Test + void externalArrayMutationCanBeRebuiltThroughBindPart() throws Exception { + TileMultipart tile = newSlottedTile(); + SlotPart part = new SlotPart((1 << 1) | (1 << 5) | (1 << 26)); + + tile.bindPart(part); + TMultiPart[] slots = partMap(tile); + assertSame(part, slots[1]); + assertSame(part, slots[5]); + assertSame(part, slots[26]); + + for (int index = 0; index < slots.length; index++) { + if (slots[index] == part) { + slots[index] = null; + } + } + tile.bindPart(part); + assertSame(part, slots[1]); + assertSame(part, slots[5]); + assertSame(part, slots[26]); + } + + @Test + void consumerSlotRefreshClearsEqualEntriesThenRebindsWithoutChangingOwnershipOrStorage() throws Exception { + TileMultipart tile = newSlottedTile(); + EqualSlotPart changed = new EqualSlotPart(1, 1 << 1); + EqualSlotPart retained = new EqualSlotPart(2, 1 << 4); + tile.addPart_do(changed); + tile.addPart_do(retained); + TMultiPart[] slots = partMap(tile); + slots[3] = new EqualSlotPart(1, 1 << 3); + changed.slotMask = 1 << 5; + + for (int index = 0; index < slots.length; index++) { + if (Objects.equals(slots[index], changed)) { + slots[index] = null; + } + } + tile.bindPart(changed); + + assertNull(tile.partMap(1)); + assertNull(tile.partMap(3), "Scala == clears a distinct equal entry too"); + assertSame(retained, tile.partMap(4)); + assertSame(changed, tile.partMap(5)); + assertEquals(Arrays.asList(changed, retained), tile.jPartList()); + assertSame(tile, changed.tile()); + assertSame(tile, retained.tile()); + } + + @Test + void javaSlotRefreshMatchesTheConsumerSequence() throws Exception { + TileMultipart tile = newSlottedTile(); + EqualSlotPart changed = new EqualSlotPart(1, 1 << 1); + EqualSlotPart retained = new EqualSlotPart(2, 1 << 4); + tile.addPart_do(changed); + tile.addPart_do(retained); + partMap(tile)[3] = new EqualSlotPart(1, 1 << 3); + changed.slotMask = 1 << 5; + changed.slotMaskCalls = 0; + + TileTraitAccessExample.refreshSlots(tile, changed); + + assertNull(tile.partMap(1)); + assertNull(tile.partMap(3)); + assertSame(retained, tile.partMap(4)); + assertSame(changed, tile.partMap(5)); + assertEquals(Arrays.asList(changed, retained), tile.jPartList()); + assertSame(tile, changed.tile()); + assertSame(tile, retained.tile()); + assertEquals(1, changed.slotMaskCalls, "The virtual bind chain runs once"); + } + + @Test + void javaSlotRefreshIsANoOpWithoutTheGeneratedSlottedCapability() { + TileMultipart tile = new TileMultipart(); + EqualSlotPart part = new EqualSlotPart(1, 1); + TileMultipart owner = new TileMultipart(); + part.bind(owner); + + tile.refreshPartSlots(part); + + assertTrue(tile.jPartList().isEmpty()); + assertNull(tile.partMap(0)); + assertSame(owner, part.tile()); + } + + @Test + void partRemovedClearsOnlyMatchingSlotsForSlottedParts() throws Exception { + TileMultipart tile = newSlottedTile(); + SlotPart removed = new SlotPart((1 << 1) | (1 << 5)); + SlotPart retained = new SlotPart(1 << 5); + PlainPart plain = new PlainPart(); + tile.bindPart(removed); + tile.bindPart(retained); + partMap(tile)[9] = plain; + + tile.partRemoved(removed, 0); + assertNull(tile.partMap(1)); + assertSame(retained, tile.partMap(5)); + assertSame(plain, tile.partMap(9)); + + tile.partRemoved(plain, 0); + assertSame(plain, tile.partMap(9)); + } + + @Test + void partRemovedUsesScalaValueEqualityForTheStoredPart() throws Exception { + TileMultipart tile = newSlottedTile(); + SlotPart stored = new SlotPart(1 << 4); + tile.bindPart(stored); + + tile.partRemoved(new SlotPart(1 << 4), 0); + + assertNull(tile.partMap(4)); + } + + @Test + void clearPartsClearsTheSuperclassListAndEverySlot() throws Exception { + TileMultipart tile = newSlottedTile(); + SlotPart slotted = new SlotPart((1 << 0) | (1 << 26)); + tile.addPart_do(slotted); + tile.addPart_do(new PlainPart()); + assertEquals(2, tile.jPartList().size()); + + tile.clearParts(); + + assertTrue(tile.jPartList().isEmpty()); + for (TMultiPart part : partMap(tile)) { + assertNull(part); + } + } + + @Test + void occupiedSlotsRejectBeforeOtherwiseDelegatingToTheBaseTile() { + TileMultipart tile = newSlottedTile(); + tile.bindPart(new SlotPart((1 << 2) | (1 << 8))); + + assertFalse(tile.canAddPart(new SlotPart(1 << 8))); + assertTrue(tile.canAddPart(new SlotPart(1 << 9))); + assertTrue(tile.canAddPart(new PlainPart())); + } + + private static TileMultipart newSlottedTile() { + int traitId = MultipartMixinFactory.getId(TSlottedTile.class.getName().replace('.', '/')); + BitSet traits = new BitSet(); + traits.set(traitId); + return (TileMultipart) MultipartMixinFactory.construct(traits, Nil$.MODULE$); + } + + private static TMultiPart[] partMap(TileMultipart tile) throws Exception { + return (TMultiPart[]) tile.getClass().getMethod("v_partMap").invoke(tile); + } + + private static void setPartMap(TileMultipart tile, TMultiPart[] map) throws Exception { + tile.getClass().getMethod("v_partMap_$eq", TMultiPart[].class).invoke(tile, (Object) map); + } + + private static class PlainPart extends TMultiPart { + + @Override + public String getType() { + return "slotted_test:plain"; + } + } + + private static final class SlotPart extends PlainPart implements TSlottedPart { + + private int slotMask; + + private SlotPart(int slotMask) { + this.slotMask = slotMask; + } + + @Override + public int getSlotMask() { + return slotMask; + } + + @Override + public boolean equals(Object other) { + return other instanceof SlotPart && slotMask == ((SlotPart) other).slotMask; + } + + @Override + public int hashCode() { + return slotMask; + } + } + + private static final class EqualSlotPart extends PlainPart implements TSlottedPart { + + private final int key; + private int slotMask; + private int slotMaskCalls; + + private EqualSlotPart(int key, int slotMask) { + this.key = key; + this.slotMask = slotMask; + } + + @Override + public int getSlotMask() { + slotMaskCalls++; + return slotMask; + } + + @Override + public boolean equals(Object other) { + return other instanceof EqualSlotPart && key == ((EqualSlotPart) other).key; + } + + @Override + public int hashCode() { + return key; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TTileChangeTileFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TTileChangeTileFunctionalTest.java new file mode 100644 index 0000000..36ca154 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TTileChangeTileFunctionalTest.java @@ -0,0 +1,175 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.INeighborTileChange; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.asm.MultipartMixinFactory; +import codechicken.multipart.scalatraits.TTileChangeTile; +import scala.collection.immutable.Nil$; + +/** Consumer-visible state and behavior of the generated neighbor-tile-change trait. */ +class TTileChangeTileFunctionalTest { + + @Test + void theFlagStartsFalseAndIsPublishedThroughGetWeakChanges() throws Exception { + TileMultipart tile = newTileChangeTile(); + + assertFalse(weakTileChanges(tile)); + assertFalse(tile.getWeakChanges()); + } + + @Test + void bindPartOnlyEverSetsTheFlag() { + TileMultipart tile = newTileChangeTile(); + + tile.bindPart(new PlainPart()); + assertFalse(tile.getWeakChanges(), "A part that is not an INeighborTileChange contributes nothing"); + + tile.bindPart(new ChangePart("quiet", false)); + assertFalse(tile.getWeakChanges()); + + tile.bindPart(new ChangePart("weak", true)); + assertTrue(tile.getWeakChanges()); + + // The flag is or-ed in, so a later quiet part cannot clear it. + tile.bindPart(new ChangePart("quiet2", false)); + assertTrue(tile.getWeakChanges()); + } + + @Test + void copyFromTakesTheFlagOnlyFromAnotherChangeTile() { + TileMultipart source = newTileChangeTile(); + source.bindPart(new ChangePart("weak", true)); + TileMultipart target = newTileChangeTile(); + + target.copyFrom(source); + assertTrue(target.getWeakChanges()); + + // A plain source leaves the existing value alone rather than clearing it. + target.copyFrom(new TileMultipart()); + assertTrue(target.getWeakChanges()); + } + + @Test + void clearPartsResetsTheFlagAndTheSuperclassList() { + TileMultipart tile = newTileChangeTile(); + tile.addPart_do(new ChangePart("weak", true)); + assertTrue(tile.getWeakChanges()); + + tile.clearParts(); + + assertFalse(tile.getWeakChanges()); + assertTrue(tile.jPartList().isEmpty()); + } + + @Test + void partRemovedRecomputesTheFlagFromTheRemainingParts() { + TileMultipart tile = newTileChangeTile(); + ChangePart weak = new ChangePart("weak", true); + ChangePart quiet = new ChangePart("quiet", false); + tile.addPart_do(weak); + tile.addPart_do(quiet); + assertTrue(tile.getWeakChanges()); + + // partRemoved recomputes from the list, so the part must already be gone from it. + tile.partList_$eq(seq(quiet)); + tile.partRemoved(weak, 0); + assertFalse(tile.getWeakChanges()); + + tile.partList_$eq(seq(quiet, weak)); + tile.partRemoved(quiet, 0); + assertTrue(tile.getWeakChanges(), "A remaining weak part keeps the flag set"); + } + + @Test + void neighborChangesDispatchOnlyWithinTwoBlocksAlongOneAxis() { + TileMultipart tile = newTileChangeTile(); + ChangePart part = new ChangePart("weak", true); + tile.addPart_do(part); + + // The tile sits at the origin, so the neighbor coordinates are the offset. + tile.onNeighborTileChange(1, 0, 0); + tile.onNeighborTileChange(0, -2, 0); + assertEquals(Arrays.asList("5:false", "0:true"), part.calls); + + part.calls.clear(); + tile.onNeighborTileChange(0, 0, 0); // no distance + tile.onNeighborTileChange(3, 0, 0); // too far + tile.onNeighborTileChange(1, 1, 0); // not axial, so no side + assertTrue(part.calls.isEmpty()); + } + + @Test + void onlyPartsWantingNeighborChangesAreCalled() { + TileMultipart tile = newTileChangeTile(); + ChangePart listening = new ChangePart("weak", true); + tile.addPart_do(new PlainPart()); + tile.addPart_do(listening); + + tile.onNeighborTileChange(0, 1, 0); + + assertEquals(Arrays.asList("1:false"), listening.calls); + } + + private static TileMultipart newTileChangeTile() { + int traitId = MultipartMixinFactory.getId(TTileChangeTile.class.getName().replace('.', '/')); + BitSet traits = new BitSet(); + traits.set(traitId); + return (TileMultipart) MultipartMixinFactory.construct(traits, Nil$.MODULE$); + } + + /** The accessor is generated onto the runtime interface, so it is not visible to this source set. */ + private static boolean weakTileChanges(TileMultipart tile) throws Exception { + return (Boolean) tile.getClass().getMethod("weakTileChanges").invoke(tile); + } + + private static scala.collection.Seq seq(TMultiPart... parts) { + return scala.collection.JavaConversions.asScalaBuffer(new ArrayList<>(Arrays.asList(parts))).toList(); + } + + private static class PlainPart extends TMultiPart { + + @Override + public String getType() { + return "tilechange_test:plain"; + } + } + + private static final class ChangePart extends PlainPart implements INeighborTileChange { + + private final String type; + private final boolean weak; + private final List calls = new ArrayList<>(); + + private ChangePart(String type, boolean weak) { + this.type = type; + this.weak = weak; + } + + @Override + public String getType() { + return "tilechange_test:" + type; + } + + @Override + public boolean weakTileChanges() { + return weak; + } + + @Override + public void onNeighborTileChanged(int side, boolean weak) { + calls.add(side + ":" + weak); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TileCacheFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TileCacheFunctionalTest.java new file mode 100644 index 0000000..8fcbb9a --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TileCacheFunctionalTest.java @@ -0,0 +1,76 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.TileCache; +import codechicken.multipart.TileMultipart; + +/** + * findTile is the whole point of the cache and needs a world, so none of it is reachable headless. Every case here uses + * a coordinate with no block in it, which is what drives BlockMultipart.getTile to null and hands control to the cache. + */ +class TileCacheFunctionalTest { + + private static final BlockCoord EMPTY = new BlockCoord(1000, 80, 1000); + + @BeforeEach + @AfterEach + void clearCache() { + TileCache.clear(); + } + + @Test + void recoversACachedTileWhenTheWorldHasNone() { + TileMultipart tile = tileAt(EMPTY); + TileCache.add(tile); + + assertSame(tile, TileCache.findTile(world(), EMPTY)); + } + + /** + * The removed flag only suppresses the warning. Both branches return the tile, because the Some pattern matches + * whatever the flag is -- the trailing null case in the reference is unreachable. + */ + @Test + void stillReturnsATileThatWasFlaggedRemoved() { + TileMultipart tile = tileAt(EMPTY); + TileCache.add(tile); + TileCache.remove(tile); + + assertSame(tile, TileCache.findTile(world(), EMPTY)); + } + + @Test + void throwsWhenTheWorldAndTheCacheBothComeUpEmpty() { + RuntimeException thrown = assertThrows(RuntimeException.class, () -> TileCache.findTile(world(), EMPTY)); + + assertTrue( + thrown.getMessage().startsWith("DC: Client multipart @"), + "Unexpected message: " + thrown.getMessage()); + } + + private static TileMultipart tileAt(BlockCoord pos) { + TileMultipart tile = new TileMultipart(); + tile.xCoord = pos.x; + tile.yCoord = pos.y; + tile.zCoord = pos.z; + return tile; + } + + private static World world() { + World world = MinecraftServer.getServer().worldServers[0]; + assertNotNull(world); + return world; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TileConversionFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TileConversionFunctionalTest.java new file mode 100644 index 0000000..c60516c --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TileConversionFunctionalTest.java @@ -0,0 +1,160 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.function.BiFunction; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileConversionResult; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.TileMultipart$; +import codechicken.multipart.examples.TileConversionExample; +import codechicken.multipart.minecraft.TorchPart; +import scala.Tuple2; + +class TileConversionFunctionalTest { + + @Test + void javaExistingTileIsReturnedWithoutConversion() { + checkExisting(TileConversionFunctionalTest::javaLookup); + } + + @Test + void javaNonConvertibleBlocksReturnNullAndFalse() { + checkMissing(TileConversionFunctionalTest::javaLookup); + } + + @Test + void javaConversionCreatesBoundPlaceholdersWithoutInstallingThem() { + checkConverted(TileConversionFunctionalTest::javaLookup); + } + + private static Tuple2 javaLookup(World world, BlockCoord pos) { + TileConversionResult result = TileMultipart.getOrConvertTileResult(world, pos); + TileMultipart example = TileConversionExample.findConvertedPlaceholder(world, pos); + if (result.isConverted()) { + assertNotSame(result.getTile(), example); + assertSame(world, example.getWorldObj()); + assertEquals(pos, new BlockCoord(example)); + } else { + assertNull(example); + } + return new Tuple2<>(result.getTile(), result.isConverted()); + } + + @Test + void legacyExistingTileIsReturnedWithoutConversion() { + checkExisting(TileMultipart::getOrConvertTile2); + checkExisting(TileMultipart$.MODULE$::getOrConvertTile2); + } + + @Test + void legacyNonConvertibleBlocksReturnNullAndFalse() { + checkMissing(TileMultipart::getOrConvertTile2); + checkMissing(TileMultipart$.MODULE$::getOrConvertTile2); + } + + @Test + void legacyConversionCreatesBoundPlaceholdersWithoutInstallingThem() { + checkConverted(TileMultipart::getOrConvertTile2); + checkConverted(TileMultipart$.MODULE$::getOrConvertTile2); + } + + private static void checkExisting(BiFunction> lookup) { + World world = world(); + BlockCoord pos = new BlockCoord(54, 200, 48); + world.setBlockToAir(pos.x, pos.y, pos.z); + try { + TMultiPart part = new MultipartGeneratorFunctionalTest.PlainPart(); + TileMultipart tile = TileMultipart.addPart(world, pos, part); + Tuple2 result = lookup.apply(world, pos); + assertSame(tile, result._1()); + assertEquals(Boolean.FALSE, result._2()); + assertSame(tile, TileMultipart.getOrConvertTile(world, pos)); + assertSame(tile, world.getTileEntity(pos.x, pos.y, pos.z)); + assertEquals(1, tile.jPartList().size()); + assertSame(part, tile.jPartList().get(0)); + assertSame(tile, part.tile()); + } finally { + world.setBlockToAir(pos.x, pos.y, pos.z); + } + } + + private static void checkMissing(BiFunction> lookup) { + World world = world(); + BlockCoord pos = new BlockCoord(54, 200, 48); + try { + for (Block block : new Block[] { Blocks.air, Blocks.stone, Blocks.chest }) { + world.setBlock(pos.x, pos.y, pos.z, block, 0, 0); + TileEntity existing = world.getTileEntity(pos.x, pos.y, pos.z); + Tuple2 result = lookup.apply(world, pos); + assertNull(result._1()); + assertEquals(Boolean.FALSE, result._2()); + assertNull(TileMultipart.getOrConvertTile(world, pos)); + assertSame(block, world.getBlock(pos.x, pos.y, pos.z)); + assertSame(existing, world.getTileEntity(pos.x, pos.y, pos.z)); + } + } finally { + world.setBlockToAir(pos.x, pos.y, pos.z); + } + } + + private static void checkConverted(BiFunction> lookup) { + World world = world(); + BlockCoord pos = new BlockCoord(54, 200, 48); + world.setBlock(pos.x, pos.y - 1, pos.z, Blocks.stone, 0, 0); + world.setBlock(pos.x, pos.y, pos.z, Blocks.torch, 5, 0); + try { + Tuple2 result = lookup.apply(world, pos); + assertEquals(Boolean.TRUE, result._2()); + TileMultipart tile = result._1(); + assertSame(world, tile.getWorldObj()); + assertEquals(pos, new BlockCoord(tile)); + assertFalse(tile.isInvalid()); + assertEquals(1, tile.jPartList().size()); + TMultiPart part = tile.jPartList().get(0); + assertTrue(part instanceof TorchPart); + assertSame(tile, part.tile()); + assertSame(Blocks.torch, world.getBlock(pos.x, pos.y, pos.z)); + assertEquals(5, world.getBlockMetadata(pos.x, pos.y, pos.z)); + assertNull(world.getTileEntity(pos.x, pos.y, pos.z)); + + Tuple2 repeated = lookup.apply(world, pos); + assertEquals(Boolean.TRUE, repeated._2()); + assertNotSame(tile, repeated._1()); + assertNotSame(part, repeated._1().jPartList().get(0)); + assertNull(TileMultipart.getTile(world, pos)); + + TMultiPart added = new MultipartGeneratorFunctionalTest.PlainPart(); + TileMultipart installed = TileMultipart.addPart(world, pos, added); + assertNotSame(tile, installed); + assertSame(installed, world.getTileEntity(pos.x, pos.y, pos.z)); + assertEquals(2, installed.jPartList().size()); + assertSame(added, installed.jPartList().get(1)); + assertEquals(Boolean.TRUE, result._2(), "A result records the lookup, not subsequent world state"); + } finally { + world.setBlockToAir(pos.x, pos.y, pos.z); + world.setBlockToAir(pos.x, pos.y - 1, pos.z); + } + } + + private static World world() { + World world = MinecraftServer.getServer().worldServers[0]; + world.getChunkFromBlockCoords(54, 48); + return world; + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TileMultipartClientFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TileMultipartClientFunctionalTest.java new file mode 100644 index 0000000..2132aff --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TileMultipartClientFunctionalTest.java @@ -0,0 +1,299 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.List; +import java.util.Random; + +import net.minecraft.util.AxisAlignedBB; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.IRandomDisplayTick; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.TileMultipartClient; +import codechicken.multipart.asm.MultipartMixinFactory; +import codechicken.multipart.scalatraits.TRandomDisplayTickTile; +import scala.collection.JavaConversions; +import scala.collection.immutable.Nil$; + +/** Consumer-visible cache and dispatch behavior of the generated client tile traits. */ +class TileMultipartClientFunctionalTest { + + @Test + void renderCachePartitionsOnceInPartOrderAndBuildsTranslatedBounds() throws Exception { + TileMultipart tile = newClientTile(); + tile.xCoord = 10; + tile.yCoord = 20; + tile.zCoord = 30; + RenderPart dynamicOnly = new RenderPart("dynamic", false, true, new Cuboid6(-0.1, 0.0, 0.0, 0.2, 0.4, 0.2)); + RenderPart fixed = new RenderPart("fixed", false, false, new Cuboid6(0.25, 0.2, 0.3, 0.5, 0.6, 0.7)); + RenderPart ticking = new RenderPart("ticking", true, true, new Cuboid6(0.8, 0.7, 0.6, 1.2, 1.1, 1.3)); + setParts(tile, dynamicOnly, fixed, ticking); + + TileMultipartClient client = (TileMultipartClient) tile; + invokeUpdateRenderCache(client); + + assertArrayEquals(new TMultiPart[] { fixed }, staticCache(client)); + assertArrayEquals(new TMultiPart[] { dynamicOnly, ticking }, dynamicCache(client)); + assertTrue((Boolean) invokeClient(client, "hasDynamicParts", boolean.class)); + assertEquals(1, dynamicOnly.doesTickCalls); + assertEquals(1, dynamicOnly.dynamicCalls); + assertEquals(1, fixed.doesTickCalls); + assertEquals(1, fixed.dynamicCalls); + assertEquals(1, ticking.doesTickCalls); + assertEquals(0, ticking.dynamicCalls, "doesTick must short-circuit shouldRenderDynamic"); + assertBounds(cachedBounds(client), 9.9, 20.0, 30.0, 11.2, 21.1, 31.3); + } + + @Test + void nullPartListProducesEmptyCachesAndTheFullBlockBounds() throws Exception { + TileMultipart tile = newClientTile(); + tile.xCoord = -3; + tile.yCoord = 7; + tile.zCoord = 11; + tile.partList_$eq(null); + + TileMultipartClient client = (TileMultipartClient) tile; + invokeUpdateRenderCache(client); + + assertEquals(0, staticCache(client).length); + assertEquals(0, dynamicCache(client).length); + assertFalse((Boolean) invokeClient(client, "hasDynamicParts", boolean.class)); + assertBounds(cachedBounds(client), -3.0, 7.0, 11.0, -2.0, 8.0, 12.0); + } + + @Test + void javaStorageAndLoadingWorkOnTheGeneratedClientTile() throws Exception { + TileMultipart tile = newClientTile(); + TileMultipartClient client = (TileMultipartClient) tile; + tile.setPartList(null); + invokeUpdateRenderCache(client); + assertEquals(0, staticCache(client).length); + RenderPart part = new RenderPart("loaded", false, false, Cuboid6.full); + tile.setPartList(Arrays.asList(part)); + assertNull(part.tile(), "Storage assignment does not bind client parts"); + tile.loadPartList(tile.jPartList()); + assertSame(tile, part.tile()); + invokeUpdateRenderCache(client); + assertArrayEquals(new TMultiPart[] { part }, staticCache(client)); + assertEquals(0, dynamicCache(client).length); + } + + @Test + void emptyPartsUseFullLocalBoundsAndLazyQueriesPopulateBothCaches() throws Exception { + TileMultipart tile = newClientTile(); + tile.xCoord = 4; + tile.yCoord = 5; + tile.zCoord = 6; + TileMultipartClient client = (TileMultipartClient) tile; + assertNull(staticCache(client)); + assertNull(cachedBounds(client)); + + assertFalse( + (Boolean) invokeClient(client, "shouldRenderInPass", boolean.class, new Class[] { int.class }, 17)); + AxisAlignedBB bounds = (AxisAlignedBB) invokeClient(client, "getRenderBoundingBox", AxisAlignedBB.class); + + assertEquals(0, staticCache(client).length); + assertEquals(0, dynamicCache(client).length); + assertBounds(bounds, 4.0, 5.0, 6.0, 5.0, 6.0, 7.0); + assertSame(bounds, cachedBounds(client)); + } + + @Test + void dynamicRenderingReturnsBeforeTouchingTheCacheWhenTheFlagIsFalse() throws Exception { + TileMultipart tile = newClientTile(); + TileMultipartClient client = (TileMultipartClient) tile; + RenderPart dynamic = new RenderPart("dynamic", true, false, Cuboid6.full); + setDynamicCache(client, new TMultiPart[] { dynamic }); + invokeClient(client, "hasDynamicParts_$eq", void.class, new Class[] { boolean.class }, false); + + invokeClient( + client, + "renderDynamic", + void.class, + new Class[] { codechicken.lib.vec.Vector3.class, float.class, int.class }, + null, + 0.5F, + 1); + + assertEquals(0, dynamic.renderDynamicCalls); + } + + @Test + void baseRandomDisplayTickIsANoOp() throws Exception { + TileMultipartClient client = (TileMultipartClient) newClientTile(); + invokeClient(client, "randomDisplayTick", void.class, new Class[] { Random.class }, new Random(1L)); + } + + @Test + void randomDisplayTickVisitsOnlyMatchingPartsInOrderWithTheSameRandom() throws Exception { + TileMultipart tile = newRandomDisplayTickTile(); + List calls = new ArrayList<>(); + DisplayPart first = new DisplayPart("first", calls); + RenderPart skipped = new RenderPart("skipped", false, false, Cuboid6.full); + DisplayPart second = new DisplayPart("second", calls); + setParts(tile, first, skipped, second); + Random random = new Random(2L); + + invokeClient( + (TileMultipartClient) tile, + "randomDisplayTick", + void.class, + new Class[] { Random.class }, + random); + + assertEquals(Arrays.asList("first", "second"), calls); + assertSame(random, first.lastRandom); + assertSame(random, second.lastRandom); + } + + private static TileMultipart newClientTile() { + int traitId = MultipartMixinFactory.getId(TileMultipartClient.class.getName().replace('.', '/')); + BitSet traits = new BitSet(); + traits.set(traitId); + return (TileMultipart) MultipartMixinFactory.construct(traits, Nil$.MODULE$); + } + + private static TileMultipart newRandomDisplayTickTile() { + BitSet traits = new BitSet(); + traits.set(MultipartMixinFactory.getId(TileMultipartClient.class.getName().replace('.', '/'))); + traits.set(MultipartMixinFactory.getId(TRandomDisplayTickTile.class.getName().replace('.', '/'))); + return (TileMultipart) MultipartMixinFactory.construct(traits, Nil$.MODULE$); + } + + private static void setParts(TileMultipart tile, TMultiPart... parts) { + tile.partList_$eq(JavaConversions.asScalaBuffer(Arrays.asList(parts)).toList()); + } + + private static void invokeUpdateRenderCache(TileMultipartClient client) throws Exception { + invokeClient(client, "updateRenderCache", void.class); + } + + private static Object invokeClient(TileMultipartClient client, String name, Class returnType, Object... args) + throws Exception { + return invokeClient(client, name, returnType, new Class[0], args); + } + + private static Object invokeClient(TileMultipartClient client, String name, Class returnType, + Class[] parameterTypes, Object... args) throws Exception { + try { + return MethodHandles.publicLookup() + .findVirtual(TileMultipartClient.class, name, MethodType.methodType(returnType, parameterTypes)) + .bindTo(client).invokeWithArguments(args); + } catch (Exception exception) { + throw exception; + } catch (Error error) { + throw error; + } catch (Throwable throwable) { + throw new AssertionError(throwable); + } + } + + private static TMultiPart[] staticCache(TileMultipartClient client) throws Exception { + return (TMultiPart[]) generatedField(client, "staticCache").get(client); + } + + private static TMultiPart[] dynamicCache(TileMultipartClient client) throws Exception { + return (TMultiPart[]) generatedField(client, "dynamicCache").get(client); + } + + private static void setDynamicCache(TileMultipartClient client, TMultiPart[] parts) throws Exception { + generatedField(client, "dynamicCache").set(client, parts); + } + + private static AxisAlignedBB cachedBounds(TileMultipartClient client) throws Exception { + return (AxisAlignedBB) generatedField(client, "cachedRenderBounds").get(client); + } + + private static Field generatedField(TileMultipartClient client, String name) throws Exception { + Field field = client.getClass().getDeclaredField("codechicken$multipart$TileMultipartClient$$" + name); + field.setAccessible(true); + return field; + } + + private static void assertBounds(AxisAlignedBB bounds, double minX, double minY, double minZ, double maxX, + double maxY, double maxZ) { + assertEquals(minX, bounds.minX, 0.000001); + assertEquals(minY, bounds.minY, 0.000001); + assertEquals(minZ, bounds.minZ, 0.000001); + assertEquals(maxX, bounds.maxX, 0.000001); + assertEquals(maxY, bounds.maxY, 0.000001); + assertEquals(maxZ, bounds.maxZ, 0.000001); + } + + private static class RenderPart extends TMultiPart { + + private final String name; + private final boolean ticking; + private final boolean dynamic; + private final Cuboid6 bounds; + private int doesTickCalls; + private int dynamicCalls; + private int renderDynamicCalls; + + private RenderPart(String name, boolean ticking, boolean dynamic, Cuboid6 bounds) { + this.name = name; + this.ticking = ticking; + this.dynamic = dynamic; + this.bounds = bounds; + } + + @Override + public String getType() { + return "client_tile_test:" + name; + } + + @Override + public boolean doesTick() { + doesTickCalls++; + return ticking; + } + + @Override + public boolean shouldRenderDynamic() { + dynamicCalls++; + return dynamic; + } + + @Override + public Cuboid6 getRenderBounds() { + return bounds; + } + + @Override + public void renderDynamic(codechicken.lib.vec.Vector3 pos, float frame, int pass) { + renderDynamicCalls++; + } + } + + private static final class DisplayPart extends RenderPart implements IRandomDisplayTick { + + private final List calls; + private Random lastRandom; + + private DisplayPart(String name, List calls) { + super(name, false, false, Cuboid6.full); + this.calls = calls; + } + + @Override + public void randomDisplayTick(Random random) { + calls.add(getType().substring("client_tile_test:".length())); + lastRandom = random; + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TileMultipartLifecycleFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TileMultipartLifecycleFunctionalTest.java new file mode 100644 index 0000000..7ee61f8 --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TileMultipartLifecycleFunctionalTest.java @@ -0,0 +1,288 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.BiConsumer; + +import net.minecraft.block.Block; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TSlottedPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.scalatraits.TSlottedTile; +import scala.collection.JavaConversions; + +/** Consumer-visible multipart ordering and lifecycle behavior that requires a real world and generated tile. */ +class TileMultipartLifecycleFunctionalTest { + + private static final BlockCoord ADD_REMOVE_POS = new BlockCoord(32, 200, 32); + private static final BlockCoord MOVE_FROM = new BlockCoord(34, 200, 32); + private static final BlockCoord MOVE_TO = new BlockCoord(36, 200, 32); + private static final BlockCoord TRAVERSAL_POS = new BlockCoord(38, 200, 32); + private static final BlockCoord LOADING_POS = new BlockCoord(40, 200, 32); + + @Test + void addAndRemovePreserveOrderSlotsAndPartCallbackOrder() { + World world = world(); + clear(world, ADD_REMOVE_POS); + List events = new ArrayList<>(); + RecordingPart first = new RecordingPart("first", 2, events); + RecordingPart second = new RecordingPart("second", 7, events); + + try { + TileMultipart tile = TileMultipart.addPart(world, ADD_REMOVE_POS, first); + assertEquals(Arrays.asList("first.bind", "first.onAdded", "first.onWorldJoin"), events); + assertEquals(Arrays.asList(first), tile.jPartList()); + assertSame(first, tile.partMap(2)); + + events.clear(); + TileMultipart sameTile = TileMultipart.addPart(world, ADD_REMOVE_POS, second); + assertSame(tile, sameTile); + assertEquals( + Arrays.asList("second.bind", "second.onAdded", "second.onWorldJoin", "first.changed:second"), + events); + assertEquals(Arrays.asList(first, second), tile.jPartList()); + assertSame(first, tile.partMap(2)); + assertSame(second, tile.partMap(7)); + + events.clear(); + assertSame(tile, tile.remPart(first)); + assertEquals( + Arrays.asList( + "first.preRemove", + "first.onRemoved", + "first.onWorldSeparate", + "second.changed:first"), + events); + assertEquals(Arrays.asList(second), tile.jPartList()); + assertNull(tile.partMap(2)); + assertSame(second, tile.partMap(7)); + assertNull(first.tile()); + } finally { + clear(world, ADD_REMOVE_POS); + } + } + + @Test + void movingTheLiveTileKeepsPartsSlotsAndGeneratedInterfaces() { + World world = world(); + clear(world, MOVE_FROM); + clear(world, MOVE_TO); + List events = new ArrayList<>(); + RecordingPart first = new RecordingPart("first", 3, events); + RecordingPart second = new RecordingPart("second", 8, events); + + try { + TileMultipart tile = TileMultipart.addPart(world, MOVE_FROM, first); + tile = TileMultipart.addPart(world, MOVE_FROM, second); + Block block = world.getBlock(MOVE_FROM.x, MOVE_FROM.y, MOVE_FROM.z); + int meta = world.getBlockMetadata(MOVE_FROM.x, MOVE_FROM.y, MOVE_FROM.z); + events.clear(); + + world.removeTileEntity(MOVE_FROM.x, MOVE_FROM.y, MOVE_FROM.z); + world.setBlockToAir(MOVE_FROM.x, MOVE_FROM.y, MOVE_FROM.z); + assertTrue(world.setBlock(MOVE_TO.x, MOVE_TO.y, MOVE_TO.z, block, meta, 3)); + tile.xCoord = MOVE_TO.x; + tile.yCoord = MOVE_TO.y; + tile.zCoord = MOVE_TO.z; + tile.validate(); + world.setTileEntity(MOVE_TO.x, MOVE_TO.y, MOVE_TO.z, tile); + tile.onMoved(); + + assertNull(world.getTileEntity(MOVE_FROM.x, MOVE_FROM.y, MOVE_FROM.z)); + assertSame(tile, world.getTileEntity(MOVE_TO.x, MOVE_TO.y, MOVE_TO.z)); + assertTrue(tile instanceof TSlottedTile); + assertEquals(Arrays.asList(first, second), tile.jPartList()); + assertSame(first, tile.partMap(3)); + assertSame(second, tile.partMap(8)); + assertSame(tile, first.tile()); + assertSame(tile, second.tile()); + assertEquals( + Arrays.asList( + "first.onWorldSeparate", + "second.onWorldSeparate", + "first.onMoved", + "first.onWorldJoin", + "second.onMoved", + "second.onWorldJoin"), + events); + assertEquals(MOVE_TO, first.movedTo); + assertEquals(MOVE_TO, second.movedTo); + } finally { + clear(world, MOVE_FROM); + clear(world, MOVE_TO); + } + } + + @Test + void javaTraversalSurvivesRealPartRemovalAndAdditionOnAGeneratedTile() { + World world = world(); + clear(world, TRAVERSAL_POS); + List events = new ArrayList<>(); + RecordingPart first = new RecordingPart("first", 2, events); + RecordingPart removed = new RecordingPart("removed", 7, events); + RecordingPart added = new RecordingPart("added", 8, events); + + try { + TileMultipart.addPart(world, TRAVERSAL_POS, first); + TileMultipart tile = TileMultipart.addPart(world, TRAVERSAL_POS, removed); + List captured = tile.jPartList(); + List visited = new ArrayList<>(); + tile.forEachPart(part -> { + visited.add(part); + if (part == first) { + assertSame(tile, tile.remPart(removed)); + assertSame(tile, TileMultipart.addPart(world, TRAVERSAL_POS, added)); + } + }); + + assertTrue(tile instanceof TSlottedTile); + assertEquals(Arrays.asList(first), visited); + assertEquals(Arrays.asList(first, removed), captured); + assertEquals(Arrays.asList(first, added), tile.jPartList()); + assertNull(removed.tile()); + assertNull(tile.partMap(7)); + assertSame(added, tile.partMap(8)); + assertSame(tile, added.tile()); + } finally { + clear(world, TRAVERSAL_POS); + } + } + + @Test + void legacyLoadingRebuildsGeneratedSlotsAndNotifiesAfterBinding() { + checkLoading((tile, parts) -> tile.loadParts(JavaConversions.asScalaBuffer(parts).toList())); + } + + @Test + void javaLoadingRebuildsGeneratedSlotsAfterStorageOnlyAssignment() { + checkLoading((tile, parts) -> { + TMultiPart old = tile.partMap(2); + tile.setPartList(parts); + assertSame(old, tile.partMap(2), "The setter must not rebuild trait caches"); + assertNull(tile.partMap(7)); + assertNull(parts.get(0).tile()); + assertEquals(parts, tile.jPartList()); + tile.loadPartList(tile.jPartList()); + }); + } + + private static void checkLoading(BiConsumer> load) { + World world = world(); + clear(world, LOADING_POS); + List events = new ArrayList<>(); + RecordingPart old = new RecordingPart("old", 2, events); + RecordingPart first = new RecordingPart("first", 7, events); + RecordingPart second = new RecordingPart("second", 8, events); + try { + TileMultipart tile = TileMultipart.addPart(world, LOADING_POS, old); + events.clear(); + load.accept(tile, Arrays.asList(first, second)); + assertEquals(Arrays.asList("first.bind", "second.bind", "first.changed:all", "second.changed:all"), events); + assertEquals(Arrays.asList(first, second), tile.jPartList()); + assertNull(tile.partMap(2)); + assertSame(first, tile.partMap(7)); + assertSame(second, tile.partMap(8)); + assertSame(tile, first.tile()); + assertSame(tile, second.tile()); + assertSame(tile, old.tile(), "Loading is not removal of previously bound parts"); + } finally { + clear(world, LOADING_POS); + } + } + + private static World world() { + World world = MinecraftServer.getServer().worldServers[0]; + world.getChunkFromBlockCoords(ADD_REMOVE_POS.x, ADD_REMOVE_POS.z); + return world; + } + + private static void clear(World world, BlockCoord pos) { + world.setBlockToAir(pos.x, pos.y, pos.z); + } + + private static final class RecordingPart extends TMultiPart implements TSlottedPart { + + private final String name; + private final int slot; + private final List events; + private BlockCoord movedTo; + + private RecordingPart(String name, int slot, List events) { + this.name = name; + this.slot = slot; + this.events = events; + } + + @Override + public String getType() { + return "mc_torch"; + } + + @Override + public int getSlotMask() { + return 1 << slot; + } + + @Override + public boolean doesTick() { + return false; + } + + @Override + public void bind(TileMultipart tile) { + super.bind(tile); + events.add(name + ".bind"); + } + + @Override + public void onAdded() { + events.add(name + ".onAdded"); + super.onAdded(); + } + + @Override + public void onWorldJoin() { + events.add(name + ".onWorldJoin"); + } + + @Override + public void onPartChanged(TMultiPart part) { + events.add(name + ".changed:" + (part == null ? "all" : ((RecordingPart) part).name)); + } + + @Override + public void preRemove() { + events.add(name + ".preRemove"); + } + + @Override + public void onRemoved() { + events.add(name + ".onRemoved"); + super.onRemoved(); + } + + @Override + public void onWorldSeparate() { + events.add(name + ".onWorldSeparate"); + } + + @Override + public void onMoved() { + movedTo = new BlockCoord(tile()); + events.add(name + ".onMoved"); + super.onMoved(); + } + } +} diff --git a/src/functionalTest/java/codechicken/multipart/test/TileTraitAccessFunctionalTest.java b/src/functionalTest/java/codechicken/multipart/test/TileTraitAccessFunctionalTest.java new file mode 100644 index 0000000..7ea91ec --- /dev/null +++ b/src/functionalTest/java/codechicken/multipart/test/TileTraitAccessFunctionalTest.java @@ -0,0 +1,98 @@ +package codechicken.multipart.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.IRedstonePart; +import codechicken.multipart.IRedstoneTile; +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.TFacePart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.examples.TileTraitAccessExample; + +class TileTraitAccessFunctionalTest { + + @Test + void javaExampleUsesGeneratedCapabilityAndHandlesAbsentCapability() { + TileMultipart tile = MultipartHelper.createTileFromParts(Arrays.asList(new PowerPart(), new CoverPart())); + for (int mask = 0; mask < 32; mask++) { + assertEquals((mask & 0x15) != 0, TileTraitAccessExample.hasOpenConnection(tile, 0, mask)); + } + TileMultipart noRedstone = MultipartHelper.createTileFromParts(Arrays.asList(new CoverPart())); + assertFalse(TileTraitAccessExample.hasOpenConnection(noRedstone, 0, 0x1F)); + assertFalse(TileTraitAccessExample.hasOpenConnection(null, 0, 0x1F)); + } + + @Test + void rawClassInvocationFailsWhileTheStableRedstoneInterfaceDispatches() throws Exception { + TileMultipart tile = MultipartHelper.createTileFromParts(Arrays.asList(new PowerPart(), new CoverPart())); + assertTrue(Class.forName("codechicken.multipart.scalatraits.TRedstoneTile").isInterface()); + assertThrows(IncompatibleClassChangeError.class, () -> RawTileTraitCalls.openConnections(tile, 0)); + IRedstoneTile redstone = (IRedstoneTile) tile; + assertEquals(0x15, redstone.openConnections(0)); + assertEquals(0x15, redstone.getConnectionMask(0)); + assertEquals(9, redstone.weakPowerLevel(0, 0x10)); + assertEquals(0, redstone.weakPowerLevel(0, 0x02)); + assertEquals(12, tile.strongPowerLevel(0)); + } + + @Test + void rawFieldAccessFailsWhileTheStableBaseDispatchesSlotReads() throws Exception { + CoverPart part = new CoverPart(); + TileMultipart tile = MultipartHelper.createTileFromParts(Arrays.asList(part)); + assertTrue(Class.forName("codechicken.multipart.scalatraits.TSlottedTile").isInterface()); + assertThrows(NoSuchFieldError.class, () -> RawTileTraitCalls.slots(tile)); + assertSame(part, tile.partMap(0)); + assertSame(part, tile.jPartList().get(0)); + assertSame(tile, part.tile()); + } + + private static final class CoverPart extends TMultiPart implements TFacePart { + + @Override + public String getType() { + return "tile_access:cover"; + } + + @Override + public int getSlotMask() { + return 1; + } + + @Override + public int redstoneConductionMap() { + return 0x15; + } + } + + private static final class PowerPart extends TMultiPart implements IRedstonePart { + + @Override + public String getType() { + return "tile_access:power"; + } + + @Override + public int strongPowerLevel(int side) { + return 12; + } + + @Override + public int weakPowerLevel(int side) { + return 9; + } + + @Override + public boolean canConnectRedstone(int side) { + return true; + } + } +} diff --git a/src/functionalTest/resources/compat/ReferenceScalaMultipartGeneratorConsumer.class.b64 b/src/functionalTest/resources/compat/ReferenceScalaMultipartGeneratorConsumer.class.b64 new file mode 100644 index 0000000..44825e1 --- /dev/null +++ b/src/functionalTest/resources/compat/ReferenceScalaMultipartGeneratorConsumer.class.b64 @@ -0,0 +1,33 @@ +yv66vgAAADQALwEARWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFN +dWx0aXBhcnRHZW5lcmF0b3JDb25zdW1lcgcAAQEAEGphdmEvbGFuZy9PYmplY3QHAAMBAC5SZWZl +cmVuY2VTY2FsYU11bHRpcGFydEdlbmVyYXRvckNvbnN1bWVyLnNjYWxhAQAeTHNjYWxhL3JlZmxl +Y3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBAi4GATUzQSEBAgETCUEjKxo0ZmUWdDctWipkQzIM +VyoeN3VTQgwnD14kZl0WFBgNXjhzBz50Ny9eN2ZlKhExAUIBB0c+bAcvGTsLBRUxESFDN3ZZUkwH +Lxk6dRUFORFhQzJwSRYcBy5bMmxLOhwBYQUCARVBETFCRAcCGSkJUSJBA3RHBmQXLQMCEBkJMRFJ +XD1TSxpEUSEFAQUCSQlhAVA1b1NSdEQjQQoRBVEBUSIBAgkLWQFBEUEMAg0NFFgtGTtmKRFBQgRL +HREFZVFSIgEDCgVtISEhBCtqWRZsVQ8cO2phBhRID0MDHisBB2EkAQN1UzIsB0NBECcbBQEjQkER +IwMpIRgOXDNmXVJMRy8fBgNHEQoRIlw1b0sOFBhNGjsLAxUKMUFcM3UTCTkDRQEGVVMyLFdJHDtq +aWZEUSFLC0ECKQpRAV0xc2lOBDJhSxo3HQlhE0cEAi5hNQlhRgMCMBEFMUFIXThwaXpKESFEBQNl +MQlxAV0xZFcGPFctAwI1awlBEQpeM3NDCmRXTQMCMxlBERFkTgUDcRERIQJWJ3ZZUkwHKxk6dREV +UVQDMQE8AxkZRy5bM29pQhExAlAFA3sxEXFBUThwWRYMZw5DA0ABEQUBKQEFc0seTDcPXjNzKQkJ +RQkFAgwFJhExCQQCBSs6TEcPQwNGfQEHYSkBA29DNiwHQ0EkSx0JWQEqAwJKGQUxAUtdM2VLGkwh +YRMnAw1NIygvGzhoFQlJRQIBAAZjcmVhdGUBAGgoTG5ldC9taW5lY3JhZnQvdGlsZWVudGl0eS9U +aWxlRW50aXR5O0xzY2FsYS9jb2xsZWN0aW9uL0l0ZXJhYmxlO1opTGNvZGVjaGlja2VuL211bHRp +cGFydC9UaWxlTXVsdGlwYXJ0OwEAKWNvZGVjaGlja2VuL211bHRpcGFydC9NdWx0aXBhcnRHZW5l +cmF0b3IkBwALAQAHTU9EVUxFJAEAK0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvTXVsdGlwYXJ0R2Vu +ZXJhdG9yJDsMAA0ADgkADAAPAQAVZ2VuZXJhdGVDb21wb3NpdGVUaWxlDAARAAoKAAwAEgEABHRo +aXMBAEdMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYU11bHRpcGFy +dEdlbmVyYXRvckNvbnN1bWVyOwEABHRpbGUBACVMbmV0L21pbmVjcmFmdC90aWxlZW50aXR5L1Rp +bGVFbnRpdHk7AQAFcGFydHMBABtMc2NhbGEvY29sbGVjdGlvbi9JdGVyYWJsZTsBAAZjbGllbnQB +AAFaAQAIcmVnaXN0ZXIBABUoTGphdmEvbGFuZy9TdHJpbmc7KVYBABxyZWdpc3RlclBhc3NUaHJv +dWdoSW50ZXJmYWNlDAAeAB0KAAwAHwEABG5hbWUBABJMamF2YS9sYW5nL1N0cmluZzsBAAY8aW5p +dD4BAAMoKVYMACMAJAoABAAlAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1i +ZXJUYWJsZQEACVNpZ25hdHVyZQEAjChMbmV0L21pbmVjcmFmdC90aWxlZW50aXR5L1RpbGVFbnRp +dHk7THNjYWxhL2NvbGxlY3Rpb24vSXRlcmFibGU8TGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVs +dGlQYXJ0Oz47WilMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RpbGVNdWx0aXBhcnQ7AQAKU291cmNl +RmlsZQEAGVJ1bnRpbWVWaXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwAhAAIABAAAAAAAAwAB +AAkACgACACcAAABSAAQABAAAAAqyABArLB22ABOwAAAAAgAoAAAAKgAEAAAACgAUABUAAAAAAAoA +FgAXAAEAAAAKABgAGQACAAAACgAaABsAAwApAAAABgABAAAACQAqAAAAAgArAAEAHAAdAAEAJwAA +ADwAAgACAAAACLIAECu2ACCxAAAAAgAoAAAAFgACAAAACAAUABUAAAAAAAgAIQAiAAEAKQAAAAYA +AQAAAAsAAQAjACQAAQAnAAAALwABAAEAAAAFKrcAJrEAAAACACgAAAAMAAEAAAAFABQAFQAAACkA +AAAGAAEAAAAMAAMALAAAAAIABQAtAAAACwABAAYAAQAHcwAIAC4AAAADBQAA diff --git a/src/functionalTest/resources/compat/ReferenceScalaMultipartSaveLoadConsumer.class.b64 b/src/functionalTest/resources/compat/ReferenceScalaMultipartSaveLoadConsumer.class.b64 new file mode 100644 index 0000000..5d78cc7 --- /dev/null +++ b/src/functionalTest/resources/compat/ReferenceScalaMultipartSaveLoadConsumer.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAJQEARGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFNdWx0aXBhcnRTYXZlTG9hZENvbnN1bWVyBwABAQAQamF2YS9sYW5nL09iamVjdAcAAwEALVJlZmVyZW5jZVNjYWxhTXVsdGlwYXJ0U2F2ZUxvYWRDb25zdW1lci5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxhU2lnbmF0dXJlOwEABWJ5dGVzAQE/BgElMkEhAQIBEwk5IysaNGZlFnQ3LVoqZEMyDFcqHjd1U0IMJw9eKmJtFmR1LhkzRF86HFgvXDNzFQkZQSEBBGRfNgQYDR4GAwsZCREiXDttaSYEGE0dOwsDHQkxYlk4ZUsORBduWTZmXQ4BMUMBAQshCVlhIkQBDRUFaREhQjpkQzIMF0JBCA0FGQllLh8qZk0iKREDAUMBJQUxQSgbOGppeiISYQUJAykBaRFBAQUGLQEhCWFGAQ1ZPgxHLRs4aC8+FEgOWgsCMUEREQRJBwI1KRExBEgBBm8+FEgOGgYDO3kJESJcNW9LDhQYTRo7CwN9CTFBXDN1EwkJI0RBA1hfSmRHDUMDJAERBUElAQltXwYkF05cNFhfSmRHbRgTZmNSEVEFCwkDFxlKIWEKBwMJVXMXDh4FBjcJAg0BBwEADGxvYWRpbmdXb3JsZAEAHSgpTG5ldC9taW5lY3JhZnQvd29ybGQvV29ybGQ7AQAwY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2hhbmRsZXIvTXVsdGlwYXJ0U2F2ZUxvYWQkBwALAQAHTU9EVUxFJAEAMkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvaGFuZGxlci9NdWx0aXBhcnRTYXZlTG9hZCQ7DAANAA4JAAwADwwACQAKCgAMABEBAAR0aGlzAQBGTGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFNdWx0aXBhcnRTYXZlTG9hZENvbnN1bWVyOwEAEGxvYWRpbmdXb3JsZF8kZXEBAB4oTG5ldC9taW5lY3JhZnQvd29ybGQvV29ybGQ7KVYMABUAFgoADAAXAQAFd29ybGQBABtMbmV0L21pbmVjcmFmdC93b3JsZC9Xb3JsZDsBAAY8aW5pdD4BAAMoKVYMABsAHAoABAAdAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAAAAAAMAAQAJAAoAAQAfAAAAMQABAAEAAAAHsgAQtgASsAAAAAIAIAAAAAwAAQAAAAcAEwAUAAAAIQAAAAYAAQAAAAcAAQAVABYAAQAfAAAAPAACAAIAAAAIsgAQK7YAGLEAAAACACAAAAAWAAIAAAAIABMAFAAAAAAACAAZABoAAQAhAAAABgABAAAACgABABsAHAABAB8AAAAvAAEAAQAAAAUqtwAesQAAAAIAIAAAAAwAAQAAAAUAEwAUAAAAIQAAAAYAAQAAAAwAAwAiAAAAAgAFACMAAAALAAEABgABAAdzAAgAJAAAAAMFAAA= diff --git a/src/functionalTest/scala/codechicken/multipart/test/ExternalScalaMicroblockFixture.scala b/src/functionalTest/scala/codechicken/multipart/test/ExternalScalaMicroblockFixture.scala new file mode 100644 index 0000000..efda1e9 --- /dev/null +++ b/src/functionalTest/scala/codechicken/multipart/test/ExternalScalaMicroblockFixture.scala @@ -0,0 +1,16 @@ +package codechicken.multipart.test + +import codechicken.microblock.Microblock + +/** Minimal external Scala trait matching ProjectRed's MicroblockGenerator + * registration path. + */ +trait ExternalScalaMicroblockFixture extends Microblock { + private var state = 41 + + def fixtureState = state + + override def shouldRenderDynamic = true + + override def getLightValue = state +} diff --git a/src/functionalTest/scala/codechicken/multipart/test/ScalaTraitRegistrationFixture.scala b/src/functionalTest/scala/codechicken/multipart/test/ScalaTraitRegistrationFixture.scala new file mode 100644 index 0000000..d265dd3 --- /dev/null +++ b/src/functionalTest/scala/codechicken/multipart/test/ScalaTraitRegistrationFixture.scala @@ -0,0 +1,28 @@ +package codechicken.multipart.test + +import cpw.mods.fml.relauncher.{Side, SideOnly} + +trait RegistrationParentA { def parentA = 11 } +trait RegistrationParentB { def parentB = 22 } +trait RegistrationInterface { def abstractOnly: Int } + +trait ScalaTraitRegistrationFixture + extends RegistrationParentA + with RegistrationParentB + with RegistrationInterface { + var count = 7 + private var hidden = 9 + def concrete = count + hidden + def overloaded(value: Int) = value + 1 + def overloaded(value: java.lang.String) = value.length + protected def protectedMethod = 3 + private def privateMethod = 4 + def deferred: Int + override def toString = super.toString + "fixture" + @SideOnly(Side.CLIENT) def clientOnly = 31 + @SideOnly(Side.SERVER) def serverOnly = 32 +} + +trait RegistrationAliasFixture { + def alias(value: String) = value.length +} diff --git a/src/functionalTest/scala/codechicken/multipart/test/SideOnlySignatureFixture.scala b/src/functionalTest/scala/codechicken/multipart/test/SideOnlySignatureFixture.scala new file mode 100644 index 0000000..69faf68 --- /dev/null +++ b/src/functionalTest/scala/codechicken/multipart/test/SideOnlySignatureFixture.scala @@ -0,0 +1,16 @@ +package codechicken.multipart.test + +import cpw.mods.fml.relauncher.{Side, SideOnly} + +/** Read as raw class bytes so the server side transformer cannot remove + * annotations. + */ +class SideOnlySignatureFixture { + @SideOnly(Side.CLIENT) + def clientOnly = 1 + + @SideOnly(Side.SERVER) + def serverOnly = 2 + + def common = 3 +} diff --git a/src/main/java/codechicken/multipart/IDWriter.java b/src/main/java/codechicken/multipart/IDWriter.java new file mode 100644 index 0000000..27d7648 --- /dev/null +++ b/src/main/java/codechicken/multipart/IDWriter.java @@ -0,0 +1,51 @@ +package codechicken.multipart; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; + +/** Class for reading and writing IDs, widening the carrier data type as necessary. */ +public class IDWriter { + + private int width; + + public void setMax(int value) { + // The reference Scala implementation widens negative values as signed values. + long maximum = value; + if (maximum > 0xffffL) { + width = 4; + } else if (maximum > 0xffL) { + width = 2; + } else { + width = 1; + } + } + + public void write(MCDataOutput data, int id) { + switch (width) { + case 1: + data.writeByte(id); + break; + case 2: + data.writeShort(id); + break; + case 4: + data.writeInt(id); + break; + default: + throw new IllegalStateException("setMax was not called before writing an ID"); + } + } + + public int read(MCDataInput data) { + switch (width) { + case 1: + return data.readUByte(); + case 2: + return data.readUShort(); + case 4: + return data.readInt(); + default: + throw new IllegalStateException("setMax was not called before reading an ID"); + } + } +} diff --git a/src/main/java/codechicken/multipart/JPartialOcclusion.java b/src/main/java/codechicken/multipart/JPartialOcclusion.java new file mode 100644 index 0000000..0c5452b --- /dev/null +++ b/src/main/java/codechicken/multipart/JPartialOcclusion.java @@ -0,0 +1,15 @@ +package codechicken.multipart; + +import codechicken.lib.vec.Cuboid6; + +/** Java callbacks for partial occlusion testing. */ +public interface JPartialOcclusion { + + /** Returns the partial occlusion boxes. */ + Iterable getPartialOcclusionBoxes(); + + /** Returns whether this part may be completely obscured. */ + default boolean allowCompleteOcclusion() { + return false; + } +} diff --git a/src/main/java/codechicken/multipart/PartialOcclusionTest.java b/src/main/java/codechicken/multipart/PartialOcclusionTest.java new file mode 100644 index 0000000..3757da8 --- /dev/null +++ b/src/main/java/codechicken/multipart/PartialOcclusionTest.java @@ -0,0 +1,78 @@ +package codechicken.multipart; + +import codechicken.lib.vec.Cuboid6; + +/** Tests whether every required part retains an exclusively owned voxel. */ +public class PartialOcclusionTest { + + private final int size; + private final int res = 8; + private final byte[] bits; + private final boolean[] partial; + + public PartialOcclusionTest(int size) { + this.size = size; + bits = new byte[res * res * res]; + partial = new boolean[size]; + } + + public int res() { + return res; + } + + public byte[] bits() { + return bits; + } + + public boolean[] partial() { + return partial; + } + + public void fill(int index, JPartialOcclusion part) { + fill(index, part.getPartialOcclusionBoxes(), part.allowCompleteOcclusion()); + } + + public void fill(int index, Iterable boxes, boolean complete) { + partial[index] = !complete; + for (Cuboid6 box : boxes) { + fill(index + 1, box); + } + } + + public void fill(int value, Cuboid6 box) { + int minX = (int) (box.min.x * res + 0.5); + int minY = (int) (box.min.y * res + 0.5); + int minZ = (int) (box.min.z * res + 0.5); + int maxX = (int) (box.max.x * res + 0.5); + int maxY = (int) (box.max.y * res + 0.5); + int maxZ = (int) (box.max.z * res + 0.5); + for (int x = minX; x < maxX; x++) { + for (int y = minY; y < maxY; y++) { + for (int z = minZ; z < maxZ; z++) { + int bitIndex = (x * res + y) * res + z; + if (bits[bitIndex] == 0) { + bits[bitIndex] = (byte) value; + } else { + bits[bitIndex] = -1; + } + } + } + } + } + + public boolean apply() { + boolean[] visible = new boolean[size]; + for (byte owner : bits) { + if (owner > 0) { + visible[owner - 1] = true; + } + } + + for (int index = 0; index < partial.length; index++) { + if (partial[index] && !visible[index]) { + return false; + } + } + return true; + } +} diff --git a/src/main/scala/codechicken/microblock/AdditionPlacement.java b/src/main/scala/codechicken/microblock/AdditionPlacement.java new file mode 100644 index 0000000..244f882 --- /dev/null +++ b/src/main/scala/codechicken/microblock/AdditionPlacement.java @@ -0,0 +1,25 @@ +package codechicken.microblock; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.TileMultipart; + +public class AdditionPlacement extends ExecutablePlacement { + + public AdditionPlacement(BlockCoord pos, Microblock part) { + super(pos, part); + } + + @Override + public void place(World world, EntityPlayer player, ItemStack item) { + TileMultipart.addPart(world, pos(), part()); + } + + @Override + public void consume(World world, EntityPlayer player, ItemStack item) { + item.stackSize -= 1; + } +} diff --git a/src/main/scala/codechicken/microblock/AngelicaCompat.java b/src/main/scala/codechicken/microblock/AngelicaCompat.java new file mode 100644 index 0000000..9cb2c39 --- /dev/null +++ b/src/main/scala/codechicken/microblock/AngelicaCompat.java @@ -0,0 +1,35 @@ +package codechicken.microblock; + +import net.coderbot.iris.Iris; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.Tessellator; + +import com.gtnewhorizon.gtnhlib.client.renderer.CapturingTessellator; + +import scala.Unit$; +import scala.runtime.BoxedUnit; + +public class AngelicaCompat { + + public Object setShaderMaterialOverride(Block block, int meta) { + try { + if (Tessellator.instance instanceof CapturingTessellator) { + Iris.setShaderMaterialOverride(block, meta); + } + return BoxedUnit.UNIT; + } catch (ClassCastException ignored) { + return Unit$.MODULE$; + } + } + + public Object resetShaderMaterialOverride() { + try { + if (Tessellator.instance instanceof CapturingTessellator) { + Iris.resetShaderMaterialOverride(); + } + return BoxedUnit.UNIT; + } catch (ClassCastException ignored) { + return Unit$.MODULE$; + } + } +} diff --git a/src/main/scala/codechicken/microblock/AngelicaCompat.scala b/src/main/scala/codechicken/microblock/AngelicaCompat.scala deleted file mode 100644 index c65449c..0000000 --- a/src/main/scala/codechicken/microblock/AngelicaCompat.scala +++ /dev/null @@ -1,26 +0,0 @@ -package codechicken.microblock - -import com.gtnewhorizon.gtnhlib.client.renderer.CapturingTessellator -import net.coderbot.iris.Iris -import net.minecraft.block.Block -import net.minecraft.client.renderer.Tessellator - -class AngelicaCompat { - def setShaderMaterialOverride(block: Block, meta: Int) = { - try { - if (Tessellator.instance.isInstanceOf[CapturingTessellator]) - Iris.setShaderMaterialOverride(block, meta) - } catch { - case ex: ClassCastException => Unit - } - } - - def resetShaderMaterialOverride() = { - try { - if (Tessellator.instance.isInstanceOf[CapturingTessellator]) - Iris.resetShaderMaterialOverride() - } catch { - case ex: ClassCastException => Unit - } - } -} diff --git a/src/main/scala/codechicken/microblock/BlockMicroMaterial$.java b/src/main/scala/codechicken/microblock/BlockMicroMaterial$.java new file mode 100644 index 0000000..e56c23a --- /dev/null +++ b/src/main/scala/codechicken/microblock/BlockMicroMaterial$.java @@ -0,0 +1,65 @@ +package codechicken.microblock; + +import net.minecraft.block.Block; + +import scala.collection.Iterator; +import scala.collection.Seq; + +public final class BlockMicroMaterial$ { + + public static final BlockMicroMaterial$ MODULE$ = new BlockMicroMaterial$(); + + private BlockMicroMaterial$() {} + + public int $lessinit$greater$default$2() { + return 0; + } + + public int createAndRegister$default$2() { + return 0; + } + + public String oldKey(Block block) { + return block.getUnlocalizedName(); + } + + public String materialKey(Block block) { + return (String) Block.blockRegistry.getNameForObject(block); + } + + public String materialKey(String name, int meta) { + return name + (meta > 0 ? "_" + meta : ""); + } + + public String materialKey(Block block, int meta) { + return materialKey(materialKey(block), meta); + } + + public void createAndRegister(Block block, int meta, String name) { + MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), materialKey(name, meta)); + } + + public void createAndRegister(Block block, int meta, String name, String oldName) { + MicroMaterialRegistry.remapName(materialKey(oldName, meta), materialKey(name, meta)); + createAndRegister(block, meta, name); + } + + public void createAndRegister(Block block, int meta) { + createAndRegister(block, meta, materialKey(block), oldKey(block)); + } + + public void createAndRegister(Block block, Seq meta) { + createAndRegister(block, meta, materialKey(block), oldKey(block)); + } + + public void createAndRegister(Block block, Seq meta, String oldName) { + createAndRegister(block, meta, materialKey(block), oldName); + } + + public void createAndRegister(Block block, Seq meta, String name, String oldName) { + Iterator iterator = meta.iterator(); + while (iterator.hasNext()) { + createAndRegister(block, (Integer) iterator.next(), name, oldName); + } + } +} diff --git a/src/main/scala/codechicken/microblock/BlockMicroMaterial.java b/src/main/scala/codechicken/microblock/BlockMicroMaterial.java new file mode 100644 index 0000000..cec3b34 --- /dev/null +++ b/src/main/scala/codechicken/microblock/BlockMicroMaterial.java @@ -0,0 +1,246 @@ +package codechicken.microblock; + +import java.util.Arrays; + +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.uv.MultiIconTransformation; +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.handler.MicroblockProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import scala.collection.JavaConversions; +import scala.collection.Seq; + +/** Standard micro material class suitable for most blocks. */ +public class BlockMicroMaterial implements IMicroMaterial { + + private final Block block; + private final int meta; + private final String blockKey; + + @SideOnly(Side.CLIENT) + private MultiIconTransformation icont; + + /** Set by {@link #loadIcons()} so the next {@link #icont()} read re-resolves the block's icons. */ + @SideOnly(Side.CLIENT) + private volatile boolean iconsStale; + + public BlockMicroMaterial(Block block, int meta) { + this.block = block; + this.meta = meta; + blockKey = (String) Block.blockRegistry.getNameForObject(block); + } + + public static int $lessinit$greater$default$2() { + return BlockMicroMaterial$.MODULE$.$lessinit$greater$default$2(); + } + + public static int createAndRegister$default$2() { + return BlockMicroMaterial$.MODULE$.createAndRegister$default$2(); + } + + public static String oldKey(Block block) { + return BlockMicroMaterial$.MODULE$.oldKey(block); + } + + public static String materialKey(Block block) { + return BlockMicroMaterial$.MODULE$.materialKey(block); + } + + public static String materialKey(String name, int meta) { + return BlockMicroMaterial$.MODULE$.materialKey(name, meta); + } + + public static String materialKey(Block block, int meta) { + return BlockMicroMaterial$.MODULE$.materialKey(block, meta); + } + + public static void createAndRegister(Block block, int meta, String name) { + BlockMicroMaterial$.MODULE$.createAndRegister(block, meta, name); + } + + public static void createAndRegister(Block block, int meta, String name, String oldName) { + BlockMicroMaterial$.MODULE$.createAndRegister(block, meta, name, oldName); + } + + public static void createAndRegister(Block block, int meta) { + BlockMicroMaterial$.MODULE$.createAndRegister(block, meta); + } + + public static void createAndRegister(Block block, Seq meta) { + BlockMicroMaterial$.MODULE$.createAndRegister(block, meta); + } + + public static void createAndRegister(Block block, Seq meta, String oldName) { + BlockMicroMaterial$.MODULE$.createAndRegister(block, meta, oldName); + } + + public static void createAndRegister(Block block, Seq meta, String name, String oldName) { + BlockMicroMaterial$.MODULE$.createAndRegister(block, meta, name, oldName); + } + + /** + * Returns this material's block for direct consumer access. The base implementation returns the constructor + * argument by identity, including null; subclasses may override it. Call this method instead of reading the private + * compatibility field so material overrides are respected. + */ + public Block block() { + return block; + } + + /** + * Returns this material's metadata for direct consumer access. The base implementation returns the constructor + * value without masking or validation; subclasses may override it. This is not a numeric micro-material ID. + */ + public int meta() { + return meta; + } + + /** + * Returns the block registry name cached at construction, possibly null. This is neither the micro-material's + * registered name nor a fresh lookup of an overridden {@link #block()}; query the returned block's registry name + * when exporting its current identity. + */ + public String blockKey() { + return blockKey; + } + + /** + * Returns the side icons. The first read after a texture stitch rebuilds them from the block: {@link #loadIcons()} + * runs inside {@code TextureStitchEvent.Post}, possibly before another mod's Post handler finishes its own icons + * (Chisel's CTMLib submaps create their sub-icons there), and the cached copy would otherwise keep missing or + * previous-stitch icons until the next stitch. + */ + public MultiIconTransformation icont() { + if (iconsStale) { + icont = buildIcons(); + iconsStale = false; + } + return icont; + } + + /** Explicitly assigned icons are kept as-is and are not re-resolved on the next {@link #icont()} read. */ + public void icont_$eq(MultiIconTransformation icont) { + this.icont = icont; + iconsStale = false; + } + + @Override + @SideOnly(Side.CLIENT) + public void loadIcons() { + icont_$eq(buildIcons()); + iconsStale = true; + } + + private MultiIconTransformation buildIcons() { + Block currentBlock = Block.getBlockFromName(blockKey()); + IIcon[] icons = new IIcon[6]; + for (int side = 0; side < icons.length; side++) { + icons[side] = codechicken$microblock$BlockMicroMaterial$$safeIcon$1(currentBlock, side); + } + return new MultiIconTransformation(icons); + } + + public final IIcon codechicken$microblock$BlockMicroMaterial$$safeIcon$1(Block block, int side) { + try { + return MicroblockProxy.renderBlocks().getIconSafe(block.getIcon(side, meta())); + } catch (Exception ignored) { + return MicroblockProxy.renderBlocks().getIconSafe(null); + } + } + + @Override + public void renderMicroFace(Vector3 pos, int pass, Cuboid6 bounds) { + MaterialRenderHelper$.MODULE$.start(pos, pass, icont()).blockColour(getColour(pass)).lighting() + .blockAndMeta(block(), meta()).render(); + } + + public int getColour(int pass) { + if (pass == -1) { + return (block().getBlockColor() << 8) | 0xFF; + } + CCRenderState state = CCRenderState.instance(); + BlockCoord pos = state.lightMatrix.pos; + return (block().colorMultiplier(state.lightMatrix.access, pos.x, pos.y, pos.z) << 8) | 0xFF; + } + + @Override + public boolean canRenderInPass(int pass) { + return block().canRenderInPass(pass); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getBreakingIcon(int side) { + return block().getIcon(side, meta()); + } + + /** + * Resolves the block tint with this material's block and metadata at the particle origin. Neighbor and biome + * lookups still use the supplied world; the multipart host's metadata must not select the material's colour. + */ + @Override + @SideOnly(Side.CLIENT) + public int getBreakingColour(int side, IBlockAccess world, int x, int y, int z) { + Block materialBlock = block(); + return materialBlock.colorMultiplier(new MaterialBlockAccess(world, materialBlock, meta(), x, y, z), x, y, z); + } + + @Override + public ItemStack getItem() { + return new ItemStack(block(), 1, meta()); + } + + @Override + public String getLocalizedName() { + return getItem().getDisplayName(); + } + + @Override + public float getStrength(EntityPlayer player) { + float hardness = 30F; + try { + hardness = block().getBlockHardness(null, 0, 0, 0); + } catch (Exception ignored) {} + return player.getBreakSpeed(block(), false, meta() % 16, 0, -1, 0) / hardness; + } + + @Override + public boolean isTransparent() { + return !block().isOpaqueCube(); + } + + @Override + public int getLightValue() { + return block().getLightValue(); + } + + public Seq toolClasses() { + return JavaConversions.asScalaBuffer(Arrays.asList("axe", "pickaxe", "shovel")).toList(); + } + + @Override + public int getCutterStrength() { + return block().getHarvestLevel(meta() % 16); + } + + @Override + public Block.SoundType getSound() { + return block().stepSound; + } + + @Override + public float explosionResistance(Entity entity) { + return block().getExplosionResistance(entity); + } +} diff --git a/src/main/scala/codechicken/microblock/BlockMicroMaterial.scala b/src/main/scala/codechicken/microblock/BlockMicroMaterial.scala deleted file mode 100644 index 83cdc95..0000000 --- a/src/main/scala/codechicken/microblock/BlockMicroMaterial.scala +++ /dev/null @@ -1,201 +0,0 @@ -package codechicken.microblock - -import net.minecraft.block.Block -import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial -import net.minecraft.util.IIcon -import cpw.mods.fml.relauncher.SideOnly -import cpw.mods.fml.relauncher.Side -import net.minecraft.item.ItemStack -import codechicken.lib.vec.{Cuboid6, Vector3} -import net.minecraft.entity.player.EntityPlayer -import codechicken.lib.render.{ - CCRenderPipeline, - CCRenderState, - ColourMultiplier -} -import codechicken.microblock.handler.{MicroblockMod, MicroblockProxy} -import net.minecraft.entity.Entity -import codechicken.lib.render.uv.{MultiIconTransformation, UVTransformation} -import cpw.mods.fml.common.registry.{GameData, GameRegistry} - -import java.util.function.Supplier - -private class ThreadState { - var pass = 0 - var builder: CCRenderPipeline#PipelineBuilder = _ -} - -object MaterialRenderHelper { - private val threadState = - ThreadLocal.withInitial[ThreadState](new Supplier[ThreadState]() { - override def get(): ThreadState = new ThreadState() - }) - def pass = threadState.get().pass - def pass_=(pass: Int) = threadState.get().pass = pass - def builder = threadState.get().builder - def builder_=(builder: CCRenderPipeline#PipelineBuilder) = - threadState.get().builder = builder - - def start(pos: Vector3, pass: Int, uvt: UVTransformation) = { - this.pass = pass - builder = CCRenderState.instance().pipeline.builder() - builder.add(pos.translation()).add(uvt) - this - } - - def blockColour(colour: Int) = { - builder.add(ColourMultiplier.instance(colour)) - this - } - - def lighting() = { - if (pass != -1) - builder.add(CCRenderState.instance().lightMatrix) - this - } - - def blockAndMeta(b: Block, meta: Int) = { - if (MicroblockMod.angelicaCompat != null) - MicroblockMod.angelicaCompat.setShaderMaterialOverride(b, meta) - this - } - - def render(): Unit = { - builder.render() - if (MicroblockMod.angelicaCompat != null) - MicroblockMod.angelicaCompat.resetShaderMaterialOverride() - } -} - -/** Standard micro material class suitable for most blocks. - */ -class BlockMicroMaterial(val block: Block, val meta: Int = 0) - extends IMicroMaterial { - val blockKey = Block.blockRegistry.getNameForObject(block) - - @SideOnly(Side.CLIENT) - var icont: MultiIconTransformation = _ - - @SideOnly(Side.CLIENT) - override def loadIcons() { - def safeIcon(block: Block, side: Int): IIcon = { - try { - return MicroblockProxy.renderBlocks.getIconSafe( - block.getIcon(side, meta) - ) - } catch { - case e: Exception => - } - return MicroblockProxy.renderBlocks.getIconSafe(null) - } - - val iblock = Block.getBlockFromName( - blockKey - ) // reacquire block instance incase a mod replcaed it - icont = new MultiIconTransformation( - Array.tabulate(6)(side => safeIcon(iblock, side)): _* - ) - } - - def renderMicroFace(pos: Vector3, pass: Int, bounds: Cuboid6) { - MaterialRenderHelper - .start(pos, pass, icont) - .blockColour(getColour(pass)) - .lighting() - .blockAndMeta(block, meta) - .render() - } - - def getColour(pass: Int) = { - if (pass == -1) - block.getBlockColor << 8 | 0xff - else { - val state = CCRenderState.instance - val pos = state.lightMatrix.pos - block.colorMultiplier( - state.lightMatrix.access, - pos.x, - pos.y, - pos.z - ) << 8 | 0xff - } - } - - override def canRenderInPass(pass: Int) = block.canRenderInPass(pass) - - @SideOnly(Side.CLIENT) - def getBreakingIcon(side: Int) = block.getIcon(side, meta) - - def getItem = new ItemStack(block, 1, meta) - - def getLocalizedName = getItem.getDisplayName - - def getStrength(player: EntityPlayer) = { - var hardness = 30f - try { - hardness = block.getBlockHardness(null, 0, 0, 0) - } catch { - case e: Exception => - } - player.getBreakSpeed(block, false, meta % 16, 0, -1, 0) / hardness - } - - def isTransparent = !block.isOpaqueCube - - def getLightValue = block.getLightValue - - def toolClasses = Seq("axe", "pickaxe", "shovel") - - // meta > 15 will throw ArrayIndexOutOfBoundsException - def getCutterStrength = block.getHarvestLevel(meta % 16) - - def getSound = block.stepSound - - def explosionResistance(entity: Entity): Float = - block.getExplosionResistance(entity) -} - -/** Utility functions for cleaner registry code - */ -object BlockMicroMaterial { - def oldKey(block: Block) = block.getUnlocalizedName - def materialKey(block: Block) = Block.blockRegistry.getNameForObject(block) - def materialKey(name: String, meta: Int) = - name + (if (meta > 0) "_" + meta else "") - def materialKey(block: Block, meta: Int): String = - materialKey(materialKey(block), meta) - - def createAndRegister(block: Block, meta: Int, name: String) = - MicroMaterialRegistry.registerMaterial( - new BlockMicroMaterial(block, meta), - materialKey(name, meta) - ) - - def createAndRegister( - block: Block, - meta: Int, - name: String, - oldName: String - ) { - MicroMaterialRegistry.remapName( - materialKey(oldName, meta), - materialKey(name, meta) - ) - createAndRegister(block, meta, name) - } - - def createAndRegister(block: Block, meta: Int = 0): Unit = - createAndRegister(block, Seq(meta)) - def createAndRegister(block: Block, meta: Seq[Int]): Unit = - createAndRegister(block, meta, materialKey(block), oldKey(block)) - def createAndRegister(block: Block, meta: Seq[Int], oldName: String): Unit = - createAndRegister(block, 0, materialKey(block), oldName) - - def createAndRegister( - block: Block, - meta: Seq[Int], - name: String, - oldName: String - ): Unit = - meta.foreach(m => createAndRegister(block, m, name, oldName)) -} diff --git a/src/main/scala/codechicken/microblock/CommonMicroClass$.java b/src/main/scala/codechicken/microblock/CommonMicroClass$.java new file mode 100644 index 0000000..fc840f9 --- /dev/null +++ b/src/main/scala/codechicken/microblock/CommonMicroClass$.java @@ -0,0 +1,30 @@ +package codechicken.microblock; + +public final class CommonMicroClass$ { + + public static final CommonMicroClass$ MODULE$ = new CommonMicroClass$(); + + private final CommonMicroClass[] classes = new CommonMicroClass[256]; + + private CommonMicroClass$() {} + + public CommonMicroClass[] classes() { + return classes; + } + + public CommonMicroClass getMicroClass(int modelId) { + return classes[modelId >> 8]; + } + + public void registerMicroClass(CommonMicroClass microClass, int id) { + if (classes[id] != null) { + throw new IllegalArgumentException( + "Microblock class id " + id + + " is already taken by " + + classes[id].getName() + + " when adding " + + microClass.getName()); + } + classes[id] = microClass; + } +} diff --git a/src/main/scala/codechicken/microblock/CommonMicroClass.java b/src/main/scala/codechicken/microblock/CommonMicroClass.java new file mode 100644 index 0000000..9b1c4ca --- /dev/null +++ b/src/main/scala/codechicken/microblock/CommonMicroClass.java @@ -0,0 +1,32 @@ +package codechicken.microblock; + +public abstract class CommonMicroClass extends MicroblockClass { + + private int classId; + + public static CommonMicroClass[] classes() { + return CommonMicroClass$.MODULE$.classes(); + } + + public static CommonMicroClass getMicroClass(int modelId) { + return CommonMicroClass$.MODULE$.getMicroClass(modelId); + } + + public static void registerMicroClass(CommonMicroClass microClass, int id) { + CommonMicroClass$.MODULE$.registerMicroClass(microClass, id); + } + + public int getClassId() { + return classId; + } + + public abstract int itemSlot(); + + public abstract PlacementProperties placementProperties(); + + public void register(int id) { + register(); + classId = id; + CommonMicroClass$.MODULE$.registerMicroClass(this, id); + } +} diff --git a/src/main/scala/codechicken/microblock/ConfigContent$.java b/src/main/scala/codechicken/microblock/ConfigContent$.java new file mode 100644 index 0000000..651ec51 --- /dev/null +++ b/src/main/scala/codechicken/microblock/ConfigContent$.java @@ -0,0 +1,226 @@ +package codechicken.microblock; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import codechicken.microblock.handler.MicroblockProxy; +import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import scala.collection.Iterator; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.mutable.HashMap; +import scala.collection.mutable.Map; + +public final class ConfigContent$ { + + public static final ConfigContent$ MODULE$ = new ConfigContent$(); + + private final Map> codechicken$microblock$ConfigContent$$nameMap = new HashMap<>(); + + private ConfigContent$() {} + + public Map> codechicken$microblock$ConfigContent$$nameMap() { + return codechicken$microblock$ConfigContent$$nameMap; + } + + public void parse(File cfgDir) { + File cfgFile = new File(cfgDir, "microblocks.cfg"); + try { + if (cfgFile.exists()) { + loadLinesIO(cfgFile); + } else { + generateDefaultIO(cfgFile); + } + } catch (IOException exception) { + MicroblockProxy.logger().error("Error parsing config", exception); + } + } + + public void generateDefault(File cfgFile) { + try { + generateDefaultIO(cfgFile); + } catch (IOException exception) { + throw ConfigContent$.rethrow(exception); + } + } + + public void loadLine(String line) { + if (line.startsWith("#") || line.length() < 3) { + return; + } + + if (line.charAt(0) != '"') { + throw new IllegalArgumentException("Line must begin with a quote"); + } + int secondQuote = line.indexOf('"', 1); + if (secondQuote < 0) { + throw new IllegalArgumentException("Unmatched quotes"); + } + + String name = line.substring(1, secondQuote); + if (!name.contains(".") && !name.contains(":")) { + name = "minecraft:" + name; + } + + List metadata = new ArrayList<>(); + metadata.add(0); + if (line.length() > secondQuote + 1) { + if (line.charAt(secondQuote + 1) != ':') { + throw new IllegalArgumentException("Name must be followed by a colon separator"); + } + + metadata.clear(); + for (String value : line.substring(secondQuote + 2).split(",")) { + if (value.contains("-")) { + String[] bounds = value.split("-"); + if (bounds.length != 2) { + throw new IllegalArgumentException("Invalid - separated range"); + } + int start = Integer.parseInt(bounds[0]); + int end = Integer.parseInt(bounds[1]); + if (start <= end) { + for (int current = start;; current++) { + metadata.add(current); + if (current == end) { + break; + } + } + } + } else { + metadata.add(Integer.parseInt(value)); + } + } + } + + codechicken$microblock$ConfigContent$$nameMap.put(name, JavaConversions.asScalaBuffer(metadata).toList()); + } + + public void loadLines(File cfgFile) { + try { + loadLinesIO(cfgFile); + } catch (IOException exception) { + throw ConfigContent$.rethrow(exception); + } + } + + public void load() { + java.util.Map> names = JavaConversions + .mutableMapAsJavaMap(codechicken$microblock$ConfigContent$$nameMap); + for (Object value : Block.blockRegistry) { + Block block = (Block) value; + List metadata = new ArrayList<>(); + addAll(metadata, names.remove(block.getUnlocalizedName())); + addAll(metadata, names.remove((String) Block.blockRegistry.getNameForObject(block))); + for (Object metaValue : metadata) { + int meta = (Integer) metaValue; + try { + BlockMicroMaterial.createAndRegister(block, meta); + } catch (IllegalStateException exception) { + MicroblockProxy.logger().error( + "Unable to register micro material: " + BlockMicroMaterial.materialKey(block, meta) + + "\n\t" + + exception.getMessage()); + } catch (Exception exception) { + MicroblockProxy.logger().error( + "Unable to register micro material: " + BlockMicroMaterial.materialKey(block, meta), + exception); + } + } + } + + for (Entry> entry : names.entrySet()) { + MicroblockProxy.logger().warn( + "Unable to add micro material for block with unlocalised name " + entry.getKey() + + " as it doesn't exist"); + } + } + + public void handleIMC(Seq messages) { + Iterator iterator = messages.iterator(); + while (iterator.hasNext()) { + IMCMessage message = iterator.next(); + if (!"microMaterial".equals(message.key)) { + continue; + } + + if (message.getMessageType() != ItemStack.class) { + imcError(message, "value is not an instanceof ItemStack"); + continue; + } + + ItemStack stack = message.getItemStackValue(); + if (!Block.blockRegistry.containsId(Item.getIdFromItem(stack.getItem()))) { + imcError(message, "Invalid Block: " + stack.getItem()); + } else if (stack.getItemDamage() < 0 || stack.getItemDamage() >= 16) { + imcError(message, "Invalid metadata: " + stack.getItemDamage()); + } else { + try { + BlockMicroMaterial + .createAndRegister(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()); + } catch (IllegalStateException exception) { + imcError( + message, + "Unable to register micro material: " + + BlockMicroMaterial + .materialKey(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()) + + "\n\t" + + exception.getMessage()); + } + } + } + } + + private static void generateDefaultIO(File cfgFile) throws IOException { + PrintWriter writer = new PrintWriter(cfgFile); + writer.println("#Configuration file for adding microblock materials for aesthetic blocks added by mods"); + writer.println("#Each line needs to be of the form :"); + writer.println( + "# is the unlocalised name or registry key of the block/item enclosed in quotes. NEI can help you find these"); + writer.println( + "# may be ommitted, in which case it defaults to 0, otherwise it can be a number, a comma separated list of numbers, or a dash separated range"); + writer.println("#Ex. \"dirt\" \"minecraft:planks\":3 \"iron_ore\":1,2,3,5 \"ThermalFoundation:Storage\":0-15"); + writer.close(); + } + + private void loadLinesIO(File cfgFile) throws IOException { + BufferedReader reader = new BufferedReader(new FileReader(cfgFile)); + String line; + do { + line = reader.readLine(); + if (line != null) { + try { + loadLine(line); + } catch (Exception exception) { + MicroblockProxy.logger().error("Invalid line in microblocks.cfg: " + line); + MicroblockProxy.logger().error(exception.getMessage()); + } + } + } while (line != null); + reader.close(); + } + + private static void addAll(List destination, Seq source) { + if (source != null) { + destination.addAll(JavaConversions.seqAsJavaList(source)); + } + } + + private static void imcError(IMCMessage message, String error) { + MicroblockProxy.logger().error("Invalid microblock IMC message from " + message.getSender() + ": " + error); + } + + @SuppressWarnings("unchecked") + private static RuntimeException rethrow(Throwable throwable) throws T { + throw (T) throwable; + } +} diff --git a/src/main/scala/codechicken/microblock/ConfigContent.java b/src/main/scala/codechicken/microblock/ConfigContent.java new file mode 100644 index 0000000..c55b5be --- /dev/null +++ b/src/main/scala/codechicken/microblock/ConfigContent.java @@ -0,0 +1,35 @@ +package codechicken.microblock; + +import java.io.File; + +import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import scala.collection.Seq; + +public final class ConfigContent { + + private ConfigContent() {} + + public static void parse(File cfgDir) { + ConfigContent$.MODULE$.parse(cfgDir); + } + + public static void generateDefault(File cfgFile) { + ConfigContent$.MODULE$.generateDefault(cfgFile); + } + + public static void loadLine(String line) { + ConfigContent$.MODULE$.loadLine(line); + } + + public static void loadLines(File cfgFile) { + ConfigContent$.MODULE$.loadLines(cfgFile); + } + + public static void load() { + ConfigContent$.MODULE$.load(); + } + + public static void handleIMC(Seq messages) { + ConfigContent$.MODULE$.handleIMC(messages); + } +} diff --git a/src/main/scala/codechicken/microblock/ConfigContent.scala b/src/main/scala/codechicken/microblock/ConfigContent.scala deleted file mode 100644 index 5c733cd..0000000 --- a/src/main/scala/codechicken/microblock/ConfigContent.scala +++ /dev/null @@ -1,173 +0,0 @@ -package codechicken.microblock - -import java.io.File -import java.io.IOException -import java.io.PrintWriter -import java.io.BufferedReader -import java.io.FileReader -import scala.collection.mutable.{Map => MMap} -import net.minecraft.block.Block -import net.minecraft.item.Item -import java.lang.Exception -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage -import net.minecraft.item.ItemStack -import BlockMicroMaterial.createAndRegister -import BlockMicroMaterial.materialKey -import java.lang.{Iterable => JIterable} -import scala.collection.JavaConversions._ - -object ConfigContent { - private val nameMap = MMap[String, Seq[Int]]() - - def parse(cfgDir: File) { - val cfgFile = new File(cfgDir, "microblocks.cfg") - try { - if (!cfgFile.exists()) - generateDefault(cfgFile) - else - loadLines(cfgFile) - } catch { - case e: IOException => logger.error("Error parsing config", e) - } - } - - def generateDefault(cfgFile: File) { - val writer = new PrintWriter(cfgFile) - writer.println( - "#Configuration file for adding microblock materials for aesthetic blocks added by mods" - ) - writer.println("#Each line needs to be of the form :") - writer.println( - "# is the unlocalised name or registry key of the block/item enclosed in quotes. NEI can help you find these" - ) - writer.println( - "# may be ommitted, in which case it defaults to 0, otherwise it can be a number, a comma separated list of numbers, or a dash separated range" - ) - writer.println( - "#Ex. \"dirt\" \"minecraft:planks\":3 \"iron_ore\":1,2,3,5 \"ThermalFoundation:Storage\":0-15" - ) - writer.close() - } - - def loadLine(line: String) { - if (line.startsWith("#") || line.length < 3) - return - - if (line.charAt(0) != '\"') - throw new IllegalArgumentException("Line must begin with a quote") - val q2 = line.indexOf('\"', 1) - if (q2 < 0) - throw new IllegalArgumentException("Unmatched quotes") - - var name = line.substring(1, q2) - if (!name.contains('.') && !name.contains(':')) - name = "minecraft:" + name - - var meta = Seq(0) - if (line.length > q2 + 1) { - if (line.charAt(q2 + 1) != ':') - throw new IllegalArgumentException( - "Name must be followed by a colon separator" - ) - - meta = line.substring(q2 + 2).split(",").flatMap { s => - if (s.contains("-")) { - val split2 = s.split("-") - if (split2.length != 2) - throw new IllegalArgumentException("Invalid - separated range") - split2(0).toInt to split2(1).toInt - } else { - Seq(s.toInt) - } - } - } - - nameMap.put(name, meta) - } - - def loadLines(cfgFile: File) { - val reader = new BufferedReader(new FileReader(cfgFile)) - var s: String = null - do { - s = reader.readLine - if (s != null) { - try { - loadLine(s) - } catch { - case e: Exception => - logger.error("Invalid line in microblocks.cfg: " + s) - logger.error(e.getMessage) - } - } - } while (s != null) - reader.close() - } - - def load() { - for (block <- Block.blockRegistry.asInstanceOf[JIterable[Block]]) { - val metas = Seq( - block.getUnlocalizedName, - Block.blockRegistry.getNameForObject(block) - ).flatMap(nameMap.remove).flatten - metas.foreach { m => - try { - createAndRegister(block, m) - } catch { - case e: IllegalStateException => - logger.error( - "Unable to register micro material: " + - materialKey(block, m) + "\n\t" + e.getMessage - ) - case e: Exception => - logger.error( - "Unable to register micro material: " + materialKey(block, m), - e - ) - } - } - } - - nameMap.foreach(e => - logger.warn( - "Unable to add micro material for block with unlocalised name " + e._1 + " as it doesn't exist" - ) - ) - } - - def handleIMC(messages: Seq[IMCMessage]) { - messages.filter(_.key == "microMaterial").foreach { msg => - def error(s: String) { - logger.error( - "Invalid microblock IMC message from " + msg.getSender + ": " + s - ) - } - - if (msg.getMessageType != classOf[ItemStack]) - error("value is not an instanceof ItemStack") - else { - val stack = msg.getItemStackValue - if (!Block.blockRegistry.containsId(Item.getIdFromItem(stack.getItem))) - error("Invalid Block: " + stack.getItem) - else if (stack.getItemDamage < 0 || stack.getItemDamage >= 16) - error("Invalid metadata: " + stack.getItemDamage) - else { - try { - createAndRegister( - Block.getBlockFromItem(stack.getItem), - stack.getItemDamage - ) - } catch { - case e: IllegalStateException => - error( - "Unable to register micro material: " + - materialKey( - Block.getBlockFromItem(stack.getItem), - stack.getItemDamage - ) + "\n\t" + e.getMessage - ) - } - } - } - } - } -} diff --git a/src/main/scala/codechicken/microblock/CornerMicroClass$.java b/src/main/scala/codechicken/microblock/CornerMicroClass$.java new file mode 100644 index 0000000..d727cbc --- /dev/null +++ b/src/main/scala/codechicken/microblock/CornerMicroClass$.java @@ -0,0 +1,66 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Scale; +import codechicken.lib.vec.Transformation; +import codechicken.lib.vec.Vector3; + +public final class CornerMicroClass$ extends CommonMicroClass { + + public static final CornerMicroClass$ MODULE$ = new CornerMicroClass$(); + + private Cuboid6[] aBounds = new Cuboid6[256]; + + private CornerMicroClass$() { + for (int corner = 0; corner < 8; corner++) { + int scaleX = (corner & 4) == 0 ? 1 : -1; + int scaleY = (corner & 1) == 0 ? 1 : -1; + int scaleZ = (corner & 2) == 0 ? 1 : -1; + Transformation transform = new Scale(new Vector3(scaleX, scaleY, scaleZ)).at(Vector3.center); + + for (int size = 1; size < 8; size++) { + double distance = size / 8D; + aBounds[size << 4 | corner] = new Cuboid6(0, 0, 0, distance, distance, distance).apply(transform); + } + } + } + + public Cuboid6[] aBounds() { + return aBounds; + } + + public void aBounds_$eq(Cuboid6[] bounds) { + aBounds = bounds; + } + + @Override + public String getName() { + return "mcr_cnr"; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public Class baseTrait() { + return (Class) CornerMicroblock.class; + } + + @Override + public Class clientTrait() { + return CommonMicroblockClient.class; + } + + @Override + public int itemSlot() { + return 7; + } + + @Override + public CornerPlacement$ placementProperties() { + return CornerPlacement$.MODULE$; + } + + @Override + public float getResistanceFactor() { + return 1; + } +} diff --git a/src/main/scala/codechicken/microblock/CornerMicroClass.java b/src/main/scala/codechicken/microblock/CornerMicroClass.java new file mode 100644 index 0000000..a3ba3ac --- /dev/null +++ b/src/main/scala/codechicken/microblock/CornerMicroClass.java @@ -0,0 +1,76 @@ +package codechicken.microblock; + +import net.minecraft.nbt.NBTTagCompound; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.vec.Cuboid6; + +public final class CornerMicroClass { + + private CornerMicroClass() {} + + public static int baseTraitId() { + return CornerMicroClass$.MODULE$.baseTraitId(); + } + + public static int clientTraitId() { + return CornerMicroClass$.MODULE$.clientTraitId(); + } + + public static void register() { + CornerMicroClass$.MODULE$.register(); + } + + public static Microblock create(boolean client, int material) { + return CornerMicroClass$.MODULE$.create(client, material); + } + + public static Microblock createPart(String name, MCDataInput packet) { + return CornerMicroClass$.MODULE$.createPart(name, packet); + } + + public static Microblock createPart(String name, NBTTagCompound nbt) { + return CornerMicroClass$.MODULE$.createPart(name, nbt); + } + + public static int getClassId() { + return CornerMicroClass$.MODULE$.getClassId(); + } + + public static void register(int id) { + CornerMicroClass$.MODULE$.register(id); + } + + public static Cuboid6[] aBounds() { + return CornerMicroClass$.MODULE$.aBounds(); + } + + public static void aBounds_$eq(Cuboid6[] bounds) { + CornerMicroClass$.MODULE$.aBounds_$eq(bounds); + } + + public static String getName() { + return CornerMicroClass$.MODULE$.getName(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + public static Class baseTrait() { + return (Class) CornerMicroClass$.MODULE$.baseTrait(); + } + + public static Class clientTrait() { + return CornerMicroClass$.MODULE$.clientTrait(); + } + + public static int itemSlot() { + return CornerMicroClass$.MODULE$.itemSlot(); + } + + public static CornerPlacement$ placementProperties() { + return CornerMicroClass$.MODULE$.placementProperties(); + } + + public static float getResistanceFactor() { + return CornerMicroClass$.MODULE$.getResistanceFactor(); + } +} diff --git a/src/main/scala/codechicken/microblock/CornerMicroblock.scala b/src/main/scala/codechicken/microblock/CornerMicroblock.scala deleted file mode 100644 index 6082295..0000000 --- a/src/main/scala/codechicken/microblock/CornerMicroblock.scala +++ /dev/null @@ -1,52 +0,0 @@ -package codechicken.microblock - -import codechicken.lib.vec.Cuboid6 -import codechicken.lib.vec.Scale -import codechicken.lib.vec.Vector3 -import Vector3._ - -object CornerPlacement extends PlacementProperties { - def microClass = CornerMicroClass - - def placementGrid = CornerPlacementGrid - - def opposite(slot: Int, side: Int) = ((slot - 7) ^ (1 << (side >> 1))) + 7 -} - -object CornerMicroClass extends CommonMicroClass { - var aBounds: Array[Cuboid6] = new Array(256) - - for (s <- 0 until 8) { - val rx = if ((s & 4) != 0) -1 else 1 - val ry = if ((s & 1) != 0) -1 else 1 - val rz = if ((s & 2) != 0) -1 else 1 - val transform = new Scale(new Vector3(rx, ry, rz)).at(center) - - for (t <- 1 until 8) { - val d = t / 8d - aBounds(t << 4 | s) = new Cuboid6(0, 0, 0, d, d, d).apply(transform) - } - } - - def getName = "mcr_cnr" - - def baseTrait = classOf[CornerMicroblock] - def clientTrait = classOf[CommonMicroblockClient] - - override def itemSlot = 7 - - def placementProperties = CornerPlacement - - def getResistanceFactor = 1 -} - -trait CornerMicroblock extends CommonMicroblock { - override def setShape(size: Int, slot: Int) = shape = - (size << 4 | (slot - 7)).toByte - - def microClass = CornerMicroClass - - def getBounds = CornerMicroClass.aBounds(shape) - - override def getSlot = getShape + 7 -} diff --git a/src/main/scala/codechicken/microblock/CornerMicroblockTraitLogic.java b/src/main/scala/codechicken/microblock/CornerMicroblockTraitLogic.java new file mode 100644 index 0000000..cd8761c --- /dev/null +++ b/src/main/scala/codechicken/microblock/CornerMicroblockTraitLogic.java @@ -0,0 +1,21 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Cuboid6; + +/** Corner behavior behind the retained Scala inheritance metadata and helper bridges. */ +final class CornerMicroblockTraitLogic { + + private CornerMicroblockTraitLogic() {} + + static void setShape(CornerMicroblock part, int size, int slot) { + ((Microblock) part).shape_$eq((byte) (size << 4 | (slot - 7))); + } + + static Cuboid6 getBounds(CornerMicroblock part) { + return CornerMicroClass.aBounds()[((Microblock) part).shape()]; + } + + static int getSlot(CornerMicroblock part) { + return ((Microblock) part).getShape() + 7; + } +} diff --git a/src/main/scala/codechicken/microblock/CornerMicroblockTraits.scala b/src/main/scala/codechicken/microblock/CornerMicroblockTraits.scala new file mode 100644 index 0000000..c4bc9bb --- /dev/null +++ b/src/main/scala/codechicken/microblock/CornerMicroblockTraits.scala @@ -0,0 +1,13 @@ +package codechicken.microblock + +// Retain Scala inheritance metadata and helper bridges for generated and external mixins. +trait CornerMicroblock extends CommonMicroblock { + override def setShape(size: Int, slot: Int) = + CornerMicroblockTraitLogic.setShape(this, size, slot) + + def microClass = CornerMicroClass$.MODULE$ + + def getBounds = CornerMicroblockTraitLogic.getBounds(this) + + override def getSlot = CornerMicroblockTraitLogic.getSlot(this) +} diff --git a/src/main/scala/codechicken/microblock/CornerPlacement$.java b/src/main/scala/codechicken/microblock/CornerPlacement$.java new file mode 100644 index 0000000..ba59a59 --- /dev/null +++ b/src/main/scala/codechicken/microblock/CornerPlacement$.java @@ -0,0 +1,23 @@ +package codechicken.microblock; + +public final class CornerPlacement$ extends PlacementProperties { + + public static final CornerPlacement$ MODULE$ = new CornerPlacement$(); + + private CornerPlacement$() {} + + @Override + public CornerMicroClass$ microClass() { + return CornerMicroClass$.MODULE$; + } + + @Override + public CornerPlacementGrid$ placementGrid() { + return CornerPlacementGrid$.MODULE$; + } + + @Override + public int opposite(int slot, int side) { + return ((slot - 7) ^ (1 << (side >> 1))) + 7; + } +} diff --git a/src/main/scala/codechicken/microblock/CornerPlacement.java b/src/main/scala/codechicken/microblock/CornerPlacement.java new file mode 100644 index 0000000..303f899 --- /dev/null +++ b/src/main/scala/codechicken/microblock/CornerPlacement.java @@ -0,0 +1,30 @@ +package codechicken.microblock; + +public final class CornerPlacement { + + private CornerPlacement() {} + + public static ExecutablePlacement customPlacement(MicroblockPlacement placement) { + return CornerPlacement$.MODULE$.customPlacement(placement); + } + + public static CornerMicroClass$ microClass() { + return CornerPlacement$.MODULE$.microClass(); + } + + public static CornerPlacementGrid$ placementGrid() { + return CornerPlacement$.MODULE$.placementGrid(); + } + + public static int opposite(int slot, int side) { + return CornerPlacement$.MODULE$.opposite(slot, side); + } + + public static boolean expand(int slot, int side) { + return CornerPlacement$.MODULE$.expand(slot, side); + } + + public static boolean sneakOpposite(int slot, int side) { + return CornerPlacement$.MODULE$.sneakOpposite(slot, side); + } +} diff --git a/src/main/scala/codechicken/microblock/CornerPlacementGrid$.java b/src/main/scala/codechicken/microblock/CornerPlacementGrid$.java new file mode 100644 index 0000000..506029f --- /dev/null +++ b/src/main/scala/codechicken/microblock/CornerPlacementGrid$.java @@ -0,0 +1,56 @@ +package codechicken.microblock; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Vector3; + +public final class CornerPlacementGrid$ implements PlacementGrid { + + public static final CornerPlacementGrid$ MODULE$ = new CornerPlacementGrid$(); + + private CornerPlacementGrid$() {} + + @Override + public void render(Vector3 hit, int side) { + PlacementGrid.super.render(hit, side); + } + + @Override + public void glTransformFace(Vector3 hit, int side) { + PlacementGrid.super.glTransformFace(hit, side); + } + + @Override + public void drawLines() { + GL11.glVertex3d(-0.5, 0, -0.5); + GL11.glVertex3d(-0.5, 0, 0.5); + + GL11.glVertex3d(-0.5, 0, 0.5); + GL11.glVertex3d(0.5, 0, 0.5); + + GL11.glVertex3d(0.5, 0, 0.5); + GL11.glVertex3d(0.5, 0, -0.5); + + GL11.glVertex3d(0.5, 0, -0.5); + GL11.glVertex3d(-0.5, 0, -0.5); + + GL11.glVertex3d(0, 0, -0.5); + GL11.glVertex3d(0, 0, 0.5); + + GL11.glVertex3d(-0.5, 0, 0); + GL11.glVertex3d(0.5, 0, 0); + } + + @Override + public int getHitSlot(Vector3 hit, int side) { + int side1 = ((side & 6) + 3) % 6; + int side2 = ((side & 6) + 5) % 6; + double u = hit.copy().add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes[side1]); + double v = hit.copy().add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes[side2]); + int positiveU = u >= 0 ? 1 : 0; + int positiveV = v >= 0 ? 1 : 0; + int normal = (side & 1) ^ 1; + return 7 + (normal << (side >> 1) | positiveU << (side1 >> 1) | positiveV << (side2 >> 1)); + } +} diff --git a/src/main/scala/codechicken/microblock/CornerPlacementGrid.java b/src/main/scala/codechicken/microblock/CornerPlacementGrid.java new file mode 100644 index 0000000..4761067 --- /dev/null +++ b/src/main/scala/codechicken/microblock/CornerPlacementGrid.java @@ -0,0 +1,24 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Vector3; + +public final class CornerPlacementGrid { + + private CornerPlacementGrid() {} + + public static void glTransformFace(Vector3 hit, int side) { + CornerPlacementGrid$.MODULE$.glTransformFace(hit, side); + } + + public static void render(Vector3 hit, int side) { + CornerPlacementGrid$.MODULE$.render(hit, side); + } + + public static int getHitSlot(Vector3 hit, int side) { + return CornerPlacementGrid$.MODULE$.getHitSlot(hit, side); + } + + public static void drawLines() { + CornerPlacementGrid$.MODULE$.drawLines(); + } +} diff --git a/src/main/scala/codechicken/microblock/DefaultContent$.java b/src/main/scala/codechicken/microblock/DefaultContent$.java new file mode 100644 index 0000000..260257d --- /dev/null +++ b/src/main/scala/codechicken/microblock/DefaultContent$.java @@ -0,0 +1,67 @@ +package codechicken.microblock; + +import net.minecraft.init.Blocks; + +import scala.collection.immutable.Range$; + +public final class DefaultContent$ { + + public static final DefaultContent$ MODULE$ = new DefaultContent$(); + + private DefaultContent$() {} + + public void load() { + FaceMicroClass$.MODULE$.register(0); + HollowMicroClass$.MODULE$.register(1); + CornerMicroClass$.MODULE$.register(2); + EdgeMicroClass$.MODULE$.register(3); + PostMicroClass$.MODULE$.register(); + + BlockMicroMaterial$ materials = BlockMicroMaterial$.MODULE$; + materials.createAndRegister(Blocks.stone, 0); + materials.createAndRegister(Blocks.dirt, Range$.MODULE$.inclusive(0, 2)); + materials.createAndRegister(Blocks.cobblestone, 0); + materials.createAndRegister(Blocks.planks, Range$.MODULE$.inclusive(0, 5)); + materials.createAndRegister(Blocks.log, Range$.MODULE$.inclusive(0, 3)); + materials.createAndRegister(Blocks.log2, Range$.MODULE$.inclusive(0, 1), "tile.log2"); + materials.createAndRegister(Blocks.leaves, Range$.MODULE$.inclusive(0, 3)); + materials.createAndRegister(Blocks.leaves2, Range$.MODULE$.inclusive(0, 1), "tile.leaves2"); + materials.createAndRegister(Blocks.sponge, 0); + materials.createAndRegister(Blocks.glass, 0); + materials.createAndRegister(Blocks.lapis_block, 0); + materials.createAndRegister(Blocks.sandstone, Range$.MODULE$.inclusive(0, 2)); + materials.createAndRegister(Blocks.wool, Range$.MODULE$.inclusive(0, 15)); + materials.createAndRegister(Blocks.gold_block, 0); + materials.createAndRegister(Blocks.iron_block, 0); + materials.createAndRegister(Blocks.brick_block, 0); + materials.createAndRegister(Blocks.bookshelf, 0); + materials.createAndRegister(Blocks.mossy_cobblestone, 0); + materials.createAndRegister(Blocks.obsidian, 0); + materials.createAndRegister(Blocks.diamond_block, 0); + materials.createAndRegister(Blocks.ice, 0); + materials.createAndRegister(Blocks.snow, 0); + materials.createAndRegister(Blocks.clay, 0); + materials.createAndRegister(Blocks.netherrack, 0); + materials.createAndRegister(Blocks.soul_sand, 0); + materials.createAndRegister(Blocks.glowstone, 0); + materials.createAndRegister(Blocks.stonebrick, Range$.MODULE$.inclusive(0, 3)); + materials.createAndRegister(Blocks.nether_brick, 0); + materials.createAndRegister(Blocks.end_stone, 0); + materials.createAndRegister(Blocks.emerald_block, 0); + materials.createAndRegister(Blocks.redstone_block, 0); + materials.createAndRegister(Blocks.quartz_block, 0); + materials.createAndRegister(Blocks.stained_hardened_clay, Range$.MODULE$.inclusive(0, 15)); + materials.createAndRegister(Blocks.hardened_clay, 0); + materials.createAndRegister(Blocks.coal_block, 0); + materials.createAndRegister(Blocks.packed_ice, 0); + materials.createAndRegister(Blocks.stained_glass, Range$.MODULE$.inclusive(0, 15)); + + MicroMaterialRegistry.remapName(materials.oldKey(Blocks.grass), materials.materialKey(Blocks.grass)); + MicroMaterialRegistry.registerMaterial(new GrassMicroMaterial(), materials.materialKey(Blocks.grass)); + MicroMaterialRegistry.remapName(materials.oldKey(Blocks.mycelium), materials.materialKey(Blocks.mycelium)); + MicroMaterialRegistry + .registerMaterial(new TopMicroMaterial(Blocks.mycelium, 0), materials.materialKey(Blocks.mycelium)); + + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, MissingMicroMaterial.key()); + } +} diff --git a/src/main/scala/codechicken/microblock/DefaultContent.java b/src/main/scala/codechicken/microblock/DefaultContent.java new file mode 100644 index 0000000..003d18d --- /dev/null +++ b/src/main/scala/codechicken/microblock/DefaultContent.java @@ -0,0 +1,10 @@ +package codechicken.microblock; + +public final class DefaultContent { + + private DefaultContent() {} + + public static void load() { + DefaultContent$.MODULE$.load(); + } +} diff --git a/src/main/scala/codechicken/microblock/DefaultContent.scala b/src/main/scala/codechicken/microblock/DefaultContent.scala deleted file mode 100644 index e0f4e3f..0000000 --- a/src/main/scala/codechicken/microblock/DefaultContent.scala +++ /dev/null @@ -1,60 +0,0 @@ -package codechicken.microblock - -import net.minecraft.init.Blocks._ -import BlockMicroMaterial._ -import MicroMaterialRegistry._ - -object DefaultContent { - def load() { - FaceMicroClass.register(0) - HollowMicroClass.register(1) - CornerMicroClass.register(2) - EdgeMicroClass.register(3) - PostMicroClass.register() - - createAndRegister(stone) - createAndRegister(dirt, 0 to 2) - createAndRegister(cobblestone) - createAndRegister(planks, 0 to 5) - createAndRegister(log, 0 to 3) - createAndRegister(log2, 0 to 1, "tile.log2") - createAndRegister(leaves, 0 to 3) - createAndRegister(leaves2, 0 to 1, "tile.leaves2") - createAndRegister(sponge) - createAndRegister(glass) - createAndRegister(lapis_block) - createAndRegister(sandstone, 0 to 2) - createAndRegister(wool, 0 to 15) - createAndRegister(gold_block) - createAndRegister(iron_block) - createAndRegister(brick_block) - createAndRegister(bookshelf) - createAndRegister(mossy_cobblestone) - createAndRegister(obsidian) - createAndRegister(diamond_block) - createAndRegister(ice) - createAndRegister(snow) - createAndRegister(clay) - createAndRegister(netherrack) - createAndRegister(soul_sand) - createAndRegister(glowstone) - createAndRegister(stonebrick, 0 to 3) - createAndRegister(nether_brick) - createAndRegister(end_stone) - createAndRegister(emerald_block) - createAndRegister(redstone_block) - createAndRegister(quartz_block) - createAndRegister(stained_hardened_clay, 0 to 15) - createAndRegister(hardened_clay) - createAndRegister(coal_block) - createAndRegister(packed_ice) - createAndRegister(stained_glass, 0 to 15) - - MicroMaterialRegistry.remapName(oldKey(grass), materialKey(grass)) - registerMaterial(new GrassMicroMaterial, materialKey(grass)) - MicroMaterialRegistry.remapName(oldKey(mycelium), materialKey(mycelium)) - registerMaterial(new TopMicroMaterial(mycelium), materialKey(mycelium)) - - registerMaterial(MissingMicroMaterial, MissingMicroMaterial.key) - } -} diff --git a/src/main/scala/codechicken/microblock/EdgeMicroClass$.java b/src/main/scala/codechicken/microblock/EdgeMicroClass$.java new file mode 100644 index 0000000..e15b45b --- /dev/null +++ b/src/main/scala/codechicken/microblock/EdgeMicroClass$.java @@ -0,0 +1,69 @@ +package codechicken.microblock; + +import codechicken.lib.vec.AxisCycle; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Scale; +import codechicken.lib.vec.Transformation; +import codechicken.lib.vec.TransformationList; +import codechicken.lib.vec.Vector3; + +public final class EdgeMicroClass$ extends CommonMicroClass { + + public static final EdgeMicroClass$ MODULE$ = new EdgeMicroClass$(); + + private Cuboid6[] aBounds = new Cuboid6[256]; + + private EdgeMicroClass$() { + for (int edge = 0; edge < 12; edge++) { + int scaleX = (edge & 2) == 0 ? 1 : -1; + int scaleZ = (edge & 1) == 0 ? 1 : -1; + Transformation transform = new TransformationList( + new Scale(new Vector3(scaleX, 1, scaleZ)), + AxisCycle.cycles[edge >> 2]).at(Vector3.center); + + for (int size = 1; size < 8; size++) { + double distance = size / 8D; + aBounds[size << 4 | edge] = new Cuboid6(0, 0, 0, distance, 1, distance).apply(transform); + } + } + } + + public Cuboid6[] aBounds() { + return aBounds; + } + + public void aBounds_$eq(Cuboid6[] bounds) { + aBounds = bounds; + } + + @Override + public int itemSlot() { + return 15; + } + + @Override + public String getName() { + return "mcr_edge"; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public Class baseTrait() { + return (Class) EdgeMicroblock.class; + } + + @Override + public Class clientTrait() { + return CommonMicroblockClient.class; + } + + @Override + public EdgePlacement$ placementProperties() { + return EdgePlacement$.MODULE$; + } + + @Override + public float getResistanceFactor() { + return 0.5F; + } +} diff --git a/src/main/scala/codechicken/microblock/EdgeMicroClass.java b/src/main/scala/codechicken/microblock/EdgeMicroClass.java new file mode 100644 index 0000000..f10e8a1 --- /dev/null +++ b/src/main/scala/codechicken/microblock/EdgeMicroClass.java @@ -0,0 +1,76 @@ +package codechicken.microblock; + +import net.minecraft.nbt.NBTTagCompound; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.vec.Cuboid6; + +public final class EdgeMicroClass { + + private EdgeMicroClass() {} + + public static int baseTraitId() { + return EdgeMicroClass$.MODULE$.baseTraitId(); + } + + public static int clientTraitId() { + return EdgeMicroClass$.MODULE$.clientTraitId(); + } + + public static void register() { + EdgeMicroClass$.MODULE$.register(); + } + + public static Microblock create(boolean client, int material) { + return EdgeMicroClass$.MODULE$.create(client, material); + } + + public static Microblock createPart(String name, MCDataInput packet) { + return EdgeMicroClass$.MODULE$.createPart(name, packet); + } + + public static Microblock createPart(String name, NBTTagCompound nbt) { + return EdgeMicroClass$.MODULE$.createPart(name, nbt); + } + + public static int getClassId() { + return EdgeMicroClass$.MODULE$.getClassId(); + } + + public static void register(int id) { + EdgeMicroClass$.MODULE$.register(id); + } + + public static Cuboid6[] aBounds() { + return EdgeMicroClass$.MODULE$.aBounds(); + } + + public static void aBounds_$eq(Cuboid6[] bounds) { + EdgeMicroClass$.MODULE$.aBounds_$eq(bounds); + } + + public static int itemSlot() { + return EdgeMicroClass$.MODULE$.itemSlot(); + } + + public static String getName() { + return EdgeMicroClass$.MODULE$.getName(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + public static Class baseTrait() { + return (Class) EdgeMicroClass$.MODULE$.baseTrait(); + } + + public static Class clientTrait() { + return EdgeMicroClass$.MODULE$.clientTrait(); + } + + public static EdgePlacement$ placementProperties() { + return EdgeMicroClass$.MODULE$.placementProperties(); + } + + public static float getResistanceFactor() { + return EdgeMicroClass$.MODULE$.getResistanceFactor(); + } +} diff --git a/src/main/scala/codechicken/microblock/EdgeMicroblock.scala b/src/main/scala/codechicken/microblock/EdgeMicroblock.scala deleted file mode 100644 index 3b1bf90..0000000 --- a/src/main/scala/codechicken/microblock/EdgeMicroblock.scala +++ /dev/null @@ -1,224 +0,0 @@ -package codechicken.microblock - -import codechicken.lib.vec.Cuboid6 -import codechicken.lib.vec.Scale -import codechicken.lib.vec.Vector3 -import codechicken.lib.vec.TransformationList -import codechicken.lib.vec.AxisCycle -import codechicken.lib.vec.Rotation -import Vector3._ -import Rotation._ -import codechicken.multipart.TMultiPart -import codechicken.multipart.TNormalOcclusion -import codechicken.multipart.JPartialOcclusion -import codechicken.multipart.TileMultipart -import codechicken.multipart.MultiPartRegistry -import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial -import codechicken.lib.raytracer.ExtendedMOP -import codechicken.multipart.TEdgePart -import scala.collection.JavaConversions._ -import codechicken.lib.data.MCDataInput -import codechicken.lib.lighting.LightMatrix - -object EdgePlacement extends PlacementProperties { - import codechicken.multipart.PartMap._ - - def microClass = EdgeMicroClass - - def placementGrid = EdgePlacementGrid - - def opposite(slot: Int, side: Int): Int = { - if (slot < 0) // custom placement - return slot - val e = slot - 15 - return 15 + packEdgeBits(e, unpackEdgeBits(e) ^ (1 << (side >> 1))) - } - - override def customPlacement( - pmt: MicroblockPlacement - ): ExecutablePlacement = { - if (pmt.size % 2 == 1) return null - - val part = PostMicroClass.create(pmt.world.isRemote, pmt.material) - part.setShape(pmt.size, pmt.hit.sideHit >> 1) - if (pmt.doExpand) { - val hpart = pmt.htile.partList(ExtendedMOP.getData[(Int, _)](pmt.hit)._1) - if (hpart.getType == PostMicroClass.getName) { - val mpart = hpart.asInstanceOf[Microblock] - if (mpart.material == pmt.material && mpart.getSize + pmt.size < 8) { - part.shape = ((mpart.getSize + pmt.size) << 4 | mpart.getShape).toByte - return pmt.expand(mpart, part) - } - } - } - - if (pmt.slot >= 0) - return null - - if (pmt.internal && !pmt.oppMod) - return pmt.internalPlacement(pmt.htile.asInstanceOf[TileMultipart], part) - - return pmt.externalPlacement(part) - } -} - -object EdgeMicroClass extends CommonMicroClass { - var aBounds: Array[Cuboid6] = new Array(256) - - for (s <- 0 until 12) { - val rx = if ((s & 2) != 0) -1 else 1 - val rz = if ((s & 1) != 0) -1 else 1 - val transform = new TransformationList( - new Scale(new Vector3(rx, 1, rz)), - AxisCycle.cycles(s >> 2) - ).at(center) - - for (t <- 1 until 8) { - val d = t / 8d - aBounds(t << 4 | s) = new Cuboid6(0, 0, 0, d, 1, d).apply(transform) - } - } - - override def itemSlot = 15 - - def getName = "mcr_edge" - - def baseTrait = classOf[EdgeMicroblock] - def clientTrait = classOf[CommonMicroblockClient] - - def placementProperties = EdgePlacement - - def getResistanceFactor = 0.5f -} - -trait EdgeMicroblock extends CommonMicroblock with TEdgePart { - override def setShape(size: Int, slot: Int) = shape = - (size << 4 | (slot - 15)).toByte - - def microClass = EdgeMicroClass - - def getBounds = EdgeMicroClass.aBounds(shape) - - override def getSlot = getShape + 15 -} - -object PostMicroClass extends MicroblockClass { - var aBounds: Array[Cuboid6] = new Array(256) - - for (s <- 0 until 3) { - val transform = sideRotations(s << 1).at(center) - for (t <- 2 until 8 by 2) { - val d1 = 0.5 - t / 16d - val d2 = 0.5 + t / 16d - aBounds(t << 4 | s) = new Cuboid6(d1, 0, d1, d2, 1, d2).apply(transform) - } - } - - def getName = "mcr_post" - - def baseTrait = classOf[PostMicroblock] - def clientTrait = classOf[PostMicroblockClient] - - def getResistanceFactor = 0.5f -} - -trait PostMicroblockClient extends PostMicroblock with MicroblockClient { - var renderBounds1: Cuboid6 = _ - var renderBounds2: Cuboid6 = _ - - override def render(pos: Vector3, pass: Int) { - val mat = getIMaterial - if (pass == -1) - MicroblockRender.renderCuboid(pos, mat, pass, getBounds, 0) - else { - MicroblockRender.renderCuboid(pos, mat, pass, renderBounds1, 0) - if (renderBounds2 != null) - MicroblockRender.renderCuboid(pos, mat, pass, renderBounds2, 0) - } - } - - override def onPartChanged(part: TMultiPart) { - recalcBounds() - } - - override def onAdded() { - super.onAdded() - recalcBounds() - } - - override def read(packet: MCDataInput) { - super.read(packet) - recalcBounds() - } - - def recalcBounds() { - renderBounds1 = getBounds.copy - renderBounds2 = null - - shrinkFace(getShape << 1) - shrinkFace(getShape << 1 | 1) - - tile.partList.foreach(p => - if (p.isInstanceOf[PostMicroblock] && p != this) - shrinkPost(p.asInstanceOf[PostMicroblock]) - ) - } - - def shrinkFace(fside: Int) { - val part = tile.partMap(fside) - if (part != null && part.getType.equals("mcr_face")) - MicroOcclusion.shrink( - renderBounds1, - part.asInstanceOf[CommonMicroblock].getBounds, - fside - ) - } - - def shrinkPost(post: PostMicroblock) { - if (post == this) - return - - if (thisShrinks(post)) { - if (renderBounds2 == null) - renderBounds2 = getBounds.copy - MicroOcclusion.shrink(renderBounds1, post.getBounds, getShape << 1 | 1) - MicroOcclusion.shrink(renderBounds2, post.getBounds, getShape << 1) - } - } - - def thisShrinks(other: PostMicroblock): Boolean = { - if (getSize != other.getSize) return getSize < other.getSize - if (isTransparent != other.isTransparent) return isTransparent - return getShape > other.getShape - } -} - -trait PostMicroblock - extends Microblock - with JPartialOcclusion - with TNormalOcclusion { - def microClass = PostMicroClass - - def getBounds = PostMicroClass.aBounds(shape) - - def getOcclusionBoxes = Seq(getBounds) - - def getPartialOcclusionBoxes = getOcclusionBoxes - - override def itemClassID = EdgeMicroClass.getClassId - - override def occlusionTest(npart: TMultiPart): Boolean = { - if (npart.isInstanceOf[PostMicroblock]) - return npart.asInstanceOf[PostMicroblock].getShape != getShape - - if (npart.getType.equals("mcr_face")) - if (npart.asInstanceOf[CommonMicroblock].getSlot >> 1 == getShape) - return true - - return super.occlusionTest(npart) - } - - def getResistanceFactor = PostMicroClass.getResistanceFactor - - override def canPlaceTorchOnTop = getShape == 0 -} diff --git a/src/main/scala/codechicken/microblock/EdgeMicroblockTraitLogic.java b/src/main/scala/codechicken/microblock/EdgeMicroblockTraitLogic.java new file mode 100644 index 0000000..bf75c33 --- /dev/null +++ b/src/main/scala/codechicken/microblock/EdgeMicroblockTraitLogic.java @@ -0,0 +1,21 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Cuboid6; + +/** Edge behavior behind the retained Scala inheritance metadata and helper bridges. */ +final class EdgeMicroblockTraitLogic { + + private EdgeMicroblockTraitLogic() {} + + static void setShape(EdgeMicroblock part, int size, int slot) { + ((Microblock) part).shape_$eq((byte) (size << 4 | (slot - 15))); + } + + static Cuboid6 getBounds(EdgeMicroblock part) { + return EdgeMicroClass.aBounds()[((Microblock) part).shape()]; + } + + static int getSlot(EdgeMicroblock part) { + return ((Microblock) part).getShape() + 15; + } +} diff --git a/src/main/scala/codechicken/microblock/EdgeMicroblockTraits.scala b/src/main/scala/codechicken/microblock/EdgeMicroblockTraits.scala new file mode 100644 index 0000000..0951212 --- /dev/null +++ b/src/main/scala/codechicken/microblock/EdgeMicroblockTraits.scala @@ -0,0 +1,81 @@ +package codechicken.microblock + +import codechicken.lib.data.MCDataInput +import codechicken.lib.vec.{Cuboid6, Vector3} +import codechicken.multipart.{ + JPartialOcclusion, + TEdgePart, + TMultiPart, + TNormalOcclusion +} + +// Retain Scala inheritance metadata and helper bridges for generated and external mixins. +trait EdgeMicroblock extends CommonMicroblock with TEdgePart { + override def setShape(size: Int, slot: Int) = + EdgeMicroblockTraitLogic.setShape(this, size, slot) + + def microClass = EdgeMicroClass$.MODULE$ + + def getBounds = EdgeMicroblockTraitLogic.getBounds(this) + + override def getSlot = EdgeMicroblockTraitLogic.getSlot(this) +} + +trait PostMicroblockClient extends PostMicroblock with MicroblockClient { + var renderBounds1: Cuboid6 = _ + var renderBounds2: Cuboid6 = _ + + override def render(pos: Vector3, pass: Int) = + PostMicroblockClientLogic.render(this, pos, pass) + + override def onPartChanged(part: TMultiPart) { + recalcBounds() + } + + override def onAdded() { + super.onAdded() + recalcBounds() + } + + override def read(packet: MCDataInput) { + super.read(packet) + recalcBounds() + } + + def recalcBounds() = PostMicroblockClientLogic.recalcBounds(this) + + def shrinkFace(fside: Int) = PostMicroblockClientLogic.shrinkFace(this, fside) + + def shrinkPost(post: PostMicroblock) = + PostMicroblockClientLogic.shrinkPost(this, post) + + def thisShrinks(other: PostMicroblock): Boolean = + PostMicroblockClientLogic.thisShrinks(this, other) +} + +trait PostMicroblock + extends Microblock + with JPartialOcclusion + with TNormalOcclusion { + def microClass = PostMicroClass$.MODULE$ + + def getBounds = PostMicroblockTraitLogic.getBounds(this) + + def getOcclusionBoxes = PostMicroblockTraitLogic.getOcclusionBoxes(this) + + def getPartialOcclusionBoxes = + PostMicroblockTraitLogic.getPartialOcclusionBoxes(this) + + override def itemClassID = PostMicroblockTraitLogic.itemClassID(this) + + override def occlusionTest(npart: TMultiPart): Boolean = { + // Java source cannot call the synthetic super accessor; keep only that dispatch here. + val result = PostMicroblockTraitLogic.occlusionResult(this, npart) + if (result < 0) super.occlusionTest(npart) else result != 0 + } + + def getResistanceFactor = PostMicroblockTraitLogic.getResistanceFactor(this) + + override def canPlaceTorchOnTop = + PostMicroblockTraitLogic.canPlaceTorchOnTop(this) +} diff --git a/src/main/scala/codechicken/microblock/EdgePlacement$.java b/src/main/scala/codechicken/microblock/EdgePlacement$.java new file mode 100644 index 0000000..8b1c54c --- /dev/null +++ b/src/main/scala/codechicken/microblock/EdgePlacement$.java @@ -0,0 +1,57 @@ +package codechicken.microblock; + +import java.util.Objects; + +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.multipart.PartMap; +import codechicken.multipart.TMultiPart; +import scala.Tuple2; + +public final class EdgePlacement$ extends PlacementProperties { + + public static final EdgePlacement$ MODULE$ = new EdgePlacement$(); + + private EdgePlacement$() {} + + @Override + public EdgeMicroClass$ microClass() { + return EdgeMicroClass$.MODULE$; + } + + @Override + public EdgePlacementGrid$ placementGrid() { + return EdgePlacementGrid$.MODULE$; + } + + @Override + public int opposite(int slot, int side) { + if (slot < 0) return slot; + int edge = slot - 15; + return 15 + PartMap.packEdgeBits(edge, PartMap.unpackEdgeBits(edge) ^ (1 << (side >> 1))); + } + + @Override + public ExecutablePlacement customPlacement(MicroblockPlacement placement) { + if ((placement.size() & 1) != 0) return null; + + Microblock part = PostMicroClass.create(placement.world().isRemote, placement.material()); + part.setShape(placement.size(), placement.hit().sideHit >> 1); + if (placement.doExpand()) { + Tuple2 data = ExtendedMOP.getData(placement.hit()); + TMultiPart hitPart = placement.htile().partList().apply((Integer) data._1()); + if (Objects.equals(hitPart.getType(), PostMicroClass.getName())) { + Microblock microPart = (Microblock) hitPart; + if (microPart.material() == placement.material() && microPart.getSize() + placement.size() < 8) { + part.shape_$eq((byte) ((microPart.getSize() + placement.size()) << 4 | microPart.getShape())); + return placement.expand(microPart, part); + } + } + } + + if (placement.slot() >= 0) return null; + if (placement.internal() && !placement.oppMod()) { + return placement.internalPlacement(placement.htile(), part); + } + return placement.externalPlacement(part); + } +} diff --git a/src/main/scala/codechicken/microblock/EdgePlacement.java b/src/main/scala/codechicken/microblock/EdgePlacement.java new file mode 100644 index 0000000..62f4a99 --- /dev/null +++ b/src/main/scala/codechicken/microblock/EdgePlacement.java @@ -0,0 +1,30 @@ +package codechicken.microblock; + +public final class EdgePlacement { + + private EdgePlacement() {} + + public static ExecutablePlacement customPlacement(MicroblockPlacement placement) { + return EdgePlacement$.MODULE$.customPlacement(placement); + } + + public static EdgeMicroClass$ microClass() { + return EdgePlacement$.MODULE$.microClass(); + } + + public static EdgePlacementGrid$ placementGrid() { + return EdgePlacement$.MODULE$.placementGrid(); + } + + public static int opposite(int slot, int side) { + return EdgePlacement$.MODULE$.opposite(slot, side); + } + + public static boolean expand(int slot, int side) { + return EdgePlacement$.MODULE$.expand(slot, side); + } + + public static boolean sneakOpposite(int slot, int side) { + return EdgePlacement$.MODULE$.sneakOpposite(slot, side); + } +} diff --git a/src/main/scala/codechicken/microblock/EdgePlacementGrid$.java b/src/main/scala/codechicken/microblock/EdgePlacementGrid$.java new file mode 100644 index 0000000..70b6cab --- /dev/null +++ b/src/main/scala/codechicken/microblock/EdgePlacementGrid$.java @@ -0,0 +1,74 @@ +package codechicken.microblock; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Vector3; +import codechicken.multipart.PartMap; + +public final class EdgePlacementGrid$ implements PlacementGrid { + + public static final EdgePlacementGrid$ MODULE$ = new EdgePlacementGrid$(); + + private EdgePlacementGrid$() {} + + @Override + public void render(Vector3 hit, int side) { + PlacementGrid.super.render(hit, side); + } + + @Override + public void glTransformFace(Vector3 hit, int side) { + PlacementGrid.super.glTransformFace(hit, side); + } + + @Override + public void drawLines() { + GL11.glVertex3d(-0.5, 0, -0.5); + GL11.glVertex3d(-0.5, 0, 0.5); + + GL11.glVertex3d(-0.5, 0, 0.5); + GL11.glVertex3d(0.5, 0, 0.5); + + GL11.glVertex3d(0.5, 0, 0.5); + GL11.glVertex3d(0.5, 0, -0.5); + + GL11.glVertex3d(0.5, 0, -0.5); + GL11.glVertex3d(-0.5, 0, -0.5); + + GL11.glVertex3d(0.25, 0, -0.5); + GL11.glVertex3d(0.25, 0, 0.5); + + GL11.glVertex3d(-0.25, 0, -0.5); + GL11.glVertex3d(-0.25, 0, 0.5); + + GL11.glVertex3d(-0.5, 0, 0.25); + GL11.glVertex3d(0.5, 0, 0.25); + + GL11.glVertex3d(-0.5, 0, -0.25); + GL11.glVertex3d(0.5, 0, -0.25); + } + + @Override + public int getHitSlot(Vector3 hit, int side) { + int side1 = (side + 2) % 6; + int side2 = (side + 4) % 6; + double u = hit.copy().add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes[side1]); + double v = hit.copy().add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes[side2]); + + if (Math.abs(u) < 4 / 16d && Math.abs(v) < 4 / 16d) { + return -1; + } + if (Math.abs(u) > 4 / 16d && Math.abs(v) > 4 / 16d) { + return PartMap.edgeBetween(u > 0 ? side1 : side1 ^ 1, v > 0 ? side2 : side2 ^ 1); + } + + int edgeSide; + if (Math.abs(u) > Math.abs(v)) { + edgeSide = u > 0 ? side1 : side1 ^ 1; + } else { + edgeSide = v > 0 ? side2 : side2 ^ 1; + } + return PartMap.edgeBetween(side ^ 1, edgeSide); + } +} diff --git a/src/main/scala/codechicken/microblock/EdgePlacementGrid.java b/src/main/scala/codechicken/microblock/EdgePlacementGrid.java new file mode 100644 index 0000000..ffa0089 --- /dev/null +++ b/src/main/scala/codechicken/microblock/EdgePlacementGrid.java @@ -0,0 +1,24 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Vector3; + +public final class EdgePlacementGrid { + + private EdgePlacementGrid() {} + + public static void glTransformFace(Vector3 hit, int side) { + EdgePlacementGrid$.MODULE$.glTransformFace(hit, side); + } + + public static void render(Vector3 hit, int side) { + EdgePlacementGrid$.MODULE$.render(hit, side); + } + + public static int getHitSlot(Vector3 hit, int side) { + return EdgePlacementGrid$.MODULE$.getHitSlot(hit, side); + } + + public static void drawLines() { + EdgePlacementGrid$.MODULE$.drawLines(); + } +} diff --git a/src/main/scala/codechicken/microblock/ExecutablePlacement.java b/src/main/scala/codechicken/microblock/ExecutablePlacement.java new file mode 100644 index 0000000..e63aaba --- /dev/null +++ b/src/main/scala/codechicken/microblock/ExecutablePlacement.java @@ -0,0 +1,30 @@ +package codechicken.microblock; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import codechicken.lib.vec.BlockCoord; + +public abstract class ExecutablePlacement { + + private final BlockCoord pos; + private final Microblock part; + + public ExecutablePlacement(BlockCoord pos, Microblock part) { + this.pos = pos; + this.part = part; + } + + public BlockCoord pos() { + return pos; + } + + public Microblock part() { + return part; + } + + public abstract void place(World world, EntityPlayer player, ItemStack item); + + public abstract void consume(World world, EntityPlayer player, ItemStack item); +} diff --git a/src/main/scala/codechicken/microblock/ExpandingPlacement.java b/src/main/scala/codechicken/microblock/ExpandingPlacement.java new file mode 100644 index 0000000..df56d44 --- /dev/null +++ b/src/main/scala/codechicken/microblock/ExpandingPlacement.java @@ -0,0 +1,29 @@ +package codechicken.microblock; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import codechicken.lib.vec.BlockCoord; + +public class ExpandingPlacement extends ExecutablePlacement { + + private final Microblock opart; + + public ExpandingPlacement(BlockCoord pos, Microblock part, Microblock opart) { + super(pos, part); + this.opart = opart; + } + + @Override + public void place(World world, EntityPlayer player, ItemStack item) { + opart.shape_$eq(part().shape()); + opart.tile().notifyPartChange(opart); + opart.sendShapeUpdate(); + } + + @Override + public void consume(World world, EntityPlayer player, ItemStack item) { + item.stackSize -= 1; + } +} diff --git a/src/main/scala/codechicken/microblock/FaceEdgeGrid.java b/src/main/scala/codechicken/microblock/FaceEdgeGrid.java new file mode 100644 index 0000000..b4d115a --- /dev/null +++ b/src/main/scala/codechicken/microblock/FaceEdgeGrid.java @@ -0,0 +1,80 @@ +package codechicken.microblock; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Vector3; + +public class FaceEdgeGrid implements PlacementGrid { + + private final double size; + + public FaceEdgeGrid(double size) { + this.size = size; + } + + @Override + public void render(Vector3 hit, int side) { + PlacementGrid.super.render(hit, side); + } + + @Override + public void glTransformFace(Vector3 hit, int side) { + PlacementGrid.super.glTransformFace(hit, side); + } + + @Override + public void drawLines() { + GL11.glVertex3d(-0.5, 0, -0.5); + GL11.glVertex3d(-0.5, 0, 0.5); + + GL11.glVertex3d(-0.5, 0, 0.5); + GL11.glVertex3d(0.5, 0, 0.5); + + GL11.glVertex3d(0.5, 0, 0.5); + GL11.glVertex3d(0.5, 0, -0.5); + + GL11.glVertex3d(0.5, 0, -0.5); + GL11.glVertex3d(-0.5, 0, -0.5); + + GL11.glVertex3d(0.5, 0, 0.5); + GL11.glVertex3d(size, 0, size); + + GL11.glVertex3d(-0.5, 0, 0.5); + GL11.glVertex3d(-size, 0, size); + + GL11.glVertex3d(0.5, 0, -0.5); + GL11.glVertex3d(size, 0, -size); + + GL11.glVertex3d(-0.5, 0, -0.5); + GL11.glVertex3d(-size, 0, -size); + + GL11.glVertex3d(-size, 0, -size); + GL11.glVertex3d(-size, 0, size); + + GL11.glVertex3d(-size, 0, size); + GL11.glVertex3d(size, 0, size); + + GL11.glVertex3d(size, 0, size); + GL11.glVertex3d(size, 0, -size); + + GL11.glVertex3d(size, 0, -size); + GL11.glVertex3d(-size, 0, -size); + } + + @Override + public int getHitSlot(Vector3 hit, int side) { + int side1 = (side + 2) % 6; + int side2 = (side + 4) % 6; + double u = hit.copy().add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes[side1]); + double v = hit.copy().add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes[side2]); + + if (Math.abs(u) < size && Math.abs(v) < size) { + return side ^ 1; + } + if (Math.abs(u) > Math.abs(v)) { + return u > 0 ? side1 : side1 ^ 1; + } + return v > 0 ? side2 : side2 ^ 1; + } +} diff --git a/src/main/scala/codechicken/microblock/FaceMicroClass$.java b/src/main/scala/codechicken/microblock/FaceMicroClass$.java new file mode 100644 index 0000000..3ab1ca2 --- /dev/null +++ b/src/main/scala/codechicken/microblock/FaceMicroClass$.java @@ -0,0 +1,62 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Transformation; +import codechicken.lib.vec.Vector3; + +public final class FaceMicroClass$ extends CommonMicroClass { + + public static final FaceMicroClass$ MODULE$ = new FaceMicroClass$(); + + private Cuboid6[] aBounds = new Cuboid6[256]; + + private FaceMicroClass$() { + for (int side = 0; side < 6; side++) { + Transformation transform = Rotation.sideRotations[side].at(Vector3.center); + for (int thickness = 1; thickness < 8; thickness++) { + double distance = thickness / 8D; + aBounds[thickness << 4 | side] = new Cuboid6(0, 0, 0, 1, distance, 1).apply(transform); + } + } + } + + public Cuboid6[] aBounds() { + return aBounds; + } + + public void aBounds_$eq(Cuboid6[] bounds) { + aBounds = bounds; + } + + @Override + public String getName() { + return "mcr_face"; + } + + @Override + public int itemSlot() { + return 3; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public Class baseTrait() { + return (Class) FaceMicroblock.class; + } + + @Override + public Class clientTrait() { + return FaceMicroblockClient.class; + } + + @Override + public FacePlacement$ placementProperties() { + return FacePlacement$.MODULE$; + } + + @Override + public float getResistanceFactor() { + return 1; + } +} diff --git a/src/main/scala/codechicken/microblock/FaceMicroClass.java b/src/main/scala/codechicken/microblock/FaceMicroClass.java new file mode 100644 index 0000000..8df7879 --- /dev/null +++ b/src/main/scala/codechicken/microblock/FaceMicroClass.java @@ -0,0 +1,74 @@ +package codechicken.microblock; + +import net.minecraft.nbt.NBTTagCompound; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.vec.Cuboid6; + +public class FaceMicroClass { + + public static int baseTraitId() { + return FaceMicroClass$.MODULE$.baseTraitId(); + } + + public static int clientTraitId() { + return FaceMicroClass$.MODULE$.clientTraitId(); + } + + public static void register() { + FaceMicroClass$.MODULE$.register(); + } + + public static Microblock create(boolean client, int material) { + return FaceMicroClass$.MODULE$.create(client, material); + } + + public static Microblock createPart(String name, MCDataInput packet) { + return FaceMicroClass$.MODULE$.createPart(name, packet); + } + + public static Microblock createPart(String name, NBTTagCompound nbt) { + return FaceMicroClass$.MODULE$.createPart(name, nbt); + } + + public static int getClassId() { + return FaceMicroClass$.MODULE$.getClassId(); + } + + public static void register(int id) { + FaceMicroClass$.MODULE$.register(id); + } + + public static Cuboid6[] aBounds() { + return FaceMicroClass$.MODULE$.aBounds(); + } + + public static void aBounds_$eq(Cuboid6[] bounds) { + FaceMicroClass$.MODULE$.aBounds_$eq(bounds); + } + + public static String getName() { + return FaceMicroClass$.MODULE$.getName(); + } + + public static int itemSlot() { + return FaceMicroClass$.MODULE$.itemSlot(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + public static Class baseTrait() { + return (Class) FaceMicroClass$.MODULE$.baseTrait(); + } + + public static Class clientTrait() { + return FaceMicroClass$.MODULE$.clientTrait(); + } + + public static FacePlacement$ placementProperties() { + return FaceMicroClass$.MODULE$.placementProperties(); + } + + public static float getResistanceFactor() { + return FaceMicroClass$.MODULE$.getResistanceFactor(); + } +} diff --git a/src/main/scala/codechicken/microblock/FaceMicroblock.scala b/src/main/scala/codechicken/microblock/FaceMicroblock.scala deleted file mode 100644 index 7bd8b72..0000000 --- a/src/main/scala/codechicken/microblock/FaceMicroblock.scala +++ /dev/null @@ -1,85 +0,0 @@ -package codechicken.microblock - -import codechicken.lib.vec.Cuboid6 -import codechicken.multipart.TFacePart -import codechicken.lib.vec.Vector3 -import codechicken.lib.vec.Rotation -import Rotation._ -import Vector3._ - -object FacePlacement extends PlacementProperties { - def microClass = FaceMicroClass - - def placementGrid = FacePlacementGrid - - def opposite(slot: Int, side: Int) = slot ^ 1 - - override def expand(slot: Int, side: Int) = sneakOpposite(slot, side) - - override def sneakOpposite(slot: Int, side: Int) = slot == (side ^ 1) -} - -class FaceMicroClass - -object FaceMicroClass extends CommonMicroClass { - var aBounds: Array[Cuboid6] = new Array(256) - - for (s <- 0 until 6) { - val transform = sideRotations(s).at(center) - for (t <- 1 until 8) { - val d = t / 8d - aBounds(t << 4 | s) = new Cuboid6(0, 0, 0, 1, d, 1).apply(transform) - } - } - - def getName = "mcr_face" - - def itemSlot = 3 - - def baseTrait = classOf[FaceMicroblock] - def clientTrait = classOf[FaceMicroblockClient] - - def placementProperties = FacePlacement - - def getResistanceFactor = 1 -} - -trait FaceMicroblockClient extends CommonMicroblockClient { - override def render(pos: Vector3, pass: Int) { - if (pass < 0) - MicroblockRender.renderCuboid(pos, getIMaterial, pass, getBounds, 0) - else if (isTransparent) - MicroblockRender.renderCuboid( - pos, - getIMaterial, - pass, - renderBounds, - renderMask - ) - else { - val mat = getIMaterial - MicroblockRender.renderCuboid( - pos, - mat, - pass, - renderBounds, - renderMask | 1 << getSlot - ) - MicroblockRender.renderCuboid( - pos, - mat, - pass, - Cuboid6.full, - ~(1 << getSlot) - ) - } - } -} - -trait FaceMicroblock extends CommonMicroblock with TFacePart { - def microClass = FaceMicroClass - - def getBounds = FaceMicroClass.aBounds(shape) - - override def solid(side: Int) = getIMaterial.isSolid -} diff --git a/src/main/scala/codechicken/microblock/FaceMicroblockTraitLogic.java b/src/main/scala/codechicken/microblock/FaceMicroblockTraitLogic.java new file mode 100644 index 0000000..58ba502 --- /dev/null +++ b/src/main/scala/codechicken/microblock/FaceMicroblockTraitLogic.java @@ -0,0 +1,37 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; + +/** Face behavior behind the retained Scala inheritance metadata and helper bridges. */ +final class FaceMicroblockTraitLogic { + + private FaceMicroblockTraitLogic() {} + + static void render(FaceMicroblockClient part, Vector3 pos, int pass) { + if (pass < 0) { + MicroblockRender.renderCuboid(pos, ((Microblock) part).getIMaterial(), pass, part.getBounds(), 0); + } else if (((Microblock) part).isTransparent()) { + MicroblockRender.renderCuboid( + pos, + ((Microblock) part).getIMaterial(), + pass, + part.renderBounds(), + part.renderMask()); + } else { + IMicroMaterial material = ((Microblock) part).getIMaterial(); + MicroblockRender + .renderCuboid(pos, material, pass, part.renderBounds(), part.renderMask() | 1 << part.getSlot()); + MicroblockRender.renderCuboid(pos, material, pass, Cuboid6.full, ~(1 << part.getSlot())); + } + } + + static Cuboid6 getBounds(FaceMicroblock part) { + return FaceMicroClass.aBounds()[((Microblock) part).shape()]; + } + + static boolean solid(FaceMicroblock part, int side) { + return ((Microblock) part).getIMaterial().isSolid(); + } +} diff --git a/src/main/scala/codechicken/microblock/FaceMicroblockTraits.scala b/src/main/scala/codechicken/microblock/FaceMicroblockTraits.scala new file mode 100644 index 0000000..f40df03 --- /dev/null +++ b/src/main/scala/codechicken/microblock/FaceMicroblockTraits.scala @@ -0,0 +1,18 @@ +package codechicken.microblock + +import codechicken.lib.vec.Vector3 +import codechicken.multipart.TFacePart + +// Retain Scala inheritance metadata and helper bridges for generated and external mixins. +trait FaceMicroblockClient extends CommonMicroblockClient { + override def render(pos: Vector3, pass: Int) = + FaceMicroblockTraitLogic.render(this, pos, pass) +} + +trait FaceMicroblock extends CommonMicroblock with TFacePart { + def microClass = FaceMicroClass$.MODULE$ + + def getBounds = FaceMicroblockTraitLogic.getBounds(this) + + override def solid(side: Int) = FaceMicroblockTraitLogic.solid(this, side) +} diff --git a/src/main/scala/codechicken/microblock/FacePlacement$.java b/src/main/scala/codechicken/microblock/FacePlacement$.java new file mode 100644 index 0000000..130d34e --- /dev/null +++ b/src/main/scala/codechicken/microblock/FacePlacement$.java @@ -0,0 +1,33 @@ +package codechicken.microblock; + +public final class FacePlacement$ extends PlacementProperties { + + public static final FacePlacement$ MODULE$ = new FacePlacement$(); + + private FacePlacement$() {} + + @Override + public FaceMicroClass$ microClass() { + return FaceMicroClass$.MODULE$; + } + + @Override + public FacePlacementGrid$ placementGrid() { + return FacePlacementGrid$.MODULE$; + } + + @Override + public int opposite(int slot, int side) { + return slot ^ 1; + } + + @Override + public boolean expand(int slot, int side) { + return sneakOpposite(slot, side); + } + + @Override + public boolean sneakOpposite(int slot, int side) { + return slot == (side ^ 1); + } +} diff --git a/src/main/scala/codechicken/microblock/FacePlacement.java b/src/main/scala/codechicken/microblock/FacePlacement.java new file mode 100644 index 0000000..e5e3cfd --- /dev/null +++ b/src/main/scala/codechicken/microblock/FacePlacement.java @@ -0,0 +1,30 @@ +package codechicken.microblock; + +public final class FacePlacement { + + private FacePlacement() {} + + public static ExecutablePlacement customPlacement(MicroblockPlacement placement) { + return FacePlacement$.MODULE$.customPlacement(placement); + } + + public static FaceMicroClass$ microClass() { + return FacePlacement$.MODULE$.microClass(); + } + + public static FacePlacementGrid$ placementGrid() { + return FacePlacement$.MODULE$.placementGrid(); + } + + public static int opposite(int slot, int side) { + return FacePlacement$.MODULE$.opposite(slot, side); + } + + public static boolean expand(int slot, int side) { + return FacePlacement$.MODULE$.expand(slot, side); + } + + public static boolean sneakOpposite(int slot, int side) { + return FacePlacement$.MODULE$.sneakOpposite(slot, side); + } +} diff --git a/src/main/scala/codechicken/microblock/FacePlacementGrid$.java b/src/main/scala/codechicken/microblock/FacePlacementGrid$.java new file mode 100644 index 0000000..b9689d3 --- /dev/null +++ b/src/main/scala/codechicken/microblock/FacePlacementGrid$.java @@ -0,0 +1,10 @@ +package codechicken.microblock; + +public final class FacePlacementGrid$ extends FaceEdgeGrid { + + public static final FacePlacementGrid$ MODULE$ = new FacePlacementGrid$(); + + private FacePlacementGrid$() { + super(1 / 4d); + } +} diff --git a/src/main/scala/codechicken/microblock/FacePlacementGrid.java b/src/main/scala/codechicken/microblock/FacePlacementGrid.java new file mode 100644 index 0000000..04dd5a7 --- /dev/null +++ b/src/main/scala/codechicken/microblock/FacePlacementGrid.java @@ -0,0 +1,24 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Vector3; + +public final class FacePlacementGrid { + + private FacePlacementGrid() {} + + public static void glTransformFace(Vector3 hit, int side) { + FacePlacementGrid$.MODULE$.glTransformFace(hit, side); + } + + public static void render(Vector3 hit, int side) { + FacePlacementGrid$.MODULE$.render(hit, side); + } + + public static int getHitSlot(Vector3 hit, int side) { + return FacePlacementGrid$.MODULE$.getHitSlot(hit, side); + } + + public static void drawLines() { + FacePlacementGrid$.MODULE$.drawLines(); + } +} diff --git a/src/main/scala/codechicken/microblock/GrassMicroMaterial.java b/src/main/scala/codechicken/microblock/GrassMicroMaterial.java new file mode 100644 index 0000000..c2c459b --- /dev/null +++ b/src/main/scala/codechicken/microblock/GrassMicroMaterial.java @@ -0,0 +1,71 @@ +package codechicken.microblock; + +import net.minecraft.block.BlockGrass; +import net.minecraft.init.Blocks; +import net.minecraft.world.IBlockAccess; + +import codechicken.lib.render.BlockRenderer.BlockFace; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.EntityDigIconFX; +import codechicken.lib.render.uv.IconTransformation; +import codechicken.lib.render.uv.UVTransformation; +import codechicken.lib.render.uv.UVTranslation; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class GrassMicroMaterial extends BlockMicroMaterial { + + private IconTransformation sideIconT; + + public GrassMicroMaterial() { + super(Blocks.grass, 0); + } + + public IconTransformation sideIconT() { + return sideIconT; + } + + public void sideIconT_$eq(IconTransformation sideIconT) { + this.sideIconT = sideIconT; + } + + @Override + public void loadIcons() { + super.loadIcons(); + sideIconT_$eq(new IconTransformation(BlockGrass.getIconSideOverlay())); + } + + /** + * Only grass_top is greyscale and needs the biome tint. Side 0 is dirt and sides 2-5 are grass_side, both already + * coloured, so tinting them would double up. Matches the carve-out in vanilla EntityDiggingFX. + */ + @Override + @SideOnly(Side.CLIENT) + public int getBreakingColour(int side, IBlockAccess world, int x, int y, int z) { + return side == 1 ? super.getBreakingColour(side, world, x, y, z) : EntityDigIconFX.NO_TINT; + } + + @Override + public void renderMicroFace(Vector3 pos, int pass, Cuboid6 bounds) { + BlockFace face = (BlockFace) CCRenderState.instance().model; + if (pass != -1) { + face.computeLightCoords(); + } + + if (face.side == 1) { + MaterialRenderHelper$.MODULE$.start(pos, pass, icont()).blockColour(getColour(pass)).lighting() + .blockAndMeta(block(), meta()).render(); + } else { + MaterialRenderHelper$.MODULE$.start(pos, pass, icont()).lighting().render(); + } + + if (face.side > 1) { + UVTransformation overlay = (UVTransformation) new UVTranslation(0, bounds.max.y - 1) + .$plus$plus(sideIconT()); + MaterialRenderHelper$.MODULE$.start(pos, pass, overlay).blockColour(getColour(pass)).lighting() + .blockAndMeta(block(), meta()).render(); + } + } +} diff --git a/src/main/scala/codechicken/microblock/GrassMicroMaterial.scala b/src/main/scala/codechicken/microblock/GrassMicroMaterial.scala deleted file mode 100644 index ec77d5b..0000000 --- a/src/main/scala/codechicken/microblock/GrassMicroMaterial.scala +++ /dev/null @@ -1,63 +0,0 @@ -package codechicken.microblock - -import codechicken.lib.vec.{Cuboid6, Vector3} -import net.minecraft.block.Block -import codechicken.lib.render.CCRenderState -import net.minecraft.block.BlockGrass -import net.minecraft.init.Blocks -import codechicken.lib.render.uv.{UVTranslation, IconTransformation} -import codechicken.lib.render.BlockRenderer.BlockFace - -class GrassMicroMaterial extends BlockMicroMaterial(Blocks.grass, 0) { - var sideIconT: IconTransformation = _ - - override def loadIcons() { - super.loadIcons() - sideIconT = new IconTransformation(BlockGrass.getIconSideOverlay) - } - - override def renderMicroFace(pos: Vector3, pass: Int, bounds: Cuboid6) { - val face = CCRenderState.instance().model.asInstanceOf[BlockFace] - if (pass != -1) - face.computeLightCoords() - - if (face.side == 1) - MaterialRenderHelper - .start(pos, pass, icont) - .blockColour(getColour(pass)) - .lighting() - .blockAndMeta(block, meta) - .render() - else - MaterialRenderHelper.start(pos, pass, icont).lighting().render() - - if (face.side > 1) - MaterialRenderHelper - .start(pos, pass, new UVTranslation(0, bounds.max.y - 1) ++ sideIconT) - .blockColour(getColour(pass)) - .lighting() - .blockAndMeta(block, meta) - .render() - } -} - -class TopMicroMaterial($block: Block, $meta: Int = 0) - extends BlockMicroMaterial($block, $meta) { - override def renderMicroFace(pos: Vector3, pass: Int, bounds: Cuboid6) { - val face = CCRenderState.instance().model.asInstanceOf[BlockFace] - if (face.side <= 1) - MaterialRenderHelper - .start(pos, pass, icont) - .blockColour(getColour(pass)) - .lighting() - .blockAndMeta(block, meta) - .render() - else - MaterialRenderHelper - .start(pos, pass, new UVTranslation(0, bounds.max.y - 1) ++ icont) - .blockColour(getColour(pass)) - .lighting() - .blockAndMeta(block, meta) - .render() - } -} diff --git a/src/main/scala/codechicken/microblock/HollowMicroClass$.java b/src/main/scala/codechicken/microblock/HollowMicroClass$.java new file mode 100644 index 0000000..6712ab5 --- /dev/null +++ b/src/main/scala/codechicken/microblock/HollowMicroClass$.java @@ -0,0 +1,88 @@ +package codechicken.microblock; + +import java.util.Arrays; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Transformation; +import codechicken.lib.vec.Vector3; +import scala.collection.JavaConversions; +import scala.collection.Seq; + +public final class HollowMicroClass$ extends CommonMicroClass { + + public static final HollowMicroClass$ MODULE$ = new HollowMicroClass$(); + + private Seq[] pBoxes; + private Cuboid6[] occBounds; + + @SuppressWarnings("unchecked") + private HollowMicroClass$() { + pBoxes = (Seq[]) new Seq[256]; + occBounds = new Cuboid6[256]; + for (int side = 0; side < 6; side++) { + Transformation transform = Rotation.sideRotations[side].at(Vector3.center); + for (int size = 1; size < 8; size++) { + double thickness = size / 8D; + double width = 1 / 8D; + int shape = size << 4 | side; + pBoxes[shape] = JavaConversions + .asScalaBuffer( + Arrays.asList( + new Cuboid6(0, 0, 0, width, thickness, 1).apply(transform), + new Cuboid6(1 - width, 0, 0, 1, thickness, 1).apply(transform), + new Cuboid6(width, 0, 0, 1 - width, thickness, width).apply(transform), + new Cuboid6(width, 0, 1 - width, 1 - width, thickness, 1).apply(transform))) + .toList(); + occBounds[shape] = new Cuboid6(1 / 8D, 0, 1 / 8D, 7 / 8D, thickness, 7 / 8D).apply(transform); + } + } + } + + public Seq[] pBoxes() { + return pBoxes; + } + + public void pBoxes_$eq(Seq[] bounds) { + pBoxes = bounds; + } + + public Cuboid6[] occBounds() { + return occBounds; + } + + public void occBounds_$eq(Cuboid6[] bounds) { + occBounds = bounds; + } + + @Override + public String getName() { + return "mcr_hllw"; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public Class baseTrait() { + return (Class) HollowMicroblock.class; + } + + @Override + public Class clientTrait() { + return HollowMicroblockClient.class; + } + + @Override + public int itemSlot() { + return 3; + } + + @Override + public HollowPlacement$ placementProperties() { + return HollowPlacement$.MODULE$; + } + + @Override + public float getResistanceFactor() { + return 1; + } +} diff --git a/src/main/scala/codechicken/microblock/HollowMicroClass.java b/src/main/scala/codechicken/microblock/HollowMicroClass.java new file mode 100644 index 0000000..2ed1497 --- /dev/null +++ b/src/main/scala/codechicken/microblock/HollowMicroClass.java @@ -0,0 +1,85 @@ +package codechicken.microblock; + +import net.minecraft.nbt.NBTTagCompound; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.vec.Cuboid6; +import scala.collection.Seq; + +public final class HollowMicroClass { + + private HollowMicroClass() {} + + public static int baseTraitId() { + return HollowMicroClass$.MODULE$.baseTraitId(); + } + + public static int clientTraitId() { + return HollowMicroClass$.MODULE$.clientTraitId(); + } + + public static void register() { + HollowMicroClass$.MODULE$.register(); + } + + public static Microblock create(boolean client, int material) { + return HollowMicroClass$.MODULE$.create(client, material); + } + + public static Microblock createPart(String name, MCDataInput packet) { + return HollowMicroClass$.MODULE$.createPart(name, packet); + } + + public static Microblock createPart(String name, NBTTagCompound nbt) { + return HollowMicroClass$.MODULE$.createPart(name, nbt); + } + + public static int getClassId() { + return HollowMicroClass$.MODULE$.getClassId(); + } + + public static void register(int id) { + HollowMicroClass$.MODULE$.register(id); + } + + public static Seq[] pBoxes() { + return HollowMicroClass$.MODULE$.pBoxes(); + } + + public static void pBoxes_$eq(Seq[] bounds) { + HollowMicroClass$.MODULE$.pBoxes_$eq(bounds); + } + + public static Cuboid6[] occBounds() { + return HollowMicroClass$.MODULE$.occBounds(); + } + + public static void occBounds_$eq(Cuboid6[] bounds) { + HollowMicroClass$.MODULE$.occBounds_$eq(bounds); + } + + public static String getName() { + return HollowMicroClass$.MODULE$.getName(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + public static Class baseTrait() { + return (Class) HollowMicroClass$.MODULE$.baseTrait(); + } + + public static Class clientTrait() { + return HollowMicroClass$.MODULE$.clientTrait(); + } + + public static int itemSlot() { + return HollowMicroClass$.MODULE$.itemSlot(); + } + + public static HollowPlacement$ placementProperties() { + return HollowMicroClass$.MODULE$.placementProperties(); + } + + public static float getResistanceFactor() { + return HollowMicroClass$.MODULE$.getResistanceFactor(); + } +} diff --git a/src/main/scala/codechicken/microblock/HollowMicroblock.scala b/src/main/scala/codechicken/microblock/HollowMicroblock.scala deleted file mode 100644 index 716bd94..0000000 --- a/src/main/scala/codechicken/microblock/HollowMicroblock.scala +++ /dev/null @@ -1,416 +0,0 @@ -package codechicken.microblock - -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.util.MovingObjectPosition -import codechicken.multipart.TFacePart -import codechicken.lib.vec.{Translation, Cuboid6, Rotation, Vector3} -import codechicken.multipart.TNormalOcclusion -import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial -import net.minecraft.client.renderer.RenderBlocks -import codechicken.lib.render.{BlockRenderer, RenderUtils, CCRenderState} -import scala.collection.JavaConversions._ -import Rotation._ -import Vector3._ -import codechicken.lib.raytracer.IndexedCuboid6 -import org.lwjgl.opengl.GL11 -import codechicken.lib.render.uv.IconTransformation - -object HollowPlacement extends PlacementProperties { - object HollowPlacementGrid extends FaceEdgeGrid(3 / 8d) - - def microClass = HollowMicroClass - - def placementGrid = HollowPlacementGrid - - def opposite(slot: Int, side: Int) = slot ^ 1 - - override def expand(slot: Int, side: Int) = sneakOpposite(slot, side) - - override def sneakOpposite(slot: Int, side: Int) = slot == (side ^ 1) -} - -object HollowMicroClass extends CommonMicroClass { - var pBoxes: Array[Seq[Cuboid6]] = new Array(256) - var occBounds: Array[Cuboid6] = new Array(256) - for (s <- 0 until 6) { - val transform = sideRotations(s).at(center) - for (t <- 1 until 8) { - val d = t / 8d - val w1 = 1 / 8d - val w2 = 3 / 16d - pBoxes(t << 4 | s) = Seq( - new Cuboid6(0, 0, 0, w1, d, 1), - new Cuboid6(1 - w1, 0, 0, 1, d, 1), - new Cuboid6(w1, 0, 0, 1 - w1, d, w1), - new Cuboid6(w1, 0, 1 - w1, 1 - w1, d, 1) - ) - .map(_.apply(transform)) - occBounds(t << 4 | s) = - new Cuboid6(1 / 8d, 0, 1 / 8d, 7 / 8d, d, 7 / 8d).apply(transform) - } - } - - def getName = "mcr_hllw" - - def baseTrait = classOf[HollowMicroblock] - def clientTrait = classOf[HollowMicroblockClient] - - def itemSlot = 3 - - def placementProperties = HollowPlacement - - def getResistanceFactor = 1 -} - -trait HollowMicroblockClient - extends HollowMicroblock - with CommonMicroblockClient { - renderMask |= 8 << 8 - - override def recalcBounds() { - super.recalcBounds() - renderMask = renderMask & 0xff | getHollowSize << 8 - } - - override def drawBreaking(renderBlocks: RenderBlocks) { - val state = CCRenderState.instance - state.resetInstance() - state.setPipelineInstance( - new Translation(x, y, z), - new IconTransformation(renderBlocks.overrideBlockTexture) - ) - renderHollow( - null, - 0, - getBounds, - 0, - false, - ( - pos: Vector3, - mat: IMicroMaterial, - pass: Int, - c: Cuboid6, - sideMask: Int - ) => BlockRenderer.renderCuboid(c, sideMask) - ) - } - - override def render(pos: Vector3, pass: Int) { - if (pass == -1) - renderHollow( - pos, - pass, - getBounds, - 0, - false, - MicroblockRender.renderCuboid - ) - else if (isTransparent) - renderHollow( - pos, - pass, - renderBounds, - renderMask, - false, - MicroblockRender.renderCuboid - ) - else { - renderHollow( - pos, - pass, - renderBounds, - renderMask | 1 << getSlot, - false, - MicroblockRender.renderCuboid - ) - renderHollow( - pos, - pass, - Cuboid6.full, - ~(1 << getSlot), - true, - MicroblockRender.renderCuboid - ) - } - } - - def renderHollow( - pos: Vector3, - pass: Int, - c: Cuboid6, - sideMask: Int, - face: Boolean, - f: (Vector3, IMicroMaterial, Int, Cuboid6, Int) => Unit - ) { - val mat = getIMaterial - val size = renderMask >> 8 - val d1 = 0.5 - size / 32d - val d2 = 0.5 + size / 32d - val x1 = c.min.x - val x2 = c.max.x - val y1 = c.min.y - val y2 = c.max.y - val z1 = c.min.z - val z2 = c.max.z - - var iMask = 0 - getSlot match { - case 0 | 1 => - if (face) - iMask = 0x3c - f( - pos, - mat, - pass, - new Cuboid6(d1, y1, d2, d2, y2, z2), - 0x3b | iMask - ) // -z internal - f( - pos, - mat, - pass, - new Cuboid6(d1, y1, z1, d2, y2, d1), - 0x37 | iMask - ) // +z internal - - f( - pos, - mat, - pass, - new Cuboid6(d2, y1, d1, x2, y2, d2), - sideMask & 0x23 | 0xc | iMask - ) // -x internal -y+y+x external - f( - pos, - mat, - pass, - new Cuboid6(x1, y1, d1, d1, y2, d2), - sideMask & 0x13 | 0xc | iMask - ) // +x internal -y+y-x external - - f( - pos, - mat, - pass, - new Cuboid6(x1, y1, d2, x2, y2, z2), - sideMask & 0x3b | 4 | iMask - ) // -y+y+z-x+x external - f( - pos, - mat, - pass, - new Cuboid6(x1, y1, z1, x2, y2, d1), - sideMask & 0x37 | 8 | iMask - ) // -y+y-z-x+x external - case 2 | 3 => - if (face) - iMask = 0x33 - f( - pos, - mat, - pass, - new Cuboid6(d2, d1, z1, x2, d2, z2), - 0x2f | iMask - ) // -x internal - f( - pos, - mat, - pass, - new Cuboid6(x1, d1, z1, d1, d2, z2), - 0x1f | iMask - ) // +x internal - - f( - pos, - mat, - pass, - new Cuboid6(d1, d2, z1, d2, y2, z2), - sideMask & 0xe | 0x30 | iMask - ) // -y internal -z+z+y external - f( - pos, - mat, - pass, - new Cuboid6(d1, y1, z1, d2, d1, z2), - sideMask & 0xd | 0x30 | iMask - ) // +y internal -z+z-y external - - f( - pos, - mat, - pass, - new Cuboid6(d2, y1, z1, x2, y2, z2), - sideMask & 0x2f | 0x10 | iMask - ) // -z+z+x-y+y external - f( - pos, - mat, - pass, - new Cuboid6(x1, y1, z1, d1, y2, z2), - sideMask & 0x1f | 0x20 | iMask - ) // -z+z-x-y+y external - case 4 | 5 => - if (face) - iMask = 0xf - f( - pos, - mat, - pass, - new Cuboid6(x1, d2, d1, x2, y2, d2), - 0x3e | iMask - ) // -y internal - f( - pos, - mat, - pass, - new Cuboid6(x1, y1, d1, x2, d1, d2), - 0x3d | iMask - ) // +y internal - - f( - pos, - mat, - pass, - new Cuboid6(x1, d1, d2, x2, d2, z2), - sideMask & 0x38 | 3 | iMask - ) // -z internal -x+x+z external - f( - pos, - mat, - pass, - new Cuboid6(x1, d1, z1, x2, d2, d1), - sideMask & 0x34 | 3 | iMask - ) // +z internal -x+x-z external - - f( - pos, - mat, - pass, - new Cuboid6(x1, d2, z1, x2, y2, z2), - sideMask & 0x3e | 1 | iMask - ) // -x+x+y-z+z external - f( - pos, - mat, - pass, - new Cuboid6(x1, y1, z1, x2, d1, z2), - sideMask & 0x3d | 2 | iMask - ) // -x+x-y-z+z external - } - } - - override def drawHighlight( - hit: MovingObjectPosition, - player: EntityPlayer, - frame: Float - ): Boolean = { - val size = getHollowSize - val d1 = 0.5 - size / 32d - val d2 = 0.5 + size / 32d - val t = (shape >> 4) / 8d - - import GL11._ - glEnable(GL_BLEND) - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) - glDisable(GL_TEXTURE_2D) - glColor4f(0, 0, 0, 0.4f) - glLineWidth(2) - glDepthMask(false) - glPushMatrix() - RenderUtils.translateToWorldCoords(player, frame) - glTranslated(x, y, z) - sideRotations(shape & 0xf).at(center).glApply() - - RenderUtils.drawCuboidOutline(new Cuboid6(0, 0, 0, 1, t, 1).expand(0.001)) - RenderUtils.drawCuboidOutline( - new Cuboid6(d1, 0, d1, d2, t, d2).expand(-0.001) - ) - glPopMatrix() - glDepthMask(true) - glEnable(GL_TEXTURE_2D) - glDisable(GL_BLEND) - return true - } -} - -trait HollowMicroblock - extends CommonMicroblock - with TFacePart - with TNormalOcclusion { - def microClass = HollowMicroClass - - def getBounds: Cuboid6 = FaceMicroClass.aBounds(shape) - - override def getPartialOcclusionBoxes = HollowMicroClass.pBoxes(shape) - - def getHollowSize = tile match { - case null => 8 - case _ => - tile.partMap(6) match { - case part: ISidedHollowConnect => part.getHollowSize(getSlot) - case _ => 8 - } - } - - def getOcclusionBoxes = { - val size = getHollowSize - val c = HollowMicroClass.occBounds(shape) - val d1 = 0.5 - size / 32d - val d2 = 0.5 + size / 32d - val x1 = c.min.x - val x2 = c.max.x - val y1 = c.min.y - val y2 = c.max.y - val z1 = c.min.z - val z2 = c.max.z - - getSlot match { - case 0 | 1 => - Seq( - new Cuboid6(d2, y1, d1, x2, y2, d2), - new Cuboid6(x1, y1, d1, d1, y2, d2), - new Cuboid6(x1, y1, d2, x2, y2, z2), - new Cuboid6(x1, y1, z1, x2, y2, d1) - ) - case 2 | 3 => - Seq( - new Cuboid6(d1, d2, z1, d2, y2, z2), - new Cuboid6(d1, y1, z1, d2, d1, z2), - new Cuboid6(d2, y1, z1, x2, y2, z2), - new Cuboid6(x1, y1, z1, d1, y2, z2) - ) - case 4 | 5 => - Seq( - new Cuboid6(x1, d1, d2, x2, d2, z2), - new Cuboid6(x1, d1, z1, x2, d2, d1), - new Cuboid6(x1, d2, z1, x2, y2, z2), - new Cuboid6(x1, y1, z1, x2, d1, z2) - ) - } - } - - override def getCollisionBoxes = { - val size = getHollowSize - val d1 = 0.5 - size / 32d - val d2 = 0.5 + size / 32d - val t = (shape >> 4) / 8d - - val tr = sideRotations(shape & 0xf).at(center) - Seq( - new Cuboid6(0, 0, 0, 1, t, d1), - new Cuboid6(0, 0, d2, 1, t, 1), - new Cuboid6(0, 0, d1, d1, t, d2), - new Cuboid6(d2, 0, d1, 1, t, d2) - ) - .map(c => c.apply(tr)) - } - - override def getSubParts = - getCollisionBoxes.map(c => new IndexedCuboid6(0, c)) - - override def allowCompleteOcclusion = true - - override def solid(side: Int) = false - - override def redstoneConductionMap = 0x10 -} diff --git a/src/main/scala/codechicken/microblock/HollowMicroblockClientLogic.java b/src/main/scala/codechicken/microblock/HollowMicroblockClientLogic.java new file mode 100644 index 0000000..10fad02 --- /dev/null +++ b/src/main/scala/codechicken/microblock/HollowMicroblockClientLogic.java @@ -0,0 +1,180 @@ +package codechicken.microblock; + +import static org.lwjgl.opengl.GL11.*; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MovingObjectPosition; + +import codechicken.lib.render.BlockRenderer; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.RenderUtils; +import codechicken.lib.render.uv.IconTransformation; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Translation; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.multipart.TMultiPart; +import scala.Function5; +import scala.MatchError; +import scala.runtime.AbstractFunction5; +import scala.runtime.BoxedUnit; +import scala.runtime.BoxesRunTime; + +/** Client rendering behind the retained Scala inheritance metadata, initializer and super bridge. */ +final class HollowMicroblockClientLogic { + + private HollowMicroblockClientLogic() {} + + static void updateRenderMask(HollowMicroblockClient part) { + part.renderMask_$eq(part.renderMask() & 0xff | part.getHollowSize() << 8); + } + + static void drawBreaking(HollowMicroblockClient part, RenderBlocks renderBlocks) { + CCRenderState state = CCRenderState.instance(); + state.resetInstance(); + TMultiPart base = (TMultiPart) part; + state.setPipelineInstance( + new Translation(base.x(), base.y(), base.z()), + new IconTransformation(renderBlocks.overrideBlockTexture)); + part.renderHollow(null, 0, part.getBounds(), 0, false, new BreakingCuboid()); + } + + static void render(HollowMicroblockClient part, Vector3 pos, int pass) { + if (pass == -1) { + part.renderHollow(pos, pass, part.getBounds(), 0, false, new RenderCuboid()); + } else if (((Microblock) part).isTransparent()) { + part.renderHollow(pos, pass, part.renderBounds(), part.renderMask(), false, new RenderCuboid()); + } else { + part.renderHollow( + pos, + pass, + part.renderBounds(), + part.renderMask() | 1 << part.getSlot(), + false, + new RenderCuboid()); + part.renderHollow(pos, pass, Cuboid6.full, ~(1 << part.getSlot()), true, new RenderCuboid()); + } + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + static void renderHollow(HollowMicroblockClient part, Vector3 pos, int pass, Cuboid6 c, int sideMask, boolean face, + Function5 callback) { + Function5 f = callback; + IMicroMaterial material = ((Microblock) part).getIMaterial(); + int size = part.renderMask() >> 8; + double d1 = 0.5 - size / 32D; + double d2 = 0.5 + size / 32D; + double x1 = c.min.x; + double x2 = c.max.x; + double y1 = c.min.y; + double y2 = c.max.y; + double z1 = c.min.z; + double z2 = c.max.z; + int slot = part.getSlot(); + int internalMask = 0; + switch (slot) { + case 0: + case 1: + if (face) internalMask = 0x3c; + f.apply(pos, material, pass, new Cuboid6(d1, y1, d2, d2, y2, z2), 0x3b | internalMask); + f.apply(pos, material, pass, new Cuboid6(d1, y1, z1, d2, y2, d1), 0x37 | internalMask); + f.apply(pos, material, pass, new Cuboid6(d2, y1, d1, x2, y2, d2), sideMask & 0x23 | 0xc | internalMask); + f.apply(pos, material, pass, new Cuboid6(x1, y1, d1, d1, y2, d2), sideMask & 0x13 | 0xc | internalMask); + f.apply(pos, material, pass, new Cuboid6(x1, y1, d2, x2, y2, z2), sideMask & 0x3b | 4 | internalMask); + f.apply(pos, material, pass, new Cuboid6(x1, y1, z1, x2, y2, d1), sideMask & 0x37 | 8 | internalMask); + break; + case 2: + case 3: + if (face) internalMask = 0x33; + f.apply(pos, material, pass, new Cuboid6(d2, d1, z1, x2, d2, z2), 0x2f | internalMask); + f.apply(pos, material, pass, new Cuboid6(x1, d1, z1, d1, d2, z2), 0x1f | internalMask); + f.apply(pos, material, pass, new Cuboid6(d1, d2, z1, d2, y2, z2), sideMask & 0xe | 0x30 | internalMask); + f.apply(pos, material, pass, new Cuboid6(d1, y1, z1, d2, d1, z2), sideMask & 0xd | 0x30 | internalMask); + f.apply( + pos, + material, + pass, + new Cuboid6(d2, y1, z1, x2, y2, z2), + sideMask & 0x2f | 0x10 | internalMask); + f.apply( + pos, + material, + pass, + new Cuboid6(x1, y1, z1, d1, y2, z2), + sideMask & 0x1f | 0x20 | internalMask); + break; + case 4: + case 5: + if (face) internalMask = 0xf; + f.apply(pos, material, pass, new Cuboid6(x1, d2, d1, x2, y2, d2), 0x3e | internalMask); + f.apply(pos, material, pass, new Cuboid6(x1, y1, d1, x2, d1, d2), 0x3d | internalMask); + f.apply(pos, material, pass, new Cuboid6(x1, d1, d2, x2, d2, z2), sideMask & 0x38 | 3 | internalMask); + f.apply(pos, material, pass, new Cuboid6(x1, d1, z1, x2, d2, d1), sideMask & 0x34 | 3 | internalMask); + f.apply(pos, material, pass, new Cuboid6(x1, d2, z1, x2, y2, z2), sideMask & 0x3e | 1 | internalMask); + f.apply(pos, material, pass, new Cuboid6(x1, y1, z1, x2, d1, z2), sideMask & 0x3d | 2 | internalMask); + break; + default: + throw new MatchError(slot); + } + } + + static boolean drawHighlight(HollowMicroblockClient part, MovingObjectPosition hit, EntityPlayer player, + float frame) { + int size = part.getHollowSize(); + double d1 = 0.5 - size / 32D; + double d2 = 0.5 + size / 32D; + double thickness = (((Microblock) part).shape() >> 4) / 8D; + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glDisable(GL_TEXTURE_2D); + glColor4f(0, 0, 0, 0.4F); + glLineWidth(2); + glDepthMask(false); + glPushMatrix(); + RenderUtils.translateToWorldCoords(player, frame); + TMultiPart base = (TMultiPart) part; + glTranslated(base.x(), base.y(), base.z()); + Rotation.sideRotations[((Microblock) part).shape() & 15].at(Vector3.center).glApply(); + RenderUtils.drawCuboidOutline(new Cuboid6(0, 0, 0, 1, thickness, 1).expand(0.001)); + RenderUtils.drawCuboidOutline(new Cuboid6(d1, 0, d1, d2, thickness, d2).expand(-0.001)); + glPopMatrix(); + glDepthMask(true); + glEnable(GL_TEXTURE_2D); + glDisable(GL_BLEND); + return true; + } + + private static final class RenderCuboid + extends AbstractFunction5 + implements scala.Serializable { + + private static final long serialVersionUID = 0L; + + RenderCuboid() {} + + @Override + public BoxedUnit apply(Vector3 pos, IMicroMaterial material, Object pass, Cuboid6 box, Object mask) { + MicroblockRender + .renderCuboid(pos, material, BoxesRunTime.unboxToInt(pass), box, BoxesRunTime.unboxToInt(mask)); + return BoxedUnit.UNIT; + } + } + + private static final class BreakingCuboid + extends AbstractFunction5 + implements scala.Serializable { + + private static final long serialVersionUID = 0L; + + BreakingCuboid() {} + + @Override + public BoxedUnit apply(Vector3 pos, IMicroMaterial material, Object pass, Cuboid6 box, Object mask) { + BoxesRunTime.unboxToInt(pass); + BlockRenderer.renderCuboid(box, BoxesRunTime.unboxToInt(mask)); + return BoxedUnit.UNIT; + } + } +} diff --git a/src/main/scala/codechicken/microblock/HollowMicroblockTraitLogic.java b/src/main/scala/codechicken/microblock/HollowMicroblockTraitLogic.java new file mode 100644 index 0000000..10a41ca --- /dev/null +++ b/src/main/scala/codechicken/microblock/HollowMicroblockTraitLogic.java @@ -0,0 +1,139 @@ +package codechicken.microblock; + +import java.util.List; + +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Transformation; +import codechicken.lib.vec.Vector3; +import codechicken.multipart.NormalOcclusionTest; +import codechicken.multipart.TMultiPart; +import scala.MatchError; +import scala.Predef$; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.Seq$; +import scala.collection.TraversableLike; +import scala.collection.mutable.Buffer; +import scala.collection.mutable.Buffer$; +import scala.runtime.AbstractFunction1; + +/** Hollow-cover behavior behind the retained Scala inheritance metadata and super-dispatch bridge. */ +final class HollowMicroblockTraitLogic { + + private HollowMicroblockTraitLogic() {} + + static Cuboid6 getBounds(HollowMicroblock part) { + return FaceMicroClass.aBounds()[((Microblock) part).shape()]; + } + + static boolean normalOcclusionTest(HollowMicroblock part, TMultiPart next) { + return NormalOcclusionTest.apply(part, next); + } + + static List getPartialOcclusionBoxes(HollowMicroblock part) { + return JavaConversions.seqAsJavaList(HollowMicroClass$.MODULE$.pBoxes()[((Microblock) part).shape()]); + } + + static int getHollowSize(HollowMicroblock part) { + if (((TMultiPart) part).tile() == null) { + return 8; + } + // The second virtual lookup is observable when a part overrides tile(). + TMultiPart center = ((TMultiPart) part).tile().partMap(6); + if (center instanceof ISidedHollowConnect) { + return ((ISidedHollowConnect) center).getHollowSize(part.getSlot()); + } + return 8; + } + + static Iterable getOcclusionBoxes(HollowMicroblock part) { + int size = part.getHollowSize(); + Cuboid6 c = HollowMicroClass$.MODULE$.occBounds()[((Microblock) part).shape()]; + double d1 = 0.5 - size / 32D; + double d2 = 0.5 + size / 32D; + double x1 = c.min.x; + double x2 = c.max.x; + double y1 = c.min.y; + double y2 = c.max.y; + double z1 = c.min.z; + double z2 = c.max.z; + int slot = part.getSlot(); + Cuboid6[] boxes; + switch (slot) { + case 0: + case 1: + boxes = new Cuboid6[] { new Cuboid6(d2, y1, d1, x2, y2, d2), new Cuboid6(x1, y1, d1, d1, y2, d2), + new Cuboid6(x1, y1, d2, x2, y2, z2), new Cuboid6(x1, y1, z1, x2, y2, d1) }; + break; + case 2: + case 3: + boxes = new Cuboid6[] { new Cuboid6(d1, d2, z1, d2, y2, z2), new Cuboid6(d1, y1, z1, d2, d1, z2), + new Cuboid6(d2, y1, z1, x2, y2, z2), new Cuboid6(x1, y1, z1, d1, y2, z2) }; + break; + case 4: + case 5: + boxes = new Cuboid6[] { new Cuboid6(x1, d1, d2, x2, d2, z2), new Cuboid6(x1, d1, z1, x2, d2, d1), + new Cuboid6(x1, d2, z1, x2, y2, z2), new Cuboid6(x1, y1, z1, x2, d1, z2) }; + break; + default: + throw new MatchError(slot); + } + return JavaConversions.seqAsJavaList(sequence(boxes)); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + static List getCollisionBoxes(HollowMicroblock part) { + int size = part.getHollowSize(); + double d1 = 0.5 - size / 32D; + double d2 = 0.5 + size / 32D; + double thickness = (((Microblock) part).shape() >> 4) / 8D; + Transformation rotation = Rotation.sideRotations[((Microblock) part).shape() & 15].at(Vector3.center); + Seq boxes = sequence( + new Cuboid6[] { new Cuboid6(0, 0, 0, 1, thickness, d1), new Cuboid6(0, 0, d2, 1, thickness, 1), + new Cuboid6(0, 0, d1, d1, thickness, d2), new Cuboid6(d2, 0, d1, 1, thickness, d2) }); + return JavaConversions.seqAsJavaList( + (Seq) ((TraversableLike) boxes).map(new RotateBox(rotation), Seq$.MODULE$.canBuildFrom())); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + static List getSubParts(HollowMicroblock part) { + return JavaConversions.bufferAsJavaList( + (Buffer) ((TraversableLike) JavaConversions.asScalaBuffer(part.getCollisionBoxes())) + .map(new IndexBox(), Buffer$.MODULE$.canBuildFrom())); + } + + @SuppressWarnings("unchecked") + private static Seq sequence(Cuboid6[] boxes) { + return (Seq) Seq$.MODULE$.apply(Predef$.MODULE$.wrapRefArray(boxes)); + } + + private static final class RotateBox extends AbstractFunction1 implements scala.Serializable { + + private static final long serialVersionUID = 0L; + private final Transformation rotation; + + RotateBox(Transformation rotation) { + this.rotation = rotation; + } + + @Override + public Cuboid6 apply(Cuboid6 box) { + return box.apply(rotation); + } + } + + private static final class IndexBox extends AbstractFunction1 + implements scala.Serializable { + + private static final long serialVersionUID = 0L; + + IndexBox() {} + + @Override + public IndexedCuboid6 apply(Cuboid6 box) { + return new IndexedCuboid6(0, box); + } + } +} diff --git a/src/main/scala/codechicken/microblock/HollowMicroblockTraits.scala b/src/main/scala/codechicken/microblock/HollowMicroblockTraits.scala new file mode 100644 index 0000000..6191432 --- /dev/null +++ b/src/main/scala/codechicken/microblock/HollowMicroblockTraits.scala @@ -0,0 +1,81 @@ +package codechicken.microblock + +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.util.MovingObjectPosition +import net.minecraft.client.renderer.RenderBlocks +import codechicken.multipart.{TFacePart, TMultiPart, TNormalOcclusion} +import codechicken.lib.vec.{Cuboid6, Vector3} +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial + +trait HollowMicroblockClient + extends HollowMicroblock + with CommonMicroblockClient { + renderMask |= 8 << 8 + + override def recalcBounds() { + super.recalcBounds() + HollowMicroblockClientLogic.updateRenderMask(this) + } + + override def drawBreaking(renderBlocks: RenderBlocks) = + HollowMicroblockClientLogic.drawBreaking(this, renderBlocks) + + override def render(pos: Vector3, pass: Int) = + HollowMicroblockClientLogic.render(this, pos, pass) + + def renderHollow( + pos: Vector3, + pass: Int, + c: Cuboid6, + sideMask: Int, + face: Boolean, + f: (Vector3, IMicroMaterial, Int, Cuboid6, Int) => Unit + ) = HollowMicroblockClientLogic.renderHollow( + this, + pos, + pass, + c, + sideMask, + face, + f + ) + + override def drawHighlight( + hit: MovingObjectPosition, + player: EntityPlayer, + frame: Float + ): Boolean = + HollowMicroblockClientLogic.drawHighlight(this, hit, player, frame) +} + +trait HollowMicroblock + extends CommonMicroblock + with TFacePart + with TNormalOcclusion { + def microClass = HollowMicroClass$.MODULE$ + + def getBounds: Cuboid6 = HollowMicroblockTraitLogic.getBounds(this) + + // Scala retains the synthetic super accessor and its trait linearization. + override def occlusionTest(npart: TMultiPart): Boolean = + HollowMicroblockTraitLogic.normalOcclusionTest(this, npart) && super + .occlusionTest(npart) + + override def getPartialOcclusionBoxes = + HollowMicroblockTraitLogic.getPartialOcclusionBoxes(this) + + def getHollowSize = HollowMicroblockTraitLogic.getHollowSize(this) + + def getOcclusionBoxes = HollowMicroblockTraitLogic.getOcclusionBoxes(this) + + override def getCollisionBoxes = + HollowMicroblockTraitLogic.getCollisionBoxes(this) + + override def getSubParts = HollowMicroblockTraitLogic.getSubParts(this) + + override def allowCompleteOcclusion = true + + override def solid(side: Int) = false + + override def redstoneConductionMap = 0x10 +} diff --git a/src/main/scala/codechicken/microblock/HollowPlacement$.java b/src/main/scala/codechicken/microblock/HollowPlacement$.java new file mode 100644 index 0000000..e955c0c --- /dev/null +++ b/src/main/scala/codechicken/microblock/HollowPlacement$.java @@ -0,0 +1,33 @@ +package codechicken.microblock; + +public final class HollowPlacement$ extends PlacementProperties { + + public static final HollowPlacement$ MODULE$ = new HollowPlacement$(); + + private HollowPlacement$() {} + + @Override + public HollowMicroClass$ microClass() { + return HollowMicroClass$.MODULE$; + } + + @Override + public HollowPlacement.HollowPlacementGrid$ placementGrid() { + return HollowPlacement.HollowPlacementGrid$.MODULE$; + } + + @Override + public int opposite(int slot, int side) { + return slot ^ 1; + } + + @Override + public boolean expand(int slot, int side) { + return sneakOpposite(slot, side); + } + + @Override + public boolean sneakOpposite(int slot, int side) { + return slot == (side ^ 1); + } +} diff --git a/src/main/scala/codechicken/microblock/HollowPlacement.java b/src/main/scala/codechicken/microblock/HollowPlacement.java new file mode 100644 index 0000000..b058700 --- /dev/null +++ b/src/main/scala/codechicken/microblock/HollowPlacement.java @@ -0,0 +1,39 @@ +package codechicken.microblock; + +public final class HollowPlacement { + + private HollowPlacement() {} + + public static ExecutablePlacement customPlacement(MicroblockPlacement placement) { + return HollowPlacement$.MODULE$.customPlacement(placement); + } + + public static HollowMicroClass$ microClass() { + return HollowPlacement$.MODULE$.microClass(); + } + + public static HollowPlacementGrid$ placementGrid() { + return HollowPlacement$.MODULE$.placementGrid(); + } + + public static int opposite(int slot, int side) { + return HollowPlacement$.MODULE$.opposite(slot, side); + } + + public static boolean expand(int slot, int side) { + return HollowPlacement$.MODULE$.expand(slot, side); + } + + public static boolean sneakOpposite(int slot, int side) { + return HollowPlacement$.MODULE$.sneakOpposite(slot, side); + } + + public static class HollowPlacementGrid$ extends FaceEdgeGrid { + + public static final HollowPlacementGrid$ MODULE$ = new HollowPlacementGrid$(); + + public HollowPlacementGrid$() { + super(3 / 8D); + } + } +} diff --git a/src/main/scala/codechicken/microblock/IMicroMaterialRender.java b/src/main/scala/codechicken/microblock/IMicroMaterialRender.java new file mode 100644 index 0000000..4a23de8 --- /dev/null +++ b/src/main/scala/codechicken/microblock/IMicroMaterialRender.java @@ -0,0 +1,26 @@ +package codechicken.microblock; + +import net.minecraft.world.World; + +import codechicken.lib.vec.Cuboid6; + +/** + * Wrapper class blocks/tiles/parts wanting to use the micro material system to render part of their models. + *

+ * The accessors keep their Scala names because TMultiPart already declares world/x/y/z/getRenderBounds under exactly + * these names, which is what implements this interface for every part. + */ +public interface IMicroMaterialRender { + + /** May be null for inventory rendering. */ + World world(); + + int x(); + + int y(); + + int z(); + + /** Return the bounds of the part for texture mapping side decals like grass. */ + Cuboid6 getRenderBounds(); +} diff --git a/src/main/scala/codechicken/microblock/IMicroMaterialRender.scala b/src/main/scala/codechicken/microblock/IMicroMaterialRender.scala deleted file mode 100644 index eee9b36..0000000 --- a/src/main/scala/codechicken/microblock/IMicroMaterialRender.scala +++ /dev/null @@ -1,21 +0,0 @@ -package codechicken.microblock - -import codechicken.lib.vec.Cuboid6 -import net.minecraft.world.World - -/** Wrapper class blocks/tiles/parts wanting to use the micro material system to - * render part of their models. - */ -trait IMicroMaterialRender { - - /** May be null for inventory rendering. - */ - def world: World - def x: Int - def y: Int - def z: Int - - /** Return the bounds of the part for texture mapping side decals like grass - */ - def getRenderBounds: Cuboid6 -} diff --git a/src/main/scala/codechicken/microblock/ISidedHollowConnect.java b/src/main/scala/codechicken/microblock/ISidedHollowConnect.java new file mode 100644 index 0000000..7d7a0d7 --- /dev/null +++ b/src/main/scala/codechicken/microblock/ISidedHollowConnect.java @@ -0,0 +1,14 @@ +package codechicken.microblock; + +/** + * Implement this on center parts that connect through hollow covers to have the covers render their hollows to fit the + * connection size. + */ +public interface ISidedHollowConnect { + + /** + * @param side The side of the block on which the cover resides + * @return The size (width and height) of the connection in pixels. Must be less than 12 and more than 0 + */ + int getHollowSize(int side); +} diff --git a/src/main/scala/codechicken/microblock/ISidedHollowConnect.scala b/src/main/scala/codechicken/microblock/ISidedHollowConnect.scala deleted file mode 100644 index 5515cd0..0000000 --- a/src/main/scala/codechicken/microblock/ISidedHollowConnect.scala +++ /dev/null @@ -1,15 +0,0 @@ -package codechicken.microblock - -/** Implement this on center parts that connect through hollow covers to have - * the covers render their hollows to fit the connection size - */ -trait ISidedHollowConnect { - - /** @param side - * The side of the block on which the cover resides - * @return - * The size (width and height) of the connection in pixels. Must be be less - * than 12 and more than 0 - */ - def getHollowSize(side: Int): Int -} diff --git a/src/main/scala/codechicken/microblock/ItemMicroPart$.java b/src/main/scala/codechicken/microblock/ItemMicroPart$.java new file mode 100644 index 0000000..6d75124 --- /dev/null +++ b/src/main/scala/codechicken/microblock/ItemMicroPart$.java @@ -0,0 +1,53 @@ +package codechicken.microblock; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.handler.MicroblockProxy; + +/** Scala-compatible singleton retained for compiled consumers. */ +public final class ItemMicroPart$ { + + public static final ItemMicroPart$ MODULE$ = new ItemMicroPart$(); + + private ItemMicroPart$() {} + + public void checkTagCompound(ItemStack stack) { + if (!stack.hasTagCompound()) { + stack.setTagCompound(new NBTTagCompound()); + } + } + + public ItemStack create(int damage, int material) { + return create(damage, MicroMaterialRegistry.materialName(material)); + } + + public ItemStack create(int damage, String material) { + return create(1, damage, material); + } + + public ItemStack create(int amount, int damage, String material) { + ItemStack stack = new ItemStack(MicroblockProxy.itemMicro(), amount, damage); + checkTagCompound(stack); + stack.getTagCompound().setString("mat", material); + return stack; + } + + public IMicroMaterial getMaterial(ItemStack stack) { + checkTagCompound(stack); + if (!stack.getTagCompound().hasKey("mat")) { + return null; + } + IMicroMaterial material = MicroMaterialRegistry.getMaterial(stack.getTagCompound().getString("mat")); + return material == null ? MissingMicroMaterial$.MODULE$ : material; + } + + public int getMaterialID(ItemStack stack) { + checkTagCompound(stack); + if (!stack.getTagCompound().hasKey("mat")) { + return MicroMaterialRegistry.getMissingId(); + } + return MicroMaterialRegistry.materialID(stack.getTagCompound().getString("mat")); + } +} diff --git a/src/main/scala/codechicken/microblock/ItemMicroPart.java b/src/main/scala/codechicken/microblock/ItemMicroPart.java new file mode 100644 index 0000000..af27698 --- /dev/null +++ b/src/main/scala/codechicken/microblock/ItemMicroPart.java @@ -0,0 +1,128 @@ +package codechicken.microblock; + +import java.util.List; + +import net.minecraft.block.Block.SoundType; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import codechicken.lib.raytracer.RayTracer; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import scala.Tuple2; + +public class ItemMicroPart extends Item { + + public ItemMicroPart() { + setUnlocalizedName("microblock"); + setHasSubtypes(true); + } + + @Override + public String getItemStackDisplayName(ItemStack stack) { + IMicroMaterial material = getMaterial(stack); + CommonMicroClass mcrClass = CommonMicroClass.getMicroClass(stack.getItemDamage()); + int size = stack.getItemDamage() & 0xFF; + if (material == null || mcrClass == null) { + return "Unnamed"; + } + return StatCollector + .translateToLocalFormatted(mcrClass.getName() + "." + size + ".name", material.getLocalizedName()); + } + + @Override + @SuppressWarnings("unchecked") + public void getSubItems(Item item, CreativeTabs tab, List list) { + List stacks = (List) list; + CommonMicroClass[] classes = CommonMicroClass.classes(); + for (int classId = 0; classId < classes.length; classId++) { + if (classes[classId] == null) { + continue; + } + for (int size = 1; size <= 4; size <<= 1) { + for (Tuple2 material : MicroMaterialRegistry.getIdMap()) { + stacks.add(create(classId << 8 | size, material._1())); + } + } + } + } + + @Override + public void registerIcons(IIconRegister register) {} + + @Override + public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { + int material = getMaterialID(item); + CommonMicroClass mcrClass = CommonMicroClass.getMicroClass(item.getItemDamage()); + int size = item.getItemDamage() & 0xFF; + if (material < 0 || mcrClass == null) { + return false; + } + + MovingObjectPosition hit = RayTracer.retraceBlock(world, player, x, y, z); + if (hit == null || hit.typeOfHit != MovingObjectType.BLOCK) { + return false; + } + + ExecutablePlacement placement = MicroblockPlacement$.MODULE$.apply( + player, + hit, + size, + material, + !player.capabilities.isCreativeMode, + mcrClass.placementProperties()); + if (placement == null) { + return false; + } + + if (!world.isRemote) { + placement.place(world, player, item); + if (!player.capabilities.isCreativeMode) { + placement.consume(world, player, item); + } + + SoundType sound = MicroMaterialRegistry.getMaterial(material).getSound(); + if (sound != null) { + world.playSoundEffect( + placement.pos().x + 0.5, + placement.pos().y + 0.5, + placement.pos().z + 0.5, + sound.func_150496_b(), + (sound.getVolume() + 1.0F) / 2.0F, + sound.getPitch() * 0.8F); + } + } + return true; + } + + public static void checkTagCompound(ItemStack stack) { + ItemMicroPart$.MODULE$.checkTagCompound(stack); + } + + public static ItemStack create(int damage, int material) { + return ItemMicroPart$.MODULE$.create(damage, material); + } + + public static ItemStack create(int damage, String material) { + return ItemMicroPart$.MODULE$.create(damage, material); + } + + public static ItemStack create(int amount, int damage, String material) { + return ItemMicroPart$.MODULE$.create(amount, damage, material); + } + + public static IMicroMaterial getMaterial(ItemStack stack) { + return ItemMicroPart$.MODULE$.getMaterial(stack); + } + + public static int getMaterialID(ItemStack stack) { + return ItemMicroPart$.MODULE$.getMaterialID(stack); + } +} diff --git a/src/main/scala/codechicken/microblock/ItemMicroPart.scala b/src/main/scala/codechicken/microblock/ItemMicroPart.scala deleted file mode 100644 index 1deb047..0000000 --- a/src/main/scala/codechicken/microblock/ItemMicroPart.scala +++ /dev/null @@ -1,209 +0,0 @@ -package codechicken.microblock - -import net.minecraft.item.Item -import net.minecraft.item.ItemStack -import net.minecraft.nbt.NBTTagCompound -import ItemMicroPart._ -import net.minecraftforge.client.IItemRenderer -import net.minecraftforge.client.IItemRenderer.ItemRenderType -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper -import org.lwjgl.opengl.GL11 -import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial -import java.util.List -import net.minecraft.creativetab.CreativeTabs -import codechicken.lib.render.CCRenderState -import net.minecraft.client.renderer.texture.IIconRegister -import codechicken.microblock.handler.MicroblockProxy -import net.minecraft.util.{StatCollector, MovingObjectPosition} -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.world.World -import codechicken.lib.raytracer.RayTracer -import codechicken.lib.vec.Vector3 -import codechicken.lib.render.TextureUtils -import net.minecraft.util.MovingObjectPosition.MovingObjectType -import CommonMicroClass._ - -class ItemMicroPart extends Item { - setUnlocalizedName("microblock") - setHasSubtypes(true) - - override def getItemStackDisplayName(stack: ItemStack): String = { - val material = getMaterial(stack) - val mcrClass = getMicroClass(stack.getItemDamage) - val size = stack.getItemDamage & 0xff - if (material == null || mcrClass == null) - return "Unnamed" - - return StatCollector.translateToLocalFormatted( - mcrClass.getName + "." + size + ".name", - material.getLocalizedName - ) - } - - override def getSubItems(item: Item, tab: CreativeTabs, list$ : List[_]) { - val list = list$.asInstanceOf[List[ItemStack]] - for (classId <- 0 until classes.length) { - val mcrClass = classes(classId) - if (mcrClass != null) - for (size <- Seq(1, 2, 4)) - MicroMaterialRegistry.getIdMap.foreach(e => - list.add(create(classId << 8 | size, e._1)) - ) - } - } - - override def registerIcons(register: IIconRegister) {} - - override def onItemUse( - item: ItemStack, - player: EntityPlayer, - world: World, - x: Int, - y: Int, - z: Int, - s: Int, - hitX: Float, - hitY: Float, - hitZ: Float - ): Boolean = { - val material = getMaterialID(item) - val mcrClass = getMicroClass(item.getItemDamage) - val size = item.getItemDamage & 0xff - if (material < 0 || mcrClass == null) - return false - - val hit = RayTracer.retraceBlock(world, player, x, y, z) - if (hit != null && hit.typeOfHit == MovingObjectType.BLOCK) { - val placement = MicroblockPlacement( - player, - hit, - size, - material, - !player.capabilities.isCreativeMode, - mcrClass.placementProperties - ) - if (placement == null) - return false - - if (!world.isRemote) { - placement.place(world, player, item) - if (!player.capabilities.isCreativeMode) - placement.consume(world, player, item) - - val sound = MicroMaterialRegistry.getMaterial(material).getSound - if (sound != null) - world.playSoundEffect( - placement.pos.x + 0.5d, - placement.pos.y + 0.5d, - placement.pos.z + 0.5d, - sound.func_150496_b, - (sound.getVolume + 1.0f) / 2.0f, - sound.getPitch * 0.8f - ) - } - - return true - } - - return false - } -} - -object ItemMicroPart { - def checkTagCompound(stack: ItemStack) { - if (!stack.hasTagCompound) - stack.setTagCompound(new NBTTagCompound()) - } - - def create(damage: Int, material: Int): ItemStack = - create(damage, MicroMaterialRegistry.materialName(material)) - - def create(damage: Int, material: String): ItemStack = - create(1, damage, material) - - def create(amount: Int, damage: Int, material: String): ItemStack = { - val stack = new ItemStack(MicroblockProxy.itemMicro, amount, damage) - checkTagCompound(stack) - stack.getTagCompound.setString("mat", material) - return stack - } - - def getMaterial(stack: ItemStack): IMicroMaterial = { - checkTagCompound(stack) - if (!stack.getTagCompound.hasKey("mat")) - return null - - MicroMaterialRegistry.getMaterial( - stack.getTagCompound.getString("mat") - ) match { - case null => MissingMicroMaterial - case mat => mat - } - } - - def getMaterialID(stack: ItemStack): Int = { - checkTagCompound(stack) - if (!stack.getTagCompound.hasKey("mat")) - return MicroMaterialRegistry.getMissingId - - return MicroMaterialRegistry.materialID( - stack.getTagCompound.getString("mat") - ) - } -} - -object ItemMicroPartRenderer extends IItemRenderer { - def handleRenderType(item: ItemStack, t: ItemRenderType) = true - - def shouldUseRenderHelper( - t: ItemRenderType, - item: ItemStack, - helper: ItemRendererHelper - ) = true - - def renderItem(t: ItemRenderType, item: ItemStack, data: Object*) { - val material = getMaterial(item) - val mcrClass = getMicroClass(item.getItemDamage) - val size = item.getItemDamage & 0xff - if (material == null || mcrClass == null) - return - - GL11.glPushMatrix() - if (t == ItemRenderType.ENTITY) - GL11.glScaled(0.5, 0.5, 0.5) - if (t == ItemRenderType.INVENTORY || t == ItemRenderType.ENTITY) - GL11.glTranslatef(-0.5f, -0.5f, -0.5f) - TextureUtils.bindAtlas(0) - val state = CCRenderState.instance - state.resetInstance() - state.useNormals = true - state.pullLightmapInstance() - state.startDrawingInstance() - val part = - mcrClass.create(true, getMaterialID(item)).asInstanceOf[MicroblockClient] - part.setShape(size, mcrClass.itemSlot) - part.render(new Vector3(0.5, 0.5, 0.5).subtract(part.getBounds.center), -1) - state.drawInstance() - GL11.glPopMatrix() - } - - def renderHighlight( - player: EntityPlayer, - stack: ItemStack, - hit: MovingObjectPosition - ): Boolean = { - val material = getMaterialID(stack) - val mcrClass = getMicroClass(stack.getItemDamage) - val size = stack.getItemDamage & 0xff - if (material < 0 || mcrClass == null) - return false - - return MicroMaterialRegistry.renderHighlight( - player, - hit, - mcrClass, - size, - material - ) - } -} diff --git a/src/main/scala/codechicken/microblock/ItemMicroPartRenderer$.java b/src/main/scala/codechicken/microblock/ItemMicroPartRenderer$.java new file mode 100644 index 0000000..06bd36c --- /dev/null +++ b/src/main/scala/codechicken/microblock/ItemMicroPartRenderer$.java @@ -0,0 +1,79 @@ +package codechicken.microblock; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.TextureUtils; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import scala.collection.Seq; + +/** Scala-compatible renderer singleton retained for registration and compiled consumers. */ +public final class ItemMicroPartRenderer$ implements IItemRenderer { + + public static final ItemMicroPartRenderer$ MODULE$ = new ItemMicroPartRenderer$(); + + private ItemMicroPartRenderer$() {} + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + renderItemPart(type, item); + } + + public void renderItem(ItemRenderType type, ItemStack item, Seq data) { + renderItemPart(type, item); + } + + private void renderItemPart(ItemRenderType type, ItemStack item) { + IMicroMaterial material = ItemMicroPart.getMaterial(item); + CommonMicroClass mcrClass = CommonMicroClass.getMicroClass(item.getItemDamage()); + int size = item.getItemDamage() & 0xFF; + if (material == null || mcrClass == null) { + return; + } + + GL11.glPushMatrix(); + if (type == ItemRenderType.ENTITY) { + GL11.glScaled(0.5, 0.5, 0.5); + } + if (type == ItemRenderType.INVENTORY || type == ItemRenderType.ENTITY) { + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + } + TextureUtils.bindAtlas(0); + CCRenderState state = CCRenderState.instance(); + state.resetInstance(); + state.useNormals = true; + state.pullLightmapInstance(); + state.startDrawingInstance(); + Microblock part = mcrClass.create(true, ItemMicroPart.getMaterialID(item)); + MicroblockRender.renderItem(part, size, mcrClass.itemSlot()); + state.drawInstance(); + GL11.glPopMatrix(); + } + + public boolean renderHighlight(EntityPlayer player, ItemStack stack, MovingObjectPosition hit) { + int material = ItemMicroPart.getMaterialID(stack); + CommonMicroClass mcrClass = CommonMicroClass.getMicroClass(stack.getItemDamage()); + int size = stack.getItemDamage() & 0xFF; + if (material < 0 || mcrClass == null) { + return false; + } + return MicroMaterialRegistry.renderHighlight(player, hit, mcrClass, size, material); + } +} diff --git a/src/main/scala/codechicken/microblock/ItemMicroPartRenderer.java b/src/main/scala/codechicken/microblock/ItemMicroPartRenderer.java new file mode 100644 index 0000000..75f61de --- /dev/null +++ b/src/main/scala/codechicken/microblock/ItemMicroPartRenderer.java @@ -0,0 +1,30 @@ +package codechicken.microblock; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; + +import scala.collection.Seq; + +public final class ItemMicroPartRenderer { + + private ItemMicroPartRenderer() {} + + public static boolean handleRenderType(ItemStack item, ItemRenderType type) { + return ItemMicroPartRenderer$.MODULE$.handleRenderType(item, type); + } + + public static boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return ItemMicroPartRenderer$.MODULE$.shouldUseRenderHelper(type, item, helper); + } + + public static void renderItem(ItemRenderType type, ItemStack item, Seq data) { + ItemMicroPartRenderer$.MODULE$.renderItem(type, item, data); + } + + public static boolean renderHighlight(EntityPlayer player, ItemStack stack, MovingObjectPosition hit) { + return ItemMicroPartRenderer$.MODULE$.renderHighlight(player, stack, hit); + } +} diff --git a/src/main/scala/codechicken/microblock/ItemSaw.java b/src/main/scala/codechicken/microblock/ItemSaw.java new file mode 100644 index 0000000..fe0edf6 --- /dev/null +++ b/src/main/scala/codechicken/microblock/ItemSaw.java @@ -0,0 +1,59 @@ +package codechicken.microblock; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import codechicken.lib.config.ConfigTag; + +public class ItemSaw extends Item implements Saw { + + private int harvestLevel; + + public ItemSaw(ConfigTag sawTag, int harvestLevel) { + this.harvestLevel = harvestLevel; + int maxDamage = sawTag.getTag("durability").getIntValue(1 << (harvestLevel + 8)); + if (maxDamage > 0) { + setMaxDamage(maxDamage); + } + setNoRepair(); + setMaxStackSize(1); + setCreativeTab(CreativeTabs.tabTools); + } + + /** @return the current cutting strength */ + public int harvestLevel() { + return harvestLevel; + } + + /** + * Changes the cutting strength used by recipes and the saw renderer. This does not change the durability selected + * when the saw was constructed. Startup integrations that change saw tiers must finish before ForgeMicroblock + * post-initialization, when {@link MicroMaterialRegistry#getMaxCuttingStrength()} is calculated. + * + * @param harvestLevel the new cutting strength + */ + public void setHarvestLevel(int harvestLevel) { + this.harvestLevel = harvestLevel; + } + + @Override + public boolean hasContainerItem() { + return true; + } + + @Override + public ItemStack getContainerItem(ItemStack stack) { + return isDamageable() ? new ItemStack(stack.getItem(), 1, stack.getItemDamage() + 1) : stack; + } + + @Override + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { + return false; + } + + @Override + public int getCuttingStrength(ItemStack item) { + return harvestLevel; + } +} diff --git a/src/main/scala/codechicken/microblock/ItemSaw.scala b/src/main/scala/codechicken/microblock/ItemSaw.scala deleted file mode 100644 index fa5af8e..0000000 --- a/src/main/scala/codechicken/microblock/ItemSaw.scala +++ /dev/null @@ -1,136 +0,0 @@ -package codechicken.microblock - -import net.minecraft.item.Item -import codechicken.lib.config.ConfigTag -import codechicken.microblock.handler.MicroblockProxy._ -import net.minecraft.item.ItemStack -import net.minecraftforge.client.IItemRenderer -import codechicken.lib.render.{TextureUtils, CCModel, CCRenderState} -import net.minecraftforge.client.IItemRenderer.ItemRenderType -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper -import codechicken.lib.vec.SwapYZ -import codechicken.lib.vec.TransformationList -import codechicken.lib.vec.Translation -import codechicken.lib.vec.Scale -import codechicken.lib.vec.Rotation -import org.lwjgl.opengl.GL11 -import ItemRenderType._ -import codechicken.lib.math.MathHelper._ -import net.minecraft.util.ResourceLocation -import net.minecraft.client.renderer.texture.{TextureMap, IIconRegister} -import codechicken.lib.render.uv.UVTranslation -import codechicken.microblock.handler.MicroblockProxy - -/** Interface for items that are 'saws' - */ -trait Saw extends Item { - - /** The maximum harvest level that some version of this saw is capable of - * cutting - */ - def getMaxCuttingStrength: Int = getCuttingStrength(new ItemStack(this)) - - /** The harvest level this saw is capable of cutting - */ - def getCuttingStrength(item: ItemStack): Int -} - -class ItemSaw(sawTag: ConfigTag, val harvestLevel: Int) extends Item with Saw { - { - val maxDamage = - sawTag.getTag("durability").getIntValue(1 << harvestLevel + 8) - if (maxDamage > 0) - setMaxDamage(maxDamage) - setNoRepair() - setMaxStackSize(1) - setCreativeTab(net.minecraft.creativetab.CreativeTabs.tabTools) - } - - override def hasContainerItem = true - - override def getContainerItem(stack: ItemStack) = - if (isDamageable) - new ItemStack(stack.getItem, 1, stack.getItemDamage + 1) - else - stack - - override def doesContainerItemLeaveCraftingGrid(stack: ItemStack) = false - - def getCuttingStrength(item: ItemStack) = harvestLevel -} - -object ItemSawRenderer extends IItemRenderer { - val models = CCModel.parseObjModels( - new ResourceLocation("microblock", "models/saw.obj"), - 7, - new SwapYZ() - ) - val handle = models.get("Handle") - val holder = models.get("BladeSupport") - val blade = models.get("Blade") - - def handleRenderType(item: ItemStack, renderType: ItemRenderType) = - !MicroblockProxy.useSawIcons || TextureUtils.isMissing( - item.getIconIndex, - TextureMap.locationItemsTexture - ) - - def shouldUseRenderHelper( - renderType: ItemRenderType, - item: ItemStack, - helper: ItemRendererHelper - ) = true - - def renderItem(renderType: ItemRenderType, item: ItemStack, data: Object*) { - val t = renderType match { - case INVENTORY => - new TransformationList( - new Scale(1.8), - new Translation(0, 0, -0.6), - new Rotation(-pi / 4, 1, 0, 0), - new Rotation(pi * 3 / 4, 0, 1, 0) - ) - case ENTITY => - new TransformationList( - new Scale(1), - new Translation(0, 0, -0.25), - new Rotation(-pi / 4, 1, 0, 0) - ) - case EQUIPPED_FIRST_PERSON => - new TransformationList( - new Scale(1.5), - new Rotation(-pi / 3, 1, 0, 0), - new Rotation(pi * 3 / 4, 0, 1, 0), - new Translation(0.5, 0.5, 0.5) - ) - case EQUIPPED => - new TransformationList( - new Scale(1.5), - new Rotation(-pi / 5, 1, 0, 0), - new Rotation(-pi * 3 / 4, 0, 1, 0), - new Translation(0.75, 0.5, 0.75) - ) - case _ => return - } - val state = CCRenderState.instance - state.resetInstance() - state.useNormals = true - state.pullLightmapInstance() - CCRenderState.changeTexture("microblock:textures/items/saw.png") - state.startDrawingInstance() - handle.render(t) - holder.render(t) - state.drawInstance() - GL11.glDisable(GL11.GL_CULL_FACE) - state.startDrawingInstance() - blade.render( - t, - new UVTranslation( - 0, - (item.getItem.asInstanceOf[Saw].getCuttingStrength(item) - 1) * 4 / 64d - ) - ) - state.drawInstance() - GL11.glEnable(GL11.GL_CULL_FACE) - } -} diff --git a/src/main/scala/codechicken/microblock/ItemSawRenderer$.java b/src/main/scala/codechicken/microblock/ItemSawRenderer$.java new file mode 100644 index 0000000..54c6ee8 --- /dev/null +++ b/src/main/scala/codechicken/microblock/ItemSawRenderer$.java @@ -0,0 +1,118 @@ +package codechicken.microblock; + +import java.util.Map; + +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.render.CCModel; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.TextureUtils; +import codechicken.lib.render.uv.UVTranslation; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Scale; +import codechicken.lib.vec.SwapYZ; +import codechicken.lib.vec.TransformationList; +import codechicken.lib.vec.Translation; +import codechicken.microblock.handler.MicroblockProxy; +import scala.Predef$; +import scala.collection.Seq; + +public final class ItemSawRenderer$ implements IItemRenderer { + + public static final ItemSawRenderer$ MODULE$ = new ItemSawRenderer$(); + + private final Map models = CCModel + .parseObjModels(new ResourceLocation("microblock", "models/saw.obj"), 7, new SwapYZ()); + private final CCModel handle = models.get("Handle"); + private final CCModel holder = models.get("BladeSupport"); + private final CCModel blade = models.get("Blade"); + + private ItemSawRenderer$() {} + + public Map models() { + return models; + } + + public CCModel handle() { + return handle; + } + + public CCModel holder() { + return holder; + } + + public CCModel blade() { + return blade; + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType renderType) { + return !MicroblockProxy.useSawIcons() + || TextureUtils.isMissing(item.getIconIndex(), TextureMap.locationItemsTexture); + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType renderType, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + @SuppressWarnings("unchecked") + public void renderItem(ItemRenderType renderType, ItemStack item, Object[] data) { + renderItem(renderType, item, (Seq) (Seq) Predef$.MODULE$.wrapRefArray(data)); + } + + public void renderItem(ItemRenderType renderType, ItemStack item, Seq data) { + TransformationList transformation; + if (renderType == ItemRenderType.INVENTORY) { + transformation = new TransformationList( + new Scale(1.8), + new Translation(0, 0, -0.6), + new Rotation(-Math.PI / 4, 1, 0, 0), + new Rotation(Math.PI * 3 / 4, 0, 1, 0)); + } else if (renderType == ItemRenderType.ENTITY) { + transformation = new TransformationList( + new Scale(1), + new Translation(0, 0, -0.25), + new Rotation(-Math.PI / 4, 1, 0, 0)); + } else if (renderType == ItemRenderType.EQUIPPED_FIRST_PERSON) { + transformation = new TransformationList( + new Scale(1.5), + new Rotation(-Math.PI / 3, 1, 0, 0), + new Rotation(Math.PI * 3 / 4, 0, 1, 0), + new Translation(0.5, 0.5, 0.5)); + } else if (renderType == ItemRenderType.EQUIPPED) { + transformation = new TransformationList( + new Scale(1.5), + new Rotation(-Math.PI / 5, 1, 0, 0), + new Rotation(-Math.PI * 3 / 4, 0, 1, 0), + new Translation(0.75, 0.5, 0.75)); + } else { + return; + } + + CCRenderState state = CCRenderState.instance(); + state.resetInstance(); + state.useNormals = true; + state.pullLightmapInstance(); + CCRenderState.changeTexture("microblock:textures/items/saw.png"); + state.startDrawingInstance(); + handle.render(transformation); + holder.render(transformation); + state.drawInstance(); + GL11.glDisable(GL11.GL_CULL_FACE); + state.startDrawingInstance(); + blade.render( + transformation, + new UVTranslation(0, (((Saw) item.getItem()).getCuttingStrength(item) - 1) * 4 / 64D)); + state.drawInstance(); + GL11.glEnable(GL11.GL_CULL_FACE); + } +} diff --git a/src/main/scala/codechicken/microblock/ItemSawRenderer.java b/src/main/scala/codechicken/microblock/ItemSawRenderer.java new file mode 100644 index 0000000..7e6f677 --- /dev/null +++ b/src/main/scala/codechicken/microblock/ItemSawRenderer.java @@ -0,0 +1,43 @@ +package codechicken.microblock; + +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; + +import codechicken.lib.render.CCModel; +import scala.collection.Seq; + +public final class ItemSawRenderer { + + private ItemSawRenderer() {} + + public static Map models() { + return ItemSawRenderer$.MODULE$.models(); + } + + public static CCModel handle() { + return ItemSawRenderer$.MODULE$.handle(); + } + + public static CCModel holder() { + return ItemSawRenderer$.MODULE$.holder(); + } + + public static CCModel blade() { + return ItemSawRenderer$.MODULE$.blade(); + } + + public static boolean handleRenderType(ItemStack item, ItemRenderType renderType) { + return ItemSawRenderer$.MODULE$.handleRenderType(item, renderType); + } + + public static boolean shouldUseRenderHelper(ItemRenderType renderType, ItemStack item, ItemRendererHelper helper) { + return ItemSawRenderer$.MODULE$.shouldUseRenderHelper(renderType, item, helper); + } + + public static void renderItem(ItemRenderType renderType, ItemStack item, Seq data) { + ItemSawRenderer$.MODULE$.renderItem(renderType, item, data); + } +} diff --git a/src/main/scala/codechicken/microblock/MaterialBlockAccess.java b/src/main/scala/codechicken/microblock/MaterialBlockAccess.java new file mode 100644 index 0000000..a9603ea --- /dev/null +++ b/src/main/scala/codechicken/microblock/MaterialBlockAccess.java @@ -0,0 +1,82 @@ +package codechicken.microblock; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.util.ForgeDirection; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** Read-only tint lookup: substitute the material at one position, retaining the surrounding world. */ +@SideOnly(Side.CLIENT) +final class MaterialBlockAccess implements IBlockAccess { + + private final IBlockAccess world; + private final Block block; + private final int meta, x, y, z; + + MaterialBlockAccess(IBlockAccess world, Block block, int meta, int x, int y, int z) { + this.world = world; + this.block = block; + this.meta = meta; + this.x = x; + this.y = y; + this.z = z; + } + + private boolean isOrigin(int x, int y, int z) { + return this.x == x && this.y == y && this.z == z; + } + + @Override + public Block getBlock(int x, int y, int z) { + return isOrigin(x, y, z) ? block : world.getBlock(x, y, z); + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + return isOrigin(x, y, z) ? meta : world.getBlockMetadata(x, y, z); + } + + @Override + public TileEntity getTileEntity(int x, int y, int z) { + return world.getTileEntity(x, y, z); + } + + @Override + public int getLightBrightnessForSkyBlocks(int x, int y, int z, int minimum) { + return world.getLightBrightnessForSkyBlocks(x, y, z, minimum); + } + + @Override + public int isBlockProvidingPowerTo(int x, int y, int z, int side) { + return world.isBlockProvidingPowerTo(x, y, z, side); + } + + @Override + public boolean isAirBlock(int x, int y, int z) { + return isOrigin(x, y, z) ? block.isAir(this, x, y, z) : world.isAirBlock(x, y, z); + } + + @Override + public BiomeGenBase getBiomeGenForCoords(int x, int z) { + return world.getBiomeGenForCoords(x, z); + } + + @Override + public int getHeight() { + return world.getHeight(); + } + + @Override + public boolean extendedLevelsInChunkCache() { + return world.extendedLevelsInChunkCache(); + } + + @Override + public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean fallback) { + return world.isSideSolid(x, y, z, side, fallback); + } +} diff --git a/src/main/scala/codechicken/microblock/MaterialRenderHelper$.java b/src/main/scala/codechicken/microblock/MaterialRenderHelper$.java new file mode 100644 index 0000000..0be3f9a --- /dev/null +++ b/src/main/scala/codechicken/microblock/MaterialRenderHelper$.java @@ -0,0 +1,72 @@ +package codechicken.microblock; + +import net.minecraft.block.Block; + +import codechicken.lib.render.CCRenderPipeline; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.ColourMultiplier; +import codechicken.lib.render.uv.UVTransformation; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.handler.MicroblockMod; + +public final class MaterialRenderHelper$ { + + public static final MaterialRenderHelper$ MODULE$ = new MaterialRenderHelper$(); + + private final ThreadLocal threadState = ThreadLocal.withInitial(ThreadState::new); + + private MaterialRenderHelper$() {} + + private ThreadLocal threadState() { + return threadState; + } + + public int pass() { + return threadState().get().pass(); + } + + public void pass_$eq(int pass) { + threadState().get().pass_$eq(pass); + } + + public CCRenderPipeline.PipelineBuilder builder() { + return threadState().get().builder(); + } + + public void builder_$eq(CCRenderPipeline.PipelineBuilder builder) { + threadState().get().builder_$eq(builder); + } + + public MaterialRenderHelper$ start(Vector3 pos, int pass, UVTransformation uvt) { + pass_$eq(pass); + builder_$eq(CCRenderState.instance().pipeline.builder()); + builder().add(pos.translation()).add(uvt); + return this; + } + + public MaterialRenderHelper$ blockColour(int colour) { + builder().add(ColourMultiplier.instance(colour)); + return this; + } + + public MaterialRenderHelper$ lighting() { + if (pass() != -1) { + builder().add(CCRenderState.instance().lightMatrix); + } + return this; + } + + public MaterialRenderHelper$ blockAndMeta(Block block, int meta) { + if (MicroblockMod.angelicaCompat() != null) { + MicroblockMod.angelicaCompat().setShaderMaterialOverride(block, meta); + } + return this; + } + + public void render() { + builder().render(); + if (MicroblockMod.angelicaCompat() != null) { + MicroblockMod.angelicaCompat().resetShaderMaterialOverride(); + } + } +} diff --git a/src/main/scala/codechicken/microblock/MaterialRenderHelper.java b/src/main/scala/codechicken/microblock/MaterialRenderHelper.java new file mode 100644 index 0000000..e748f52 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MaterialRenderHelper.java @@ -0,0 +1,48 @@ +package codechicken.microblock; + +import net.minecraft.block.Block; + +import codechicken.lib.render.CCRenderPipeline; +import codechicken.lib.render.uv.UVTransformation; +import codechicken.lib.vec.Vector3; + +public final class MaterialRenderHelper { + + private MaterialRenderHelper() {} + + public static int pass() { + return MaterialRenderHelper$.MODULE$.pass(); + } + + public static void pass_$eq(int pass) { + MaterialRenderHelper$.MODULE$.pass_$eq(pass); + } + + public static CCRenderPipeline.PipelineBuilder builder() { + return MaterialRenderHelper$.MODULE$.builder(); + } + + public static void builder_$eq(CCRenderPipeline.PipelineBuilder builder) { + MaterialRenderHelper$.MODULE$.builder_$eq(builder); + } + + public static MaterialRenderHelper$ start(Vector3 pos, int pass, UVTransformation uvt) { + return MaterialRenderHelper$.MODULE$.start(pos, pass, uvt); + } + + public static MaterialRenderHelper$ blockColour(int colour) { + return MaterialRenderHelper$.MODULE$.blockColour(colour); + } + + public static MaterialRenderHelper$ lighting() { + return MaterialRenderHelper$.MODULE$.lighting(); + } + + public static MaterialRenderHelper$ blockAndMeta(Block block, int meta) { + return MaterialRenderHelper$.MODULE$.blockAndMeta(block, meta); + } + + public static void render() { + MaterialRenderHelper$.MODULE$.render(); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroMaterialRegistry$.java b/src/main/scala/codechicken/microblock/MicroMaterialRegistry$.java new file mode 100644 index 0000000..9d8906c --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroMaterialRegistry$.java @@ -0,0 +1,112 @@ +package codechicken.microblock; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MovingObjectPosition; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.packet.PacketCustom; +import codechicken.microblock.MicroMaterialRegistry.IMicroHighlightRenderer; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import scala.Tuple2; + +/** + * Scala companion singleton. Retained because compiled Scala consumers read MODULE$ and call these instance methods. + */ +public final class MicroMaterialRegistry$ { + + public static final MicroMaterialRegistry$ MODULE$ = new MicroMaterialRegistry$(); + + private MicroMaterialRegistry$() {} + + public void registerMaterial(IMicroMaterial material, String name) { + MicroMaterialRegistry.registerMaterial(material, name); + } + + public void replaceMaterial(IMicroMaterial material, String name) { + MicroMaterialRegistry.replaceMaterial(material, name); + } + + public void registerHighlightRenderer(IMicroHighlightRenderer handler) { + MicroMaterialRegistry.registerHighlightRenderer(handler); + } + + public void remapName(String oldName, String newName) { + MicroMaterialRegistry.remapName(oldName, newName); + } + + /** Internal FMP lifecycle bridge; see {@link MicroMaterialRegistry#setupIDMap()}. */ + public void setupIDMap() { + MicroMaterialRegistry.setupIDMap(); + } + + public int getMissingId() { + return MicroMaterialRegistry.getMissingId(); + } + + /** Internal FMP lifecycle bridge; see {@link MicroMaterialRegistry#calcMaxCuttingStrength()}. */ + public void calcMaxCuttingStrength() { + MicroMaterialRegistry.calcMaxCuttingStrength(); + } + + /** Internal FMP client texture-lifecycle bridge; see {@link MicroMaterialRegistry#loadIcons()}. */ + public void loadIcons() { + MicroMaterialRegistry.loadIcons(); + } + + public int getMaxCuttingStrength() { + return MicroMaterialRegistry.getMaxCuttingStrength(); + } + + /** Internal FMP handshake bridge; see {@link MicroMaterialRegistry#writeIDMap(PacketCustom)}. */ + public void writeIDMap(PacketCustom packet) { + MicroMaterialRegistry.writeIDMap(packet); + } + + /** Internal FMP handshake bridge; see {@link MicroMaterialRegistry#readIDMap(PacketCustom)}. */ + public List readIDMap(PacketCustom packet) { + return MicroMaterialRegistry.readIDMap(packet); + } + + public void writeMaterialID(MCDataOutput data, int id) { + MicroMaterialRegistry.writeMaterialID(data, id); + } + + public int readMaterialID(MCDataInput data) { + return MicroMaterialRegistry.readMaterialID(data); + } + + public String materialName(int id) { + return MicroMaterialRegistry.materialName(id); + } + + public int materialID(String name) { + return MicroMaterialRegistry.materialID(name); + } + + public IMicroMaterial getMaterial(String name) { + return MicroMaterialRegistry.getMaterial(name); + } + + public IMicroMaterial getMaterial(int id) { + return MicroMaterialRegistry.getMaterial(id); + } + + /** + * Returns the same legacy backing array as {@link MicroMaterialRegistry#getIdMap()}. + * + * @deprecated For enumeration, use {@link MicroMaterialRegistry#materialCount()}, + * {@link MicroMaterialRegistry#materialName(int)} and {@link MicroMaterialRegistry#getMaterial(int)}. + */ + @Deprecated + public Tuple2[] getIdMap() { + return MicroMaterialRegistry.getIdMap(); + } + + public boolean renderHighlight(EntityPlayer player, MovingObjectPosition hit, CommonMicroClass mcrClass, int size, + int material) { + return MicroMaterialRegistry.renderHighlight(player, hit, mcrClass, size, material); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroMaterialRegistry.java b/src/main/scala/codechicken/microblock/MicroMaterialRegistry.java new file mode 100644 index 0000000..9768f26 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroMaterialRegistry.java @@ -0,0 +1,364 @@ +package codechicken.microblock; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import net.minecraft.block.Block.SoundType; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.render.EntityDigIconFX; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.handler.MicroblockProxy; +import codechicken.multipart.IDWriter; +import codechicken.multipart.MultiPartRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import scala.Tuple2; + +public final class MicroMaterialRegistry { + + /** Interface for defining a micro material. */ + public interface IMicroMaterial { + + /** The icon to be used for breaking particles on side. */ + @SideOnly(Side.CLIENT) + IIcon getBreakingIcon(int side); + + /** + * The 0xRRGGBB tint to multiply breaking particles on side by, {@link EntityDigIconFX#NO_TINT} for none. + *

+ * A material whose icon for side is greyscale and gets its colour at render time (leaves, grass tops) must + * override this, or it breaks into grey particles. Defaults to no tint, which is correct for any material whose + * texture is already coloured. + */ + @SideOnly(Side.CLIENT) + default int getBreakingColour(int side, IBlockAccess world, int x, int y, int z) { + return EntityDigIconFX.NO_TINT; + } + + /** + * Supported material extension callback to load icons from the underlying block/etc., invoked by FMP on the + * client. + */ + @SideOnly(Side.CLIENT) + default void loadIcons() {} + + /** + * This function must configure and use the CCRenderState pipeline to draw from the current vertex source. + * CCRenderState.lightMatrix will be set. + * + * @param pass The current render pass, -1 for inventory rendering + * @param bounds The cuboid bounds of the face being rendered + */ + @SideOnly(Side.CLIENT) + void renderMicroFace(Vector3 pos, int pass, Cuboid6 bounds); + + /** Get the render pass for which this material renders in. */ + @SideOnly(Side.CLIENT) + default boolean canRenderInPass(int pass) { + return pass == 0; + } + + /** Return true if this material is not opaque (glass, ice). */ + boolean isTransparent(); + + /** Return the light level emitted by this material (glowstone). */ + int getLightValue(); + + /** Return the strength of this material. */ + float getStrength(EntityPlayer player); + + /** Return the localised name of this material (normally the block name). */ + String getLocalizedName(); + + /** Get the item that this material is cut from (full block to slabs). */ + ItemStack getItem(); + + /** Get the strength of saw requried to cut this material. */ + int getCutterStrength(); + + /** Get the breaking/walking sound. */ + SoundType getSound(); + + /** Return true if this material is solid and opaque (can run wires on etc). */ + default boolean isSolid() { + return !isTransparent(); + } + + /** Get the explosion resistance of this part to an explosion caused by entity. */ + float explosionResistance(Entity entity); + } + + /** + * Interface for overriding the default micro placement highlight handler to show the effect of placement on a + * certain block/part. + */ + public interface IMicroHighlightRenderer { + + /** Return true if a custom highlight was rendered and the default should be skipped. */ + boolean renderHighlight(EntityPlayer player, MovingObjectPosition hit, CommonMicroClass mcrClass, int size, + int material); + } + + private static final Map typeMap = new HashMap<>(); + private static final Map nameMap = new HashMap<>(); + private static Tuple2[] idMap; + private static final IDWriter idWriter = new IDWriter(); + + private static final List highlightRenderers = new ArrayList<>(); + private static int maxCuttingStrength; + + private static final Map remap = new HashMap<>(); + private static int missingId; + + private MicroMaterialRegistry() {} + + /** Register a micro material with unique identifier name. */ + public static void registerMaterial(IMicroMaterial material, String name) { + if (MultiPartRegistry.loaded()) { + throw new IllegalStateException("You must register your materials in the init methods."); + } + + if (typeMap.containsKey(name)) { + MicroblockProxy.logger().error("Material with id " + name + " is already registered."); + return; + } + + typeMap.put(name, material); + } + + /** Replace a micro material with unique identifier name. */ + public static void replaceMaterial(IMicroMaterial material, String name) { + if (MultiPartRegistry.loaded()) { + throw new IllegalStateException("You must register your materials in the init methods."); + } + + if (typeMap.remove(name) == null) { + MicroblockProxy.logger().error("Material with id " + name + " was not registered."); + } + + MicroblockProxy.logger().debug("Replaced micro material: " + name); + + typeMap.put(name, material); + } + + /** Registers a highlight renderer. */ + public static void registerHighlightRenderer(IMicroHighlightRenderer handler) { + highlightRenderers.add(handler); + } + + public static void remapName(String oldName, String newName) { + remap.put(oldName, newName); + } + + /** + * Internal FMP lifecycle step that rebuilds material IDs. Consumers register materials during initialization and + * enumerate the initialized map through {@link #materialCount()}; do not rebuild IDs from consumer code. + */ + @SuppressWarnings("unchecked") + public static void setupIDMap() { + List> entries = new ArrayList<>(typeMap.entrySet()); + entries.sort(Comparator.comparing(Map.Entry::getKey)); + + idMap = new Tuple2[entries.size()]; + for (int i = 0; i < entries.size(); i++) { + idMap[i] = new Tuple2<>(entries.get(i).getKey(), entries.get(i).getValue()); + } + + idWriter.setMax(idMap.length); + nameMap.clear(); + for (int i = 0; i < idMap.length; i++) { + nameMap.put(idMap[i]._1(), i); + } + + Integer missing = nameMap.get(MissingMicroMaterial.key()); + if (missing == null) { + throw new IllegalStateException( + "MissingMicroMaterial is not registered; the placeholder must never fall back to id 0."); + } + missingId = missing; + } + + public static int getMissingId() { + return missingId; + } + + /** Internal FMP lifecycle calculation; consumers read {@link #getMaxCuttingStrength()} after initialization. */ + public static void calcMaxCuttingStrength() { + int max = Integer.MIN_VALUE; + boolean found = false; + for (Iterator it = Item.itemRegistry.iterator(); it.hasNext();) { + Object next = it.next(); + if (next instanceof Saw) { + max = Math.max(max, ((Saw) next).getMaxCuttingStrength()); + found = true; + } + } + if (!found) { + // Matches the reference, where max on an empty collection throws. + throw new UnsupportedOperationException("empty.max"); + } + maxCuttingStrength = max; + } + + /** + * Internal FMP client texture-lifecycle dispatcher; do not call directly from consumers. The per-material + * {@link IMicroMaterial#loadIcons()} callback remains a supported extension hook. + */ + public static void loadIcons() { + if (idMap != null) { + for (Tuple2 entry : idMap) { + entry._2().loadIcons(); + } + } + } + + public static int getMaxCuttingStrength() { + return maxCuttingStrength; + } + + /** + * Internal FMP handshake writer for the entire material map. Consumer part packets use + * {@link #writeMaterialID(MCDataOutput, int)} for an individual material ID instead. + */ + public static void writeIDMap(PacketCustom packet) { + packet.writeInt(idMap.length); + for (Tuple2 entry : idMap) { + packet.writeString(entry._1()); + } + } + + /** + * Internal FMP handshake reader: replaces this client's ID map with the server's, returning missing material names. + * Consumer part packets use {@link #readMaterialID(MCDataInput)} for an individual material ID instead. + */ + @SuppressWarnings("unchecked") + public static List readIDMap(PacketCustom packet) { + int k = packet.readInt(); + idWriter.setMax(k); + idMap = new Tuple2[k]; + nameMap.clear(); + List missing = new ArrayList<>(); + for (int i = 0; i < k; i++) { + String s = packet.readString(); + IMicroMaterial v = typeMap.get(s); + if (v == null) { + missing.add(s); + } else { + idMap[i] = new Tuple2<>(s, v); + nameMap.put(s, i); + } + } + return missing; + } + + public static void writeMaterialID(MCDataOutput data, int id) { + idWriter.write(data, id); + } + + public static int readMaterialID(MCDataInput data) { + return idWriter.read(data); + } + + /** + * Returns the persistent name at a numeric ID in the active material map. IDs may change when the map is rebuilt or + * synchronized with a server; store material names rather than numeric IDs in persistent data. + * + * @param id an ID from zero (inclusive) to {@link #materialCount()} (exclusive) + * @throws ArrayIndexOutOfBoundsException if the ID is outside the active map + * @throws NullPointerException if the map is uninitialized or the ID is unresolved after a failed + * handshake + */ + public static String materialName(int id) { + return idMap[id]._1(); + } + + public static int materialID(String name) { + Integer id = nameMap.get(remapped(name)); + if (id == null) { + MicroblockProxy.logger().error("Missing mapping for part with ID: " + name); + return missingId; + } + return id; + } + + public static IMicroMaterial getMaterial(String name) { + return typeMap.get(remapped(name)); + } + + /** + * Returns the registered material instance at an ID in the active material map; no copy is made. + * + * @param id an ID from zero (inclusive) to {@link #materialCount()} (exclusive) + * @throws ArrayIndexOutOfBoundsException if the ID is outside the active map + * @throws NullPointerException if the map is uninitialized or the ID is unresolved after a failed + * handshake + */ + public static IMicroMaterial getMaterial(int id) { + return idMap[id]._2(); + } + + /** + * Returns the number of numeric ID slots in the active material map, including the missing-material placeholder + * when present. Enumerate IDs from zero (inclusive) to this count (exclusive) with {@link #materialName(int)} and + * {@link #getMaterial(int)}. + * + * FMP builds the map during post-initialization and before server startup. A multiplayer handshake replaces the + * client map with server ID order. Enumerate on the game/lifecycle thread after initialization; multiplayer clients + * must also finish the handshake successfully. The map must not be rebuilt during enumeration. Do not cache numeric + * IDs across map replacements. A failed handshake can leave unresolved slots, which this count includes; it is not + * a readiness check. + * + * @return the active map length, or zero for an initialized empty map + * @throws IllegalStateException if FMP has not initialized the material ID map + */ + public static int materialCount() { + if (idMap == null) { + throw new IllegalStateException("The material ID map has not been initialized."); + } + return idMap.length; + } + + /** + * Returns the legacy live backing array, or null before ID-map initialization. A map replacement leaves earlier + * array references pointing at the old map; unresolved IDs after a failed handshake contain null. + * + * @deprecated For enumeration, use {@link #materialCount()}, {@link #materialName(int)} and + * {@link #getMaterial(int)}. The Scala array descriptor is retained for existing consumers. + */ + @Deprecated + public static Tuple2[] getIdMap() { + return idMap; + } + + public static boolean renderHighlight(EntityPlayer player, MovingObjectPosition hit, CommonMicroClass mcrClass, + int size, int material) { + for (IMicroHighlightRenderer renderer : highlightRenderers) { + if (renderer.renderHighlight(player, hit, mcrClass, size, material)) { + return true; + } + } + + MicroblockRender.renderHighlight(player, hit, mcrClass, size, material); + return true; + } + + private static String remapped(String name) { + String replacement = remap.get(name); + return replacement == null ? name : replacement; + } +} diff --git a/src/main/scala/codechicken/microblock/MicroMaterialRegistry.scala b/src/main/scala/codechicken/microblock/MicroMaterialRegistry.scala deleted file mode 100644 index ca9f314..0000000 --- a/src/main/scala/codechicken/microblock/MicroMaterialRegistry.scala +++ /dev/null @@ -1,255 +0,0 @@ -package codechicken.microblock - -import codechicken.multipart.IDWriter -import codechicken.lib.packet.PacketCustom -import scala.collection.mutable.HashMap -import codechicken.lib.data.MCDataOutput -import codechicken.lib.data.MCDataInput -import codechicken.multipart.MultiPartRegistry -import cpw.mods.fml.relauncher.SideOnly -import cpw.mods.fml.relauncher.Side -import codechicken.lib.vec.{Cuboid6, Vector3} -import net.minecraft.util.IIcon -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.{Item, ItemStack} -import scala.collection.mutable.ListBuffer -import net.minecraft.util.MovingObjectPosition -import net.minecraft.entity.Entity -import scala.collection.JavaConversions._ -import java.util.{Iterator => JIterator} -import net.minecraft.block.Block.SoundType - -object MicroMaterialRegistry { - - /** Interface for defining a micro material - */ - trait IMicroMaterial { - - /** The icon to be used for breaking particles on side - */ - @SideOnly(Side.CLIENT) - def getBreakingIcon(side: Int): IIcon - - /** Callback to load icons from the underlying block/etc - */ - @SideOnly(Side.CLIENT) - def loadIcons() {} - - /** This function must configure and use the CCRenderState pipeline to draw - * from the current vertex source. CCRenderState.lightMatrix will be set. - * @param pass - * The current render pass, -1 for inventory rendering - * @param bounds - * The cuboid bounds of the face being rendered - */ - @SideOnly(Side.CLIENT) - def renderMicroFace(pos: Vector3, pass: Int, bounds: Cuboid6) - - /** Get the render pass for which this material renders in. - */ - @SideOnly(Side.CLIENT) - def canRenderInPass(pass: Int) = pass == 0 - - /** Return true if this material is not opaque (glass, ice). - */ - def isTransparent: Boolean - - /** Return the light level emitted by this material (glowstone) - */ - def getLightValue: Int - - /** Return the strength of this material - */ - def getStrength(player: EntityPlayer): Float - - /** Return the localised name of this material (normally the block name) - */ - def getLocalizedName: String - - /** Get the item that this material is cut from (full block -> slabs) - */ - def getItem: ItemStack - - /** Get the strength of saw requried to cut this material - */ - def getCutterStrength: Int - - /** Get the breaking/walking sound - */ - def getSound: SoundType - - /** Return true if this material is solid and opaque (can run wires on etc) - */ - def isSolid = !isTransparent - - /** Get the explosion resistance of this part to an explosion caused by - * entity - */ - def explosionResistance(entity: Entity): Float - } - - /** Interface for overriding the default micro placement highlight handler to - * show the effect of placement on a certain block/part - */ - trait IMicroHighlightRenderer { - - /** Return true if a custom highlight was rendered and the default should be - * skipped - */ - def renderHighlight( - player: EntityPlayer, - hit: MovingObjectPosition, - mcrClass: CommonMicroClass, - size: Int, - material: Int - ): Boolean - } - - private val typeMap = HashMap[String, IMicroMaterial]() - private val nameMap = HashMap[String, Int]() - private var idMap: Array[(String, IMicroMaterial)] = _ - private val idWriter = new IDWriter - - private val highlightRenderers = ListBuffer[IMicroHighlightRenderer]() - private var maxCuttingStrength: Int = _ - - private val remap = HashMap[String, String]() - private var missingId: Int = 0 - - /** Register a micro material with unique identifier name - */ - def registerMaterial(material: IMicroMaterial, name: String) { - if (MultiPartRegistry.loaded) - throw new IllegalStateException( - "You must register your materials in the init methods." - ) - - if (typeMap.contains(name)) { - logger.error("Material with id " + name + " is already registered.") - return - } - - typeMap.put(name, material) - } - - /** Replace a micro material with unique identifier name - */ - def replaceMaterial(material: IMicroMaterial, name: String) { - if (MultiPartRegistry.loaded) - throw new IllegalStateException( - "You must register your materials in the init methods." - ) - - if (typeMap.remove(name).isEmpty) - logger.error("Material with id " + name + " was not registered.") - - logger.debug("Replaced micro material: " + name) - - typeMap.put(name, material) - } - - /** Registers a highlight renderer - */ - def registerHighlightRenderer(handler: IMicroHighlightRenderer) { - highlightRenderers += handler - } - - def remapName(oldName: String, newName: String): Unit = - remap.put(oldName, newName) - - private[microblock] def setupIDMap() { - idMap = typeMap.toList.sortBy(_._1).toArray - idWriter.setMax(idMap.length) - nameMap.clear() - for (i <- 0 until idMap.length) - nameMap.put(idMap(i)._1, i) - missingId = nameMap.getOrElse( - MissingMicroMaterial.key, - throw new IllegalStateException( - "MissingMicroMaterial is not registered; the placeholder must never " + - "fall back to id 0." - ) - ) - } - - def getMissingId = missingId - - private[microblock] def calcMaxCuttingStrength() { - val it = Item.itemRegistry.iterator.asInstanceOf[JIterator[Item]] - maxCuttingStrength = it.flatMap { - case saw: Saw => Some(saw.getMaxCuttingStrength) - case _ => None - }.max - } - - private[microblock] def loadIcons() { - if (idMap != null) - idMap.foreach(e => e._2.loadIcons()) - } - - def getMaxCuttingStrength = maxCuttingStrength - - def writeIDMap(packet: PacketCustom) { - packet.writeInt(idMap.size) - idMap.foreach(e => packet.writeString(e._1)) - } - - def readIDMap(packet: PacketCustom): Seq[String] = { - val k = packet.readInt() - idWriter.setMax(k) - idMap = new Array(k) - nameMap.clear() - val missing = ListBuffer[String]() - for (i <- 0 until k) { - val s = packet.readString() - val v = typeMap.get(s) - if (v.isEmpty) - missing += s - else { - idMap(i) = (s, v.get) - nameMap.put(s, i) - } - } - return missing - } - - def writeMaterialID(data: MCDataOutput, id: Int) { - idWriter.write(data, id) - } - - def readMaterialID(data: MCDataInput) = idWriter.read(data) - - def materialName(id: Int) = idMap(id)._1 - - def materialID(name: String) = - nameMap.get(remap.getOrElse(name, name)) match { - case Some(v) => v - case None => - logger.error("Missing mapping for part with ID: " + name) - missingId - } - - def getMaterial(name: String) = - typeMap.getOrElse(remap.getOrElse(name, name), null) - - def getMaterial(id: Int) = idMap(id)._2 - - def getIdMap = idMap - - def renderHighlight( - player: EntityPlayer, - hit: MovingObjectPosition, - mcrClass: CommonMicroClass, - size: Int, - material: Int - ): Boolean = { - val overridden = highlightRenderers.find( - _.renderHighlight(player, hit, mcrClass, size, material) - ) - if (overridden.isDefined) - return true - - MicroblockRender.renderHighlight(player, hit, mcrClass, size, material) - return true - } -} diff --git a/src/main/scala/codechicken/microblock/MicroOcclusion$.java b/src/main/scala/codechicken/microblock/MicroOcclusion$.java new file mode 100644 index 0000000..1edc6e4 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroOcclusion$.java @@ -0,0 +1,212 @@ +package codechicken.microblock; + +import static codechicken.multipart.PartMap.edgeAxisMask; +import static codechicken.multipart.PartMap.unpackEdgeBits; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.MatchError; + +public final class MicroOcclusion$ { + + public static final MicroOcclusion$ MODULE$ = new MicroOcclusion$(); + + private MicroOcclusion$() {} + + public void shrink(Cuboid6 renderBounds, Cuboid6 bounds, int side) { + switch (side) { + case -1: + return; + case 0: + if (renderBounds.min.y < bounds.max.y) { + renderBounds.min.y = bounds.max.y; + } + return; + case 1: + if (renderBounds.max.y > bounds.min.y) { + renderBounds.max.y = bounds.min.y; + } + return; + case 2: + if (renderBounds.min.z < bounds.max.z) { + renderBounds.min.z = bounds.max.z; + } + return; + case 3: + if (renderBounds.max.z > bounds.min.z) { + renderBounds.max.z = bounds.min.z; + } + return; + case 4: + if (renderBounds.min.x < bounds.max.x) { + renderBounds.min.x = bounds.max.x; + } + return; + case 5: + if (renderBounds.max.x > bounds.min.x) { + renderBounds.max.x = bounds.min.x; + } + return; + default: + throw new MatchError(side); + } + } + + public int shrinkFrom(JMicroShrinkRender part, JMicroShrinkRender other, Cuboid6 renderBounds) { + if (shrinkTest(part, other)) { + shrink(renderBounds, other.getBounds(), shrinkSide(part.getSlot(), other.getSlot())); + } else if (other.getSlot() < 6 && !other.isTransparent()) { + boolean coversFace; + switch (other.getSlot()) { + case 0: + coversFace = renderBounds.min.y <= 0; + break; + case 1: + coversFace = renderBounds.max.y >= 1; + break; + case 2: + coversFace = renderBounds.min.z <= 0; + break; + case 3: + coversFace = renderBounds.max.z >= 1; + break; + case 4: + coversFace = renderBounds.min.x <= 0; + break; + case 5: + coversFace = renderBounds.max.x >= 1; + break; + default: + throw new MatchError(other.getSlot()); + } + if (coversFace) { + return 1 << other.getSlot(); + } + } + return 0; + } + + public int shrink(JMicroShrinkRender part, Cuboid6 renderBounds, int slots) { + int renderMask = 0; + TileMultipart tile = ((TMultiPart) part).tile(); + for (int slot = 0; slot < slots; slot++) { + if (slot != part.getSlot()) { + TMultiPart other = tile.partMap(slot); + if (other instanceof JMicroShrinkRender) { + renderMask |= shrinkFrom(part, (JMicroShrinkRender) other, renderBounds); + } + } + } + return renderMask; + } + + public int shrinkSide(int firstSlot, int secondSlot) { + if (secondSlot < 6) { + return secondSlot; + } + if (firstSlot < 15) { + int firstCorner = firstSlot - 7; + int secondCorner = secondSlot - 7; + switch (firstCorner ^ secondCorner) { + case 1: + return secondCorner & 1; + case 2: + return 2 | (secondCorner & 2) >> 1; + case 4: + return 4 | (secondCorner & 4) >> 2; + default: + return -1; + } + } + if (secondSlot < 15) { + int firstEdge = firstSlot - 15; + int secondCorner = secondSlot - 7; + int edgeBits = unpackEdgeBits(firstEdge); + if ((secondCorner & edgeAxisMask(firstEdge)) != edgeBits) { + return -1; + } + return (firstEdge & 0xC) >> 1 | (secondCorner & ~edgeBits) >> (firstEdge >> 2); + } + + int firstEdge = firstSlot - 15; + int secondEdge = secondSlot - 15; + int firstBits = unpackEdgeBits(firstEdge); + int secondBits = unpackEdgeBits(secondEdge); + if ((firstEdge & 0xC) == (secondEdge & 0xC)) { + switch (firstBits ^ secondBits) { + case 1: + return (secondBits & 1) == 0 ? 0 : 1; + case 2: + return (secondBits & 2) == 0 ? 2 : 3; + case 4: + return (secondBits & 4) == 0 ? 4 : 5; + default: + return -1; + } + } + + int mask = edgeAxisMask(firstEdge) & edgeAxisMask(secondEdge); + if ((firstBits & mask) != (secondBits & mask)) { + return -1; + } + switch (firstEdge >> 2) { + case 0: + return (secondBits & 1) == 0 ? 0 : 1; + case 1: + return (secondBits & 2) == 0 ? 2 : 3; + case 2: + return (secondBits & 4) == 0 ? 4 : 5; + default: + throw new MatchError(firstEdge >> 2); + } + } + + public int recalcBounds(JMicroShrinkRender part, Cuboid6 renderBounds) { + if (part.getSlot() < 6) { + return shrink(part, renderBounds, 6); + } + if (part.getSlot() < 15) { + return shrink(part, renderBounds, 15); + } + return shrink(part, renderBounds, 27); + } + + public int shapePriority(int slot) { + if (slot < 6) { + return 2; + } + if (slot < 15) { + return 1; + } + return 0; + } + + public boolean shrinkTest(JMicroShrinkRender first, JMicroShrinkRender second) { + if (first.getPriorityClass() != second.getPriorityClass()) { + return first.getPriorityClass() < second.getPriorityClass(); + } + + int firstShape = shapePriority(first.getSlot()); + int secondShape = shapePriority(second.getSlot()); + if (firstShape != secondShape) { + return firstShape < secondShape; + } + if (first.getSlot() < 6) { + if (first.isTransparent() != second.isTransparent()) { + return first.isTransparent(); + } + if (first.getSize() != second.getSize()) { + return first.getSize() < second.getSize(); + } + } else { + if (first.getSize() != second.getSize()) { + return first.getSize() < second.getSize(); + } + if (first.isTransparent() != second.isTransparent()) { + return first.isTransparent(); + } + } + return first.getSlot() < second.getSlot(); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroOcclusion.java b/src/main/scala/codechicken/microblock/MicroOcclusion.java new file mode 100644 index 0000000..a6d3fd6 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroOcclusion.java @@ -0,0 +1,36 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Cuboid6; + +public final class MicroOcclusion { + + private MicroOcclusion() {} + + public static void shrink(Cuboid6 renderBounds, Cuboid6 bounds, int side) { + MicroOcclusion$.MODULE$.shrink(renderBounds, bounds, side); + } + + public static int shrinkFrom(JMicroShrinkRender part, JMicroShrinkRender other, Cuboid6 renderBounds) { + return MicroOcclusion$.MODULE$.shrinkFrom(part, other, renderBounds); + } + + public static int shrink(JMicroShrinkRender part, Cuboid6 renderBounds, int slots) { + return MicroOcclusion$.MODULE$.shrink(part, renderBounds, slots); + } + + public static int shrinkSide(int firstSlot, int secondSlot) { + return MicroOcclusion$.MODULE$.shrinkSide(firstSlot, secondSlot); + } + + public static int recalcBounds(JMicroShrinkRender part, Cuboid6 renderBounds) { + return MicroOcclusion$.MODULE$.recalcBounds(part, renderBounds); + } + + public static int shapePriority(int slot) { + return MicroOcclusion$.MODULE$.shapePriority(slot); + } + + public static boolean shrinkTest(JMicroShrinkRender first, JMicroShrinkRender second) { + return MicroOcclusion$.MODULE$.shrinkTest(first, second); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroRecipe$.java b/src/main/scala/codechicken/microblock/MicroRecipe$.java new file mode 100644 index 0000000..64863aa --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroRecipe$.java @@ -0,0 +1,302 @@ +package codechicken.microblock; + +import java.util.Objects; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; +import net.minecraftforge.oredict.RecipeSorter; + +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.handler.MicroblockProxy; +import scala.Tuple2; +import scala.Tuple3; +import scala.collection.immutable.Map; +import scala.collection.immutable.Map$; + +/** Scala-compatible singleton carrying the microblock recipe implementation. */ +public final class MicroRecipe$ implements IRecipe { + + public static final MicroRecipe$ MODULE$ = new MicroRecipe$(); + + private final Map splitMap; + + private MicroRecipe$() { + RecipeSorter.register("fmp:micro", getClass(), RecipeSorter.Category.SHAPED, "after:forge:shapelessore"); + Map splits = Map$.MODULE$.empty(); + splits = splits.updated(0, 3); + splits = splits.updated(1, 3); + splitMap = splits.updated(3, 2); + } + + @Override + public ItemStack getRecipeOutput() { + return ItemMicroPart.create(1, 1, "tile.stone"); + } + + @Override + public int getRecipeSize() { + return 9; + } + + @Override + public boolean matches(InventoryCrafting crafting, World world) { + return getCraftingResult(crafting) != null; + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting crafting) { + ItemStack result = getHollowResult(crafting); + if (result != null) { + return result; + } + result = getGluingResult(crafting); + if (result != null) { + return result; + } + result = getThinningResult(crafting); + if (result != null) { + return result; + } + result = getSplittingResult(crafting); + return result != null ? result : getHollowFillResult(crafting); + } + + public ItemStack create(int amount, int microClass, int size, int material) { + if (size == 8) { + ItemStack item = MicroMaterialRegistry.getMaterial(material).getItem().copy(); + item.stackSize = amount; + return item; + } + return ItemMicroPart.create(amount, microClass << 8 | size, MicroMaterialRegistry.materialName(material)); + } + + public int microMaterial(ItemStack item) { + return Objects.equals(item.getItem(), MicroblockProxy.itemMicro()) ? ItemMicroPart.getMaterialID(item) + : findMaterial(item); + } + + public int microClass(ItemStack item) { + return Objects.equals(item.getItem(), MicroblockProxy.itemMicro()) ? item.getItemDamage() >> 8 : 0; + } + + public int microSize(ItemStack item) { + return Objects.equals(item.getItem(), MicroblockProxy.itemMicro()) ? item.getItemDamage() & 0xFF : 8; + } + + public ItemStack getHollowResult(InventoryCrafting crafting) { + if (crafting.getStackInRowAndColumn(1, 1) != null) { + return null; + } + + ItemStack first = crafting.getStackInRowAndColumn(0, 0); + if (first == null || !Objects.equals(first.getItem(), MicroblockProxy.itemMicro()) || microClass(first) != 0) { + return null; + } + int size = microSize(first); + int material = microMaterial(first); + + for (int slot = 1; slot <= 8; slot++) { + if (slot == 4) { + continue; + } + ItemStack item = crafting.getStackInSlot(slot); + if (item == null || !Objects.equals(item.getItem(), MicroblockProxy.itemMicro()) + || microMaterial(item) != material + || item.getItemDamage() != first.getItemDamage()) { + return null; + } + } + return create(8, 1, size, material); + } + + public ItemStack getGluingResult(InventoryCrafting crafting) { + int size = 0; + int count = 0; + int smallest = 0; + int microClass = 0; + int material = 0; + for (int slot = 0; slot < 9; slot++) { + ItemStack item = crafting.getStackInSlot(slot); + if (item == null) { + continue; + } + if (!Objects.equals(item.getItem(), MicroblockProxy.itemMicro())) { + return null; + } + if (count == 0) { + size = microSize(item); + microClass = microClass(item); + material = microMaterial(item); + count = 1; + smallest = size; + } else if (microClass(item) != microClass || microMaterial(item) != material) { + return null; + } else if (microClass >= 2 && microSize(item) != smallest) { + return null; + } else { + smallest = Math.min(smallest, microSize(item)); + count++; + size += microSize(item); + } + } + + if (count <= 1) { + return null; + } + switch (microClass) { + case 3: + return count == 2 ? create(1, 0, smallest, material) : null; + case 2: + if (count == 2) { + return create(1, 3, smallest, material); + } + return count == 4 ? create(1, 0, smallest, material) : null; + case 1: + case 0: + int base = 0; + for (int candidate = 1; candidate <= 4; candidate <<= 1) { + if ((candidate & size) != 0) { + base = candidate; + break; + } + } + if (base == 0) { + return create(size / 8, 0, 8, material); + } + return base <= smallest ? null : create(size / base, microClass, base, material); + default: + return null; + } + } + + public Tuple3 getSaw(InventoryCrafting crafting) { + int slot = findSawSlot(crafting); + if (slot < 0) { + return new Tuple3<>(null, 0, 0); + } + ItemStack item = crafting.getStackInRowAndColumn(slot % 3, slot / 3); + return new Tuple3<>((Saw) item.getItem(), slot / 3, slot % 3); + } + + public boolean canCut(Saw saw, ItemStack sawItem, int material) { + int sawStrength = saw.getCuttingStrength(sawItem); + int materialStrength = MicroMaterialRegistry.getMaterial(material).getCutterStrength(); + return sawStrength >= materialStrength || sawStrength == MicroMaterialRegistry.getMaxCuttingStrength(); + } + + public ItemStack getThinningResult(InventoryCrafting crafting) { + int sawSlot = findSawSlot(crafting); + if (sawSlot < 0) { + return null; + } + int row = sawSlot / 3; + int column = sawSlot % 3; + ItemStack sawItem = crafting.getStackInRowAndColumn(column, row); + Saw saw = (Saw) sawItem.getItem(); + ItemStack item = crafting.getStackInRowAndColumn(column, row + 1); + if (item == null) { + return null; + } + + int size = microSize(item); + int material = microMaterial(item); + int microClass = microClass(item); + if (size == 1 || material < 0 || !canCut(saw, sawItem, material)) { + return null; + } + + for (int checkedRow = 0; checkedRow < 3; checkedRow++) { + for (int checkedColumn = 0; checkedColumn < 3; checkedColumn++) { + if ((checkedColumn != column || checkedRow != row && checkedRow != row + 1) + && crafting.getStackInRowAndColumn(checkedColumn, checkedRow) != null) { + return null; + } + } + } + return create(2, microClass, size / 2, material); + } + + public int findMaterial(ItemStack item) { + for (Tuple2 entry : MicroMaterialRegistry.getIdMap()) { + // The recovery placeholder exposes stone, but must never win a raw-material recipe lookup. + if (entry._2() == MissingMicroMaterial$.MODULE$) { + continue; + } + ItemStack materialItem = entry._2().getItem(); + if (Objects.equals(item.getItem(), materialItem.getItem()) + && item.getItemDamage() == materialItem.getItemDamage() + && ItemStack.areItemStackTagsEqual(item, materialItem)) { + return MicroMaterialRegistry.materialID(entry._1()); + } + } + return -1; + } + + public Map splitMap() { + return splitMap; + } + + public ItemStack getSplittingResult(InventoryCrafting crafting) { + int sawSlot = findSawSlot(crafting); + if (sawSlot < 0) { + return null; + } + int row = sawSlot / 3; + int column = sawSlot % 3; + ItemStack sawItem = crafting.getStackInRowAndColumn(column, row); + Saw saw = (Saw) sawItem.getItem(); + ItemStack item = crafting.getStackInRowAndColumn(column + 1, row); + if (item == null || !Objects.equals(item.getItem(), MicroblockProxy.itemMicro())) { + return null; + } + + int microClass = microClass(item); + int material = microMaterial(item); + if (!canCut(saw, sawItem, material)) { + return null; + } + + if (!splitMap.contains(microClass)) { + return null; + } + int splitClass = ((Number) splitMap.apply(microClass)).intValue(); + + for (int checkedRow = 0; checkedRow < 3; checkedRow++) { + for (int checkedColumn = 0; checkedColumn < 3; checkedColumn++) { + if ((checkedRow != row || checkedColumn != column && checkedColumn != column + 1) + && crafting.getStackInRowAndColumn(checkedColumn, checkedRow) != null) { + return null; + } + } + } + return create(2, splitClass, microSize(item), material); + } + + public ItemStack getHollowFillResult(InventoryCrafting crafting) { + ItemStack cover = null; + for (int slot = 0; slot < 9; slot++) { + ItemStack item = crafting.getStackInSlot(slot); + if (item == null) { + continue; + } + if (!Objects.equals(item.getItem(), MicroblockProxy.itemMicro()) || cover != null + || microClass(item) != 1) { + return null; + } + cover = item; + } + return cover == null ? null : create(1, 0, microSize(cover), microMaterial(cover)); + } + + private int findSawSlot(InventoryCrafting crafting) { + for (int slot = 0; slot < 9; slot++) { + ItemStack item = crafting.getStackInRowAndColumn(slot % 3, slot / 3); + if (item != null && item.getItem() instanceof Saw) { + return slot; + } + } + return -1; + } +} diff --git a/src/main/scala/codechicken/microblock/MicroRecipe.java b/src/main/scala/codechicken/microblock/MicroRecipe.java new file mode 100644 index 0000000..f7c5fa1 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroRecipe.java @@ -0,0 +1,82 @@ +package codechicken.microblock; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import scala.Tuple3; +import scala.collection.immutable.Map; + +/** Static forwarders for Java and existing bytecode; implementation remains on {@link MicroRecipe$}. */ +public final class MicroRecipe { + + private MicroRecipe() {} + + public static ItemStack getRecipeOutput() { + return MicroRecipe$.MODULE$.getRecipeOutput(); + } + + public static int getRecipeSize() { + return MicroRecipe$.MODULE$.getRecipeSize(); + } + + public static boolean matches(InventoryCrafting crafting, World world) { + return MicroRecipe$.MODULE$.matches(crafting, world); + } + + public static ItemStack getCraftingResult(InventoryCrafting crafting) { + return MicroRecipe$.MODULE$.getCraftingResult(crafting); + } + + public static ItemStack create(int amount, int microClass, int size, int material) { + return MicroRecipe$.MODULE$.create(amount, microClass, size, material); + } + + public static int microMaterial(ItemStack item) { + return MicroRecipe$.MODULE$.microMaterial(item); + } + + public static int microClass(ItemStack item) { + return MicroRecipe$.MODULE$.microClass(item); + } + + public static int microSize(ItemStack item) { + return MicroRecipe$.MODULE$.microSize(item); + } + + public static ItemStack getHollowResult(InventoryCrafting crafting) { + return MicroRecipe$.MODULE$.getHollowResult(crafting); + } + + public static ItemStack getGluingResult(InventoryCrafting crafting) { + return MicroRecipe$.MODULE$.getGluingResult(crafting); + } + + public static Tuple3 getSaw(InventoryCrafting crafting) { + return MicroRecipe$.MODULE$.getSaw(crafting); + } + + public static boolean canCut(Saw saw, ItemStack sawItem, int material) { + return MicroRecipe$.MODULE$.canCut(saw, sawItem, material); + } + + public static ItemStack getThinningResult(InventoryCrafting crafting) { + return MicroRecipe$.MODULE$.getThinningResult(crafting); + } + + public static int findMaterial(ItemStack item) { + return MicroRecipe$.MODULE$.findMaterial(item); + } + + public static Map splitMap() { + return MicroRecipe$.MODULE$.splitMap(); + } + + public static ItemStack getSplittingResult(InventoryCrafting crafting) { + return MicroRecipe$.MODULE$.getSplittingResult(crafting); + } + + public static ItemStack getHollowFillResult(InventoryCrafting crafting) { + return MicroRecipe$.MODULE$.getHollowFillResult(crafting); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroRecipe.scala b/src/main/scala/codechicken/microblock/MicroRecipe.scala deleted file mode 100644 index c9b5991..0000000 --- a/src/main/scala/codechicken/microblock/MicroRecipe.scala +++ /dev/null @@ -1,247 +0,0 @@ -package codechicken.microblock - -import net.minecraft.item.crafting.IRecipe -import net.minecraft.world.World -import net.minecraft.inventory.InventoryCrafting -import net.minecraft.item.ItemStack -import codechicken.microblock.handler.MicroblockProxy._ -import net.minecraftforge.oredict.RecipeSorter - -object MicroRecipe extends IRecipe { - RecipeSorter.register( - "fmp:micro", - getClass, - RecipeSorter.Category.SHAPED, - "after:forge:shapelessore" - ) - - def getRecipeOutput = ItemMicroPart.create(1, 1, "tile.stone") - - def getRecipeSize = 9 - - def matches(icraft: InventoryCrafting, world: World) = - getCraftingResult(icraft) != null - - def getCraftingResult(icraft: InventoryCrafting): ItemStack = { - var res = getHollowResult(icraft) - if (res != null) return res - res = getGluingResult(icraft) - if (res != null) return res - res = getThinningResult(icraft) - if (res != null) return res - res = getSplittingResult(icraft) - if (res != null) return res - res = getHollowFillResult(icraft) - return res - } - - def create( - amount: Int, - mcrClass: Int, - size: Int, - material: Int - ): ItemStack = { - if (size == 8) { - val item = MicroMaterialRegistry.getMaterial(material).getItem.copy - item.stackSize = amount - return item - } - return ItemMicroPart.create( - amount, - mcrClass << 8 | size, - MicroMaterialRegistry.materialName(material) - ) - } - - def microMaterial(item: ItemStack) = - if (item.getItem == itemMicro) - ItemMicroPart.getMaterialID(item) - else - findMaterial(item) - - def microClass(item: ItemStack) = - if (item.getItem == itemMicro) - item.getItemDamage >> 8 - else - 0 - - def microSize(item: ItemStack) = - if (item.getItem == itemMicro) - item.getItemDamage & 0xff - else - 8 - - def getHollowResult(icraft: InventoryCrafting): ItemStack = { - if (icraft.getStackInRowAndColumn(1, 1) != null) return null - - val first = icraft.getStackInRowAndColumn(0, 0) - if (first == null || first.getItem != itemMicro || microClass(first) != 0) - return null - val size = microSize(first) - val material = microMaterial(first) - - for (i <- 1 to 8 if i != 4) { - val item = icraft.getStackInSlot(i) - if ( - item == null || item.getItem != itemMicro || - microMaterial( - item - ) != material || item.getItemDamage != first.getItemDamage - ) - return null - } - return create(8, 1, size, material) - } - - def getGluingResult(icraft: InventoryCrafting): ItemStack = { - var size = 0 - var count = 0 - var smallest = 0 - var mcrClass = 0 - var material = 0 - for (i <- 0 until 9) { - val item = icraft.getStackInSlot(i) - if (item != null) { - if (item.getItem != itemMicro) return null - if (count == 0) { - size = microSize(item) - mcrClass = microClass(item) - material = microMaterial(item) - count = 1 - smallest = size - } else if ( - microClass(item) != mcrClass || microMaterial(item) != material - ) return null - else if (mcrClass >= 2 && microSize(item) != smallest) return null - else { - smallest = Math.min(smallest, microSize(item)) - count += 1 - size += microSize(item) - } - } - } - - if (count <= 1) return null - - mcrClass match { - case 3 => - count match { - case 2 => create(1, 0, smallest, material) - case _ => null - } - case 2 => - count match { - case 2 => create(1, 3, smallest, material) - case 4 => create(1, 0, smallest, material) - case _ => null - } - case 1 | 0 => - val base = Seq(1, 2, 4).find(s => (s & size) != 0) - if (base.isEmpty) - create(size / 8, 0, 8, material) - else if (base.get <= smallest) - null - else - create(size / base.get, mcrClass, base.get, material) - case _ => null - } - } - - def getSaw(icraft: InventoryCrafting): (Saw, Int, Int) = { - for (r <- 0 until 3) - for (c <- 0 until 3) { - val item = icraft.getStackInRowAndColumn(c, r) - if (item != null && item.getItem.isInstanceOf[Saw]) - return (item.getItem.asInstanceOf[Saw], r, c) - } - return (null, 0, 0) - } - - def canCut(saw: Saw, sawItem: ItemStack, material: Int): Boolean = { - val sawStrength = saw.getCuttingStrength(sawItem) - val matStrength = - MicroMaterialRegistry.getMaterial(material).getCutterStrength - return sawStrength >= matStrength || sawStrength == MicroMaterialRegistry.getMaxCuttingStrength - } - - def getThinningResult(icraft: InventoryCrafting): ItemStack = { - val (saw, row, col) = getSaw(icraft) - if (saw == null) - return null - - val item = icraft.getStackInRowAndColumn(col, row + 1) - if (item == null) - return null - - val size = microSize(item) - val material = microMaterial(item) - val mcrClass = microClass(item) - if ( - size == 1 || material < 0 || !canCut( - saw, - icraft.getStackInRowAndColumn(col, row), - material - ) - ) - return null - - for (r <- 0 until 3) - for (c <- 0 until 3) - if ( - (c != col || r != row && r != row + 1) && - icraft.getStackInRowAndColumn(c, r) != null - ) - return null - - return create(2, mcrClass, size / 2, material) - } - - def findMaterial(item: ItemStack): Int = - MicroMaterialRegistry.getIdMap.find { m => - val mitem = m._2.getItem - m._2 != MissingMicroMaterial && item.getItem == mitem.getItem && - item.getItemDamage == mitem.getItemDamage && - ItemStack.areItemStackTagsEqual(item, mitem) - } match { - case None => -1 - case Some((name, m)) => MicroMaterialRegistry.materialID(name) - } - - val splitMap = Map(0 -> 3, 1 -> 3, 3 -> 2) - def getSplittingResult(icraft: InventoryCrafting): ItemStack = { - val (saw, row, col) = getSaw(icraft) - if (saw == null) return null - val item = icraft.getStackInRowAndColumn(col + 1, row) - if (item == null || item.getItem != itemMicro) return null - val mcrClass = microClass(item) - val material = microMaterial(item) - if (!canCut(saw, icraft.getStackInRowAndColumn(col, row), material)) - return null - val split = splitMap.get(mcrClass) - if (split.isEmpty) return null - - for (r <- 0 until 3) - for (c <- 0 until 3) - if ( - (r != row || c != col && c != col + 1) && - icraft.getStackInRowAndColumn(c, r) != null - ) - return null - - return create(2, split.get, microSize(item), material) - } - - def getHollowFillResult(icraft: InventoryCrafting): ItemStack = { - var cover: ItemStack = null - for (i <- 0 until 9) { - val item = icraft.getStackInSlot(i) - if (item != null) { - if (item.getItem != itemMicro || cover != null || microClass(item) != 1) - return null - else cover = item - } - } - if (cover == null) return null - return create(1, 0, microSize(cover), microMaterial(cover)) - } -} diff --git a/src/main/scala/codechicken/microblock/Microblock$.java b/src/main/scala/codechicken/microblock/Microblock$.java new file mode 100644 index 0000000..a9c39dc --- /dev/null +++ b/src/main/scala/codechicken/microblock/Microblock$.java @@ -0,0 +1,12 @@ +package codechicken.microblock; + +public final class Microblock$ { + + public static final Microblock$ MODULE$ = new Microblock$(); + + private Microblock$() {} + + public int $lessinit$greater$default$1() { + return 0; + } +} diff --git a/src/main/scala/codechicken/microblock/Microblock.java b/src/main/scala/codechicken/microblock/Microblock.java new file mode 100644 index 0000000..384869e --- /dev/null +++ b/src/main/scala/codechicken/microblock/Microblock.java @@ -0,0 +1,199 @@ +package codechicken.microblock; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.render.EntityDigIconFX; +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.JCuboidPart; +import codechicken.multipart.TCuboidPart; +import codechicken.multipart.TMultiPart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public abstract class Microblock extends TMultiPart implements TCuboidPart { + + private int material; + private byte shape; + + public static int $lessinit$greater$default$1() { + return Microblock$.MODULE$.$lessinit$greater$default$1(); + } + + public Microblock(int material) { + this.material = material; + } + + public int material() { + return material; + } + + public void material_$eq(int value) { + material = value; + } + + public byte shape() { + return shape; + } + + public void shape_$eq(byte value) { + shape = value; + } + + @Override + public Iterable getSubParts() { + return JCuboidPart.subParts(this); + } + + @Override + public Iterable getCollisionBoxes() { + return JCuboidPart.collisionBoxes(this); + } + + @Override + public void drawBreaking(RenderBlocks renderBlocks) { + JCuboidPart.renderBreaking(this, renderBlocks); + } + + public abstract MicroblockClass microClass(); + + @Override + public String getType() { + return microClass().getName(); + } + + @Override + public float getStrength(MovingObjectPosition hit, EntityPlayer player) { + MicroMaterialRegistry.IMicroMaterial microMaterial = getIMaterial(); + return microMaterial == null ? super.getStrength(hit, player) : microMaterial.getStrength(player); + } + + @Override + public boolean doesTick() { + return false; + } + + public int getSize() { + return shape() >> 4; + } + + public int getShape() { + return shape() & 0xF; + } + + public void setShape(int size, int slot) { + shape_$eq((byte) (size << 4 | slot)); + } + + public int getMaterial() { + return material(); + } + + public MicroMaterialRegistry.IMicroMaterial getIMaterial() { + return MicroMaterialRegistry.getMaterial(material()); + } + + /** + * Satisfies {@link codechicken.multipart.JIconHitEffects#getBrokenColour} for every microblock, pairing with the + * icon {@link MicroblockClient} resolves for the same side. + *

+ * Declared on this class rather than on the MicroblockClient trait on purpose: a new Scala trait member is abstract + * on the compiled interface, so mixins built against older FMP would fail with AbstractMethodError. A concrete + * method here is inherited by those classes instead. + */ + @SideOnly(Side.CLIENT) + public int getBrokenColour(int side, IBlockAccess world, int x, int y, int z) { + MicroMaterialRegistry.IMicroMaterial material = getIMaterial(); + return material == null ? EntityDigIconFX.NO_TINT : material.getBreakingColour(side, world, x, y, z); + } + + public abstract int itemClassID(); + + @Override + public List getDrops() { + int remaining = getSize(); + List items = new ArrayList<>(3); + for (int size = 4; size > 0; size /= 2) { + int amount = remaining / size; + remaining -= amount * size; + if (amount > 0) { + items.add( + ItemMicroPart.create( + amount, + size | itemClassID() << 8, + MicroMaterialRegistry.materialName(material()))); + } + } + return items; + } + + @Override + public ItemStack pickItem(MovingObjectPosition hit) { + int size = getSize(); + for (int itemSize = 4; itemSize > 0; itemSize /= 2) { + if (size % itemSize == 0 && size / itemSize >= 1) { + return ItemMicroPart + .create(itemSize | itemClassID() << 8, MicroMaterialRegistry.materialName(material())); + } + } + return null; + } + + @Override + public void writeDesc(MCDataOutput packet) { + MicroMaterialRegistry.writeMaterialID(packet, material()); + packet.writeByte(shape()); + } + + @Override + public void readDesc(MCDataInput packet) { + shape_$eq(packet.readByte()); + } + + public void sendShapeUpdate() { + getWriteStream().writeByte(shape()); + } + + @Override + public void read(MCDataInput packet) { + super.read(packet); + tile().notifyPartChange(this); + } + + @Override + public void save(NBTTagCompound tag) { + tag.setByte("shape", shape()); + tag.setString("material", MicroMaterialRegistry.materialName(material())); + } + + @Override + public void load(NBTTagCompound tag) { + shape_$eq(tag.getByte("shape")); + material_$eq(MicroMaterialRegistry.materialID(tag.getString("material"))); + } + + public boolean isTransparent() { + return getIMaterial().isTransparent(); + } + + @Override + public int getLightValue() { + return getIMaterial().getLightValue(); + } + + @Override + public float explosionResistance(Entity entity) { + return getIMaterial().explosionResistance(entity) * microClass().getResistanceFactor(); + } +} diff --git a/src/main/scala/codechicken/microblock/Microblock.scala b/src/main/scala/codechicken/microblock/Microblock.scala deleted file mode 100644 index 34b611a..0000000 --- a/src/main/scala/codechicken/microblock/Microblock.scala +++ /dev/null @@ -1,177 +0,0 @@ -package codechicken.microblock - -import net.minecraft.nbt.NBTTagCompound -import codechicken.lib.lighting.LightMatrix -import codechicken.microblock.MicroMaterialRegistry._ -import codechicken.lib.vec.BlockCoord -import org.lwjgl.opengl.GL11 -import codechicken.lib.render.CCRenderState -import net.minecraft.world.World -import codechicken.lib.vec.Cuboid6 -import codechicken.lib.vec.Vector3 -import codechicken.multipart.TIconHitEffects -import net.minecraft.util.IIcon -import net.minecraft.block.Block -import codechicken.multipart.TCuboidPart -import net.minecraft.util.MovingObjectPosition -import net.minecraft.entity.player.EntityPlayer -import codechicken.multipart.JPartialOcclusion -import codechicken.lib.render.Vertex5 -import net.minecraft.item.ItemStack -import scala.collection.mutable.ListBuffer -import codechicken.lib.data.MCDataOutput -import codechicken.lib.data.MCDataInput -import codechicken.lib.render.RenderUtils -import codechicken.lib.render.IFaceRenderer -import codechicken.multipart.TSlottedPart -import scala.collection.JavaConversions._ -import codechicken.lib.render.TextureUtils -import net.minecraft.entity.Entity -import net.minecraft.init.Blocks -import cpw.mods.fml.relauncher.{Side, SideOnly} -import codechicken.lib.render.BlockRenderer.BlockFace - -abstract class Microblock(var material: Int = 0) extends TCuboidPart { - var shape: Byte = 0 - - def microClass: MicroblockClass - - def getType = microClass.getName - - override def getStrength(hit: MovingObjectPosition, player: EntityPlayer) = - getIMaterial match { - case null => super.getStrength(hit, player) - case mat => mat.getStrength(player) - } - - override def doesTick = false - - def getSize = shape >> 4 - - def getShape = shape & 0xf - - def setShape(size: Int, slot: Int) = shape = (size << 4 | slot).toByte - - def getMaterial = material - - def getIMaterial = MicroMaterialRegistry.getMaterial(material) - - def itemClassID: Int - - override def getDrops = { - var size = getSize - val items = ListBuffer[ItemStack]() - for (s <- Seq(4, 2, 1)) { - val m = size / s - size -= m * s - if (m > 0) - items += ItemMicroPart.create( - m, - s | itemClassID << 8, - MicroMaterialRegistry.materialName(material) - ) - } - items - } - - override def pickItem(hit: MovingObjectPosition): ItemStack = { - val size = getSize - for (s <- Seq(4, 2, 1)) - if (size % s == 0 && size / s >= 1) - return ItemMicroPart.create( - s | itemClassID << 8, - MicroMaterialRegistry.materialName(material) - ) - - return null // unreachable - } - - override def writeDesc(packet: MCDataOutput) { - writeMaterialID(packet, material) - packet.writeByte(shape) - } - - override def readDesc(packet: MCDataInput) { - shape = packet.readByte - } - - def sendShapeUpdate() { - getWriteStream.writeByte(shape) - } - - override def read(packet: MCDataInput) { - super.read(packet) - tile.notifyPartChange(this) - } - - override def save(tag: NBTTagCompound) { - tag.setByte("shape", shape) - tag.setString("material", materialName(material)) - } - - override def load(tag: NBTTagCompound) { - shape = tag.getByte("shape") - material = materialID(tag.getString("material")) - } - - def isTransparent = getIMaterial.isTransparent - - override def getLightValue = getIMaterial.getLightValue - - override def explosionResistance(entity: Entity) = - getIMaterial.explosionResistance(entity) * microClass.getResistanceFactor -} - -trait MicroblockClient - extends Microblock - with TIconHitEffects - with IMicroMaterialRender { - def getBrokenIcon(side: Int) = getIMaterial match { - case null => Blocks.stone.getIcon(0, 0) - case mat => mat.getBreakingIcon(side) - } - - override def renderStatic(pos: Vector3, pass: Int) = { - if (getIMaterial.canRenderInPass(pass)) { - render(pos, pass) - true - } else - false - } - - def render(pos: Vector3, pass: Int) - - override def getRenderBounds = getBounds -} - -trait CommonMicroblockClient - extends CommonMicroblock - with MicroblockClient - with TMicroOcclusionClient { - def render(pos: Vector3, pass: Int) { - if (pass < 0) - MicroblockRender.renderCuboid(pos, getIMaterial, pass, getBounds, 0) - else - MicroblockRender.renderCuboid( - pos, - getIMaterial, - pass, - renderBounds, - renderMask - ) - } -} - -trait CommonMicroblock - extends Microblock - with JPartialOcclusion - with TMicroOcclusion - with TSlottedPart { - def microClass: CommonMicroClass - - def getSlot = getShape - def getSlotMask = 1 << getSlot - def getPartialOcclusionBoxes = Seq(getBounds) - - override def itemClassID = microClass.getClassId -} diff --git a/src/main/scala/codechicken/microblock/MicroblockClass.java b/src/main/scala/codechicken/microblock/MicroblockClass.java new file mode 100644 index 0000000..6c6829f --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroblockClass.java @@ -0,0 +1,73 @@ +package codechicken.microblock; + +import net.minecraft.nbt.NBTTagCompound; + +import codechicken.lib.data.MCDataInput; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultiPartRegistry.IPartFactory2; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public abstract class MicroblockClass implements IPartFactory2 { + + private final int baseTraitId; + + @SideOnly(Side.CLIENT) + private int clientTraitId; + + private volatile boolean bitmap$0; + + public MicroblockClass() { + baseTraitId = MicroblockGenerator$.MODULE$.registerTrait(baseTrait()); + } + + public abstract String getName(); + + public abstract Class baseTrait(); + + @SideOnly(Side.CLIENT) + public abstract Class clientTrait(); + + public abstract float getResistanceFactor(); + + public int baseTraitId() { + return baseTraitId; + } + + public int clientTraitId() { + return bitmap$0 ? clientTraitId : clientTraitId$lzycompute(); + } + + private int clientTraitId$lzycompute() { + synchronized (this) { + if (!bitmap$0) { + clientTraitId = MicroblockGenerator$.MODULE$.registerTrait(clientTrait()); + bitmap$0 = true; + } + return clientTraitId; + } + } + + public void register() { + MultiPartRegistry.registerParts(this, getName()); + } + + public Microblock create(boolean client, int material) { + return MicroblockGenerator$.MODULE$.create(this, material, client); + } + + @Override + public Microblock createPart(String name, MCDataInput packet) { + return create(true, MicroMaterialRegistry.readMaterialID(packet)); + } + + @Override + public Microblock createPart(String name, NBTTagCompound nbt) { + return create(false, MicroMaterialRegistry.materialID(nbt.getString("material"))); + } + + @Override + public Microblock createPartForClientPreview(String name, NBTTagCompound nbt) { + return create(true, MicroMaterialRegistry.materialID(nbt.getString("material"))); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroblockClass.scala b/src/main/scala/codechicken/microblock/MicroblockClass.scala deleted file mode 100644 index eebb9a1..0000000 --- a/src/main/scala/codechicken/microblock/MicroblockClass.scala +++ /dev/null @@ -1,63 +0,0 @@ -package codechicken.microblock - -import codechicken.multipart.MultiPartRegistry -import codechicken.multipart.MultiPartRegistry.IPartFactory2 -import net.minecraft.nbt.NBTTagCompound -import codechicken.lib.data.MCDataInput -import cpw.mods.fml.relauncher.{Side, SideOnly} - -abstract class MicroblockClass extends IPartFactory2 { - def getName: String - def baseTrait: Class[_ <: Microblock] - @SideOnly(Side.CLIENT) - def clientTrait: Class[_ <: MicroblockClient] - def getResistanceFactor: Float - - val baseTraitId = MicroblockGenerator.registerTrait(baseTrait) - @SideOnly(Side.CLIENT) - lazy val clientTraitId = MicroblockGenerator.registerTrait(clientTrait) - - def register() { - MultiPartRegistry.registerParts(this, getName) - } - - def create(client: Boolean, material: Int) = - MicroblockGenerator.create(this, material, client) - override def createPart(name: String, packet: MCDataInput) = - create(true, MicroMaterialRegistry.readMaterialID(packet)) - override def createPart(name: String, nbt: NBTTagCompound) = - create(false, MicroMaterialRegistry.materialID(nbt.getString("material"))) -} - -/** Microblocks with corresponding items - */ -abstract class CommonMicroClass extends MicroblockClass { - private var classId: Int = _ - - def getClassId = classId - def itemSlot: Int - def placementProperties: PlacementProperties - - def register(id: Int) { - register() - classId = id - CommonMicroClass.registerMicroClass(this, id) - } -} - -object CommonMicroClass { - val classes = new Array[CommonMicroClass](256) - - def getMicroClass(modelId: Int) = classes(modelId >> 8) - - def registerMicroClass(mcrClass: CommonMicroClass, id: Int) { - if (classes(id) != null) - throw new IllegalArgumentException( - "Microblock class id " + id + " is already taken by " + classes( - id - ).getName + " when adding " + mcrClass.getName - ) - - classes(id) = mcrClass - } -} diff --git a/src/main/scala/codechicken/microblock/MicroblockGenerator$.java b/src/main/scala/codechicken/microblock/MicroblockGenerator$.java new file mode 100644 index 0000000..762c0c5 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroblockGenerator$.java @@ -0,0 +1,61 @@ +package codechicken.microblock; + +import java.util.BitSet; + +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.multipart.asm.ASMMixinFactory; +import codechicken.multipart.asm.ScratchBitSet; +import codechicken.multipart.asm.ScratchBitSet$class; +import scala.Predef$; + +public final class MicroblockGenerator$ extends ASMMixinFactory implements ScratchBitSet { + + public static final MicroblockGenerator$ MODULE$ = new MicroblockGenerator$(); + + private ThreadLocal codechicken$multipart$asm$ScratchBitSet$$bitSets; + + private MicroblockGenerator$() { + super(Microblock.class, Predef$.MODULE$.wrapRefArray(new Class[] { Integer.TYPE })); + ScratchBitSet$class.$init$(this); + } + + @Override + public ThreadLocal codechicken$multipart$asm$ScratchBitSet$$bitSets() { + return codechicken$multipart$asm$ScratchBitSet$$bitSets; + } + + @Override + public void codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq( + ThreadLocal value) { + codechicken$multipart$asm$ScratchBitSet$$bitSets = value; + } + + @Override + public BitSet getBitSet() { + return ScratchBitSet$class.getBitSet(this); + } + + @Override + public BitSet freshBitSet() { + return ScratchBitSet$class.freshBitSet(this); + } + + /** + * Retained companion entry for compiled and reflective consumers. Java callers can use + * {@link MicroblockGenerator#create(MicroblockClass, int, boolean)} with the same construction contract. + */ + public Microblock create(MicroblockClass microClass, int materialId, boolean client) { + BitSet traits = freshBitSet(); + traits.set(microClass.baseTraitId()); + if (client) { + traits.set(microClass.clientTraitId()); + } + + IMicroMaterial material = MicroMaterialRegistry.getMaterial(materialId); + if (material instanceof MicroblockGenerator.IGeneratedMaterial) { + ((MicroblockGenerator.IGeneratedMaterial) material).addTraits(traits, microClass, client); + } + + return construct(traits, Predef$.MODULE$.wrapRefArray(new Object[] { Integer.valueOf(materialId) })); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroblockGenerator.java b/src/main/scala/codechicken/microblock/MicroblockGenerator.java new file mode 100644 index 0000000..40ccede --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroblockGenerator.java @@ -0,0 +1,99 @@ +package codechicken.microblock; + +import java.util.BitSet; + +import scala.collection.Seq; + +public final class MicroblockGenerator { + + /** Optional material capability for adding registered traits before a microblock is constructed. */ + public interface IGeneratedMaterial { + + /** + * Adds material-specific traits to the borrowed generator scratch set, which already contains the factory's + * base trait and, on the client path, its client trait. Add registered trait IDs without removing required + * traits. Do not retain this mutable set or recursively create a microblock from this callback: the next + * creation on this thread clears and reuses the same set. Exceptions propagate without rolling back changes. + * + * @param microClass the exact factory supplied to create + * @param client the requested construction side, not a world lookup + */ + void addTraits(BitSet traits, MicroblockClass microClass, boolean client); + } + + private MicroblockGenerator() {} + + public static Class baseType() { + return MicroblockGenerator$.MODULE$.baseType(); + } + + @SuppressWarnings("rawtypes") + public static Object construct(BitSet traits, Seq arguments) { + return MicroblockGenerator$.MODULE$.construct(traits, arguments); + } + + public static int getId(String trait) { + return MicroblockGenerator$.MODULE$.getId(trait); + } + + /** + * Registers an already loadable trait, including retained Scala trait interfaces. For a Java source trait that FMP + * must rewrite into an interface, use {@link #registerTrait(String)} before its class is loaded instead. + */ + public static int registerTrait(Class trait) { + return MicroblockGenerator$.MODULE$.registerTrait(trait); + } + + /** + * Registers a microblock trait by binary name (dots or slashes accepted), returning its generator-local ID. + * Existing registration returns the same ID. Use this overload for Java source traits before any class literal, + * instance or other use loads that class; FMP must first transform its class bytes into a runtime interface. + * Register during mod initialization, before material registration and construction that require this trait. + * + * Java input is a top-level class extending Microblock (possibly abstract), with a no-argument constructor. Its + * direct superclass constructor call is discarded during trait initialization; the generated microblock receives + * the real material ID. Client-only overrides must carry SideOnly(CLIENT). The existing transformer has bytecode + * restrictions: keep inherited state access and substantial logic in an ordinary helper, passing the trait as + * Object and casting to Microblock there. Do not instantiate or invoke a transformed trait as a Java class. Use + * stable Microblock methods or a separately declared capability interface for consumer dispatch. + * + * The material's {@link IGeneratedMaterial#addTraits(BitSet, MicroblockClass, boolean)} callback adds this ID to + * each requested shape/side. Registration does not register a material or remove the retained Scala trait path. + */ + public static int registerTrait(String trait) { + return MicroblockGenerator$.MODULE$.registerTrait(trait); + } + + public static BitSet getBitSet() { + return MicroblockGenerator$.MODULE$.getBitSet(); + } + + public static BitSet freshBitSet() { + return MicroblockGenerator$.MODULE$.freshBitSet(); + } + + /** + * Constructs a fresh, unbound microblock using the factory's registered traits and an ID from the active material + * map. Selects the base trait, then the client trait if requested, then invokes the material's + * {@link IGeneratedMaterial#addTraits(BitSet, MicroblockClass, boolean)} callback if implemented. Generated classes + * are cached, but part instances are new and their trait initializers run for each construction. + * + *

+ * Does not copy another part, load NBT, assign shape, bind to a tile or install anything in a world. Callers + * restore shape or load NBT before preparing/loading the composite tile. Resolve the intended material before + * construction; subsequently changing a part's material field does not regenerate its material-specific traits. + * + *

+ * Call on the initialization/game thread after factory/trait registration and material-map setup. On multiplayer + * clients use the active synchronized material IDs. Client microblock construction requires the physical client; + * the dedicated server strips client-only factory methods. Null factories, invalid/unresolved IDs and callback or + * construction failures propagate through the existing generator. No fallback or rollback is added. + * + * @param microClass factory whose registered traits define the microblock family + * @param material numeric ID in the active material map, not a persistent saved identifier + * @param client true for client traits, false for server traits + */ + public static Microblock create(MicroblockClass microClass, int material, boolean client) { + return MicroblockGenerator$.MODULE$.create(microClass, material, client); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroblockGenerator.scala b/src/main/scala/codechicken/microblock/MicroblockGenerator.scala deleted file mode 100644 index 67ce6b2..0000000 --- a/src/main/scala/codechicken/microblock/MicroblockGenerator.scala +++ /dev/null @@ -1,26 +0,0 @@ -package codechicken.microblock - -import codechicken.multipart.asm.{ScratchBitSet, ASMMixinFactory} -import java.util.BitSet - -object MicroblockGenerator - extends ASMMixinFactory(classOf[Microblock], classOf[Int]) - with ScratchBitSet { - trait IGeneratedMaterial { - def addTraits(traits: BitSet, mcrClass: MicroblockClass, client: Boolean) - } - - def create(mcrClass: MicroblockClass, material: Int, client: Boolean) = { - val bitset = freshBitSet - bitset.set(mcrClass.baseTraitId) - if (client) bitset.set(mcrClass.clientTraitId) - - MicroMaterialRegistry.getMaterial(material) match { - case genMat: IGeneratedMaterial => - genMat.addTraits(bitset, mcrClass, client) - case _ => - } - - construct(bitset, material: Integer) - } -} diff --git a/src/main/scala/codechicken/microblock/MicroblockPlacement$.java b/src/main/scala/codechicken/microblock/MicroblockPlacement$.java new file mode 100644 index 0000000..bd76f31 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroblockPlacement$.java @@ -0,0 +1,16 @@ +package codechicken.microblock; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MovingObjectPosition; + +public final class MicroblockPlacement$ { + + public static final MicroblockPlacement$ MODULE$ = new MicroblockPlacement$(); + + private MicroblockPlacement$() {} + + public ExecutablePlacement apply(EntityPlayer player, MovingObjectPosition hit, int size, int material, + boolean checkMaterial, PlacementProperties properties) { + return new MicroblockPlacement(player, hit, size, material, checkMaterial, properties).apply(); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroblockPlacement.java b/src/main/scala/codechicken/microblock/MicroblockPlacement.java new file mode 100644 index 0000000..08a8304 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroblockPlacement.java @@ -0,0 +1,238 @@ +package codechicken.microblock; + +import java.util.Objects; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Vector3; +import codechicken.multipart.ControlKeyModifer; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.Tuple2; + +public class MicroblockPlacement { + + private final EntityPlayer player; + private final MovingObjectPosition hit; + private final int size; + private final int material; + private final boolean checkMaterial; + private final PlacementProperties pp; + private final World world; + private final MicroblockClass mcrClass; + private final BlockCoord pos; + private final Vector3 vhit; + private final Tuple2 gtile; + private final TileMultipart htile; + private final int slot; + private final int oslot; + private final double d; + private final boolean useOppMod; + private final boolean oppMod; + private final boolean internal; + private final boolean doExpand; + private final int side; + + public MicroblockPlacement(EntityPlayer player, MovingObjectPosition hit, int size, int material, + boolean checkMaterial, PlacementProperties pp) { + this.player = player; + this.hit = hit; + this.size = size; + this.material = material; + this.checkMaterial = checkMaterial; + this.pp = pp; + world = player.worldObj; + mcrClass = pp.microClass(); + pos = new BlockCoord(hit.blockX, hit.blockY, hit.blockZ); + vhit = new Vector3(hit.hitVec).add(-pos.x, -pos.y, -pos.z); + gtile = TileMultipart.getOrConvertTile2(world, pos); + htile = gtile._1(); + slot = pp.placementGrid().getHitSlot(vhit, hit.sideHit); + oslot = pp.opposite(slot, hit.sideHit); + d = getHitDepth(vhit, hit.sideHit); + useOppMod = pp.sneakOpposite(slot, hit.sideHit); + oppMod = ControlKeyModifer.isControlDown(player); + internal = d < 1 && htile != null; + doExpand = internal && !(Boolean) gtile._2() + && !player.isSneaking() + && !(oppMod && useOppMod) + && pp.expand(slot, hit.sideHit); + side = hit.sideHit; + } + + public EntityPlayer player() { + return player; + } + + public MovingObjectPosition hit() { + return hit; + } + + public int size() { + return size; + } + + public int material() { + return material; + } + + public boolean checkMaterial() { + return checkMaterial; + } + + public PlacementProperties pp() { + return pp; + } + + public World world() { + return world; + } + + public MicroblockClass mcrClass() { + return mcrClass; + } + + public BlockCoord pos() { + return pos; + } + + public Vector3 vhit() { + return vhit; + } + + public Tuple2 gtile() { + return gtile; + } + + public TileMultipart htile() { + return htile; + } + + public int slot() { + return slot; + } + + public int oslot() { + return oslot; + } + + public double d() { + return d; + } + + public boolean useOppMod() { + return useOppMod; + } + + public boolean oppMod() { + return oppMod; + } + + public boolean internal() { + return internal; + } + + public boolean doExpand() { + return doExpand; + } + + public int side() { + return side; + } + + public ExecutablePlacement apply() { + ExecutablePlacement customPlacement = pp.customPlacement(this); + if (customPlacement != null) { + return customPlacement; + } + if (slot < 0) { + return null; + } + + if (doExpand) { + Tuple2 data = ExtendedMOP.getData(hit); + TMultiPart hitPart = htile.partList().apply((Integer) data._1()); + if (Objects.equals(hitPart.getType(), mcrClass.getName())) { + CommonMicroblock commonPart = (CommonMicroblock) hitPart; + Microblock microPart = (Microblock) hitPart; + if (microPart.material() == material && microPart.getSize() + size < 8) { + return expand(commonPart); + } + } + } + + if (internal) { + if (d < 0.5 || !useOppMod) { + ExecutablePlacement placement = internalPlacement(htile, slot); + if (placement != null) { + if (!useOppMod || !oppMod) { + return placement; + } + return internalPlacement(htile, oslot); + } + } + if (useOppMod && !oppMod) { + return internalPlacement(htile, oslot); + } + return externalPlacement(slot); + } + + if (!useOppMod || !oppMod) { + return externalPlacement(slot); + } + return externalPlacement(oslot); + } + + public ExecutablePlacement expand(CommonMicroblock part) { + Microblock microPart = (Microblock) part; + return expand(microPart, create(microPart.getSize() + size, part.getSlot(), microPart.material())); + } + + public ExecutablePlacement expand(Microblock part, Microblock newPart) { + BlockCoord partPos = new BlockCoord(part.tile()); + if (TileMultipart.checkNoEntityCollision(world, partPos, newPart) + && part.tile().canReplacePart(part, newPart)) { + return new ExpandingPlacement(partPos, newPart, part); + } + return null; + } + + public ExecutablePlacement internalPlacement(TileMultipart tile, int targetSlot) { + return internalPlacement(tile, create(size, targetSlot, material)); + } + + public ExecutablePlacement internalPlacement(TileMultipart tile, Microblock newPart) { + BlockCoord tilePos = new BlockCoord(tile); + if (TileMultipart.checkNoEntityCollision(world, tilePos, newPart) && tile.canAddPart(newPart)) { + return new AdditionPlacement(tilePos, newPart); + } + return null; + } + + public ExecutablePlacement externalPlacement(int targetSlot) { + return externalPlacement(create(size, targetSlot, material)); + } + + public ExecutablePlacement externalPlacement(Microblock newPart) { + BlockCoord targetPos = pos.copy().offset(side); + if (TileMultipart.canPlacePart(world, targetPos, newPart)) { + return new AdditionPlacement(targetPos, newPart); + } + return null; + } + + public double getHitDepth(Vector3 localHit, int hitSide) { + return localHit.copy().scalarProject(Rotation.axes[hitSide]) + (hitSide % 2 ^ 1); + } + + public Microblock create(int partSize, int partSlot, int partMaterial) { + Microblock part = mcrClass.create(world.isRemote, partMaterial); + part.setShape(partSize, partSlot); + return part; + } +} diff --git a/src/main/scala/codechicken/microblock/MicroblockPlacement.scala b/src/main/scala/codechicken/microblock/MicroblockPlacement.scala deleted file mode 100644 index cae4fcd..0000000 --- a/src/main/scala/codechicken/microblock/MicroblockPlacement.scala +++ /dev/null @@ -1,180 +0,0 @@ -package codechicken.microblock - -import net.minecraft.world.World -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.util.MovingObjectPosition -import codechicken.lib.vec.Vector3 -import codechicken.lib.vec.BlockCoord -import codechicken.lib.vec.Rotation -import codechicken.multipart.ControlKeyModifer._ -import net.minecraft.item.ItemStack -import codechicken.multipart.TileMultipart -import codechicken.lib.raytracer.ExtendedMOP - -abstract class ExecutablePlacement(val pos: BlockCoord, val part: Microblock) { - def place(world: World, player: EntityPlayer, item: ItemStack) - def consume(world: World, player: EntityPlayer, item: ItemStack) -} - -class AdditionPlacement($pos: BlockCoord, $part: Microblock) - extends ExecutablePlacement($pos, $part) { - def place(world: World, player: EntityPlayer, item: ItemStack) { - TileMultipart.addPart(world, pos, part) - } - - def consume(world: World, player: EntityPlayer, item: ItemStack) { - item.stackSize -= 1 - } -} - -class ExpandingPlacement($pos: BlockCoord, $part: Microblock, opart: Microblock) - extends ExecutablePlacement($pos, $part) { - def place(world: World, player: EntityPlayer, item: ItemStack) { - opart.shape = part.shape - opart.tile.notifyPartChange(opart) - opart.sendShapeUpdate() - } - - def consume(world: World, player: EntityPlayer, item: ItemStack) { - item.stackSize -= 1 - } -} - -abstract class PlacementProperties { - def opposite(slot: Int, side: Int): Int - - def sneakOpposite(slot: Int, side: Int) = true - - def expand(slot: Int, side: Int) = true - - def microClass: MicroblockClass - - def placementGrid: PlacementGrid - - def customPlacement(pmt: MicroblockPlacement): ExecutablePlacement = null -} - -object MicroblockPlacement { - def apply( - player: EntityPlayer, - hit: MovingObjectPosition, - size: Int, - material: Int, - checkMaterial: Boolean, - pp: PlacementProperties - ): ExecutablePlacement = - new MicroblockPlacement(player, hit, size, material, checkMaterial, pp)() -} - -class MicroblockPlacement( - val player: EntityPlayer, - val hit: MovingObjectPosition, - val size: Int, - val material: Int, - val checkMaterial: Boolean, - val pp: PlacementProperties -) { - val world = player.worldObj - val mcrClass = pp.microClass - val pos = new BlockCoord(hit.blockX, hit.blockY, hit.blockZ) - val vhit = new Vector3(hit.hitVec).add(-pos.x, -pos.y, -pos.z) - val gtile = TileMultipart.getOrConvertTile2(world, pos) - val htile = gtile._1 - val slot = pp.placementGrid.getHitSlot(vhit, hit.sideHit) - val oslot = pp.opposite(slot, hit.sideHit) - - val d = getHitDepth(vhit, hit.sideHit) - val useOppMod = pp.sneakOpposite(slot, hit.sideHit) - val oppMod = player.isControlDown - val internal = d < 1 && htile != null - val doExpand = - internal && !gtile._2 && !player.isSneaking && !(oppMod && useOppMod) && pp - .expand(slot, hit.sideHit) - val side = hit.sideHit - - def apply(): ExecutablePlacement = { - val customPlacement = pp.customPlacement(this) - if (customPlacement != null) - return customPlacement - - if (slot < 0) - return null - - if (doExpand) { - val hpart = htile.partList(ExtendedMOP.getData[(Int, _)](hit)._1) - if (hpart.getType == mcrClass.getName) { - val mpart = hpart.asInstanceOf[CommonMicroblock] - if (mpart.material == material && mpart.getSize + size < 8) - return expand(mpart) - } - } - - if (internal) { - if (d < 0.5 || !useOppMod) { - val ret = internalPlacement(htile, slot) - if (ret != null) { - if (!useOppMod || !oppMod) return ret - else return internalPlacement(htile, oslot) - } - } - if (useOppMod && !oppMod) - return internalPlacement(htile, oslot) - else - return externalPlacement(slot) - } - - if (!useOppMod || !oppMod) - return externalPlacement(slot) - else - return externalPlacement(oslot) - } - - def expand(mpart: CommonMicroblock): ExecutablePlacement = - expand(mpart, create(mpart.getSize + size, mpart.getSlot, mpart.material)) - - def expand(mpart: Microblock, npart: Microblock): ExecutablePlacement = { - val pos = new BlockCoord(mpart.tile) - if ( - TileMultipart.checkNoEntityCollision(world, pos, npart) && mpart.tile - .canReplacePart(mpart, npart) - ) - return new ExpandingPlacement(pos, npart, mpart) - return null - } - - def internalPlacement(htile: TileMultipart, slot: Int): ExecutablePlacement = - internalPlacement(htile, create(size, slot, material)) - - def internalPlacement( - htile: TileMultipart, - npart: Microblock - ): ExecutablePlacement = { - val pos = new BlockCoord(htile) - if ( - TileMultipart.checkNoEntityCollision(world, pos, npart) && htile - .canAddPart(npart) - ) - return new AdditionPlacement(pos, npart) - return null - } - - def externalPlacement(slot: Int): ExecutablePlacement = externalPlacement( - create(size, slot, material) - ) - - def externalPlacement(npart: Microblock): ExecutablePlacement = { - val pos = this.pos.copy().offset(side) - if (TileMultipart.canPlacePart(world, pos, npart)) - return new AdditionPlacement(pos, npart) - return null - } - - def getHitDepth(vhit: Vector3, side: Int): Double = - vhit.copy.scalarProject(Rotation.axes(side)) + (side % 2 ^ 1) - - def create(size: Int, slot: Int, material: Int) = { - val part = mcrClass.create(world.isRemote, material) - part.setShape(size, slot) - part - } -} diff --git a/src/main/scala/codechicken/microblock/MicroblockRender$.java b/src/main/scala/codechicken/microblock/MicroblockRender$.java new file mode 100644 index 0000000..257d79b --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroblockRender$.java @@ -0,0 +1,84 @@ +package codechicken.microblock; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MovingObjectPosition; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.render.BlockRenderer.BlockFace; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.TextureUtils; +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; + +public final class MicroblockRender$ { + + public static final MicroblockRender$ MODULE$ = new MicroblockRender$(); + + private final ThreadLocal face = ThreadLocal.withInitial(BlockFace::new); + + private MicroblockRender$() {} + + public void renderItem(Microblock part, int size, int slot) { + MicroblockClient client = (MicroblockClient) part; + part.setShape(size, slot); + client.render(new Vector3(0.5, 0.5, 0.5).subtract(client.getBounds().center()), -1); + } + + public void renderHighlight(EntityPlayer player, MovingObjectPosition hit, CommonMicroClass mcrClass, int size, + int material) { + mcrClass.placementProperties().placementGrid().render(new Vector3(hit.hitVec), hit.sideHit); + + ExecutablePlacement placement = MicroblockPlacement$.MODULE$.apply( + player, + hit, + size, + material, + !player.capabilities.isCreativeMode, + mcrClass.placementProperties()); + if (placement == null) { + return; + } + + BlockCoord pos = placement.pos(); + MicroblockClient part = (MicroblockClient) placement.part(); + CCRenderState state = CCRenderState.instance(); + + GL11.glPushMatrix(); + GL11.glTranslated(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5); + GL11.glScaled(1.002, 1.002, 1.002); + GL11.glTranslated(-0.5, -0.5, -0.5); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glDepthMask(false); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + TextureUtils.bindAtlas(0); + state.resetInstance(); + state.alphaOverride = 80; + state.useNormals = true; + state.startDrawingInstance(); + part.render(Vector3.zero, -1); + state.drawInstance(); + + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + GL11.glPopMatrix(); + } + + public ThreadLocal face() { + return face; + } + + public void renderCuboid(Vector3 pos, IMicroMaterial material, int pass, Cuboid6 bounds, int faces) { + BlockFace localFace = face.get(); + CCRenderState.instance().setModelInstance(localFace); + for (int side = 0; side < 6; side++) { + if ((faces & 1 << side) == 0) { + localFace.loadCuboidFace(bounds, side); + material.renderMicroFace(pos, pass, bounds); + } + } + } +} diff --git a/src/main/scala/codechicken/microblock/MicroblockRender.java b/src/main/scala/codechicken/microblock/MicroblockRender.java new file mode 100644 index 0000000..bb80647 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroblockRender.java @@ -0,0 +1,31 @@ +package codechicken.microblock; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MovingObjectPosition; + +import codechicken.lib.render.BlockRenderer.BlockFace; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; + +public final class MicroblockRender { + + private MicroblockRender() {} + + public static void renderItem(Microblock part, int size, int slot) { + MicroblockRender$.MODULE$.renderItem(part, size, slot); + } + + public static void renderHighlight(EntityPlayer player, MovingObjectPosition hit, CommonMicroClass mcrClass, + int size, int material) { + MicroblockRender$.MODULE$.renderHighlight(player, hit, mcrClass, size, material); + } + + public static ThreadLocal face() { + return MicroblockRender$.MODULE$.face(); + } + + public static void renderCuboid(Vector3 pos, IMicroMaterial material, int pass, Cuboid6 bounds, int faces) { + MicroblockRender$.MODULE$.renderCuboid(pos, material, pass, bounds, faces); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroblockRender.scala b/src/main/scala/codechicken/microblock/MicroblockRender.scala deleted file mode 100644 index e9df131..0000000 --- a/src/main/scala/codechicken/microblock/MicroblockRender.scala +++ /dev/null @@ -1,76 +0,0 @@ -package codechicken.microblock - -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.util.MovingObjectPosition -import codechicken.lib.vec.{Cuboid6, Vector3} -import org.lwjgl.opengl.GL11._ -import codechicken.lib.render.{CCRenderState, TextureUtils} -import codechicken.lib.render.BlockRenderer.BlockFace -import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial -import java.util.function.Supplier - -object MicroblockRender { - def renderHighlight( - player: EntityPlayer, - hit: MovingObjectPosition, - mcrClass: CommonMicroClass, - size: Int, - material: Int - ) { - mcrClass.placementProperties.placementGrid - .render(new Vector3(hit.hitVec), hit.sideHit) - - val placement = MicroblockPlacement( - player, - hit, - size, - material, - !player.capabilities.isCreativeMode, - mcrClass.placementProperties - ) - if (placement == null) - return - val pos = placement.pos - val part = placement.part.asInstanceOf[MicroblockClient] - val state = CCRenderState.instance - - glPushMatrix() - glTranslated(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5) - glScaled(1.002, 1.002, 1.002) - glTranslated(-0.5, -0.5, -0.5) - - glEnable(GL_BLEND) - glDepthMask(false) - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) - // TODO: update to use a thread local copy - TextureUtils.bindAtlas(0) - state.resetInstance() - state.alphaOverride = 80 - state.useNormals = true - state.startDrawingInstance() - part.render(Vector3.zero, -1) - state.drawInstance() - - glDisable(GL_BLEND) - glDepthMask(true) - glPopMatrix() - } - - val face = ThreadLocal.withInitial[BlockFace](new Supplier[BlockFace]() { - override def get(): BlockFace = new BlockFace() - }) - def renderCuboid( - pos: Vector3, - mat: IMicroMaterial, - pass: Int, - c: Cuboid6, - faces: Int - ) { - val localFace = face.get() - CCRenderState.instance().setModelInstance(localFace) - for (s <- 0 until 6 if (faces & 1 << s) == 0) { - localFace.loadCuboidFace(c, s) - mat.renderMicroFace(pos, pass, c) - } - } -} diff --git a/src/main/scala/codechicken/microblock/MicroblockTraitLogic.java b/src/main/scala/codechicken/microblock/MicroblockTraitLogic.java new file mode 100644 index 0000000..b82d809 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroblockTraitLogic.java @@ -0,0 +1,68 @@ +package codechicken.microblock; + +import java.util.List; + +import net.minecraft.init.Blocks; +import net.minecraft.util.IIcon; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import scala.Predef$; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.Seq$; + +/** Implementation behind the Scala trait declarations needed by inherited and external mixins. */ +final class MicroblockTraitLogic { + + private MicroblockTraitLogic() {} + + static IIcon getBrokenIcon(MicroblockClient part, int side) { + IMicroMaterial material = ((Microblock) part).getIMaterial(); + return material == null ? Blocks.stone.getIcon(0, 0) : material.getBreakingIcon(side); + } + + static boolean renderStatic(MicroblockClient part, Vector3 pos, int pass) { + if (((Microblock) part).getIMaterial().canRenderInPass(pass)) { + part.render(pos, pass); + return true; + } + return false; + } + + static Cuboid6 getRenderBounds(MicroblockClient part) { + return part.getBounds(); + } + + static void render(CommonMicroblockClient part, Vector3 pos, int pass) { + if (pass < 0) { + MicroblockRender.renderCuboid(pos, ((Microblock) part).getIMaterial(), pass, part.getBounds(), 0); + } else { + MicroblockRender.renderCuboid( + pos, + ((Microblock) part).getIMaterial(), + pass, + part.renderBounds(), + part.renderMask()); + } + } + + static int getSlot(CommonMicroblock part) { + return ((Microblock) part).getShape(); + } + + static int getSlotMask(CommonMicroblock part) { + return 1 << part.getSlot(); + } + + @SuppressWarnings("unchecked") + static List getPartialOcclusionBoxes(CommonMicroblock part) { + return JavaConversions.seqAsJavaList( + (Seq) Seq$.MODULE$.apply(Predef$.MODULE$.wrapRefArray(new Cuboid6[] { part.getBounds() }))); + } + + static int itemClassID(CommonMicroblock part) { + return part.microClass().getClassId(); + } +} diff --git a/src/main/scala/codechicken/microblock/MicroblockTraits.scala b/src/main/scala/codechicken/microblock/MicroblockTraits.scala new file mode 100644 index 0000000..fd03528 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MicroblockTraits.scala @@ -0,0 +1,58 @@ +package codechicken.microblock + +import codechicken.lib.vec.Vector3 +import codechicken.multipart.{ + IconHitEffects, + JPartialOcclusion, + TIconHitEffects, + TSlottedPart +} +import net.minecraft.client.particle.EffectRenderer +import net.minecraft.util.MovingObjectPosition + +// Keep Scala inheritance metadata and helper bridges while derived and external mixins use Scala registration. +trait MicroblockClient + extends Microblock + with TIconHitEffects + with IMicroMaterialRender { + def getBrokenIcon(side: Int) = MicroblockTraitLogic.getBrokenIcon(this, side) + + // TIconHitEffects is a Java interface, so these must be declared explicitly or TMultiPart's empty versions win. + override def addHitEffects( + hit: MovingObjectPosition, + effectRenderer: EffectRenderer + ) = IconHitEffects.addHitEffects(this, hit, effectRenderer) + + override def addDestroyEffects(effectRenderer: EffectRenderer) = + IconHitEffects.addDestroyEffects(this, effectRenderer) + + override def renderStatic(pos: Vector3, pass: Int) = + MicroblockTraitLogic.renderStatic(this, pos, pass) + + def render(pos: Vector3, pass: Int) + + override def getRenderBounds = MicroblockTraitLogic.getRenderBounds(this) +} + +trait CommonMicroblockClient + extends CommonMicroblock + with MicroblockClient + with TMicroOcclusionClient { + def render(pos: Vector3, pass: Int) = + MicroblockTraitLogic.render(this, pos, pass) +} + +trait CommonMicroblock + extends Microblock + with JPartialOcclusion + with TMicroOcclusion + with TSlottedPart { + def microClass: CommonMicroClass + + def getSlot = MicroblockTraitLogic.getSlot(this) + def getSlotMask = MicroblockTraitLogic.getSlotMask(this) + def getPartialOcclusionBoxes = + MicroblockTraitLogic.getPartialOcclusionBoxes(this) + + override def itemClassID = MicroblockTraitLogic.itemClassID(this) +} diff --git a/src/main/scala/codechicken/microblock/MissingMicroMaterial$.java b/src/main/scala/codechicken/microblock/MissingMicroMaterial$.java new file mode 100644 index 0000000..824ce2c --- /dev/null +++ b/src/main/scala/codechicken/microblock/MissingMicroMaterial$.java @@ -0,0 +1,91 @@ +package codechicken.microblock; + +import net.minecraft.block.Block; +import net.minecraft.block.Block.SoundType; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import codechicken.lib.render.uv.IconTransformation; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.handler.MicroblockProxy$; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public final class MissingMicroMaterial$ implements IMicroMaterial { + + public static final MissingMicroMaterial$ MODULE$ = new MissingMicroMaterial$(); + + private final String key = "forgemicroblock:missing"; + + @SideOnly(Side.CLIENT) + private IIcon icon; + + private MissingMicroMaterial$() {} + + public String key() { + return key; + } + + @Override + @SideOnly(Side.CLIENT) + public void loadIcons() { + icon = MicroblockProxy$.MODULE$.renderBlocks().getIconSafe(null); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getBreakingIcon(int side) { + return icon; + } + + @Override + @SideOnly(Side.CLIENT) + public void renderMicroFace(Vector3 pos, int pass, Cuboid6 bounds) { + MaterialRenderHelper$.MODULE$.start(pos, pass, new IconTransformation(icon)).lighting().render(); + } + + @Override + public boolean isTransparent() { + return false; + } + + @Override + public int getLightValue() { + return 0; + } + + @Override + public float getStrength(EntityPlayer player) { + return 1f; + } + + @Override + public String getLocalizedName() { + return "Missing Material"; + } + + @Override + public ItemStack getItem() { + return new ItemStack(Blocks.stone); + } + + @Override + public int getCutterStrength() { + return 0; + } + + @Override + public SoundType getSound() { + return Block.soundTypeStone; + } + + @Override + public float explosionResistance(Entity entity) { + return 6f; + } +} diff --git a/src/main/scala/codechicken/microblock/MissingMicroMaterial.java b/src/main/scala/codechicken/microblock/MissingMicroMaterial.java new file mode 100644 index 0000000..2a738d8 --- /dev/null +++ b/src/main/scala/codechicken/microblock/MissingMicroMaterial.java @@ -0,0 +1,68 @@ +package codechicken.microblock; + +import net.minecraft.block.Block.SoundType; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public final class MissingMicroMaterial { + + private MissingMicroMaterial() {} + + public static String key() { + return MissingMicroMaterial$.MODULE$.key(); + } + + @SideOnly(Side.CLIENT) + public static void loadIcons() { + MissingMicroMaterial$.MODULE$.loadIcons(); + } + + @SideOnly(Side.CLIENT) + public static IIcon getBreakingIcon(int side) { + return MissingMicroMaterial$.MODULE$.getBreakingIcon(side); + } + + @SideOnly(Side.CLIENT) + public static void renderMicroFace(Vector3 pos, int pass, Cuboid6 bounds) { + MissingMicroMaterial$.MODULE$.renderMicroFace(pos, pass, bounds); + } + + public static boolean isTransparent() { + return MissingMicroMaterial$.MODULE$.isTransparent(); + } + + public static int getLightValue() { + return MissingMicroMaterial$.MODULE$.getLightValue(); + } + + public static float getStrength(EntityPlayer player) { + return MissingMicroMaterial$.MODULE$.getStrength(player); + } + + public static String getLocalizedName() { + return MissingMicroMaterial$.MODULE$.getLocalizedName(); + } + + public static ItemStack getItem() { + return MissingMicroMaterial$.MODULE$.getItem(); + } + + public static int getCutterStrength() { + return MissingMicroMaterial$.MODULE$.getCutterStrength(); + } + + public static SoundType getSound() { + return MissingMicroMaterial$.MODULE$.getSound(); + } + + public static float explosionResistance(Entity entity) { + return MissingMicroMaterial$.MODULE$.explosionResistance(entity); + } +} diff --git a/src/main/scala/codechicken/microblock/MissingMicroMaterial.scala b/src/main/scala/codechicken/microblock/MissingMicroMaterial.scala deleted file mode 100644 index 1812302..0000000 --- a/src/main/scala/codechicken/microblock/MissingMicroMaterial.scala +++ /dev/null @@ -1,55 +0,0 @@ -package codechicken.microblock - -import codechicken.lib.render.uv.IconTransformation -import codechicken.lib.vec.{Cuboid6, Vector3} -import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial -import codechicken.microblock.handler.MicroblockProxy -import cpw.mods.fml.relauncher.{Side, SideOnly} -import net.minecraft.block.Block -import net.minecraft.block.Block.SoundType -import net.minecraft.entity.Entity -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.init.Blocks -import net.minecraft.item.ItemStack -import net.minecraft.util.IIcon - -/** Stand-in for a material whose name could not be resolved at load time. - * Renders the vanilla missing texture (magenta/black checkerboard) and behaves - * inertly. Resolving an unknown name to this placeholder keeps microblocks - * from silently becoming material id 0 (Blood Rune in GTNH). - */ -object MissingMicroMaterial extends IMicroMaterial { - val key = "forgemicroblock:missing" - - @SideOnly(Side.CLIENT) - private var icon: IIcon = _ - - @SideOnly(Side.CLIENT) - override def loadIcons(): Unit = { - icon = MicroblockProxy.renderBlocks.getIconSafe(null) - } - - @SideOnly(Side.CLIENT) - override def getBreakingIcon(side: Int): IIcon = icon - - @SideOnly(Side.CLIENT) - override def renderMicroFace( - pos: Vector3, - pass: Int, - bounds: Cuboid6 - ): Unit = { - MaterialRenderHelper - .start(pos, pass, new IconTransformation(icon)) - .lighting() - .render() - } - - override def isTransparent: Boolean = false - override def getLightValue: Int = 0 - override def getStrength(player: EntityPlayer): Float = 1f - override def getLocalizedName: String = "Missing Material" - override def getItem: ItemStack = new ItemStack(Blocks.stone) - override def getCutterStrength: Int = 0 - override def getSound: SoundType = Block.soundTypeStone - override def explosionResistance(entity: Entity): Float = 6f -} diff --git a/src/main/scala/codechicken/microblock/PlacementGrid$class.java b/src/main/scala/codechicken/microblock/PlacementGrid$class.java new file mode 100644 index 0000000..e98c79b --- /dev/null +++ b/src/main/scala/codechicken/microblock/PlacementGrid$class.java @@ -0,0 +1,38 @@ +package codechicken.microblock; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Vector3; + +/** Binary bridge for Scala implementations compiled against the original trait. */ +@Deprecated +public abstract class PlacementGrid$class { + + private PlacementGrid$class() {} + + public static void render(PlacementGrid grid, Vector3 hit, int side) { + grid.glTransformFace(hit, side); + GL11.glLineWidth(2); + GL11.glColor4f(0, 0, 0, 1); + GL11.glBegin(GL11.GL_LINES); + grid.drawLines(); + GL11.glEnd(); + GL11.glPopMatrix(); + } + + public static void drawLines(PlacementGrid grid) {} + + public static void glTransformFace(PlacementGrid grid, Vector3 hit, int side) { + BlockCoord pos = new BlockCoord(hit); + GL11.glPushMatrix(); + GL11.glTranslated(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5); + Rotation.sideRotations[side].glApply(); + Vector3 rotatedHit = new Vector3(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5).subtract(hit) + .apply(Rotation.sideRotations[side ^ 1].inverse()); + GL11.glTranslated(0, rotatedHit.y - 0.002, 0); + } + + public static void $init$(PlacementGrid grid) {} +} diff --git a/src/main/scala/codechicken/microblock/PlacementGrid.java b/src/main/scala/codechicken/microblock/PlacementGrid.java new file mode 100644 index 0000000..faed03d --- /dev/null +++ b/src/main/scala/codechicken/microblock/PlacementGrid.java @@ -0,0 +1,18 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Vector3; + +public interface PlacementGrid { + + int getHitSlot(Vector3 hit, int side); + + default void render(Vector3 hit, int side) { + PlacementGrid$class.render(this, hit, side); + } + + default void drawLines() {} + + default void glTransformFace(Vector3 hit, int side) { + PlacementGrid$class.glTransformFace(this, hit, side); + } +} diff --git a/src/main/scala/codechicken/microblock/PlacementGrids.scala b/src/main/scala/codechicken/microblock/PlacementGrids.scala deleted file mode 100644 index 5b035e9..0000000 --- a/src/main/scala/codechicken/microblock/PlacementGrids.scala +++ /dev/null @@ -1,180 +0,0 @@ -package codechicken.microblock - -import codechicken.lib.vec.Vector3 -import codechicken.lib.vec.BlockCoord -import codechicken.lib.vec.Rotation -import Rotation._ -import org.lwjgl.opengl.GL11._ -import codechicken.multipart.PartMap - -trait PlacementGrid { - def getHitSlot(vhit: Vector3, side: Int): Int - - def render(hit: Vector3, side: Int) { - glTransformFace(hit, side) - glLineWidth(2) - glColor4f(0, 0, 0, 1) - glBegin(GL_LINES) - drawLines() - glEnd() - glPopMatrix() - } - - def drawLines() {} - - def glTransformFace(hit: Vector3, side: Int) { - val pos = new BlockCoord(hit) - glPushMatrix() - glTranslated(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5) - sideRotations(side).glApply() - val rhit = new Vector3(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5) - .subtract(hit) - .apply(sideRotations(side ^ 1).inverse) - glTranslated(0, rhit.y - 0.002, 0) - } -} - -class FaceEdgeGrid(size: Double) extends PlacementGrid { - override def drawLines() { - glVertex3d(-0.5, 0, -0.5) - glVertex3d(-0.5, 0, 0.5) - - glVertex3d(-0.5, 0, 0.5) - glVertex3d(0.5, 0, 0.5) - - glVertex3d(0.5, 0, 0.5) - glVertex3d(0.5, 0, -0.5) - - glVertex3d(0.5, 0, -0.5) - glVertex3d(-0.5, 0, -0.5) - - glVertex3d(0.5, 0, 0.5) - glVertex3d(size, 0, size) - - glVertex3d(-0.5, 0, 0.5) - glVertex3d(-size, 0, size) - - glVertex3d(0.5, 0, -0.5) - glVertex3d(size, 0, -size) - - glVertex3d(-0.5, 0, -0.5) - glVertex3d(-size, 0, -size) - - glVertex3d(-size, 0, -size) - glVertex3d(-size, 0, size) - - glVertex3d(-size, 0, size) - glVertex3d(size, 0, size) - - glVertex3d(size, 0, size) - glVertex3d(size, 0, -size) - - glVertex3d(size, 0, -size) - glVertex3d(-size, 0, -size) - } - - def getHitSlot(vhit: Vector3, side: Int) = { - val s1 = (side + 2) % 6 - val s2 = (side + 4) % 6 - val u = vhit.copy.add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes(s1)) - val v = vhit.copy.add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes(s2)) - - if (Math.abs(u) < size && Math.abs(v) < size) - side ^ 1 - else if (Math.abs(u) > Math.abs(v)) - if (u > 0) s1 else s1 ^ 1 - else if (v > 0) s2 - else s2 ^ 1 - } -} - -object FacePlacementGrid extends FaceEdgeGrid(1 / 4d) - -object CornerPlacementGrid extends PlacementGrid { - override def drawLines() { - glVertex3d(-0.5, 0, -0.5) - glVertex3d(-0.5, 0, 0.5) - - glVertex3d(-0.5, 0, 0.5) - glVertex3d(0.5, 0, 0.5) - - glVertex3d(0.5, 0, 0.5) - glVertex3d(0.5, 0, -0.5) - - glVertex3d(0.5, 0, -0.5) - glVertex3d(-0.5, 0, -0.5) - - glVertex3d(0, 0, -0.5) - glVertex3d(0, 0, 0.5) - - glVertex3d(-0.5, 0, 0) - glVertex3d(0.5, 0, 0) - } - - def getHitSlot(vhit: Vector3, side: Int): Int = { - val s1 = ((side & 6) + 3) % 6 - val s2 = ((side & 6) + 5) % 6 - val u = vhit.copy().add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes(s1)) - val v = vhit.copy().add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes(s2)) - - val bu = if (u >= 0) 1 else 0 - val bv = if (v >= 0) 1 else 0 - val bw = (side & 1) ^ 1 - - return 7 + (bw << (side >> 1) | - bu << (s1 >> 1) | - bv << (s2 >> 1)) - } -} - -object EdgePlacementGrid extends PlacementGrid { - override def drawLines() { - glVertex3d(-0.5, 0, -0.5) - glVertex3d(-0.5, 0, 0.5) - - glVertex3d(-0.5, 0, 0.5) - glVertex3d(0.5, 0, 0.5) - - glVertex3d(0.5, 0, 0.5) - glVertex3d(0.5, 0, -0.5) - - glVertex3d(0.5, 0, -0.5) - glVertex3d(-0.5, 0, -0.5) - - glVertex3d(0.25, 0, -0.5) - glVertex3d(0.25, 0, 0.5) - - glVertex3d(-0.25, 0, -0.5) - glVertex3d(-0.25, 0, 0.5) - - glVertex3d(-0.5, 0, 0.25) - glVertex3d(0.5, 0, 0.25) - - glVertex3d(-0.5, 0, -0.25) - glVertex3d(0.5, 0, -0.25) - } - - override def getHitSlot(vhit: Vector3, side: Int): Int = { - val s1 = (side + 2) % 6 - val s2 = (side + 4) % 6 - val u = vhit.copy.add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes(s1)) - val v = vhit.copy.add(-0.5, -0.5, -0.5).scalarProject(Rotation.axes(s2)) - - if (Math.abs(u) < 4 / 16d && Math.abs(v) < 4 / 16d) - return -1 - - if (Math.abs(u) > 4 / 16d && Math.abs(v) > 4 / 16d) - return PartMap.edgeBetween( - if (u > 0) s1 else s1 ^ 1, - if (v > 0) s2 else s2 ^ 1 - ) - - val s = - if (Math.abs(u) > Math.abs(v)) - if (u > 0) s1 else s1 ^ 1 - else if (v > 0) s2 - else s2 ^ 1 - - return PartMap.edgeBetween(side ^ 1, s) - } -} diff --git a/src/main/scala/codechicken/microblock/PlacementProperties.java b/src/main/scala/codechicken/microblock/PlacementProperties.java new file mode 100644 index 0000000..236aaaf --- /dev/null +++ b/src/main/scala/codechicken/microblock/PlacementProperties.java @@ -0,0 +1,22 @@ +package codechicken.microblock; + +public abstract class PlacementProperties { + + public abstract int opposite(int slot, int side); + + public boolean sneakOpposite(int slot, int side) { + return true; + } + + public boolean expand(int slot, int side) { + return true; + } + + public abstract MicroblockClass microClass(); + + public abstract PlacementGrid placementGrid(); + + public ExecutablePlacement customPlacement(MicroblockPlacement placement) { + return null; + } +} diff --git a/src/main/scala/codechicken/microblock/PostMicroClass$.java b/src/main/scala/codechicken/microblock/PostMicroClass$.java new file mode 100644 index 0000000..88a78d4 --- /dev/null +++ b/src/main/scala/codechicken/microblock/PostMicroClass$.java @@ -0,0 +1,53 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Transformation; +import codechicken.lib.vec.Vector3; + +public final class PostMicroClass$ extends MicroblockClass { + + public static final PostMicroClass$ MODULE$ = new PostMicroClass$(); + + private Cuboid6[] aBounds = new Cuboid6[256]; + + private PostMicroClass$() { + for (int axis = 0; axis < 3; axis++) { + Transformation transform = Rotation.sideRotations[axis << 1].at(Vector3.center); + for (int size = 2; size < 8; size += 2) { + double min = 0.5 - size / 16D; + double max = 0.5 + size / 16D; + aBounds[size << 4 | axis] = new Cuboid6(min, 0, min, max, 1, max).apply(transform); + } + } + } + + public Cuboid6[] aBounds() { + return aBounds; + } + + public void aBounds_$eq(Cuboid6[] bounds) { + aBounds = bounds; + } + + @Override + public String getName() { + return "mcr_post"; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public Class baseTrait() { + return (Class) PostMicroblock.class; + } + + @Override + public Class clientTrait() { + return PostMicroblockClient.class; + } + + @Override + public float getResistanceFactor() { + return 0.5F; + } +} diff --git a/src/main/scala/codechicken/microblock/PostMicroClass.java b/src/main/scala/codechicken/microblock/PostMicroClass.java new file mode 100644 index 0000000..939d2ac --- /dev/null +++ b/src/main/scala/codechicken/microblock/PostMicroClass.java @@ -0,0 +1,60 @@ +package codechicken.microblock; + +import net.minecraft.nbt.NBTTagCompound; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.vec.Cuboid6; + +public final class PostMicroClass { + + private PostMicroClass() {} + + public static int baseTraitId() { + return PostMicroClass$.MODULE$.baseTraitId(); + } + + public static int clientTraitId() { + return PostMicroClass$.MODULE$.clientTraitId(); + } + + public static void register() { + PostMicroClass$.MODULE$.register(); + } + + public static Microblock create(boolean client, int material) { + return PostMicroClass$.MODULE$.create(client, material); + } + + public static Microblock createPart(String name, MCDataInput packet) { + return PostMicroClass$.MODULE$.createPart(name, packet); + } + + public static Microblock createPart(String name, NBTTagCompound nbt) { + return PostMicroClass$.MODULE$.createPart(name, nbt); + } + + public static Cuboid6[] aBounds() { + return PostMicroClass$.MODULE$.aBounds(); + } + + public static void aBounds_$eq(Cuboid6[] bounds) { + PostMicroClass$.MODULE$.aBounds_$eq(bounds); + } + + public static String getName() { + return PostMicroClass$.MODULE$.getName(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + public static Class baseTrait() { + return (Class) PostMicroClass$.MODULE$.baseTrait(); + } + + public static Class clientTrait() { + return PostMicroClass$.MODULE$.clientTrait(); + } + + public static float getResistanceFactor() { + return PostMicroClass$.MODULE$.getResistanceFactor(); + } +} diff --git a/src/main/scala/codechicken/microblock/PostMicroblockClientLogic.java b/src/main/scala/codechicken/microblock/PostMicroblockClientLogic.java new file mode 100644 index 0000000..46cccde --- /dev/null +++ b/src/main/scala/codechicken/microblock/PostMicroblockClientLogic.java @@ -0,0 +1,83 @@ +package codechicken.microblock; + +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.multipart.TMultiPart; +import scala.runtime.AbstractFunction1; +import scala.runtime.BoxedUnit; + +/** Client behavior behind the retained Scala state, inheritance and lifecycle bridges. */ +final class PostMicroblockClientLogic { + + private PostMicroblockClientLogic() {} + + static void render(PostMicroblockClient part, Vector3 pos, int pass) { + IMicroMaterial material = ((Microblock) part).getIMaterial(); + if (pass == -1) { + MicroblockRender.renderCuboid(pos, material, pass, part.getBounds(), 0); + } else { + MicroblockRender.renderCuboid(pos, material, pass, part.renderBounds1(), 0); + if (part.renderBounds2() != null) { + MicroblockRender.renderCuboid(pos, material, pass, part.renderBounds2(), 0); + } + } + } + + static void recalcBounds(PostMicroblockClient part) { + part.renderBounds1_$eq(part.getBounds().copy()); + part.renderBounds2_$eq(null); + part.shrinkFace(((Microblock) part).getShape() << 1); + part.shrinkFace(((Microblock) part).getShape() << 1 | 1); + ((TMultiPart) part).tile().partList().foreach(new ShrinkPosts(part)); + } + + static void shrinkFace(PostMicroblockClient part, int side) { + TMultiPart other = ((TMultiPart) part).tile().partMap(side); + if (other != null && other.getType().equals("mcr_face")) { + MicroOcclusion.shrink(part.renderBounds1(), ((CommonMicroblock) other).getBounds(), side); + } + } + + static void shrinkPost(PostMicroblockClient part, PostMicroblock other) { + // Scala equality calls the left operand's equals even when the references are identical. + if (other == null ? part == null : other.equals(part)) { + return; + } + if (part.thisShrinks(other)) { + if (part.renderBounds2() == null) { + part.renderBounds2_$eq(part.getBounds().copy()); + } + MicroOcclusion.shrink(part.renderBounds1(), other.getBounds(), ((Microblock) part).getShape() << 1 | 1); + MicroOcclusion.shrink(part.renderBounds2(), other.getBounds(), ((Microblock) part).getShape() << 1); + } + } + + static boolean thisShrinks(PostMicroblockClient part, PostMicroblock other) { + if (((Microblock) part).getSize() != ((Microblock) other).getSize()) { + return ((Microblock) part).getSize() < ((Microblock) other).getSize(); + } + if (((Microblock) part).isTransparent() != ((Microblock) other).isTransparent()) { + return ((Microblock) part).isTransparent(); + } + return ((Microblock) part).getShape() > ((Microblock) other).getShape(); + } + + private static final class ShrinkPosts extends AbstractFunction1 + implements scala.Serializable { + + private static final long serialVersionUID = 0L; + private final PostMicroblockClient part; + + ShrinkPosts(PostMicroblockClient part) { + this.part = part; + } + + @Override + public BoxedUnit apply(TMultiPart other) { + if (other instanceof PostMicroblock && !other.equals(part)) { + part.shrinkPost((PostMicroblock) other); + } + return BoxedUnit.UNIT; + } + } +} diff --git a/src/main/scala/codechicken/microblock/PostMicroblockTraitLogic.java b/src/main/scala/codechicken/microblock/PostMicroblockTraitLogic.java new file mode 100644 index 0000000..8582dab --- /dev/null +++ b/src/main/scala/codechicken/microblock/PostMicroblockTraitLogic.java @@ -0,0 +1,56 @@ +package codechicken.microblock; + +import java.util.List; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.NormalOcclusionTest; +import codechicken.multipart.TMultiPart; +import scala.Predef$; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.Seq$; + +/** Post behavior behind the retained Scala inheritance metadata and super-dispatch bridge. */ +final class PostMicroblockTraitLogic { + + private PostMicroblockTraitLogic() {} + + static Cuboid6 getBounds(PostMicroblock part) { + return PostMicroClass.aBounds()[((Microblock) part).shape()]; + } + + @SuppressWarnings("unchecked") + static List getOcclusionBoxes(PostMicroblock part) { + return JavaConversions.seqAsJavaList( + (Seq) Seq$.MODULE$.apply(Predef$.MODULE$.wrapRefArray(new Cuboid6[] { part.getBounds() }))); + } + + static List getPartialOcclusionBoxes(PostMicroblock part) { + return part.getOcclusionBoxes(); + } + + static int itemClassID(PostMicroblock part) { + return EdgeMicroClass.getClassId(); + } + + /** Returns 0/1 for a decision, or -1 to continue through the retained Scala super accessor. */ + static int occlusionResult(PostMicroblock part, TMultiPart next) { + if (next instanceof PostMicroblock) { + return ((Microblock) next).getShape() != ((Microblock) part).getShape() ? 1 : 0; + } + if (next.getType().equals("mcr_face")) { + if (((CommonMicroblock) next).getSlot() >> 1 == ((Microblock) part).getShape()) { + return 1; + } + } + return NormalOcclusionTest.apply(part, next) ? -1 : 0; + } + + static float getResistanceFactor(PostMicroblock part) { + return PostMicroClass.getResistanceFactor(); + } + + static boolean canPlaceTorchOnTop(PostMicroblock part) { + return ((Microblock) part).getShape() == 0; + } +} diff --git a/src/main/scala/codechicken/microblock/Saw$class.java b/src/main/scala/codechicken/microblock/Saw$class.java new file mode 100644 index 0000000..7471dc7 --- /dev/null +++ b/src/main/scala/codechicken/microblock/Saw$class.java @@ -0,0 +1,20 @@ +package codechicken.microblock; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +/** + * Binary bridge for Scala implementations compiled against the original trait. Their forwarders call this static + * directly, so the body cannot delegate back to the instance method without recursing. + */ +@Deprecated +public abstract class Saw$class { + + private Saw$class() {} + + public static int getMaxCuttingStrength(Saw saw) { + return saw.getCuttingStrength(new ItemStack((Item) saw)); + } + + public static void $init$(Saw saw) {} +} diff --git a/src/main/scala/codechicken/microblock/Saw.java b/src/main/scala/codechicken/microblock/Saw.java new file mode 100644 index 0000000..31cde0e --- /dev/null +++ b/src/main/scala/codechicken/microblock/Saw.java @@ -0,0 +1,21 @@ +package codechicken.microblock; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +/** + * Interface for items that are 'saws'. + *

+ * Item does not declare getMaxCuttingStrength, so it can safely be a default method. Implementors must extend + * {@link Item}; the default casts to it in order to build a stack of itself, exactly as the reference did. + */ +public interface Saw { + + /** The maximum harvest level that some version of this saw is capable of cutting. */ + default int getMaxCuttingStrength() { + return getCuttingStrength(new ItemStack((Item) this)); + } + + /** The harvest level this saw is capable of cutting. */ + int getCuttingStrength(ItemStack item); +} diff --git a/src/main/scala/codechicken/microblock/TMicroOcclusion.scala b/src/main/scala/codechicken/microblock/TMicroOcclusion.scala index 4aa2fca..12c380b 100644 --- a/src/main/scala/codechicken/microblock/TMicroOcclusion.scala +++ b/src/main/scala/codechicken/microblock/TMicroOcclusion.scala @@ -2,159 +2,8 @@ package codechicken.microblock import codechicken.multipart.TMultiPart import codechicken.lib.vec.Cuboid6 -import codechicken.multipart.PartMap._ import codechicken.lib.data.MCDataInput -/** Suite of classes for performing microblock style occlusion and shrink - * rendering. Use at your own peril. - */ -object MicroOcclusion { - def shrink(renderBounds: Cuboid6, b: Cuboid6, side: Int) = side match { - case -1 => - case 0 => if (renderBounds.min.y < b.max.y) renderBounds.min.y = b.max.y - case 1 => if (renderBounds.max.y > b.min.y) renderBounds.max.y = b.min.y - case 2 => if (renderBounds.min.z < b.max.z) renderBounds.min.z = b.max.z - case 3 => if (renderBounds.max.z > b.min.z) renderBounds.max.z = b.min.z - case 4 => if (renderBounds.min.x < b.max.x) renderBounds.min.x = b.max.x - case 5 => if (renderBounds.max.x > b.min.x) renderBounds.max.x = b.min.x - } - - def shrinkFrom( - p: JMicroShrinkRender, - other: JMicroShrinkRender, - renderBounds: Cuboid6 - ): Int = { - if (shrinkTest(p, other)) { - shrink( - renderBounds, - other.getBounds, - shrinkSide(p.getSlot, other.getSlot) - ) - } else if ( - other.getSlot < 6 && !other.isTransparent - ) // other gets full face, we didn't shrink, flag rendermask - { - if ( - other.getSlot match { - case 0 => renderBounds.min.y <= 0 - case 1 => renderBounds.max.y >= 1 - case 2 => renderBounds.min.z <= 0 - case 3 => renderBounds.max.z >= 1 - case 4 => renderBounds.min.x <= 0 - case 5 => renderBounds.max.x >= 1 - } - ) - return 1 << other.getSlot - } - return 0 - } - - def shrink(p: JMicroShrinkRender, renderBounds: Cuboid6, m: Int): Int = { - var renderMask = 0 - val part = p.asInstanceOf[TMultiPart] - val tile = part.tile - for (i <- 0 until m) - if (i != p.getSlot) - tile.partMap(i) match { - case other: JMicroShrinkRender => - renderMask |= shrinkFrom(p, other, renderBounds) - case _ => - } - return renderMask - } - - def shrinkSide(s1: Int, s2: Int): Int = { - if (s2 < 6) // other is a cover - return s2 - if (s1 < 15) // both corners - { - val c1 = s1 - 7 - val c2 = s2 - 7 - return c1 ^ c2 match // different axis bits will become 1, same 0 - { - case 1 => c2 & 1 - case 2 => 2 | (c2 & 2) >> 1 - case 4 => 4 | (c2 & 4) >> 2 - case _ => -1 - } - } - if (s2 < 15) // edge, other corner - { - val e1 = s1 - 15 - val c2 = s2 - 7 - val ebits = unpackEdgeBits(e1) - if ((c2 & edgeAxisMask(e1)) != ebits) - return -1 - - return (e1 & 0xc) >> 1 | (c2 & (~ebits)) >> (e1 >> 2) - } - // both edges - { - val e1 = s1 - 15 - val e2 = s2 - 15 - val e1bits = unpackEdgeBits(e1) - val e2bits = unpackEdgeBits(e2) - if ((e1 & 0xc) == (e2 & 0xc)) // same axis - { - return e1bits ^ e2bits match { - case 1 => if ((e2bits & 1) == 0) 0 else 1 - case 2 => if ((e2bits & 2) == 0) 2 else 3 - case 4 => if ((e2bits & 4) == 0) 4 else 5 - case _ => -1 - } - } else { - val mask = edgeAxisMask(e1) & edgeAxisMask(e2) - if ((e1bits & mask) != (e2bits & mask)) - return -1 - - return e1 >> 2 match { - case 0 => if ((e2bits & 1) == 0) 0 else 1 - case 1 => if ((e2bits & 2) == 0) 2 else 3 - case 2 => if ((e2bits & 4) == 0) 4 else 5 - } - } - } - - throw new IllegalArgumentException("Switch Falloff") - } - - def recalcBounds(p: JMicroShrinkRender, renderBounds: Cuboid6) = { - if (p.getSlot < 6) - shrink(p, renderBounds, 6) - else if (p.getSlot < 15) - shrink(p, renderBounds, 15) - else - shrink(p, renderBounds, 27) - } - - def shapePriority(slot: Int): Int = - if (slot < 6) - return 2 - else if (slot < 15) - return 1 - else - return 0 - - def shrinkTest(a: JMicroShrinkRender, b: JMicroShrinkRender): Boolean = { - if (a.getPriorityClass != b.getPriorityClass) - return a.getPriorityClass < b.getPriorityClass - - val shape1 = shapePriority(a.getSlot) - val shape2 = shapePriority(b.getSlot) - - if (shape1 != shape2) return shape1 < shape2 - if (a.getSlot < 6) // transparency takes precedence for covers - { - if (a.isTransparent != b.isTransparent) return a.isTransparent - if (a.getSize != b.getSize) return a.getSize < b.getSize - } else { - if (a.getSize != b.getSize) return a.getSize < b.getSize - if (a.isTransparent != b.isTransparent) return a.isTransparent - } - return a.getSlot < b.getSlot - } -} - trait JMicroShrinkRender { def getPriorityClass: Int def getSlot: Int @@ -182,72 +31,25 @@ trait TMicroOcclusionClient extends TMicroOcclusion with JMicroShrinkRender { recalcBounds() } - def recalcBounds() { - renderBounds = getBounds.copy - renderMask = MicroOcclusion.recalcBounds(this, renderBounds) - } + def recalcBounds(): Unit = + TMicroOcclusionClientLogic.recalcBounds(this) override def getPriorityClass = 0 } trait TMicroOcclusion extends TMultiPart { - import MicroOcclusion._ - def getSlot: Int def getSize: Int def getMaterial: Int def getBounds: Cuboid6 - override def occlusionTest(npart: TMultiPart): Boolean = { - if (!super.occlusionTest(npart)) - return false - - if (!npart.isInstanceOf[TMicroOcclusion]) - return true - - val mpart = npart.asInstanceOf[TMicroOcclusion] - val shape1 = shapePriority(getSlot) - val shape2 = shapePriority(mpart.getSlot) - - if (mpart.getSize + getSize > 8) // intersecting if opposite - { - if (shape1 == 2 && shape2 == 2) - if (mpart.getSlot == (getSlot ^ 1)) - return false - - if (mpart.getMaterial != getMaterial) { - if (shape1 == 1 && shape2 == 1) { - val axisMask = (getSlot - 7) ^ (mpart.getSlot - 7) - if (axisMask == 3 || axisMask == 5 || axisMask == 6) - return false - } - - if (shape1 == 0 && shape2 == 1) - if (!edgeCornerOcclusionTest(this, mpart)) - return false - - if (shape1 == 1 && shape2 == 0) - if (!edgeCornerOcclusionTest(mpart, this)) - return false - - if (shape1 == 0 && shape2 == 0) { - val e1 = getSlot - 15 - val e2 = mpart.getSlot - 15 - if ((e1 & 0xc) == (e2 & 0xc) && ((e1 & 3) ^ (e2 & 3)) == 3) - return false - } - } - } - - return true - } + // Scala retains the synthetic super accessor and trait linearization. + override def occlusionTest(npart: TMultiPart): Boolean = + super + .occlusionTest(npart) && TMicroOcclusionLogic.occlusionTest(this, npart) def edgeCornerOcclusionTest( edge: TMicroOcclusion, corner: TMicroOcclusion - ): Boolean = { - ((corner.getSlot - 7) & edgeAxisMask(edge.getSlot - 15)) == unpackEdgeBits( - edge.getSlot - 15 - ) - } + ): Boolean = TMicroOcclusionLogic.edgeCornerOcclusionTest(edge, corner) } diff --git a/src/main/scala/codechicken/microblock/TMicroOcclusionClientLogic.java b/src/main/scala/codechicken/microblock/TMicroOcclusionClientLogic.java new file mode 100644 index 0000000..f82002e --- /dev/null +++ b/src/main/scala/codechicken/microblock/TMicroOcclusionClientLogic.java @@ -0,0 +1,12 @@ +package codechicken.microblock; + +/** Render-state updates behind the retained Scala state accessors and lifecycle super bridges. */ +final class TMicroOcclusionClientLogic { + + private TMicroOcclusionClientLogic() {} + + static void recalcBounds(TMicroOcclusionClient part) { + part.renderBounds_$eq(part.getBounds().copy()); + part.renderMask_$eq(MicroOcclusion$.MODULE$.recalcBounds(part, part.renderBounds())); + } +} diff --git a/src/main/scala/codechicken/microblock/TMicroOcclusionLogic.java b/src/main/scala/codechicken/microblock/TMicroOcclusionLogic.java new file mode 100644 index 0000000..623f800 --- /dev/null +++ b/src/main/scala/codechicken/microblock/TMicroOcclusionLogic.java @@ -0,0 +1,57 @@ +package codechicken.microblock; + +import codechicken.multipart.PartMap; +import codechicken.multipart.TMultiPart; + +/** Occlusion rules after the retained Scala super call. */ +final class TMicroOcclusionLogic { + + private TMicroOcclusionLogic() {} + + static boolean occlusionTest(TMicroOcclusion part, TMultiPart next) { + if (!(next instanceof TMicroOcclusion)) { + return true; + } + TMicroOcclusion other = (TMicroOcclusion) next; + int shape1 = MicroOcclusion$.MODULE$.shapePriority(part.getSlot()); + int shape2 = MicroOcclusion$.MODULE$.shapePriority(other.getSlot()); + if (other.getSize() + part.getSize() > 8) { + if (shape1 == 2 && shape2 == 2) { + if (other.getSlot() == (part.getSlot() ^ 1)) { + return false; + } + } + if (other.getMaterial() != part.getMaterial()) { + if (shape1 == 1 && shape2 == 1) { + int axisMask = (part.getSlot() - 7) ^ (other.getSlot() - 7); + if (axisMask == 3 || axisMask == 5 || axisMask == 6) { + return false; + } + } + if (shape1 == 0 && shape2 == 1) { + if (!part.edgeCornerOcclusionTest(part, other)) { + return false; + } + } + if (shape1 == 1 && shape2 == 0) { + if (!part.edgeCornerOcclusionTest(other, part)) { + return false; + } + } + if (shape1 == 0 && shape2 == 0) { + int edge1 = part.getSlot() - 15; + int edge2 = other.getSlot() - 15; + if ((edge1 & 0xc) == (edge2 & 0xc) && ((edge1 & 3) ^ (edge2 & 3)) == 3) { + return false; + } + } + } + } + return true; + } + + static boolean edgeCornerOcclusionTest(TMicroOcclusion edge, TMicroOcclusion corner) { + return ((corner.getSlot() - 7) & PartMap.edgeAxisMask(edge.getSlot() - 15)) + == PartMap.unpackEdgeBits(edge.getSlot() - 15); + } +} diff --git a/src/main/scala/codechicken/microblock/ThreadState.java b/src/main/scala/codechicken/microblock/ThreadState.java new file mode 100644 index 0000000..f567589 --- /dev/null +++ b/src/main/scala/codechicken/microblock/ThreadState.java @@ -0,0 +1,25 @@ +package codechicken.microblock; + +import codechicken.lib.render.CCRenderPipeline; + +public class ThreadState { + + private int pass; + private CCRenderPipeline.PipelineBuilder builder; + + public int pass() { + return pass; + } + + public void pass_$eq(int pass) { + this.pass = pass; + } + + public CCRenderPipeline.PipelineBuilder builder() { + return builder; + } + + public void builder_$eq(CCRenderPipeline.PipelineBuilder builder) { + this.builder = builder; + } +} diff --git a/src/main/scala/codechicken/microblock/TopMicroMaterial$.java b/src/main/scala/codechicken/microblock/TopMicroMaterial$.java new file mode 100644 index 0000000..e53e780 --- /dev/null +++ b/src/main/scala/codechicken/microblock/TopMicroMaterial$.java @@ -0,0 +1,12 @@ +package codechicken.microblock; + +public final class TopMicroMaterial$ { + + public static final TopMicroMaterial$ MODULE$ = new TopMicroMaterial$(); + + private TopMicroMaterial$() {} + + public int $lessinit$greater$default$2() { + return 0; + } +} diff --git a/src/main/scala/codechicken/microblock/TopMicroMaterial.java b/src/main/scala/codechicken/microblock/TopMicroMaterial.java new file mode 100644 index 0000000..856a7bc --- /dev/null +++ b/src/main/scala/codechicken/microblock/TopMicroMaterial.java @@ -0,0 +1,33 @@ +package codechicken.microblock; + +import net.minecraft.block.Block; + +import codechicken.lib.render.BlockRenderer.BlockFace; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.uv.UVTransformation; +import codechicken.lib.render.uv.UVTranslation; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; + +public class TopMicroMaterial extends BlockMicroMaterial { + + public static int $lessinit$greater$default$2() { + return TopMicroMaterial$.MODULE$.$lessinit$greater$default$2(); + } + + public TopMicroMaterial(Block block, int meta) { + super(block, meta); + } + + @Override + public void renderMicroFace(Vector3 pos, int pass, Cuboid6 bounds) { + BlockFace face = (BlockFace) CCRenderState.instance().model; + UVTransformation icons = icont(); + if (face.side > 1) { + icons = (UVTransformation) new UVTranslation(0, bounds.max.y - 1).$plus$plus(icons); + } + + MaterialRenderHelper$.MODULE$.start(pos, pass, icons).blockColour(getColour(pass)).lighting() + .blockAndMeta(block(), meta()).render(); + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockCPH$.java b/src/main/scala/codechicken/microblock/handler/MicroblockCPH$.java new file mode 100644 index 0000000..4ca6c2b --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockCPH$.java @@ -0,0 +1,41 @@ +package codechicken.microblock.handler; + +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.network.play.INetHandlerPlayClient; +import net.minecraft.network.play.server.S40PacketDisconnect; +import net.minecraft.util.ChatComponentTranslation; + +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.packet.PacketCustom.IClientPacketHandler; +import codechicken.microblock.MicroMaterialRegistry; +import scala.MatchError; + +public final class MicroblockCPH$ extends MicroblockPH implements IClientPacketHandler { + + public static final MicroblockCPH$ MODULE$ = new MicroblockCPH$(); + + private MicroblockCPH$() {} + + @Override + public void handlePacket(PacketCustom packet, Minecraft minecraft, INetHandlerPlayClient netHandler) { + int type = packet.getType(); + if (type == 1) { + if (!minecraft.isSingleplayer()) { + handleMaterialRegistration(packet, netHandler); + } + return; + } + throw new MatchError(type); + } + + public void handleMaterialRegistration(PacketCustom packet, INetHandlerPlayClient netHandler) { + List missing = MicroMaterialRegistry.readIDMap(packet); + if (!missing.isEmpty()) { + netHandler.handleDisconnect( + new S40PacketDisconnect( + new ChatComponentTranslation("microblock.missing", String.join(", ", missing)))); + } + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockCPH.java b/src/main/scala/codechicken/microblock/handler/MicroblockCPH.java new file mode 100644 index 0000000..0056550 --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockCPH.java @@ -0,0 +1,23 @@ +package codechicken.microblock.handler; + +import net.minecraft.client.Minecraft; +import net.minecraft.network.play.INetHandlerPlayClient; + +import codechicken.lib.packet.PacketCustom; + +public final class MicroblockCPH { + + private MicroblockCPH() {} + + public static String registryChannel() { + return MicroblockCPH$.MODULE$.registryChannel(); + } + + public static void handlePacket(PacketCustom packet, Minecraft minecraft, INetHandlerPlayClient netHandler) { + MicroblockCPH$.MODULE$.handlePacket(packet, minecraft, netHandler); + } + + public static void handleMaterialRegistration(PacketCustom packet, INetHandlerPlayClient netHandler) { + MicroblockCPH$.MODULE$.handleMaterialRegistration(packet, netHandler); + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockEventHandler$.java b/src/main/scala/codechicken/microblock/handler/MicroblockEventHandler$.java new file mode 100644 index 0000000..b26e846 --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockEventHandler$.java @@ -0,0 +1,44 @@ +package codechicken.microblock.handler; + +import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraftforge.client.event.DrawBlockHighlightEvent; +import net.minecraftforge.client.event.TextureStitchEvent; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.render.RenderUtils; +import codechicken.microblock.ItemMicroPartRenderer$; +import codechicken.microblock.MicroMaterialRegistry; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public final class MicroblockEventHandler$ { + + public static final MicroblockEventHandler$ MODULE$ = new MicroblockEventHandler$(); + + private MicroblockEventHandler$() {} + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void postTextureStitch(TextureStitchEvent.Post event) { + if (event.map.getTextureType() == 0) { + MicroMaterialRegistry.loadIcons(); + } + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void drawBlockHighlight(DrawBlockHighlightEvent event) { + if (event.currentItem != null && event.currentItem.getItem() == MicroblockProxy$.MODULE$.itemMicro() + && event.target != null + && event.target.typeOfHit == MovingObjectType.BLOCK) { + GL11.glPushMatrix(); + RenderUtils.translateToWorldCoords(event.player, event.partialTicks); + if (ItemMicroPartRenderer$.MODULE$.renderHighlight(event.player, event.currentItem, event.target)) { + event.setCanceled(true); + } + GL11.glPopMatrix(); + } + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockEventHandler.java b/src/main/scala/codechicken/microblock/handler/MicroblockEventHandler.java new file mode 100644 index 0000000..f504bae --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockEventHandler.java @@ -0,0 +1,25 @@ +package codechicken.microblock.handler; + +import net.minecraftforge.client.event.DrawBlockHighlightEvent; +import net.minecraftforge.client.event.TextureStitchEvent; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public final class MicroblockEventHandler { + + private MicroblockEventHandler() {} + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public static void postTextureStitch(TextureStitchEvent.Post event) { + MicroblockEventHandler$.MODULE$.postTextureStitch(event); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public static void drawBlockHighlight(DrawBlockHighlightEvent event) { + MicroblockEventHandler$.MODULE$.drawBlockHighlight(event); + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockEventHandler.scala b/src/main/scala/codechicken/microblock/handler/MicroblockEventHandler.scala deleted file mode 100644 index 2d3e41d..0000000 --- a/src/main/scala/codechicken/microblock/handler/MicroblockEventHandler.scala +++ /dev/null @@ -1,44 +0,0 @@ -package codechicken.microblock.handler - -import cpw.mods.fml.common.eventhandler.{EventPriority, SubscribeEvent} -import cpw.mods.fml.relauncher.SideOnly -import cpw.mods.fml.relauncher.Side -import net.minecraftforge.client.event.TextureStitchEvent -import codechicken.microblock.MicroMaterialRegistry -import net.minecraftforge.client.event.DrawBlockHighlightEvent -import org.lwjgl.opengl.GL11 -import codechicken.lib.render.RenderUtils -import codechicken.microblock.ItemMicroPartRenderer -import cpw.mods.fml.common.Loader -import cpw.mods.fml.common.LoaderState -import net.minecraft.util.MovingObjectPosition.MovingObjectType - -object MicroblockEventHandler { - @SubscribeEvent(priority = EventPriority.LOW) - @SideOnly(Side.CLIENT) - def postTextureStitch(event: TextureStitchEvent.Post) { - if (event.map.getTextureType == 0) - MicroMaterialRegistry.loadIcons() - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - def drawBlockHighlight(event: DrawBlockHighlightEvent) { - if ( - event.currentItem != null && event.currentItem.getItem == MicroblockProxy.itemMicro && - event.target != null && event.target.typeOfHit == MovingObjectType.BLOCK - ) { - GL11.glPushMatrix() - RenderUtils.translateToWorldCoords(event.player, event.partialTicks) - if ( - ItemMicroPartRenderer.renderHighlight( - event.player, - event.currentItem, - event.target - ) - ) - event.setCanceled(true) - GL11.glPopMatrix() - } - } -} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockMod$.java b/src/main/scala/codechicken/microblock/handler/MicroblockMod$.java new file mode 100644 index 0000000..fb765e9 --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockMod$.java @@ -0,0 +1,67 @@ +package codechicken.microblock.handler; + +import codechicken.microblock.AngelicaCompat; +import codechicken.microblock.ConfigContent$; +import codechicken.microblock.DefaultContent$; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.multipart.Tags; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import scala.collection.JavaConversions; + +@Mod( + modid = "ForgeMicroblock", + name = "Forge Microblocks", + acceptedMinecraftVersions = "[1.7.10]", + dependencies = "required-after:CodeChickenCore@[1.4.20,);required-after:ForgeMultipart", + version = Tags.VERSION, + modLanguage = "scala") +public final class MicroblockMod$ { + + public static final MicroblockMod$ MODULE$ = new MicroblockMod$(); + + private AngelicaCompat angelicaCompat; + + private MicroblockMod$() {} + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + MicroblockProxy$.MODULE$.preInit(event.getModLog()); + DefaultContent$.MODULE$.load(); + ConfigContent$.MODULE$.parse(event.getModConfigurationDirectory()); + } + + @Mod.EventHandler + public void init(FMLInitializationEvent event) { + MicroblockProxy$.MODULE$.init(); + ConfigContent$.MODULE$.load(); + } + + @Mod.EventHandler + public void postInit(FMLPostInitializationEvent event) { + MicroMaterialRegistry.setupIDMap(); + MicroblockProxy$.MODULE$.postInit(); + } + + @Mod.EventHandler + public void beforeServerStart(FMLServerAboutToStartEvent event) { + MicroMaterialRegistry.setupIDMap(); + } + + @Mod.EventHandler + public void handleIMC(IMCEvent event) { + ConfigContent$.MODULE$.handleIMC(JavaConversions.asScalaBuffer(event.getMessages())); + } + + public AngelicaCompat angelicaCompat() { + return angelicaCompat; + } + + public void angelicaCompat_$eq(AngelicaCompat angelicaCompat) { + this.angelicaCompat = angelicaCompat; + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockMod.java b/src/main/scala/codechicken/microblock/handler/MicroblockMod.java new file mode 100644 index 0000000..8d88ece --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockMod.java @@ -0,0 +1,55 @@ +package codechicken.microblock.handler; + +import codechicken.microblock.AngelicaCompat; +import codechicken.multipart.Tags; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; + +@Mod( + modid = "ForgeMicroblock", + name = "Forge Microblocks", + acceptedMinecraftVersions = "[1.7.10]", + dependencies = "required-after:CodeChickenCore@[1.4.20,);required-after:ForgeMultipart", + version = Tags.VERSION, + modLanguage = "scala") +public final class MicroblockMod { + + private MicroblockMod() {} + + @Mod.EventHandler + public static void preInit(FMLPreInitializationEvent event) { + MicroblockMod$.MODULE$.preInit(event); + } + + @Mod.EventHandler + public static void init(FMLInitializationEvent event) { + MicroblockMod$.MODULE$.init(event); + } + + @Mod.EventHandler + public static void postInit(FMLPostInitializationEvent event) { + MicroblockMod$.MODULE$.postInit(event); + } + + @Mod.EventHandler + public static void beforeServerStart(FMLServerAboutToStartEvent event) { + MicroblockMod$.MODULE$.beforeServerStart(event); + } + + @Mod.EventHandler + public static void handleIMC(IMCEvent event) { + MicroblockMod$.MODULE$.handleIMC(event); + } + + public static AngelicaCompat angelicaCompat() { + return MicroblockMod$.MODULE$.angelicaCompat(); + } + + public static void angelicaCompat_$eq(AngelicaCompat angelicaCompat) { + MicroblockMod$.MODULE$.angelicaCompat_$eq(angelicaCompat); + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockMod.scala b/src/main/scala/codechicken/microblock/handler/MicroblockMod.scala deleted file mode 100644 index 604f402..0000000 --- a/src/main/scala/codechicken/microblock/handler/MicroblockMod.scala +++ /dev/null @@ -1,60 +0,0 @@ -package codechicken.microblock.handler - -import cpw.mods.fml.common.Mod -import cpw.mods.fml.common.event.FMLInitializationEvent -import cpw.mods.fml.common.event.FMLPreInitializationEvent -import cpw.mods.fml.common.Mod.EventHandler -import cpw.mods.fml.common.event.FMLServerAboutToStartEvent -import codechicken.microblock.{ - AngelicaCompat, - ConfigContent, - DefaultContent, - MicroMaterialRegistry -} -import codechicken.multipart.Tags -import cpw.mods.fml.common.event.FMLPostInitializationEvent -import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent - -import scala.collection.JavaConversions._ - -@Mod( - modid = "ForgeMicroblock", - name = "Forge Microblocks", - acceptedMinecraftVersions = "[1.7.10]", - dependencies = - "required-after:CodeChickenCore@[1.4.3,);required-after:ForgeMultipart", - version = Tags.VERSION, - modLanguage = "scala" -) -object MicroblockMod { - @EventHandler - def preInit(event: FMLPreInitializationEvent) { - MicroblockProxy.preInit(event.getModLog) - DefaultContent.load() - ConfigContent.parse(event.getModConfigurationDirectory) - } - - @EventHandler - def init(event: FMLInitializationEvent) { - MicroblockProxy.init() - ConfigContent.load() - } - - @EventHandler - def postInit(event: FMLPostInitializationEvent) { - MicroMaterialRegistry.setupIDMap() - MicroblockProxy.postInit() - } - - @EventHandler - def beforeServerStart(event: FMLServerAboutToStartEvent) { - MicroMaterialRegistry.setupIDMap() - } - - @EventHandler - def handleIMC(event: IMCEvent) { - ConfigContent.handleIMC(event.getMessages) - } - - var angelicaCompat: AngelicaCompat = null -} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockPH.java b/src/main/scala/codechicken/microblock/handler/MicroblockPH.java new file mode 100644 index 0000000..c980f80 --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockPH.java @@ -0,0 +1,10 @@ +package codechicken.microblock.handler; + +public class MicroblockPH { + + private final String registryChannel = "ForgeMicroblock"; + + public String registryChannel() { + return registryChannel; + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockProxy$.java b/src/main/scala/codechicken/microblock/handler/MicroblockProxy$.java new file mode 100644 index 0000000..8928898 --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockProxy$.java @@ -0,0 +1,8 @@ +package codechicken.microblock.handler; + +public final class MicroblockProxy$ extends MicroblockProxy_clientImpl { + + public static final MicroblockProxy$ MODULE$ = new MicroblockProxy$(); + + private MicroblockProxy$() {} +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockProxy.java b/src/main/scala/codechicken/microblock/handler/MicroblockProxy.java new file mode 100644 index 0000000..08bd7fa --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockProxy.java @@ -0,0 +1,98 @@ +package codechicken.microblock.handler; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.Item; + +import org.apache.logging.log4j.Logger; + +import codechicken.lib.config.ConfigFile; +import codechicken.microblock.ItemMicroPart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public final class MicroblockProxy { + + private MicroblockProxy() {} + + public static Logger logger() { + return MicroblockProxy$.MODULE$.logger(); + } + + public static void logger_$eq(Logger logger) { + MicroblockProxy$.MODULE$.logger_$eq(logger); + } + + public static ItemMicroPart itemMicro() { + return MicroblockProxy$.MODULE$.itemMicro(); + } + + public static void itemMicro_$eq(ItemMicroPart itemMicro) { + MicroblockProxy$.MODULE$.itemMicro_$eq(itemMicro); + } + + public static Item sawStone() { + return MicroblockProxy$.MODULE$.sawStone(); + } + + public static void sawStone_$eq(Item sawStone) { + MicroblockProxy$.MODULE$.sawStone_$eq(sawStone); + } + + public static Item sawIron() { + return MicroblockProxy$.MODULE$.sawIron(); + } + + public static void sawIron_$eq(Item sawIron) { + MicroblockProxy$.MODULE$.sawIron_$eq(sawIron); + } + + public static Item sawDiamond() { + return MicroblockProxy$.MODULE$.sawDiamond(); + } + + public static void sawDiamond_$eq(Item sawDiamond) { + MicroblockProxy$.MODULE$.sawDiamond_$eq(sawDiamond); + } + + public static Item stoneRod() { + return MicroblockProxy$.MODULE$.stoneRod(); + } + + public static void stoneRod_$eq(Item stoneRod) { + MicroblockProxy$.MODULE$.stoneRod_$eq(stoneRod); + } + + public static boolean useSawIcons() { + return MicroblockProxy$.MODULE$.useSawIcons(); + } + + public static void useSawIcons_$eq(boolean useSawIcons) { + MicroblockProxy$.MODULE$.useSawIcons_$eq(useSawIcons); + } + + public static void preInit(Logger logger) { + MicroblockProxy$.MODULE$.preInit(logger); + } + + public static Item createSaw(ConfigFile config, String name, int strength) { + return MicroblockProxy$.MODULE$.createSaw(config, name, strength); + } + + public static void addSawRecipe(Item saw, Item blade) { + MicroblockProxy$.MODULE$.addSawRecipe(saw, blade); + } + + public static RenderBlocks renderBlocks() { + return MicroblockProxy$.MODULE$.renderBlocks(); + } + + @SideOnly(Side.CLIENT) + public static void init() { + MicroblockProxy$.MODULE$.init(); + } + + @SideOnly(Side.CLIENT) + public static void postInit() { + MicroblockProxy$.MODULE$.postInit(); + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockProxy_clientImpl.java b/src/main/scala/codechicken/microblock/handler/MicroblockProxy_clientImpl.java new file mode 100644 index 0000000..2cdeeee --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockProxy_clientImpl.java @@ -0,0 +1,60 @@ +package codechicken.microblock.handler; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.Item; +import net.minecraftforge.client.MinecraftForgeClient; + +import codechicken.lib.packet.PacketCustom; +import codechicken.microblock.AngelicaCompat; +import codechicken.microblock.ItemMicroPartRenderer$; +import codechicken.microblock.ItemSawRenderer$; +import codechicken.microblock.MicroMaterialRegistry; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import scala.collection.Iterator; + +public class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl { + + @SideOnly(Side.CLIENT) + private RenderBlocks renderBlocks; + + private volatile boolean bitmap$0; + + private RenderBlocks renderBlocks$lzycompute() { + synchronized (this) { + if (!bitmap$0) { + renderBlocks = new RenderBlocks(); + bitmap$0 = true; + } + return renderBlocks; + } + } + + public RenderBlocks renderBlocks() { + return bitmap$0 ? renderBlocks : renderBlocks$lzycompute(); + } + + @Override + @SideOnly(Side.CLIENT) + public void postInit() { + super.postInit(); + MicroMaterialRegistry.loadIcons(); + MinecraftForgeClient.registerItemRenderer(itemMicro(), ItemMicroPartRenderer$.MODULE$); + PacketCustom.assignHandler(MicroblockCPH.registryChannel(), MicroblockCPH$.MODULE$); + + if (Loader.isModLoaded("angelica")) { + MicroblockMod.angelicaCompat_$eq(new AngelicaCompat()); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void init() { + super.init(); + Iterator iterator = saws().iterator(); + while (iterator.hasNext()) { + MinecraftForgeClient.registerItemRenderer(iterator.next(), ItemSawRenderer$.MODULE$); + } + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockProxy_serverImpl.java b/src/main/scala/codechicken/microblock/handler/MicroblockProxy_serverImpl.java new file mode 100644 index 0000000..8ef5550 --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockProxy_serverImpl.java @@ -0,0 +1,167 @@ +package codechicken.microblock.handler; + +import java.util.List; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import org.apache.logging.log4j.Logger; + +import codechicken.lib.config.ConfigFile; +import codechicken.lib.packet.PacketCustom; +import codechicken.microblock.ItemMicroPart; +import codechicken.microblock.ItemSaw; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MicroRecipe$; +import codechicken.microblock.compat.PosteaCompat; +import codechicken.multipart.handler.MultipartProxy; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import scala.collection.mutable.MutableList; + +public class MicroblockProxy_serverImpl { + + private Logger logger; + private ItemMicroPart itemMicro; + private Item sawStone; + private Item sawIron; + private Item sawDiamond; + private Item stoneRod; + private boolean useSawIcons; + private MutableList saws = new MutableList<>(); + + public Logger logger() { + return logger; + } + + public void logger_$eq(Logger logger) { + this.logger = logger; + } + + public ItemMicroPart itemMicro() { + return itemMicro; + } + + public void itemMicro_$eq(ItemMicroPart itemMicro) { + this.itemMicro = itemMicro; + } + + public Item sawStone() { + return sawStone; + } + + public void sawStone_$eq(Item sawStone) { + this.sawStone = sawStone; + } + + public Item sawIron() { + return sawIron; + } + + public void sawIron_$eq(Item sawIron) { + this.sawIron = sawIron; + } + + public Item sawDiamond() { + return sawDiamond; + } + + public void sawDiamond_$eq(Item sawDiamond) { + this.sawDiamond = sawDiamond; + } + + public Item stoneRod() { + return stoneRod; + } + + public void stoneRod_$eq(Item stoneRod) { + this.stoneRod = stoneRod; + } + + public boolean useSawIcons() { + return useSawIcons; + } + + public void useSawIcons_$eq(boolean useSawIcons) { + this.useSawIcons = useSawIcons; + } + + public void preInit(Logger logger) { + this.logger = logger; + itemMicro = new ItemMicroPart(); + GameRegistry.registerItem(itemMicro, "microblock"); + sawStone = createSaw(MultipartProxy.config(), "sawStone", 1); + sawIron = createSaw(MultipartProxy.config(), "sawIron", 2); + sawDiamond = createSaw(MultipartProxy.config(), "sawDiamond", 3); + stoneRod = new Item().setUnlocalizedName("microblock:stoneRod").setTextureName("microblock:stoneRod"); + GameRegistry.registerItem(stoneRod, "stoneRod"); + + OreDictionary.registerOre("rodStone", stoneRod); + MinecraftForge.EVENT_BUS.register(MicroblockEventHandler$.MODULE$); + + useSawIcons = MultipartProxy.config().getTag("useSawIcons") + .setComment("Set to true to use mc style icons for the saw instead of the 3D model") + .getBooleanValue(false); + } + + public MutableList saws() { + return saws; + } + + public void saws_$eq(MutableList saws) { + this.saws = saws; + } + + public Item createSaw(ConfigFile config, String name, int strength) { + Item saw = new ItemSaw(config.getTag(name).useBraces(), strength).setUnlocalizedName("microblock:" + name) + .setTextureName("microblock:" + name); + GameRegistry.registerItem(saw, name); + saws.$plus$eq(saw); + return saw; + } + + public void addSawRecipe(Item saw, Item blade) { + recipes().add( + new ShapedOreRecipe( + new ItemStack(saw), + "srr", + "sbr", + Character.valueOf('s'), + "stickWood", + Character.valueOf('r'), + "rodStone", + Character.valueOf('b'), + blade)); + } + + public void init() { + recipes().add(MicroRecipe$.MODULE$); + if (!Loader.isModLoaded("dreamcraft")) { + CraftingManager.getInstance() + .addRecipe(new ItemStack(stoneRod, 4), "s", "s", Character.valueOf('s'), Blocks.stone); + addSawRecipe(sawStone, Items.flint); + addSawRecipe(sawIron, Items.iron_ingot); + addSawRecipe(sawDiamond, Items.diamond); + } + } + + public void postInit() { + MicroMaterialRegistry.calcMaxCuttingStrength(); + PacketCustom.assignHandshakeHandler(MicroblockSPH.registryChannel(), MicroblockSPH$.MODULE$); + if (Loader.isModLoaded("postea")) { + PosteaCompat.registerTransformers(); + } + } + + @SuppressWarnings("unchecked") + private static List recipes() { + return CraftingManager.getInstance().getRecipeList(); + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockSPH$.java b/src/main/scala/codechicken/microblock/handler/MicroblockSPH$.java new file mode 100644 index 0000000..b5d39f9 --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockSPH$.java @@ -0,0 +1,27 @@ +package codechicken.microblock.handler; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.network.play.INetHandlerPlayServer; + +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.packet.PacketCustom.IHandshakeHandler; +import codechicken.lib.packet.PacketCustom.IServerPacketHandler; +import codechicken.microblock.MicroMaterialRegistry; + +public final class MicroblockSPH$ extends MicroblockPH implements IServerPacketHandler, IHandshakeHandler { + + public static final MicroblockSPH$ MODULE$ = new MicroblockSPH$(); + + private MicroblockSPH$() {} + + @Override + public void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) {} + + @Override + public void handshakeRecieved(NetHandlerPlayServer netHandler) { + PacketCustom packet = new PacketCustom(registryChannel(), 1); + MicroMaterialRegistry.writeIDMap(packet); + netHandler.sendPacket(packet.toPacket()); + } +} diff --git a/src/main/scala/codechicken/microblock/handler/MicroblockSPH.java b/src/main/scala/codechicken/microblock/handler/MicroblockSPH.java new file mode 100644 index 0000000..0ed757e --- /dev/null +++ b/src/main/scala/codechicken/microblock/handler/MicroblockSPH.java @@ -0,0 +1,24 @@ +package codechicken.microblock.handler; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.network.play.INetHandlerPlayServer; + +import codechicken.lib.packet.PacketCustom; + +public final class MicroblockSPH { + + private MicroblockSPH() {} + + public static String registryChannel() { + return MicroblockSPH$.MODULE$.registryChannel(); + } + + public static void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) { + MicroblockSPH$.MODULE$.handlePacket(packet, sender, netHandler); + } + + public static void handshakeRecieved(NetHandlerPlayServer netHandler) { + MicroblockSPH$.MODULE$.handshakeRecieved(netHandler); + } +} diff --git a/src/main/scala/codechicken/microblock/handler/packethandlers.scala b/src/main/scala/codechicken/microblock/handler/packethandlers.scala deleted file mode 100644 index 796105f..0000000 --- a/src/main/scala/codechicken/microblock/handler/packethandlers.scala +++ /dev/null @@ -1,72 +0,0 @@ -package codechicken.microblock.handler - -import codechicken.lib.packet.PacketCustom.{ - IHandshakeHandler, - IClientPacketHandler, - IServerPacketHandler -} -import codechicken.lib.packet.PacketCustom -import net.minecraft.client.Minecraft -import codechicken.microblock.MicroMaterialRegistry -import net.minecraft.entity.player.EntityPlayerMP -import net.minecraft.network.play.{INetHandlerPlayServer, INetHandlerPlayClient} -import net.minecraft.network.play.server.S40PacketDisconnect -import net.minecraft.util.ChatComponentTranslation -import net.minecraft.network.NetHandlerPlayServer - -class MicroblockPH { - val registryChannel = - "ForgeMicroblock" // Must use the 250 system for ID registry as the NetworkMod idMap hasn't been properly initialized from the server yet. -} - -object MicroblockCPH extends MicroblockPH with IClientPacketHandler { - def handlePacket( - packet: PacketCustom, - mc: Minecraft, - netHandler: INetHandlerPlayClient - ) { - packet.getType match { - // In singleplayer the integrated server and this client share the one - // static registry, so the id-map packet is redundant. Skipping it avoids - // rebuilding (clearing) the shared maps on the netty thread while the - // server thread reads them - the race that turned microblocks into Blood - // Rune slabs. - case 1 => - if (!mc.isSingleplayer) - handleMaterialRegistration(packet, netHandler) - } - } - - def handleMaterialRegistration( - packet: PacketCustom, - netHandler: INetHandlerPlayClient - ) { - val missing = MicroMaterialRegistry.readIDMap(packet) - if (!missing.isEmpty) - netHandler.handleDisconnect( - new S40PacketDisconnect( - new ChatComponentTranslation( - "microblock.missing", - missing.mkString(", ") - ) - ) - ) - } -} - -object MicroblockSPH - extends MicroblockPH - with IServerPacketHandler - with IHandshakeHandler { - def handlePacket( - packet: PacketCustom, - sender: EntityPlayerMP, - netHandler: INetHandlerPlayServer - ) {} - - def handshakeRecieved(netHandler: NetHandlerPlayServer) { - val packet = new PacketCustom(registryChannel, 1) - MicroMaterialRegistry.writeIDMap(packet) - netHandler.sendPacket(packet.toPacket) - } -} diff --git a/src/main/scala/codechicken/microblock/handler/proxies.scala b/src/main/scala/codechicken/microblock/handler/proxies.scala deleted file mode 100644 index a1a5e36..0000000 --- a/src/main/scala/codechicken/microblock/handler/proxies.scala +++ /dev/null @@ -1,142 +0,0 @@ -package codechicken.microblock.handler - -import net.minecraftforge.common.MinecraftForge -import codechicken.multipart.handler.MultipartProxy._ -import codechicken.microblock._ -import net.minecraftforge.client.MinecraftForgeClient -import cpw.mods.fml.relauncher.SideOnly -import cpw.mods.fml.relauncher.Side -import net.minecraft.item.crafting.CraftingManager -import net.minecraft.item.Item -import net.minecraft.item.crafting.IRecipe - -import java.util.{List => JList} -import codechicken.lib.config.ConfigFile -import net.minecraftforge.oredict.OreDictionary -import net.minecraft.item.ItemStack -import net.minecraftforge.oredict.ShapedOreRecipe -import codechicken.lib.packet.PacketCustom -import codechicken.microblock.compat.PosteaCompat -import cpw.mods.fml.common.Loader -import cpw.mods.fml.common.registry.GameRegistry -import net.minecraft.client.renderer.RenderBlocks -import net.minecraft.init.{Blocks, Items} -import org.apache.logging.log4j.Logger - -import scala.collection.mutable - -class MicroblockProxy_serverImpl { - var logger: Logger = _ - - var itemMicro: ItemMicroPart = _ - var sawStone: Item = _ - var sawIron: Item = _ - var sawDiamond: Item = _ - var stoneRod: Item = _ - - var useSawIcons: Boolean = _ - - def preInit(logger: Logger) { - this.logger = logger - itemMicro = new ItemMicroPart - GameRegistry.registerItem(itemMicro, "microblock") - sawStone = createSaw(config, "sawStone", 1) - sawIron = createSaw(config, "sawIron", 2) - sawDiamond = createSaw(config, "sawDiamond", 3) - stoneRod = new Item() - .setUnlocalizedName("microblock:stoneRod") - .setTextureName("microblock:stoneRod") - GameRegistry.registerItem(stoneRod, "stoneRod") - - OreDictionary.registerOre("rodStone", stoneRod) - MinecraftForge.EVENT_BUS.register(MicroblockEventHandler) - - useSawIcons = config - .getTag("useSawIcons") - .setComment( - "Set to true to use mc style icons for the saw instead of the 3D model" - ) - .getBooleanValue(false) - } - - protected var saws = mutable.MutableList[Item]() - def createSaw(config: ConfigFile, name: String, strength: Int) = { - val saw = new ItemSaw(config.getTag(name).useBraces(), strength) - .setUnlocalizedName("microblock:" + name) - .setTextureName("microblock:" + name) - GameRegistry.registerItem(saw, name) - saws += saw - saw - } - - def addSawRecipe(saw: Item, blade: Item) { - CraftingManager.getInstance.getRecipeList - .asInstanceOf[JList[IRecipe]] - .add( - new ShapedOreRecipe( - new ItemStack(saw), - "srr", - "sbr", - 's': Character, - "stickWood", - 'r': Character, - "rodStone", - 'b': Character, - blade - ) - ) - } - - def init() { - CraftingManager.getInstance.getRecipeList - .asInstanceOf[JList[IRecipe]] - .add(MicroRecipe) - if (!Loader.isModLoaded("dreamcraft")) { - CraftingManager.getInstance.addRecipe( - new ItemStack(stoneRod, 4), - "s", - "s", - 's': Character, - Blocks.stone - ) - addSawRecipe(sawStone, Items.flint) - addSawRecipe(sawIron, Items.iron_ingot) - addSawRecipe(sawDiamond, Items.diamond) - } - } - - def postInit() { - MicroMaterialRegistry.calcMaxCuttingStrength() - PacketCustom.assignHandshakeHandler( - MicroblockSPH.registryChannel, - MicroblockSPH - ) - if (Loader.isModLoaded("postea")) { - PosteaCompat.registerTransformers() - } - } -} - -class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl { - @SideOnly(Side.CLIENT) - lazy val renderBlocks = new RenderBlocks - - @SideOnly(Side.CLIENT) - override def postInit() { - super.postInit() - MicroMaterialRegistry.loadIcons() - MinecraftForgeClient.registerItemRenderer(itemMicro, ItemMicroPartRenderer) - PacketCustom.assignHandler(MicroblockCPH.registryChannel, MicroblockCPH) - - if (Loader.isModLoaded("angelica")) - MicroblockMod.angelicaCompat = new AngelicaCompat - } - - @SideOnly(Side.CLIENT) - override def init() { - super.init() - saws.foreach(MinecraftForgeClient.registerItemRenderer(_, ItemSawRenderer)) - } -} - -object MicroblockProxy extends MicroblockProxy_clientImpl {} diff --git a/src/main/scala/codechicken/microblock/package.scala b/src/main/scala/codechicken/microblock/package.scala deleted file mode 100644 index e346958..0000000 --- a/src/main/scala/codechicken/microblock/package.scala +++ /dev/null @@ -1,7 +0,0 @@ -package codechicken - -import codechicken.microblock.handler.MicroblockProxy - -package object microblock { - def logger = MicroblockProxy.logger -} diff --git a/src/main/scala/codechicken/multipart/BlockMultipart$.java b/src/main/scala/codechicken/multipart/BlockMultipart$.java new file mode 100644 index 0000000..83979ac --- /dev/null +++ b/src/main/scala/codechicken/multipart/BlockMultipart$.java @@ -0,0 +1,35 @@ +package codechicken.multipart; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import codechicken.lib.raytracer.ExtendedMOP; +import scala.Tuple2; + +/** + * Scala companion singleton. Retained because compiled Scala consumers read MODULE$ and call these instance methods. + */ +public final class BlockMultipart$ { + + public static final BlockMultipart$ MODULE$ = new BlockMultipart$(); + + private BlockMultipart$() {} + + public TileMultipart getTile(IBlockAccess world, int x, int y, int z) { + return BlockMultipart.getTile(world, x, y, z); + } + + public TileMultipartClient getClientTile(IBlockAccess world, int x, int y, int z) { + return BlockMultipart.getClientTile(world, x, y, z); + } + + public Tuple2 reduceMOP(MovingObjectPosition hit) { + return BlockMultipart.reduceMOP(hit); + } + + public boolean drawHighlight(World world, EntityPlayer player, MovingObjectPosition hit, float frame) { + return BlockMultipart.drawHighlight(world, player, hit, frame); + } +} diff --git a/src/main/scala/codechicken/multipart/BlockMultipart.java b/src/main/scala/codechicken/multipart/BlockMultipart.java new file mode 100644 index 0000000..c4b7a3d --- /dev/null +++ b/src/main/scala/codechicken/multipart/BlockMultipart.java @@ -0,0 +1,407 @@ +package codechicken.multipart; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.lib.raytracer.RayTracer; +import codechicken.lib.render.TextureUtils; +import codechicken.lib.vec.Cuboid6; +import scala.Tuple2; +import scala.collection.Iterator; + +/** Block class for all multiparts, should be internal use only. */ +public class BlockMultipart extends Block { + + public BlockMultipart() { + super(new Material(MapColor.stoneColor)); + } + + public static TileMultipart getTile(IBlockAccess world, int x, int y, int z) { + net.minecraft.tileentity.TileEntity t = world.getTileEntity(x, y, z); + if (t instanceof TileMultipart && !((TileMultipart) t).partList().isEmpty()) { + return (TileMultipart) t; + } + return null; + } + + public static TileMultipartClient getClientTile(IBlockAccess world, int x, int y, int z) { + net.minecraft.tileentity.TileEntity t = world.getTileEntity(x, y, z); + if (t instanceof TileMultipartClient && !((TileMultipart) t).partList().isEmpty()) { + return (TileMultipartClient) t; + } + return null; + } + + /** + * Returns the index of the part struck by a multipart ray-trace hit, or -1 if the hit carries no part index. + * + *

+ * The index is the struck part's position in {@link TileMultipart#jPartList()} when the trace ran, as recorded by + * {@link TileMultipart#rayTraceAll}. It is the same value as {@code reduceMOP(hit)._1()}, without Scala types or a + * rebased hit. It goes stale if parts are added or removed after the trace. This method does not check the hit's + * coordinates or look up a tile; callers should bounds-check the index against the tile they retrieve. + * + * @param hit a hit from {@link TileMultipart#collisionRayTrace} or a block ray trace through a multipart block + */ + public static int hitPartIndex(MovingObjectPosition hit) { + if (hit instanceof ExtendedMOP && ((ExtendedMOP) hit).data instanceof Tuple2) { + Object index = ((Tuple2) ((ExtendedMOP) hit).data)._1(); + if (index instanceof Integer) { + return (Integer) index; + } + } + return -1; + } + + /** + * Splits a hit into the index of the part it struck and a MOP rebased onto that part's own data. The index is a + * boxed {@link Integer}; GT5U casts {@code _1()} to it. Java callers that need only the index should use + * {@link #hitPartIndex(MovingObjectPosition)}. + */ + public static Tuple2 reduceMOP(MovingObjectPosition hit) { + ExtendedMOP ehit = (ExtendedMOP) hit; + Tuple2 data = ExtendedMOP.getData(hit); + return new Tuple2<>(data._1(), new ExtendedMOP(ehit, data._2(), ehit.dist)); + } + + public static boolean drawHighlight(World world, EntityPlayer player, MovingObjectPosition hit, float frame) { + TileMultipart tile = getTile(world, hit.blockX, hit.blockY, hit.blockZ); + if (tile == null) { + return false; + } + + Tuple2 reduced = reduceMOP(hit); + int index = (Integer) reduced._1(); + if (tile.partList().apply(index).drawHighlight(reduced._2(), player, frame)) { + return true; + } + + tile.partList().apply(index).collisionRayTrace(RayTracer.getStartVec(player), RayTracer.getEndVec(player)); + return false; + } + + @Override + public boolean hasTileEntity(int meta) { + return true; + } + + @Override + public boolean isBlockSolid(IBlockAccess world, int x, int y, int z, int side) { + TileMultipart tile = getTile(world, x, y, z); + return tile != null && tile.isSolid(side); + } + + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return isBlockSolid(world, x, y, z, side.ordinal()); + } + + @Override + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { + TileMultipart tile = getTile(world, x, y, z); + return tile != null && tile.canPlaceTorchOnTop(); + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + TileMultipart tile = getTile(world, x, y, z); + if (tile != null) { + tile.onNeighborBlockChange(); + } + } + + @Override + public ExtendedMOP collisionRayTrace(World world, int x, int y, int z, Vec3 start, Vec3 end) { + TileMultipart tile = getTile(world, x, y, z); + return tile == null ? null : tile.collisionRayTrace(start, end); + } + + public Iterable rayTraceAll(World world, int x, int y, int z, Vec3 start, Vec3 end) { + TileMultipart tile = getTile(world, x, y, z); + return tile == null ? java.util.Collections.emptyList() : tile.rayTraceAll(start, end); + } + + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + MovingObjectPosition hit = RayTracer.retraceBlock(world, player, x, y, z); + TileMultipart tile = getTile(world, x, y, z); + + if (hit == null || tile == null) { + dropAndDestroy(world, x, y, z); + return true; + } + + Tuple2 reduced = reduceMOP(hit); + int index = (Integer) reduced._1(); + if (world.isRemote) { + tile.partList().apply(index).addDestroyEffects(reduced._2(), Minecraft.getMinecraft().effectRenderer); + return true; + } + + tile.harvestPart(index, reduced._2(), player); + return world.getTileEntity(x, y, z) == null; + } + + public void dropAndDestroy(World world, int x, int y, int z) { + TileMultipart tile = getTile(world, x, y, z); + if (tile != null && !world.isRemote) { + tile.dropItems(getDrops(world, x, y, z, 0, 0)); + } + + world.setBlockToAir(x, y, z); + } + + @Override + public int quantityDropped(int meta, int fortune, Random random) { + return 0; + } + + @Override + public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { + ArrayList ai = new ArrayList<>(); + if (world.isRemote) { + return ai; + } + + TileMultipart tile = getTile(world, x, y, z); + if (tile != null) { + Iterator iterator = tile.partList().iterator(); + while (iterator.hasNext()) { + TMultiPart part = iterator.next(); + for (ItemStack item : part.getDrops()) { + ai.add(item); + } + } + } + + return ai; + } + + @Override + @SuppressWarnings("unchecked") + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB ebb, List list$, + Entity entity) { + List list = list$; + TileMultipart tile = getTile(world, x, y, z); + if (tile != null) { + Iterator iterator = tile.partList().iterator(); + while (iterator.hasNext()) { + TMultiPart part = iterator.next(); + for (Cuboid6 c : part.getCollisionBoxes()) { + AxisAlignedBB aabb = c.toAABB().offset(x, y, z); + if (aabb.intersectsWith(ebb)) { + list.add(aabb); + } + } + } + } + } + + @Override + public boolean addHitEffects(World world, MovingObjectPosition hit, EffectRenderer effectRenderer) { + TileMultipartClient tile = getClientTile(world, hit.blockX, hit.blockY, hit.blockZ); + if (tile != null) { + // The mixin transformer turns TileMultipartClient into an interface at runtime, so retain the cast in + // bytecode even though the Java source model extends TileMultipart. + TileMultipart parts = TileMultipart.class.cast(tile); + Tuple2 reduced = reduceMOP(hit); + int index = (Integer) reduced._1(); + if (index < parts.partList().size()) { + parts.partList().apply(index).addHitEffects(reduced._2(), effectRenderer); + } + } + + return true; + } + + @Override + public boolean addDestroyEffects(World world, int x, int y, int z, int s, EffectRenderer effectRenderer) { + return true; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getRenderType() { + return TileMultipart.renderID(); + } + + @Override + public boolean isAir(IBlockAccess world, int x, int y, int z) { + TileMultipart tile = getTile(world, x, y, z); + return tile == null || tile.partList().isEmpty(); + } + + @Override + public boolean isReplaceable(IBlockAccess world, int x, int y, int z) { + return isAir(world, x, y, z); + } + + @Override + public int getRenderBlockPass() { + return 1; + } + + @Override + public boolean canRenderInPass(int pass) { + return true; + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition hit, World world, int x, int y, int z) { + TileMultipart tile = getTile(world, x, y, z); + if (tile != null) { + if (!(hit instanceof ExtendedMOP)) { + return null; + } + Tuple2 reduced = reduceMOP(hit); + return tile.partList().apply((Integer) reduced._1()).pickItem(reduced._2()); + } + return null; + } + + @Override + public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, int x, int y, int z) { + MovingObjectPosition hit = RayTracer.retraceBlock(world, player, x, y, z); + TileMultipart tile = getTile(world, x, y, z); + if (hit != null && tile != null) { + Tuple2 reduced = reduceMOP(hit); + return tile.partList().apply((Integer) reduced._1()).getStrength(reduced._2(), player) / 30f; + } + + return 1 / 100f; + } + + /** Kludge to set PROTECTED blockIcon to a blank icon. */ + @Override + public void registerBlockIcons(IIconRegister register) { + net.minecraft.util.IIcon icon = TextureUtils.getBlankIcon(16, register); + setBlockTextureName(icon.getIconName()); + super.registerBlockIcons(register); + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + TileMultipart tile = getTile(world, x, y, z); + return tile == null ? 0 : tile.getLightValue(); + } + + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random random) { + TileMultipartClient tile = getClientTile(world, x, y, z); + if (tile != null) { + TileMultipart.class.cast(tile).randomDisplayTick(random); + } + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, + float hitY, float hitZ) { + MovingObjectPosition hit = RayTracer.retraceBlock(world, player, x, y, z); + if (hit == null) { + return false; + } + + TileMultipart tile = getTile(world, x, y, z); + if (tile == null) { + return false; + } + + Tuple2 reduced = reduceMOP(hit); + return tile.partList().apply((Integer) reduced._1()).activate(player, reduced._2(), player.getHeldItem()); + } + + @Override + public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) { + MovingObjectPosition hit = RayTracer.retraceBlock(world, player, x, y, z); + if (hit == null) { + return; + } + + TileMultipart tile = getTile(world, x, y, z); + if (tile == null) { + return; + } + + Tuple2 reduced = reduceMOP(hit); + tile.partList().apply((Integer) reduced._1()).click(player, reduced._2(), player.getHeldItem()); + } + + @Override + public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side) { + TileMultipart tile = getTile(world, x, y, z); + return tile == null ? 0 : tile.strongPowerLevel(side ^ 1); + } + + @Override + public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { + TileMultipart tile = getTile(world, x, y, z); + return tile == null ? 0 : tile.weakPowerLevel(side ^ 1); + } + + @Override + public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side) { + TileMultipart tile = getTile(world, x, y, z); + return tile != null && tile.canConnectRedstone(side); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + TileMultipart tile = getTile(world, x, y, z); + if (tile != null) { + tile.onEntityCollision(entity); + } + } + + @Override + public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + TileMultipart tile = getTile(world, x, y, z); + if (tile != null) { + tile.onNeighborTileChange(tileX, tileY, tileZ); + } + } + + @Override + public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, + double explosionY, double explosionZ) { + TileMultipart tile = getTile(world, x, y, z); + return tile == null ? 0 : tile.getExplosionResistance(entity); + } + + @Override + public boolean getWeakChanges(IBlockAccess world, int x, int y, int z) { + TileMultipart tile = getTile(world, x, y, z); + return tile != null && tile.getWeakChanges(); + } + + @Override + public boolean canProvidePower() { + return true; + } +} diff --git a/src/main/scala/codechicken/multipart/BlockMultipart.scala b/src/main/scala/codechicken/multipart/BlockMultipart.scala deleted file mode 100644 index 317ac77..0000000 --- a/src/main/scala/codechicken/multipart/BlockMultipart.scala +++ /dev/null @@ -1,449 +0,0 @@ -package codechicken.multipart - -import java.util.List -import java.lang.Iterable -import net.minecraft.block.Block -import net.minecraft.block.material.{MapColor, Material} -import net.minecraft.entity.Entity -import net.minecraft.util.AxisAlignedBB -import net.minecraft.world.World -import net.minecraftforge.common.util.ForgeDirection -import net.minecraft.util.Vec3 -import net.minecraft.util.MovingObjectPosition -import codechicken.lib.raytracer.RayTracer -import net.minecraft.entity.player.EntityPlayer - -import java.util.Random -import java.util.ArrayList -import net.minecraft.item.ItemStack -import net.minecraft.client.particle.EffectRenderer -import net.minecraft.client.Minecraft -import net.minecraft.client.renderer.texture.IIconRegister -import codechicken.lib.render.TextureUtils -import net.minecraft.world.IBlockAccess -import codechicken.lib.raytracer.ExtendedMOP -import scala.collection.JavaConversions._ - -object BlockMultipart { - def getTile(world: IBlockAccess, x: Int, y: Int, z: Int) = - world.getTileEntity(x, y, z) match { - case t: TileMultipart if !t.partList.isEmpty => t - case _ => null - } - - def getClientTile(world: IBlockAccess, x: Int, y: Int, z: Int) = - world.getTileEntity(x, y, z) match { - case t: TileMultipartClient if !t.partList.isEmpty => t - case _ => null - } - - def reduceMOP(hit: MovingObjectPosition): (Int, ExtendedMOP) = { - val ehit = hit.asInstanceOf[ExtendedMOP] - val data: (Int, _) = ExtendedMOP.getData(hit) - return (data._1, new ExtendedMOP(ehit, data._2, ehit.dist)) - } - - def drawHighlight( - world: World, - player: EntityPlayer, - hit: MovingObjectPosition, - frame: Float - ): Boolean = { - val tile = getTile(world, hit.blockX, hit.blockY, hit.blockZ) - if (tile == null) - return false - - val (index, mop) = reduceMOP(hit) - if (tile.partList(index).drawHighlight(mop, player, frame)) - return true - - tile - .partList(index) - .collisionRayTrace( - RayTracer.getStartVec(player), - RayTracer.getEndVec(player) - ) - return false - } -} - -/** Block class for all multiparts, should be internal use only. - */ -class BlockMultipart extends Block(new Material(MapColor.stoneColor)) { - import BlockMultipart._ - - override def hasTileEntity(meta: Int = 0) = true - - override def isBlockSolid( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: Int - ): Boolean = - getTile(world, x, y, z) match { - case null => false - case tile => tile.isSolid(side) - } - - override def isSideSolid( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: ForgeDirection - ): Boolean = - isBlockSolid(world, x, y, z, side.ordinal()) - - override def canPlaceTorchOnTop(world: World, x: Int, y: Int, z: Int) = - getTile(world, x, y, z) match { - case null => false - case tile => tile.canPlaceTorchOnTop - } - - override def onNeighborBlockChange( - world: World, - x: Int, - y: Int, - z: Int, - block: Block - ) { - val tile = getTile(world, x, y, z) - if (tile != null) - tile.onNeighborBlockChange() - } - - override def collisionRayTrace( - world: World, - x: Int, - y: Int, - z: Int, - start: Vec3, - end: Vec3 - ): ExtendedMOP = - getTile(world, x, y, z) match { - case null => null - case tile => tile.collisionRayTrace(start, end) - } - - def rayTraceAll( - world: World, - x: Int, - y: Int, - z: Int, - start: Vec3, - end: Vec3 - ): Iterable[ExtendedMOP] = - getTile(world, x, y, z) match { - case null => Seq() - case tile => tile.rayTraceAll(start, end) - } - - override def removedByPlayer( - world: World, - player: EntityPlayer, - x: Int, - y: Int, - z: Int - ): Boolean = { - val hit = RayTracer.retraceBlock(world, player, x, y, z) - val tile = getTile(world, x, y, z) - - if (hit == null || tile == null) { - dropAndDestroy(world, x, y, z) - return true - } - - val (index, mop) = reduceMOP(hit) - if (world.isRemote) { - tile - .partList(index) - .addDestroyEffects(mop, Minecraft.getMinecraft.effectRenderer) - return true - } - - tile.harvestPart(index, mop, player) - return world.getTileEntity(x, y, z) == null - } - - def dropAndDestroy(world: World, x: Int, y: Int, z: Int) { - val tile = getTile(world, x, y, z) - if (tile != null && !world.isRemote) - tile.dropItems(getDrops(world, x, y, z, 0, 0)) - - world.setBlockToAir(x, y, z) - } - - override def quantityDropped(meta: Int, fortune: Int, random: Random) = 0 - - override def getDrops( - world: World, - x: Int, - y: Int, - z: Int, - meta: Int, - fortune: Int - ): ArrayList[ItemStack] = { - val ai = new ArrayList[ItemStack]() - if (world.isRemote) - return ai - - val tile = getTile(world, x, y, z) - if (tile != null) - tile.partList.foreach(part => part.getDrops.foreach(item => ai.add(item))) - - return ai - } - - override def addCollisionBoxesToList( - world: World, - x: Int, - y: Int, - z: Int, - ebb: AxisAlignedBB, - list$ : List[_], - entity: Entity - ) { - val list = list$.asInstanceOf[List[AxisAlignedBB]] - val tile = getTile(world, x, y, z) - if (tile != null) - tile.partList.foreach(part => - part.getCollisionBoxes.foreach { c => - val aabb = c.toAABB.offset(x, y, z) - if (aabb.intersectsWith(ebb)) - list.add(aabb) - } - ) - } - - override def addHitEffects( - world: World, - hit: MovingObjectPosition, - effectRenderer: EffectRenderer - ): Boolean = { - val tile = getClientTile(world, hit.blockX, hit.blockY, hit.blockZ) - if (tile != null) { - val (index, mop) = reduceMOP(hit) - if (index < tile.partList.size) - tile.partList(index).addHitEffects(mop, effectRenderer) - } - - return true - } - - override def addDestroyEffects( - world: World, - x: Int, - y: Int, - z: Int, - s: Int, - effectRenderer: EffectRenderer - ) = true - - override def renderAsNormalBlock() = false - - override def isOpaqueCube = false - - override def getRenderType = TileMultipart.renderID - - override def isAir(world: IBlockAccess, x: Int, y: Int, z: Int): Boolean = - getTile(world, x, y, z) match { - case null => true - case tile => tile.partList.isEmpty - } - - override def isReplaceable(world: IBlockAccess, x: Int, y: Int, z: Int) = - isAir(world, x, y, z) - - override def getRenderBlockPass = 1 - - override def canRenderInPass(pass: Int): Boolean = true - - override def getPickBlock( - hit: MovingObjectPosition, - world: World, - x: Int, - y: Int, - z: Int - ): ItemStack = { - val tile = getTile(world, x, y, z) - if (tile != null) { - if (!hit.isInstanceOf[ExtendedMOP]) { - return null - } - val (index, mop) = reduceMOP(hit) - return tile.partList(index).pickItem(mop) - } - return null - } - - override def getPlayerRelativeBlockHardness( - player: EntityPlayer, - world: World, - x: Int, - y: Int, - z: Int - ): Float = { - val hit = RayTracer.retraceBlock(world, player, x, y, z) - val tile = getTile(world, x, y, z) - if (hit != null && tile != null) { - val (index, mop) = reduceMOP(hit) - return tile.partList(index).getStrength(mop, player) / 30f - } - - return 1 / 100f - } - - /** Kludge to set PROTECTED blockIcon to a blank icon - */ - override def registerBlockIcons(register: IIconRegister) { - val icon = TextureUtils.getBlankIcon(16, register) - setBlockTextureName(icon.getIconName) - super.registerBlockIcons(register) - } - - override def getLightValue(world: IBlockAccess, x: Int, y: Int, z: Int): Int = - getTile(world, x, y, z) match { - case null => 0 - case tile => tile.getLightValue - } - - override def randomDisplayTick( - world: World, - x: Int, - y: Int, - z: Int, - random: Random - ) { - val tile = getClientTile(world, x, y, z) - if (tile != null) - tile.randomDisplayTick(random) - } - - override def onBlockActivated( - world: World, - x: Int, - y: Int, - z: Int, - player: EntityPlayer, - side: Int, - hitX: Float, - hitY: Float, - hitZ: Float - ): Boolean = { - val hit = RayTracer.retraceBlock(world, player, x, y, z) - if (hit == null) - return false - - val tile = getTile(world, x, y, z) - if (tile == null) - return false - - val (index, mop) = reduceMOP(hit) - return tile.partList(index).activate(player, mop, player.getHeldItem) - } - - override def onBlockClicked( - world: World, - x: Int, - y: Int, - z: Int, - player: EntityPlayer - ) { - val hit = RayTracer.retraceBlock(world, player, x, y, z) - if (hit == null) - return - - val tile = getTile(world, x, y, z) - if (tile == null) - return - - val (index, mop) = reduceMOP(hit) - tile.partList(index).click(player, mop, player.getHeldItem) - } - - override def isProvidingStrongPower( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: Int - ): Int = - getTile(world, x, y, z) match { - case null => 0 - case tile => tile.strongPowerLevel(side ^ 1) - } - - override def isProvidingWeakPower( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: Int - ): Int = - getTile(world, x, y, z) match { - case null => 0 - case tile => tile.weakPowerLevel(side ^ 1) - } - - override def canConnectRedstone( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: Int - ): Boolean = - getTile(world, x, y, z) match { - case null => false - case tile => tile.canConnectRedstone(side) - } - - override def onEntityCollidedWithBlock( - world: World, - x: Int, - y: Int, - z: Int, - entity: Entity - ) { - val tile = getTile(world, x, y, z) - if (tile != null) - tile.onEntityCollision(entity) - } - - override def onNeighborChange( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - tileX: Int, - tileY: Int, - tileZ: Int - ) { - val tile = getTile(world, x, y, z) - if (tile != null) - tile.onNeighborTileChange(tileX, tileY, tileZ) - } - - override def getExplosionResistance( - entity: Entity, - world: World, - x: Int, - y: Int, - z: Int, - explosionX: Double, - explosionY: Double, - explosionZ: Double - ): Float = - getTile(world, x, y, z) match { - case null => 0 - case tile => tile.getExplosionResistance(entity) - } - - override def getWeakChanges(world: IBlockAccess, x: Int, y: Int, z: Int) = - getTile(world, x, y, z) match { - case null => false - case tile => tile.getWeakChanges - } - - override def canProvidePower = true -} diff --git a/src/main/scala/codechicken/multipart/ControlKeyHandler.java b/src/main/scala/codechicken/multipart/ControlKeyHandler.java new file mode 100644 index 0000000..e315a8b --- /dev/null +++ b/src/main/scala/codechicken/multipart/ControlKeyHandler.java @@ -0,0 +1,50 @@ +package codechicken.multipart; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.settings.KeyBinding; + +import org.lwjgl.input.Keyboard; + +import codechicken.lib.packet.PacketCustom; +import codechicken.multipart.handler.MultipartCPH; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Key handler implementation. Client only: it extends a client class, so it must never be loaded on a server. + *

+ * The reference was a Scala object, which is a singleton reached as {@code ControlKeyHandler$.MODULE$}. Java has no + * object sugar, so the single instance both the key registry and the event bus need is {@link #INSTANCE}. + */ +@SideOnly(Side.CLIENT) +public class ControlKeyHandler extends KeyBinding { + + public static final ControlKeyHandler INSTANCE = new ControlKeyHandler(); + + private boolean wasPressed; + + private ControlKeyHandler() { + super("key.control", Keyboard.KEY_NONE, "Forge Multipart"); + } + + public boolean wasPressed() { + return wasPressed; + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void tick(ClientTickEvent event) { + boolean pressed = getIsKeyPressed(); + if (pressed != wasPressed) { + wasPressed = pressed; + if (Minecraft.getMinecraft().getNetHandler() != null) { + ControlKeyModifer.setClientPressing(pressed); + PacketCustom packet = new PacketCustom(MultipartCPH.channel(), 1); + packet.writeBoolean(pressed); + packet.sendToServer(); + } + } + } +} diff --git a/src/main/scala/codechicken/multipart/ControlKeyModifer.java b/src/main/scala/codechicken/multipart/ControlKeyModifer.java new file mode 100644 index 0000000..092ee0a --- /dev/null +++ b/src/main/scala/codechicken/multipart/ControlKeyModifer.java @@ -0,0 +1,46 @@ +package codechicken.multipart; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; + +/** + * A class that maintains a map server<->client of which players are holding the control (or placement modifier + * key) much like sneaking. + *

+ * The misspelling in the class name is the published one and is kept deliberately. + */ +public final class ControlKeyModifer { + + private static final Map map = new HashMap<>(); + + private static boolean clientPressing; + + private ControlKeyModifer() {} + + /** Players the server has been told are holding the key. Absent means not holding. */ + public static Map map() { + return map; + } + + public static boolean isClientPressing() { + return clientPressing; + } + + public static void setClientPressing(boolean pressing) { + clientPressing = pressing; + } + + /** + * On a client world this reports what this client is pressing; on a server world it reports what the given player + * last told the server. + */ + public static boolean isControlDown(EntityPlayer p) { + if (p.worldObj.isRemote) { + return clientPressing; + } + Boolean pressed = map.get(p); + return pressed != null && pressed; + } +} diff --git a/src/main/scala/codechicken/multipart/ControlKeyModifier.scala b/src/main/scala/codechicken/multipart/ControlKeyModifier.scala deleted file mode 100644 index 00f1131..0000000 --- a/src/main/scala/codechicken/multipart/ControlKeyModifier.scala +++ /dev/null @@ -1,63 +0,0 @@ -package codechicken.multipart - -import net.minecraft.client.settings.KeyBinding -import org.lwjgl.input.Keyboard -import net.minecraft.client.Minecraft -import codechicken.lib.packet.PacketCustom -import codechicken.multipart.handler.MultipartCPH -import scala.collection.mutable.HashMap -import net.minecraft.entity.player.EntityPlayer -import cpw.mods.fml.common.eventhandler.SubscribeEvent -import cpw.mods.fml.relauncher.{Side, SideOnly} -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent - -/** A class that maintains a map server<->client of which players are holding - * the control (or placement modifier key) much like sneaking. - */ -object ControlKeyModifer { - implicit def playerControlValue(p: EntityPlayer) = new ControlKeyValue(p) - - class ControlKeyValue(p: EntityPlayer) { - def isControlDown = { - if (p.worldObj.isRemote) { - isClientPressing - } else { - map(p) - } - } - } - - val map = HashMap[EntityPlayer, Boolean]().withDefaultValue(false) - var isClientPressing = false; - - /** Implicit static for Java users. - */ - def isControlDown(p: EntityPlayer) = p.isControlDown -} - -/** Key Handler implementation - */ -object ControlKeyHandler - extends KeyBinding( - "key.control", - Keyboard.KEY_NONE, - "Forge Multipart" - ) { - import ControlKeyModifer._ - var wasPressed = false - - @SubscribeEvent - @SideOnly(Side.CLIENT) - def tick(event: ClientTickEvent) { - val pressed = getIsKeyPressed - if (pressed != wasPressed) { - wasPressed = pressed - if (Minecraft.getMinecraft.getNetHandler != null) { - isClientPressing = pressed - val packet = new PacketCustom(MultipartCPH.channel, 1) - packet.writeBoolean(pressed) - packet.sendToServer() - } - } - } -} diff --git a/src/main/scala/codechicken/multipart/IDWriter.scala b/src/main/scala/codechicken/multipart/IDWriter.scala deleted file mode 100644 index a420aea..0000000 --- a/src/main/scala/codechicken/multipart/IDWriter.scala +++ /dev/null @@ -1,26 +0,0 @@ -package codechicken.multipart - -import codechicken.lib.data.MCDataOutput -import codechicken.lib.data.MCDataInput - -/** Class for reading and writing ids, widening the carrier data type as - * necessary - */ -class IDWriter { - var write: (MCDataOutput, Int) => Unit = _ - var read: (MCDataInput) => Int = _ - - def setMax(i: Int) { - val l = i.toLong & 0xffffffff - if (l > 0xffff) { - write = (data, i) => data.writeInt(i) - read = (data) => data.readInt() - } else if (l > 0xff) { - write = (data, i) => data.writeShort(i) - read = (data) => data.readUShort() - } else { - write = (data, i) => data.writeByte(i) - read = (data) => data.readUByte() - } - } -} diff --git a/src/main/scala/codechicken/multipart/IFaceRedstonePart.java b/src/main/scala/codechicken/multipart/IFaceRedstonePart.java new file mode 100644 index 0000000..d37f172 --- /dev/null +++ b/src/main/scala/codechicken/multipart/IFaceRedstonePart.java @@ -0,0 +1,7 @@ +package codechicken.multipart; + +/** A face-attached redstone part whose connections reduce to the edge between two faces. */ +public interface IFaceRedstonePart extends IRedstonePart { + + int getFace(); +} diff --git a/src/main/scala/codechicken/multipart/IMaskedRedstonePart.java b/src/main/scala/codechicken/multipart/IMaskedRedstonePart.java new file mode 100644 index 0000000..47f98b2 --- /dev/null +++ b/src/main/scala/codechicken/multipart/IMaskedRedstonePart.java @@ -0,0 +1,7 @@ +package codechicken.multipart; + +/** A redstone part that supplies its own side connection masks. */ +public interface IMaskedRedstonePart extends IRedstonePart { + + int getConnectionMask(int side); +} diff --git a/src/main/scala/codechicken/multipart/INeighborTileChange.java b/src/main/scala/codechicken/multipart/INeighborTileChange.java new file mode 100644 index 0000000..f5bbdb1 --- /dev/null +++ b/src/main/scala/codechicken/multipart/INeighborTileChange.java @@ -0,0 +1,14 @@ +package codechicken.multipart; + +/** + * Mixin interface for parts that want to be notified of neighbor tile change events (comparators or inventory + * maintainers). + */ +public interface INeighborTileChange { + + /** Returns whether this part needs calls for tile changes through one solid block. */ + boolean weakTileChanges(); + + /** Callback for neighbor tile changes, from same function in Block. */ + void onNeighborTileChanged(int side, boolean weak); +} diff --git a/src/main/scala/codechicken/multipart/INeighborTileChange.scala b/src/main/scala/codechicken/multipart/INeighborTileChange.scala deleted file mode 100644 index ca4ec2f..0000000 --- a/src/main/scala/codechicken/multipart/INeighborTileChange.scala +++ /dev/null @@ -1,16 +0,0 @@ -package codechicken.multipart - -/** Mixin interface for parts that want to be notified of neighbor tile change - * events (comparators or inventory maintainers) - */ -trait INeighborTileChange { - - /** Returns whether this part needs calls for tile changes through one solid - * block - */ - def weakTileChanges(): Boolean - - /** Callback for neighbor tile changes, from same function in Block - */ - def onNeighborTileChanged(side: Int, weak: Boolean) -} diff --git a/src/main/scala/codechicken/multipart/IRandomDisplayTick.java b/src/main/scala/codechicken/multipart/IRandomDisplayTick.java new file mode 100644 index 0000000..3cc761a --- /dev/null +++ b/src/main/scala/codechicken/multipart/IRandomDisplayTick.java @@ -0,0 +1,14 @@ +package codechicken.multipart; + +import java.util.Random; + +/** + * Interface for parts that need random display ticks (torches). + *

+ * Marker interface for TRandomDisplayTickTile. + */ +public interface IRandomDisplayTick { + + /** Called on a random display tick. */ + void randomDisplayTick(Random random); +} diff --git a/src/main/scala/codechicken/multipart/IRandomDisplayTick.scala b/src/main/scala/codechicken/multipart/IRandomDisplayTick.scala deleted file mode 100644 index e2dcb4e..0000000 --- a/src/main/scala/codechicken/multipart/IRandomDisplayTick.scala +++ /dev/null @@ -1,14 +0,0 @@ -package codechicken.multipart - -import java.util.Random - -/** Interface for parts that need random display ticks (torches) - * - * Marker interface for TRandomDisplayTickTile - */ -trait IRandomDisplayTick { - - /** Called on a random display tick. - */ - def randomDisplayTick(random: Random) -} diff --git a/src/main/scala/codechicken/multipart/IRedstoneConnector.java b/src/main/scala/codechicken/multipart/IRedstoneConnector.java new file mode 100644 index 0000000..dd4abaa --- /dev/null +++ b/src/main/scala/codechicken/multipart/IRedstoneConnector.java @@ -0,0 +1,9 @@ +package codechicken.multipart; + +/** A tile whose redstone connections are split into an edge-and-center mask for each side. */ +public interface IRedstoneConnector { + + int getConnectionMask(int side); + + int weakPowerLevel(int side, int mask); +} diff --git a/src/main/scala/codechicken/multipart/IRedstoneConnectorBlock.java b/src/main/scala/codechicken/multipart/IRedstoneConnectorBlock.java new file mode 100644 index 0000000..b1b7f1c --- /dev/null +++ b/src/main/scala/codechicken/multipart/IRedstoneConnectorBlock.java @@ -0,0 +1,11 @@ +package codechicken.multipart; + +import net.minecraft.world.IBlockAccess; + +/** Block counterpart to {@link IRedstoneConnector}. */ +public interface IRedstoneConnectorBlock { + + int getConnectionMask(IBlockAccess world, int x, int y, int z, int side); + + int weakPowerLevel(IBlockAccess world, int x, int y, int z, int side, int mask); +} diff --git a/src/main/scala/codechicken/multipart/IRedstonePart.java b/src/main/scala/codechicken/multipart/IRedstonePart.java new file mode 100644 index 0000000..08367f6 --- /dev/null +++ b/src/main/scala/codechicken/multipart/IRedstonePart.java @@ -0,0 +1,11 @@ +package codechicken.multipart; + +/** A part with redstone interaction. Its presence selects the generated redstone tile trait. */ +public interface IRedstonePart { + + int strongPowerLevel(int side); + + int weakPowerLevel(int side); + + boolean canConnectRedstone(int side); +} diff --git a/src/main/scala/codechicken/multipart/IRedstonePart.scala b/src/main/scala/codechicken/multipart/IRedstonePart.scala deleted file mode 100644 index 553a625..0000000 --- a/src/main/scala/codechicken/multipart/IRedstonePart.scala +++ /dev/null @@ -1,310 +0,0 @@ -package codechicken.multipart - -import net.minecraft.world.World -import net.minecraft.block.Block -import net.minecraft.world.IBlockAccess -import net.minecraft.util.Direction -import codechicken.lib.vec.Rotation._ -import net.minecraft.init.Blocks - -/** Interface for parts with redstone interaction - * - * Marker interface for TRedstoneTile. This means that if a part is an instance - * of IRedstonePart, the container tile may be cast to TRedstoneTile - */ -trait IRedstonePart { - - /** Returns the strong (indirect, through blocks) signal being emitted by this - * part to the specified side - */ - def strongPowerLevel(side: Int): Int - - /** Returns the weak (direct) signal being emitted by this part to the - * specified side - */ - def weakPowerLevel(side: Int): Int - - /** Returns true if this part can connect to redstone on the specified side. - * Blocking parts like covers will be handled by RedstoneInteractions - */ - def canConnectRedstone(side: Int): Boolean -} - -/** For parts like wires that adhere to a specific face, reduces redstone - * connections to the specific edge between two faces. Should be implemented on - * parts implementing TFacePart - */ -trait IFaceRedstonePart extends IRedstonePart { - - /** Return the face to which this redstone part is attached - */ - def getFace: Int -} - -/** For parts that want to define their own connection masks (like center-center - * parts) - */ -trait IMaskedRedstonePart extends IRedstonePart { - - /** Returns the redstone connection mask for this part on side. See - * IRedstoneConnector for mask definition - */ - def getConnectionMask(side: Int): Int -} - -/** Interface for tile entities which split their redstone connections into a - * mask for each side (edges and center) - * - * All connection masks are a 5 bit map. The lowest 4 bits correspond to the - * connection toward the face specified Rotation.rotateSide(side&6, b) where b - * is the bit index from lowest to highest. Bit 5 corresponds to a connection - * opposite side. - */ -trait IRedstoneConnector { - - /** Returns the redstone connection mask for this tile on side. - */ - def getConnectionMask(side: Int): Int - - /** Returns the weak power level provided by this tile on side through mask - */ - def weakPowerLevel(side: Int, mask: Int): Int -} - -/** Internal interface for TileMultipart instances hosting IRedstonePart - */ -trait IRedstoneTile extends IRedstoneConnector { - - /** Returns a mask of spaces through which a wire could connect on side - */ - def openConnections(side: Int): Int -} - -/** Block version of IRedstoneConnector Due to the inadequate - * Block.canConnectRedstone not handling the bottom side (nor the top - * particularly well) - */ -trait IRedstoneConnectorBlock { - def getConnectionMask( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: Int - ): Int - def weakPowerLevel( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: Int, - mask: Int - ): Int -} - -/** static helper class for calculating various things about redstone. Indirect - * power (also known as strong power) is not handled here, just use - * world.getIndirectPowerTo Masks are defined in IRedstoneConnector - */ -object RedstoneInteractions { - import net.minecraft.util.Facing._ - - val vanillaSideMap = Array(-2, -1, 0, 2, 3, 1) - val sideVanillaMap = Array(1, 2, 5, 3, 4) - - /** Hardcoded vanilla overrides for Block.canConnectRedstone (see - * \@IRedstoneConnectorBlock) - */ - val fullVanillaBlocks = Set( - Blocks.redstone_torch, - Blocks.unlit_redstone_torch, - Blocks.lever, - Blocks.stone_button, - Blocks.wooden_button, - Blocks.redstone_block - ) - - /** Get the direct power to p on side - */ - def getPowerTo(p: TMultiPart, side: Int): Int = { - val tile = p.tile - return getPowerTo( - tile.getWorldObj, - tile.xCoord, - tile.yCoord, - tile.zCoord, - side, - tile.asInstanceOf[IRedstoneTile].openConnections(side) & connectionMask( - p, - side - ) - ) - } - - /** Get the direct power level to space (x, y, z) on side with mask - */ - def getPowerTo( - world: World, - x: Int, - y: Int, - z: Int, - side: Int, - mask: Int - ): Int = - getPower( - world, - x + offsetsXForSide(side), - y + offsetsYForSide(side), - z + offsetsZForSide(side), - side ^ 1, - mask - ) - - /** Get the direct power level provided by space (x, y, z) on side with mask - */ - def getPower( - world: World, - x: Int, - y: Int, - z: Int, - side: Int, - mask: Int - ): Int = { - val tile = world.getTileEntity(x, y, z) - if (tile.isInstanceOf[IRedstoneConnector]) - return tile.asInstanceOf[IRedstoneConnector].weakPowerLevel(side, mask) - - val block = world.getBlock(x, y, z) - if (block.isInstanceOf[IRedstoneConnectorBlock]) - return block - .asInstanceOf[IRedstoneConnectorBlock] - .weakPowerLevel(world, x, y, z, side, mask) - - val vmask = vanillaConnectionMask(block, world, x, y, z, side, true) - if ((vmask & mask) > 0) { - var m = world.getIndirectPowerLevelTo(x, y, z, side ^ 1) - if (m < 15 && block == Blocks.redstone_wire) - m = - Math.max(m, world.getBlockMetadata(x, y, z)) // painful vanilla kludge - return m - } - return 0 - } - - def vanillaToSide(vside: Int) = sideVanillaMap(vside + 1) - - /** Get the connection mask of the block on side of (x, y, z). - * @param power, - * whether the connection mask is for signal transfer or visual connection. - * (some blocks accept power without visual connection) - */ - def otherConnectionMask( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: Int, - power: Boolean - ): Int = - getConnectionMask( - world, - x + offsetsXForSide(side), - y + offsetsYForSide(side), - z + offsetsZForSide(side), - side ^ 1, - power - ) - - /** Get the connection mask of part on side - */ - def connectionMask(p: TMultiPart, side: Int): Int = { - if ( - p.isInstanceOf[IRedstonePart] && p - .asInstanceOf[IRedstonePart] - .canConnectRedstone(side) - ) { - if (p.isInstanceOf[IFaceRedstonePart]) { - val fside = p.asInstanceOf[IFaceRedstonePart].getFace - if ((side & 6) == (fside & 6)) - return 0x10 - - return 1 << rotationTo(side & 6, fside) - } else if (p.isInstanceOf[IMaskedRedstonePart]) { - return p.asInstanceOf[IMaskedRedstonePart].getConnectionMask(side) - } - return 0x1f - } - return 0 - } - - /** @param power - * If true, don't test canConnectRedstone on blocks, just get a power - * transmission mask rather than a visual connection - */ - def getConnectionMask( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: Int, - power: Boolean - ): Int = { - val tile = world.getTileEntity(x, y, z) - if (tile.isInstanceOf[IRedstoneConnector]) - return tile.asInstanceOf[IRedstoneConnector].getConnectionMask(side) - - val block = world.getBlock(x, y, z) - if (block.isInstanceOf[IRedstoneConnectorBlock]) - return block - .asInstanceOf[IRedstoneConnectorBlock] - .getConnectionMask(world, x, y, z, side) - - return vanillaConnectionMask(block, world, x, y, z, side, power) - } - - /** Returns the connection mask for a vanilla block - */ - def vanillaConnectionMask( - block: Block, - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - side: Int, - power: Boolean - ): Int = { - if (fullVanillaBlocks(block)) - return 0x1f - - /** so that these can be conducted to from face parts on the other side of - * the block. Due to vanilla's in adequecy with redstone/logic on walls - */ - if ( - block == Blocks.redstone_wire || block == Blocks.powered_comparator || block == Blocks.unpowered_comparator - ) { - if (side != 0) - return if (power) 0x1f else 4 - - return 0 - } - - val vside = vanillaSideMap(side) - if ( - block == Blocks.powered_repeater || block == Blocks.unpowered_repeater - ) // stupid minecraft hardcodes - { - val meta = world.getBlockMetadata(x, y, z) - if (vside == (meta & 3) || vside == Direction.rotateOpposite(meta & 3)) - return if (power) 0x1f else 4 - - return 0 - } - - if ( - power || block.canConnectRedstone(world, x, y, z, vside) - ) // some blocks accept power without visualising connections - return 0x1f - - return 0 - } -} diff --git a/src/main/scala/codechicken/multipart/IRedstoneTile.java b/src/main/scala/codechicken/multipart/IRedstoneTile.java new file mode 100644 index 0000000..211fbbc --- /dev/null +++ b/src/main/scala/codechicken/multipart/IRedstoneTile.java @@ -0,0 +1,19 @@ +package codechicken.multipart; + +/** + * Supported redstone capability of generated multipart tiles hosting {@link IRedstonePart}. Use this stable Java + * interface for consumer calls, rather than the transformed TRedstoneTile implementation class. Not every multipart + * tile implements it; test instanceof when the caller does not already require this capability. Other connector + * implementations may implement only {@link IRedstoneConnector}. + */ +public interface IRedstoneTile extends IRedstoneConnector { + + /** + * Returns the geometrically open connection mask for a Minecraft side (0..5): bits 0..3 are the four rotations + * around that side and bit 4 is the center. Face and edge parts can obstruct these connections. This is not the + * mask of connections actually offered by contained redstone parts; use getConnectionMask for that query. Reads + * current part/slot state without caching or notifications. The caller supplies a valid side and uses the world's + * thread; this interface adds no validation or synchronization. + */ + int openConnections(int side); +} diff --git a/src/main/scala/codechicken/multipart/IScheduledPacketPart.java b/src/main/scala/codechicken/multipart/IScheduledPacketPart.java new file mode 100644 index 0000000..39ed743 --- /dev/null +++ b/src/main/scala/codechicken/multipart/IScheduledPacketPart.java @@ -0,0 +1,22 @@ +package codechicken.multipart; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; + +/** Callback interface for PacketScheduler. */ +public interface IScheduledPacketPart { + + /** Write scheduled data to the packet, mask is the cumulative mask from calls to schedulePacket. */ + void writeScheduled(long mask, MCDataOutput packet); + + /** + * Returns the width (in bytes) of the data type required to hold all valid mask bits. Valid values are 1, 2, 4 and + * 8. + */ + int maskWidth(); + + /** + * Read data matching mask. Establishes a method for subclasses to override. This should be called from read. + */ + void readScheduled(long mask, MCDataInput packet); +} diff --git a/src/main/scala/codechicken/multipart/IconHitEffects.java b/src/main/scala/codechicken/multipart/IconHitEffects.java new file mode 100644 index 0000000..b9e4c06 --- /dev/null +++ b/src/main/scala/codechicken/multipart/IconHitEffects.java @@ -0,0 +1,67 @@ +package codechicken.multipart; + +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.lib.render.EntityDigIconFX; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; + +/** + * Static implementations of the functions a part would override on {@link TMultiPart} for standard Minecraft style hit + * and break particles. + *

+ * Java composition setup. A Java class implements {@link JIconHitEffects}, overrides the functions on + * {@link TMultiPart}, and calls these statics with 'this' as the first parameter. {@link TIconHitEffects} is the + * equivalent for Scala implementors. + */ +public final class IconHitEffects { + + private IconHitEffects() {} + + public static void addHitEffects(JIconHitEffects part, MovingObjectPosition hit, EffectRenderer effectRenderer) { + TileMultipart tile = ((TMultiPart) part).tile(); + World world = tile.getWorldObj(); + EntityDigIconFX.addBlockHitEffects( + world, + part.getBounds().copy().add(Vector3.fromTileEntity(tile)), + hit.sideHit, + part.getBreakingIcon(ExtendedMOP.getData(hit), hit.sideHit), + part.getBreakingColour( + ExtendedMOP.getData(hit), + hit.sideHit, + world, + tile.xCoord, + tile.yCoord, + tile.zCoord), + effectRenderer); + } + + public static void addDestroyEffects(JIconHitEffects part, EffectRenderer effectRenderer) { + addDestroyEffects(part, effectRenderer, true); + } + + public static void addDestroyEffects(JIconHitEffects part, EffectRenderer effectRenderer, boolean scaleDensity) { + IIcon[] icons = new IIcon[6]; + for (int i = 0; i < 6; i++) { + icons[i] = part.getBrokenIcon(i); + } + Cuboid6 bounds = scaleDensity ? part.getBounds().copy() : Cuboid6.full.copy(); + // The tile is read only here, after the icons and bounds, matching the reference evaluation order. + TileMultipart tile = ((TMultiPart) part).tile(); + World world = tile.getWorldObj(); + int[] colours = new int[6]; + for (int i = 0; i < 6; i++) { + colours[i] = part.getBrokenColour(i, world, tile.xCoord, tile.yCoord, tile.zCoord); + } + EntityDigIconFX.addBlockDestroyEffects( + world, + bounds.add(Vector3.fromTileEntity(tile)), + icons, + colours, + effectRenderer); + } +} diff --git a/src/main/scala/codechicken/multipart/ItemMultiPart.scala b/src/main/scala/codechicken/multipart/ItemMultiPart.scala deleted file mode 100644 index dbf640b..0000000 --- a/src/main/scala/codechicken/multipart/ItemMultiPart.scala +++ /dev/null @@ -1,68 +0,0 @@ -package codechicken.multipart - -import net.minecraft.item.Item -import codechicken.lib.vec.Vector3 -import codechicken.lib.vec.Rotation -import net.minecraft.item.ItemStack -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.world.World -import codechicken.lib.vec.BlockCoord - -/** Java class implementation - */ -abstract class JItemMultiPart extends Item with TItemMultiPart - -/** Simple multipart item class for easy placement. Simply override the newPart - * function and it the part will be added to the block space if it passes the - * occlusion tests. - */ -trait TItemMultiPart extends Item { - def getHitDepth(vhit: Vector3, side: Int): Double = - vhit.copy.scalarProject(Rotation.axes(side)) + (side % 2 ^ 1) - - override def onItemUse( - item: ItemStack, - player: EntityPlayer, - world: World, - x: Int, - y: Int, - z: Int, - side: Int, - hitX: Float, - hitY: Float, - hitZ: Float - ): Boolean = { - val pos = new BlockCoord(x, y, z) - val vhit = new Vector3(hitX, hitY, hitZ) - val d = getHitDepth(vhit, side) - - def place(): Boolean = { - val part = newPart(item, player, world, pos, side, vhit) - if (part == null || !TileMultipart.canPlacePart(world, pos, part)) - return false - - if (!world.isRemote) - TileMultipart.addPart(world, pos, part) - if (!player.capabilities.isCreativeMode) - item.stackSize -= 1 - return true - } - - if (d < 1 && place()) - return true - - pos.offset(side) - return place() - } - - /** Create a new part based on the placement information parameters. - */ - def newPart( - item: ItemStack, - player: EntityPlayer, - world: World, - pos: BlockCoord, - side: Int, - vhit: Vector3 - ): TMultiPart -} diff --git a/src/main/scala/codechicken/multipart/JCuboidPart.java b/src/main/scala/codechicken/multipart/JCuboidPart.java new file mode 100644 index 0000000..0f1cf34 --- /dev/null +++ b/src/main/scala/codechicken/multipart/JCuboidPart.java @@ -0,0 +1,53 @@ +package codechicken.multipart; + +import java.util.Collections; + +import net.minecraft.client.renderer.RenderBlocks; + +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.render.BlockRenderer; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.uv.IconTransformation; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Translation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** Java class implementation of {@link TCuboidPart}, and the canonical home of its behavior. */ +public abstract class JCuboidPart extends TMultiPart implements TCuboidPart { + + @Override + public Iterable getSubParts() { + return subParts(this); + } + + @Override + public Iterable getCollisionBoxes() { + return collisionBoxes(this); + } + + @SideOnly(Side.CLIENT) + @Override + public void drawBreaking(RenderBlocks renderBlocks) { + renderBreaking(this, renderBlocks); + } + + public static Iterable subParts(TCuboidPart part) { + return Collections.singletonList(new IndexedCuboid6(0, part.getBounds())); + } + + public static Iterable collisionBoxes(TCuboidPart part) { + return Collections.singletonList(part.getBounds()); + } + + @SideOnly(Side.CLIENT) + public static void renderBreaking(TCuboidPart part, RenderBlocks renderBlocks) { + TMultiPart multiPart = (TMultiPart) part; + CCRenderState state = CCRenderState.instance(); + state.resetInstance(); + state.setPipelineInstance( + new Translation(multiPart.x(), multiPart.y(), multiPart.z()), + new IconTransformation(renderBlocks.overrideBlockTexture)); + BlockRenderer.renderCuboid(part.getBounds(), 0); + } +} diff --git a/src/main/scala/codechicken/multipart/JIconHitEffects$class.java b/src/main/scala/codechicken/multipart/JIconHitEffects$class.java new file mode 100644 index 0000000..821bb41 --- /dev/null +++ b/src/main/scala/codechicken/multipart/JIconHitEffects$class.java @@ -0,0 +1,20 @@ +package codechicken.multipart; + +import net.minecraft.util.IIcon; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** Binary bridge for Scala implementations compiled against the original trait. */ +@Deprecated +public abstract class JIconHitEffects$class { + + private JIconHitEffects$class() {} + + @SideOnly(Side.CLIENT) + public static IIcon getBreakingIcon(JIconHitEffects part, Object subPart, int side) { + return part.getBrokenIcon(side); + } + + public static void $init$(JIconHitEffects part) {} +} diff --git a/src/main/scala/codechicken/multipart/JIconHitEffects.java b/src/main/scala/codechicken/multipart/JIconHitEffects.java new file mode 100644 index 0000000..aff7cea --- /dev/null +++ b/src/main/scala/codechicken/multipart/JIconHitEffects.java @@ -0,0 +1,45 @@ +package codechicken.multipart; + +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + +import codechicken.lib.render.EntityDigIconFX; +import codechicken.lib.vec.Cuboid6; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Java interface containing callbacks for particle rendering. Make sure to override addHitEffects and addDestroyEffects + * on {@link TMultiPart} as {@link TIconHitEffects} does, calling the {@link IconHitEffects} statics. + */ +public interface JIconHitEffects { + + Cuboid6 getBounds(); + + @SideOnly(Side.CLIENT) + default IIcon getBreakingIcon(Object subPart, int side) { + return getBrokenIcon(side); + } + + @SideOnly(Side.CLIENT) + IIcon getBrokenIcon(int side); + + /** + * The 0xRRGGBB tint for the hit particle on side, mirroring {@link #getBreakingIcon(Object, int)}. Defaults to the + * whole-part tint. + */ + @SideOnly(Side.CLIENT) + default int getBreakingColour(Object subPart, int side, IBlockAccess world, int x, int y, int z) { + return getBrokenColour(side, world, x, y, z); + } + + /** + * The 0xRRGGBB tint to multiply the particle for side by, {@link EntityDigIconFX#NO_TINT} for none. Override + * alongside {@link #getBrokenIcon(int)} whenever that icon is greyscale and coloured at render time, or the part + * breaks into grey particles. + */ + @SideOnly(Side.CLIENT) + default int getBrokenColour(int side, IBlockAccess world, int x, int y, int z) { + return EntityDigIconFX.NO_TINT; + } +} diff --git a/src/main/scala/codechicken/multipart/JItemMultiPart.java b/src/main/scala/codechicken/multipart/JItemMultiPart.java new file mode 100644 index 0000000..91a9a5b --- /dev/null +++ b/src/main/scala/codechicken/multipart/JItemMultiPart.java @@ -0,0 +1,58 @@ +package codechicken.multipart; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Vector3; + +/** Java class implementation of {@link TItemMultiPart}, and the canonical home of its behavior. */ +public abstract class JItemMultiPart extends Item implements TItemMultiPart { + + @Override + public double getHitDepth(Vector3 vhit, int side) { + return hitDepth(vhit, side); + } + + @Override + public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { + return onItemUse(this, item, player, world, x, y, z, side, hitX, hitY, hitZ); + } + + public static double hitDepth(Vector3 vhit, int side) { + return vhit.copy().scalarProject(Rotation.axes[side]) + (side % 2 ^ 1); + } + + public static boolean onItemUse(TItemMultiPart part, ItemStack item, EntityPlayer player, World world, int x, int y, + int z, int side, float hitX, float hitY, float hitZ) { + BlockCoord pos = new BlockCoord(x, y, z); + Vector3 vhit = new Vector3(hitX, hitY, hitZ); + + if (part.getHitDepth(vhit, side) < 1 && place(part, item, player, world, pos, side, vhit)) { + return true; + } + + pos.offset(side); + return place(part, item, player, world, pos, side, vhit); + } + + private static boolean place(TItemMultiPart part, ItemStack item, EntityPlayer player, World world, BlockCoord pos, + int side, Vector3 vhit) { + TMultiPart newPart = part.newPart(item, player, world, pos, side, vhit); + if (newPart == null || !TileMultipart.canPlacePart(world, pos, newPart)) { + return false; + } + + if (!world.isRemote) { + TileMultipart.addPart(world, pos, newPart); + } + if (!player.capabilities.isCreativeMode) { + item.stackSize -= 1; + } + return true; + } +} diff --git a/src/main/scala/codechicken/multipart/JNormalOcclusion.java b/src/main/scala/codechicken/multipart/JNormalOcclusion.java new file mode 100644 index 0000000..f0ebc28 --- /dev/null +++ b/src/main/scala/codechicken/multipart/JNormalOcclusion.java @@ -0,0 +1,13 @@ +package codechicken.multipart; + +import codechicken.lib.vec.Cuboid6; + +/** + * Java interface containing callbacks for normal occlusion testing. Make sure to override occlusionTest as in + * {@link TNormalOcclusion}. + */ +public interface JNormalOcclusion { + + /** Return a list of normal occlusion boxes. */ + Iterable getOcclusionBoxes(); +} diff --git a/src/main/scala/codechicken/multipart/JsonModeledPart.java b/src/main/scala/codechicken/multipart/JsonModeledPart.java index 7c83123..09a945e 100644 --- a/src/main/scala/codechicken/multipart/JsonModeledPart.java +++ b/src/main/scala/codechicken/multipart/JsonModeledPart.java @@ -11,7 +11,7 @@ public interface JsonModeledPart { * Use to give your part a world that can be used to define properties for rendering. For example having your world * returning your block with some specific state such as meta you can override the getMeta for the input location to * be the meta you desire - * + * * @return The world to use */ IBlockAccess getRenderWorld(); diff --git a/src/main/scala/codechicken/multipart/MultiPartRegistry$.java b/src/main/scala/codechicken/multipart/MultiPartRegistry$.java new file mode 100644 index 0000000..b4711b1 --- /dev/null +++ b/src/main/scala/codechicken/multipart/MultiPartRegistry$.java @@ -0,0 +1,114 @@ +package codechicken.multipart; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultiPartRegistry.IPartConverter; +import codechicken.multipart.MultiPartRegistry.IPartFactory; +import codechicken.multipart.MultiPartRegistry.IPartFactory2; +import cpw.mods.fml.common.ModContainer; +import scala.collection.JavaConversions; + +/** + * Scala companion singleton. Retained because compiled Scala consumers read MODULE$ and call these instance methods. + */ +public final class MultiPartRegistry$ { + + public static final MultiPartRegistry$ MODULE$ = new MultiPartRegistry$(); + + /** + * Retained with its original name and Scala type because Schematica reflects it directly. New callers should use + * {@link MultiPartRegistry#getPartFactory(String)}; this live compatibility view remains until consumer adoption. + */ + @SuppressWarnings("unused") + private final scala.collection.mutable.Map codechicken$multipart$MultiPartRegistry$$typeMap = JavaConversions + .mapAsScalaMap(MultiPartRegistry.typeMapBacking()); + + private MultiPartRegistry$() {} + + /** @deprecated Implement {@link IPartFactory2} and use {@link MultiPartRegistry#registerPartFactory}. */ + @Deprecated + public void registerParts(IPartFactory partFactory, String... types) { + MultiPartRegistry.registerParts(partFactory, types); + } + + /** @deprecated Implement {@link IPartFactory2} and use {@link MultiPartRegistry#registerPartFactory}. */ + @Deprecated + public void registerParts(scala.Function2 partFactory, + scala.collection.Seq types) { + MultiPartRegistry.registerParts(partFactory, types); + } + + public void registerParts(IPartFactory2 partFactory, String... types) { + MultiPartRegistry.registerParts(partFactory, types); + } + + /** + * @deprecated Use {@link MultiPartRegistry#registerPartFactory(IPartFactory2, String...)}. Retained with its exact + * descriptor for compiled Scala consumers. + */ + @Deprecated + public void registerParts(IPartFactory2 partFactory, scala.collection.Seq types) { + MultiPartRegistry.registerParts(partFactory, types); + } + + public void registerConverter(IPartConverter c) { + MultiPartRegistry.registerConverter(c); + } + + public void beforeServerStart() { + MultiPartRegistry.beforeServerStart(); + } + + public void writeIDMap(PacketCustom packet) { + MultiPartRegistry.writeIDMap(packet); + } + + public List readIDMap(PacketCustom packet) { + return MultiPartRegistry.readIDMap(packet); + } + + public boolean required() { + return MultiPartRegistry.required(); + } + + public boolean loaded() { + return MultiPartRegistry.loaded(); + } + + public void postInit() { + MultiPartRegistry.postInit(); + } + + public void writePartID(MCDataOutput data, TMultiPart part) { + MultiPartRegistry.writePartID(data, part); + } + + public TMultiPart readPart(MCDataInput data) { + return MultiPartRegistry.readPart(data); + } + + public TMultiPart loadPart(String name, NBTTagCompound nbt) { + return MultiPartRegistry.loadPart(name, nbt); + } + + @Deprecated + public TMultiPart createPart(String name, boolean client) { + return MultiPartRegistry.createPart(name, client); + } + + public TMultiPart convertBlock(World world, BlockCoord pos, Block block) { + return MultiPartRegistry.convertBlock(world, pos, block); + } + + public ModContainer getModContainer(String name) { + return MultiPartRegistry.getModContainer(name); + } +} diff --git a/src/main/scala/codechicken/multipart/MultiPartRegistry.java b/src/main/scala/codechicken/multipart/MultiPartRegistry.java new file mode 100644 index 0000000..fff35e9 --- /dev/null +++ b/src/main/scala/codechicken/multipart/MultiPartRegistry.java @@ -0,0 +1,394 @@ +package codechicken.multipart; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; + +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import com.google.common.collect.ArrayListMultimap; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.handler.MultipartProxy; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; +import scala.Tuple2; +import scala.collection.JavaConversions; + +/** This class handles the registration and internal ID mapping of all multipart classes. */ +public final class MultiPartRegistry { + + /** + * Interface to be registered for constructing parts. Every instance of every multipart is constructed from an + * implementor of this. + * + * @deprecated Implement {@link IPartFactory2} and use + * {@link MultiPartRegistry#registerPartFactory(IPartFactory2, String...)}. + */ + @Deprecated + public interface IPartFactory { + + /** + * Create a new instance of the part with the specified type name identifier. + * + * @param client If the part instance is for the client or the server + */ + TMultiPart createPart(String name, boolean client); + } + + /** + * Factory with separate server/NBT and client/packet construction paths. Register during mod initialization with + * {@link MultiPartRegistry#registerPartFactory(IPartFactory2, String...)}. Registration does not call the factory. + * Return a fresh, unbound part with a stable registered {@link TMultiPart#getType()} for each supported name. + */ + public interface IPartFactory2 { + + /** + * Create a new server instance of the part with the specified type name identifier. + * + * @param nbt The same tag compound the reconstruction caller subsequently passes to part.load; may be inspected + * to select the part class. The registry does not call load. Legacy createPart(name, false) passes + * null, so factories used through that deprecated path must handle it. + */ + TMultiPart createPart(String name, NBTTagCompound nbt); + + /** + * Create a new client instance of the part with the specified type name identifier. + * + * @param packet The same input the reconstruction caller subsequently passes to part.readDesc, positioned after + * the registry ID. A factory may consume a constructor discriminator; readDesc continues at the + * resulting cursor without a rewind. The registry does not call readDesc. Legacy createPart(name, + * true) passes null. + */ + TMultiPart createPart(String name, MCDataInput packet); + + /** + * Creates a client part from saved NBT for an off-world preview. The returned part must be fresh and unbound; + * the preview loader subsequently calls {@link TMultiPart#load(NBTTagCompound)} and binds it to a generated + * client tile. Return null when this factory cannot construct its client variant without a description packet. + * + *

+ * The preview loader calls this only for client construction. Existing factories remain binary compatible and + * opt out by default. Do not consume or mutate the supplied tag. + */ + default TMultiPart createPartForClientPreview(String name, NBTTagCompound nbt) { + return null; + } + } + + /** + * Converts an existing block/tile into a fresh, unbound part. Register once during common mod initialization on + * both sides with {@link MultiPartRegistry#registerConverter(IPartConverter)}, separately from its persistent part + * factory. Conversion may run repeatedly for inspection, placement checks and eventual placement; do not remove the + * source block or transfer live resources here. See {@link TMultiPart#invalidateConvertedTile()} and + * {@link TMultiPart#onConverted()} for the committed conversion lifecycle. + */ + public interface IPartConverter { + + /** + * Returns the block instances this converter may handle. Enumerated immediately during registration; the + * iterable is not retained. Return non-null blocks without duplicates. Metadata/tile eligibility is checked by + * convert, not by registration. + */ + Iterable blockTypes(); + + /** + * Inspect the source at pos and return a fresh, unbound part, or null to let the next converter try. World and + * position are borrowed, unchanged references; do not mutate the position. Use world.isRemote for side-specific + * construction. Copy required state without consuming it: the candidate may be discarded and this callback may + * run again. FMP does not invoke load/readDesc on this result or validate its registered type. Exceptions + * propagate and stop dispatch; they do not mean "try the next converter". + */ + TMultiPart convert(World world, BlockCoord pos); + } + + private static final Map typeMap = new HashMap<>(); + private static final Map nameMap = new HashMap<>(); + private static Tuple2[] idMap; + private static final IDWriter idWriter = new IDWriter(); + private static final ArrayListMultimap converters = ArrayListMultimap.create(); + private static final Map containers = new HashMap<>(); + + /** The state of the registry. 0 = no parts, 1 = registering, 2 = registered. */ + private static int state = 0; + + private MultiPartRegistry() {} + + static Map typeMapBacking() { + return typeMap; + } + + /** + * Register a part factory with an array of types it is capable of instantiating. Must be called before postInit. + * + * @deprecated Implement {@link IPartFactory2} and use {@link #registerPartFactory(IPartFactory2, String...)}. + */ + @Deprecated + public static void registerParts(IPartFactory partFactory, String... types) { + registerParts(new IPartFactory2() { + + @Override + public TMultiPart createPart(String name, MCDataInput packet) { + return partFactory.createPart(name, true); + } + + @Override + public TMultiPart createPart(String name, NBTTagCompound nbt) { + return partFactory.createPart(name, false); + } + + @Override + public TMultiPart createPartForClientPreview(String name, NBTTagCompound nbt) { + return partFactory.createPart(name, true); + } + }, types); + } + + /** + * Scala function version of registerParts. + * + * @deprecated Implement {@link IPartFactory2} and use {@link #registerPartFactory(IPartFactory2, String...)}. + */ + @Deprecated + public static void registerParts(scala.Function2 partFactory, + scala.collection.Seq types) { + registerParts(new IPartFactory2() { + + @Override + public TMultiPart createPart(String name, MCDataInput packet) { + return partFactory.apply(name, Boolean.TRUE); + } + + @Override + public TMultiPart createPart(String name, NBTTagCompound nbt) { + return partFactory.apply(name, Boolean.FALSE); + } + + @Override + public TMultiPart createPartForClientPreview(String name, NBTTagCompound nbt) { + return partFactory.apply(name, Boolean.TRUE); + } + }, types); + } + + /** + * Scala va-args version of registerParts. + * + * @deprecated Use {@link #registerPartFactory(IPartFactory2, String...)} with Java strings/arrays. Retained for + * existing Scala callers; sequence conversion still precedes registry-state checks. + */ + @Deprecated + public static void registerParts(IPartFactory2 partFactory, scala.collection.Seq types) { + registerParts(partFactory, JavaConversions.seqAsJavaList(types).toArray(new String[0])); + } + + /** + * Register a part factory with an array of types it is capable of instantiating. Must be called before postInit. + * Prefer {@link #registerPartFactory(IPartFactory2, String...)} in Java sources compiled without Scala: this legacy + * overload family contains Scala parameter types that javac may require during overload resolution. + */ + public static void registerParts(IPartFactory2 partFactory, String... types) { + if (loaded()) { + throw new IllegalStateException("Parts must be registered in the init methods."); + } + state = 1; + + ModContainer container = Loader.instance().activeModContainer(); + if (container == null) { + throw new IllegalStateException( + "Parts must be registered during the initialization phase of a mod container"); + } + + for (String s : types) { + if (typeMap.containsKey(s)) { + throw new IllegalStateException("Part with id " + s + " is already registered."); + } + + typeMap.put(s, partFactory); + containers.put(s, container); + } + } + + /** + * Registers a factory for stable part identifiers during a mod's preInit/init, before FMP's postInit closes the + * registry. Requires FML's active mod container, which becomes the owner of each ID. Register on both sides using + * the same IDs; construction later selects the NBT/server or packet/client factory method. + * + *

+ * Processes IDs in array order without calling the factory or retaining the array. A duplicate throws immediately; + * earlier registrations from this call remain. Factory and ID validity are not eagerly checked, so callers must + * supply a non-null factory and valid non-null, stable names. A null array fails after the existing state/container + * checks. Empty arrays still perform those checks. This entry retains all legacy failure/state behavior. + * + * @param partFactory factory retained for later construction; it does not load, bind or place parts at registration + * @param types unique persistent type names; preserve published names when migrating existing parts + */ + public static void registerPartFactory(IPartFactory2 partFactory, String... types) { + registerParts(partFactory, types); + } + + /** + * Registers a converter for each block returned by blockTypes, in iteration order. Retains the converter object and + * appends to each block's ordered list; duplicate blocks or calls create duplicate entries. Registration does not + * call convert, register a part factory or copy the iterable. Iterator failures leave earlier entries present. + * + *

+ * Call once from common preInit/init after source blocks exist, on both sides. Unlike part-factory registration, + * this legacy entry does not enforce an active mod container or a registry-state gate. It provides no unregister, + * deduplication or synchronization; do not use world-load callbacks to repeatedly register converters. + */ + public static void registerConverter(IPartConverter c) { + for (Block block : c.blockTypes()) { + converters.put(block, c); + } + } + + @SuppressWarnings("unchecked") + public static void beforeServerStart() { + List> entries = new ArrayList<>(typeMap.entrySet()); + entries.sort(Comparator.comparing(Map.Entry::getKey)); + + idMap = new Tuple2[entries.size()]; + for (int i = 0; i < entries.size(); i++) { + idMap[i] = new Tuple2<>(entries.get(i).getKey(), entries.get(i).getValue()); + } + + idWriter.setMax(idMap.length); + nameMap.clear(); + for (int i = 0; i < idMap.length; i++) { + nameMap.put(idMap[i]._1(), i); + } + } + + public static void writeIDMap(PacketCustom packet) { + packet.writeInt(idMap.length); + for (Tuple2 entry : idMap) { + packet.writeString(entry._1()); + } + } + + /** Reads the server's id map, returning the names this client has no factory for. */ + @SuppressWarnings("unchecked") + public static List readIDMap(PacketCustom packet) { + int k = packet.readInt(); + idWriter.setMax(k); + idMap = new Tuple2[k]; + nameMap.clear(); + List missing = new ArrayList<>(); + for (int i = 0; i < k; i++) { + String s = packet.readString(); + IPartFactory2 v = typeMap.get(s); + if (v == null) { + missing.add(s); + } else { + idMap[i] = new Tuple2<>(s, v); + nameMap.put(s, i); + } + } + return missing; + } + + /** Return true if any multiparts have been registered. */ + public static boolean required() { + return state > 0; + } + + /** Return true if no more parts can be registered. */ + public static boolean loaded() { + return state == 2; + } + + public static void postInit() { + state = 2; + } + + /** Writes the id of part to data. */ + public static void writePartID(MCDataOutput data, TMultiPart part) { + Integer id = nameMap.get(part.getType()); + if (id == null) { + throw new NoSuchElementException("None.get"); + } + idWriter.write(data, id); + } + + /** Uses instantiators to create a new part from the id read from data. */ + public static TMultiPart readPart(MCDataInput data) { + Tuple2 e = idMap[idWriter.read(data)]; + return e._2().createPart(e._1(), data); + } + + /** + * Returns the registered factory for an exact, case-sensitive part type name, or null if no factory is mapped. + * Reads the current registration map, independently of the network ID map, without constructing a part, logging a + * missing name or changing registration state. The returned object is the registered instance, not a copy. + * + *

+ * Look up after the owning mod has registered its parts, on the initialization/game thread. This method neither + * waits for registration nor adds synchronization. It grants no right to mutate the registry or factory state. For + * ordinary NBT/packet construction use {@link #loadPart(String, NBTTagCompound)} or {@link #readPart(MCDataInput)}. + * Specialized callers may inspect the factory's supported type, for example a microblock class needed to create a + * client preview from a material ID. Factory construction still requires the caller to load and bind the part. + */ + public static IPartFactory2 getPartFactory(String name) { + return typeMap.get(name); + } + + /** Uses instantiators to create a new part from a tag compound. */ + public static TMultiPart loadPart(String name, NBTTagCompound nbt) { + IPartFactory2 factory = typeMap.get(name); + if (factory == null) { + MultipartProxy.logger().error("Missing mapping for part with ID: " + name); + return null; + } + return factory.createPart(name, nbt); + } + + /** + * Uses instantiators to create a new part with specified identifier on side. + * + * @deprecated currently calls the nbt/packet version with a null parameter, use readPart or loadPart instead + */ + @Deprecated + public static TMultiPart createPart(String name, boolean client) { + IPartFactory2 factory = typeMap.get(name); + if (factory == null) { + MultipartProxy.logger().error("Missing mapping for part with ID: " + name); + return null; + } + return client ? factory.createPart(name, (MCDataInput) null) : factory.createPart(name, (NBTTagCompound) null); + } + + /** + * Tries converters registered for the supplied block, in registration order, and returns the first non-null result + * unchanged. The block argument selects the list; this method does not read or verify the world's block. Callbacks + * receive the original world/pos references. Returns null when all decline or none are registered; failures + * propagate. Does not load, bind, install or invoke conversion lifecycle hooks on the result. Ordinary callers + * should use {@link TileMultipart#getOrConvertTileResult(World, BlockCoord)} for a bound placeholder, or the + * placement APIs. + */ + public static TMultiPart convertBlock(World world, BlockCoord pos, Block block) { + for (IPartConverter c : converters.get(block)) { + TMultiPart ret = c.convert(world, pos); + if (ret != null) { + return ret; + } + } + return null; + } + + public static ModContainer getModContainer(String name) { + ModContainer container = containers.get(name); + if (container == null) { + throw new NoSuchElementException("key not found: " + name); + } + return container; + } +} diff --git a/src/main/scala/codechicken/multipart/MultiPartRegistry.scala b/src/main/scala/codechicken/multipart/MultiPartRegistry.scala deleted file mode 100644 index 9acc8e1..0000000 --- a/src/main/scala/codechicken/multipart/MultiPartRegistry.scala +++ /dev/null @@ -1,247 +0,0 @@ -package codechicken.multipart - -import scala.collection.mutable.{Map => MMap} -import codechicken.lib.packet.PacketCustom -import codechicken.lib.data.MCDataOutput -import codechicken.lib.data.MCDataInput -import net.minecraft.world.World -import codechicken.lib.vec.BlockCoord -import scala.collection.mutable.ListBuffer -import cpw.mods.fml.common.ModContainer -import cpw.mods.fml.common.Loader -import net.minecraft.block.Block -import java.lang.Iterable -import com.google.common.collect.ArrayListMultimap -import scala.collection.JavaConversions._ -import net.minecraft.nbt.NBTTagCompound - -/** This class handles the registration and internal ID mapping of all multipart - * classes. - */ -object MultiPartRegistry { - - /** Interface to be registered for constructing parts. Every instance of every - * multipart is constructed from an implementor of this. - */ - @Deprecated - trait IPartFactory { - - /** Create a new instance of the part with the specified type name - * identifier - * @param client - * If the part instance is for the client or the server - */ - def createPart(name: String, client: Boolean): TMultiPart - } - - /** Will replace IPartFactory in 1.8 - */ - trait IPartFactory2 { - - /** Create a new server instance of the part with the specified type name - * identifier - * @param nbt - * The tag compound that will be passed to part.load, can be used to - * change the class of part returned - */ - def createPart(name: String, nbt: NBTTagCompound): TMultiPart - - /** Create a new client instance of the part with the specified type name - * identifier - * @param packet - * The packet that will be passed to part.readDesc, can be used to change - * the class of part returned - */ - def createPart(name: String, packet: MCDataInput): TMultiPart - } - - /** An interface for converting existing blocks/tile entities to multipart - * versions. - */ - trait IPartConverter { - - /** Return true if this converter can handle the specific blockID (may or - * may not actually convert the block) - */ - def blockTypes: Iterable[Block] - - /** Return a multipart version of the block at pos in world. Return null if - * no conversion is possible. - */ - def convert(world: World, pos: BlockCoord): TMultiPart - } - - private val typeMap = MMap[String, IPartFactory2]() - private val nameMap = MMap[String, Int]() - private var idMap: Array[(String, IPartFactory2)] = _ - private val idWriter = new IDWriter - private val converters = ArrayListMultimap.create[Block, IPartConverter]() - private val containers = MMap[String, ModContainer]() - - /** The state of the registry. 0 = no parts, 1 = registering, 2 = registered - */ - private var state: Int = 0 - - /** Register a part factory with an array of types it is capable of - * instantiating. Must be called before postInit - * @deprecated - * Use IPartFactory2 - */ - @Deprecated - def registerParts(partFactory: IPartFactory, types: Array[String]) { - registerParts(partFactory.createPart _, types: _*) - } - - /** Scala function version of registerParts - * @deprecated - * Use IPartFactory2 - */ - @Deprecated - def registerParts( - partFactory: (String, Boolean) => TMultiPart, - types: String* - ) { - registerParts( - new IPartFactory2 { - override def createPart(name: String, packet: MCDataInput) = - partFactory(name, true) - override def createPart(name: String, nbt: NBTTagCompound) = - partFactory(name, false) - }, - types: _* - ) - } - - /** Register a part factory with an array of types it is capable of - * instantiating. Must be called before postInit - */ - def registerParts(partFactory: IPartFactory2, types: Array[String]) { - registerParts(partFactory, types: _*) - } - - /** Scala va-args version of registerParts - */ - def registerParts(partFactory: IPartFactory2, types: String*) { - if (loaded) - throw new IllegalStateException( - "Parts must be registered in the init methods." - ) - state = 1 - - val container = Loader.instance.activeModContainer - if (container == null) - throw new IllegalStateException( - "Parts must be registered during the initialization phase of a mod container" - ) - - types.foreach { s => - if (typeMap.contains(s)) - throw new IllegalStateException( - "Part with id " + s + " is already registered." - ) - - typeMap.put(s, partFactory) - containers.put(s, container) - } - } - - /** Register a part converter instance - */ - def registerConverter(c: IPartConverter) { - c.blockTypes.foreach(converters.put(_, c)) - } - - private[multipart] def beforeServerStart() { - idMap = typeMap.toList.sortBy(_._1).toArray - idWriter.setMax(idMap.length) - nameMap.clear() - for (i <- 0 until idMap.length) - nameMap.put(idMap(i)._1, i) - } - - private[multipart] def writeIDMap(packet: PacketCustom) { - packet.writeInt(idMap.length) - idMap.foreach(e => packet.writeString(e._1)) - } - - private[multipart] def readIDMap(packet: PacketCustom): Seq[String] = { - val k = packet.readInt() - idWriter.setMax(k) - idMap = new Array(k) - nameMap.clear() - val missing = ListBuffer[String]() - for (i <- 0 until k) { - val s = packet.readString() - val v = typeMap.get(s) - if (v.isEmpty) - missing += s - else { - idMap(i) = (s, v.get) - nameMap.put(s, i) - } - } - return missing - } - - /** Return true if any multiparts have been registered - */ - private[multipart] def required = state > 0 - - /** Return true if no more parts can be registered - */ - def loaded = state == 2 - - private[multipart] def postInit() { - state = 2 - } - - /** Writes the id of part to data - */ - def writePartID(data: MCDataOutput, part: TMultiPart) { - idWriter.write(data, nameMap.get(part.getType).get) - } - - /** Uses instantiators to creat a new part from the id read from data - */ - def readPart(data: MCDataInput) = { - val e = idMap(idWriter.read(data)) - e._2.createPart(e._1, data) - } - - /** Uses instantiators to creat a new part from the a tag compound - */ - def loadPart(name: String, nbt: NBTTagCompound) = typeMap.get(name) match { - case Some(factory) => factory.createPart(name, nbt) - case None => - logger.error("Missing mapping for part with ID: " + name) - null - } - - /** Uses instantiators to create a new part with specified identifier on side - * @deprecated - * currently calls the nbt/packet version with a null parameter, use - * readPart or loadPart instead - */ - @Deprecated - def createPart(name: String, client: Boolean) = typeMap.get(name) match { - case Some(factory) => - if (client) factory.createPart(name, null: MCDataInput) - else factory.createPart(name, null: NBTTagCompound) - case None => - logger.error("Missing mapping for part with ID: " + name) - null - } - - /** Calls converters to create a multipart version of the block at pos - */ - def convertBlock(world: World, pos: BlockCoord, block: Block): TMultiPart = { - for (c <- converters.get(block)) { - val ret = c.convert(world, pos) - if (ret != null) - return ret - } - return null - } - - def getModContainer(name: String) = containers(name) -} diff --git a/src/main/scala/codechicken/multipart/MultipartGenerator$.java b/src/main/scala/codechicken/multipart/MultipartGenerator$.java new file mode 100644 index 0000000..eefb4c6 --- /dev/null +++ b/src/main/scala/codechicken/multipart/MultipartGenerator$.java @@ -0,0 +1,221 @@ +package codechicken.multipart; + +import java.util.BitSet; +import java.util.LinkedHashSet; +import java.util.Set; + +import net.minecraft.network.play.server.S23PacketBlockChange; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.asm.ASMImplicits; +import codechicken.multipart.asm.MultipartMixinFactory; +import codechicken.multipart.asm.ScratchBitSet; +import codechicken.multipart.asm.ScratchBitSet$class; +import codechicken.multipart.handler.MultipartProxy; +import codechicken.multipart.handler.MultipartProxy$; +import scala.Option; +import scala.Tuple2; +import scala.collection.Iterable; +import scala.collection.Iterator; +import scala.collection.immutable.Nil$; +import scala.collection.mutable.HashMap; +import scala.collection.mutable.Map; + +public final class MultipartGenerator$ implements ScratchBitSet { + + public static final MultipartGenerator$ MODULE$ = new MultipartGenerator$(); + + private final Map, BitSet> tileTraitMap = new HashMap<>(); + private final Map interfaceTraitMap_c = new HashMap<>(); + private final Map interfaceTraitMap_s = new HashMap<>(); + private final Map, BitSet> partTraitMap_c = new HashMap<>(); + private final Map, BitSet> partTraitMap_s = new HashMap<>(); + private final int clientTraitId; + private ThreadLocal codechicken$multipart$asm$ScratchBitSet$$bitSets; + + private MultipartGenerator$() { + ScratchBitSet$class.$init$(this); + clientTraitId = MultipartMixinFactory.registerTrait("codechicken.multipart.TileMultipartClient"); + } + + @Override + public ThreadLocal codechicken$multipart$asm$ScratchBitSet$$bitSets() { + return codechicken$multipart$asm$ScratchBitSet$$bitSets; + } + + @Override + public void codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq( + ThreadLocal value) { + codechicken$multipart$asm$ScratchBitSet$$bitSets = value; + } + + @Override + public BitSet getBitSet() { + return ScratchBitSet$class.getBitSet(this); + } + + @Override + public BitSet freshBitSet() { + return ScratchBitSet$class.freshBitSet(this); + } + + public Map codechicken$multipart$MultipartGenerator$$interfaceTraitMap(boolean client) { + return client ? interfaceTraitMap_c : interfaceTraitMap_s; + } + + public BitSet codechicken$multipart$MultipartGenerator$$traitsForPart(TMultiPart part, boolean client) { + Map, BitSet> cache = client ? partTraitMap_c : partTraitMap_s; + Option cached = cache.get(part.getClass()); + if (cached.isDefined()) return cached.get(); + + Set traits = new LinkedHashSet<>(); + collectTraits(part.getClass(), codechicken$multipart$MultipartGenerator$$interfaceTraitMap(client), traits); + BitSet bitset = new BitSet(); + for (String trait : traits) bitset.set(MultipartMixinFactory.getId(trait)); + cache.put(part.getClass(), bitset); + return bitset; + } + + private void collectTraits(Class type, Map map, Set traits) { + for (Class iface : type.getInterfaces()) collectTraits(iface, map, traits); + Option trait = map.get(ASMImplicits.nodeName(type.getName())); + if (trait.isDefined()) traits.add(trait.get()); + if (type.getSuperclass() != null) collectTraits(type.getSuperclass(), map, traits); + } + + private BitSet setTraits(TMultiPart part, boolean client) { + BitSet bitset = freshBitSet(); + bitset.or(codechicken$multipart$MultipartGenerator$$traitsForPart(part, client)); + if (client) bitset.set(clientTraitId); + return bitset; + } + + private BitSet setTraits(Iterable parts, boolean client) { + BitSet bitset = freshBitSet(); + for (Iterator it = parts.iterator(); it.hasNext();) { + bitset.or(codechicken$multipart$MultipartGenerator$$traitsForPart(it.next(), client)); + } + if (client) bitset.set(clientTraitId); + return bitset; + } + + /** Replaces the tile if the new part requires additional interfaces, then adds the part. */ + public TileMultipart addPart(World world, BlockCoord pos, TMultiPart part) { + Tuple2 convertedTile = world.isRemote + ? new Tuple2<>(TileMultipart.getTile(world, pos), Boolean.FALSE) + : TileMultipart.getOrConvertTile2(world, pos); + TileMultipart tile = convertedTile._1(); + boolean converted = (Boolean) convertedTile._2(); + BitSet bitset = setTraits(part, world.isRemote); + + TileMultipart next = tile; + if (next != null) { + if (converted) { // Server-side conversion, then tell the clients. + next.partList().apply(0).invalidateConvertedTile(); + world.setBlock(pos.x, pos.y, pos.z, MultipartProxy.block(), 0, 0); + silentAddTile(world, pos, next); + PacketCustom.sendToChunk( + new S23PacketBlockChange(pos.x, pos.y, pos.z, world), + world, + pos.x >> 4, + pos.z >> 4); + next.partList().apply(0).onConverted(); + next.writeAddPart(next.partList().apply(0)); + } + + BitSet tileTraits = tileTraitMap.apply(tile.getClass()); + bitset.andNot(tileTraits); + if (!bitset.isEmpty()) { + bitset.or(tileTraits); + next = (TileMultipart) MultipartMixinFactory.construct(bitset, Nil$.MODULE$); + tile.setValid(false); + silentAddTile(world, pos, next); + next.from(tile); + } + } else { + world.setBlock(pos.x, pos.y, pos.z, MultipartProxy.block(), 0, 0); + next = (TileMultipart) MultipartMixinFactory.construct(bitset, Nil$.MODULE$); + silentAddTile(world, pos, next); + } + next.addPart_impl(part); + return next; + } + + public void silentAddTile(World world, BlockCoord pos, TileEntity tile) { + tile.xCoord = pos.x; + tile.yCoord = pos.y; + tile.zCoord = pos.z; + Chunk chunk = world.getChunkFromBlockCoords(pos.x, pos.z); + if (chunk != null) chunk.addTileEntity(tile); + } + + /** + * Reuses the tile only when it has exactly the interfaces required by the parts. + * + * @deprecated Use {@link MultipartGenerator#generateCompositeTile(TileEntity, java.lang.Iterable, boolean)} with + * Java parts. Retained for compiled callers and exact Scala-parameter reflection. + */ + @Deprecated + public TileMultipart generateCompositeTile(TileEntity tile, Iterable parts, boolean client) { + BitSet bitset = setTraits(parts, client); + if (tile instanceof TileMultipart && bitset.equals(tileTraitMap.apply(tile.getClass()))) { + return (TileMultipart) tile; + } + return (TileMultipart) MultipartMixinFactory.construct(bitset, Nil$.MODULE$); + } + + /** Replaces a tile whose remaining parts no longer require all its interfaces. */ + public TileMultipart partRemoved(TileMultipart tile) { + TileMultipart next = generateCompositeTile(tile, tile.partList(), tile.getWorldObj().isRemote); + if (!next.equals(tile)) { + tile.setValid(false); + silentAddTile(tile.getWorldObj(), new BlockCoord(tile), next); + next.from(tile); + next.notifyTileChange(); + } + return next; + } + + public void registerTrait(String marker, String trait) { + registerTrait(marker, trait, trait); + } + + public void registerTrait(String marker, String clientTrait, String serverTrait) { + marker = ASMImplicits.nodeName(marker); + clientTrait = ASMImplicits.nodeName(clientTrait); + serverTrait = ASMImplicits.nodeName(serverTrait); + registerSide(interfaceTraitMap_c, marker, clientTrait); + registerSide(interfaceTraitMap_s, marker, serverTrait); + } + + private void registerSide(Map map, String marker, String trait) { + if (trait == null) return; + if (map.contains(marker)) { + MultipartProxy.logger().error("Trait already registered for " + marker); + } else { + map.put(marker, trait); + MultipartMixinFactory.registerTrait(trait); + } + } + + public void registerPassThroughInterface(String name) { + registerPassThroughInterface(name, true, true); + } + + public void registerPassThroughInterface(String name, boolean client, boolean server) { + String trait = MultipartMixinFactory.generatePassThroughTrait(name); + if (trait == null) return; + registerTrait(name, client ? trait : null, server ? trait : null); + } + + public void registerTileClass(Class type, BitSet traits) { + BitSet copy = new BitSet(); + copy.or(traits); + tileTraitMap.put(type, copy); + MultipartProxy$.MODULE$.onTileClassBuilt(type); + } +} diff --git a/src/main/scala/codechicken/multipart/MultipartGenerator.java b/src/main/scala/codechicken/multipart/MultipartGenerator.java new file mode 100644 index 0000000..6d9d070 --- /dev/null +++ b/src/main/scala/codechicken/multipart/MultipartGenerator.java @@ -0,0 +1,107 @@ +package codechicken.multipart; + +import java.util.BitSet; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import codechicken.lib.vec.BlockCoord; +import scala.collection.JavaConversions; + +/** + * Manages dynamic construction of multipart container tiles. Register a mixin against a part's marker interface to add + * tile-level logic or interfaces whenever that part is present. Generated classes can be inspected with the ASM debug + * configuration option. + */ +public final class MultipartGenerator { + + private MultipartGenerator() {} + + /** + * Selects a composite tile with exactly the capabilities required by the supplied parts and side. Reuses a + * registered multipart tile only when its trait set matches exactly; otherwise returns a fresh empty tile. A null + * or non-multipart candidate is allowed. An unregistered multipart subclass throws NoSuchElementException. + * + *

+ * This is generation only: no parts are loaded/bound, no world or position is assigned, no state is copied, no + * previous tile is invalidated and no tile is installed in a world. A reused tile retains all its existing state. + * The caller prepares world/position or NBT state before {@link TileMultipart#loadPartList(java.util.Collection)} + * and owns any subsequent installation and notifications. For ordinary placement use + * {@link TileMultipart#addPart(World, BlockCoord, TMultiPart)} instead. + * + *

+ * Reads the iterable once per call, including reuse, without a snapshot. Do not mutate it during generation; retain + * a repeatable collection for later loading. Null inputs/elements and iterator failures propagate through the + * existing generator, without rollback of its scratch state or caches. Call on the initialization/game thread after + * trait registration. Client tile selection does not convert server parts into client part variants. + * + * @param tile candidate for exact reuse, or null for a fresh tile + * @param parts parts whose capabilities select the tile; use these same parts for subsequent loading + * @param client true for a client tile, false for a server tile + */ + public static TileMultipart generateCompositeTile(TileEntity tile, Iterable parts, boolean client) { + return MultipartGenerator$.MODULE$ + .generateCompositeTile(tile, JavaConversions.iterableAsScalaIterable(parts), client); + } + + public static BitSet getBitSet() { + return MultipartGenerator$.MODULE$.getBitSet(); + } + + public static BitSet freshBitSet() { + return MultipartGenerator$.MODULE$.freshBitSet(); + } + + /** Adds a tile without notifying neighbouring blocks or adding it to the tick list. */ + public static void silentAddTile(World world, BlockCoord pos, TileEntity tile) { + MultipartGenerator$.MODULE$.silentAddTile(world, pos, tile); + } + + /** + * Registers a marker interface implemented by parts with the same generated tile trait on both sides. Names may use + * dots or slashes. Call during common mod initialization, before FMP first inspects an implementing part class. + * + *

+ * For a Java source trait, pass its binary name as a string instead of loading its class. The trait is a top-level + * class extending {@link TileMultipart}, possibly abstract, with a no-argument constructor; FMP rewrites it into a + * runtime interface. Consumer-callable methods belong on a separate ordinary interface implemented by the trait. Do + * not instantiate or invoke the raw trait class from consumer code. + * + *

+ * Registration only associates the marker with generated behavior. It does not construct a tile, load or bind + * parts, or register a part factory. Repeating a marker registration for a side logs an error and retains the first + * mapping. See {@code docs/api/CUSTOM_TILE_TRAITS.md} for the compiling pattern and transformer constraints. + * + * @param marker binary name of the ordinary interface implemented by requesting parts + * @param trait binary name of the generated tile trait + */ + public static void registerTrait(String marker, String trait) { + MultipartGenerator$.MODULE$.registerTrait(marker, trait); + } + + /** + * Registers side-specific generated tile traits for a part marker. This has the same timing, class-loading and + * trait authoring contract as {@link #registerTrait(String, String)}. Either trait may be null to omit the + * capability from that side; the argument order is client, then server. Register parent Java traits before child + * traits. + * + * @param marker binary name of the ordinary interface implemented by requesting parts + * @param clientTrait client trait binary name, or null for none + * @param serverTrait server trait binary name, or null for none + */ + public static void registerTrait(String marker, String clientTrait, String serverTrait) { + MultipartGenerator$.MODULE$.registerTrait(marker, clientTrait, serverTrait); + } + + public static void registerPassThroughInterface(String name) { + MultipartGenerator$.MODULE$.registerPassThroughInterface(name); + } + + /** + * Adds the interface to the container and forwards its methods to its single implementing part. A second part + * implementing the same interface is rejected by the generated trait's occlusion check. + */ + public static void registerPassThroughInterface(String name, boolean client, boolean server) { + MultipartGenerator$.MODULE$.registerPassThroughInterface(name, client, server); + } +} diff --git a/src/main/scala/codechicken/multipart/MultipartGenerator.scala b/src/main/scala/codechicken/multipart/MultipartGenerator.scala deleted file mode 100644 index d7e1a8b..0000000 --- a/src/main/scala/codechicken/multipart/MultipartGenerator.scala +++ /dev/null @@ -1,241 +0,0 @@ -package codechicken.multipart - -import net.minecraft.tileentity.TileEntity -import net.minecraft.world.World -import codechicken.lib.vec.BlockCoord -import codechicken.multipart.handler.MultipartProxy -import codechicken.lib.packet.PacketCustom -import net.minecraft.network.play.server.S23PacketBlockChange -import java.util.BitSet -import scala.collection.mutable.Map -import codechicken.multipart.asm.{ScratchBitSet, MultipartMixinFactory} -import codechicken.multipart.asm.ASMImplicits._ - -/** This class manages the dynamic construction and allocation of container - * TileMultipart instances. - * - * Classes that extend TileMultipart, adding tile centric logic, optimisations - * or interfaces, can be registered to a marker interface on a part instance. - * When a part is added to the tile that implements the certain marker - * interface, the container tile will be replaced with a class that includes - * the functionality from the corresponding mixin class. - * - * Classes are generated in a similar fashion to the way scala traits are - * compiled. To see the output, simply enable the config option and look in the - * asm/multipart folder of you .minecraft directory. - * - * There are several mixin traits that come with the API included in the - * scalatraits package. TPartialOcclusionTile is defined as class instead of - * trait to give an example for Java programmers. - */ -object MultipartGenerator extends ScratchBitSet { - private val tileTraitMap = Map[Class[_], BitSet]() - private val interfaceTraitMap_c = Map[String, String]() - private val interfaceTraitMap_s = Map[String, String]() - private val partTraitMap_c = Map[Class[_], BitSet]() - private val partTraitMap_s = Map[Class[_], BitSet]() - private val clientTraitId = - MultipartMixinFactory.registerTrait(classOf[TileMultipartClient]) - - private def partTraitMap(client: Boolean) = - if (client) partTraitMap_c else partTraitMap_s - private def interfaceTraitMap(client: Boolean) = - if (client) interfaceTraitMap_c else interfaceTraitMap_s - - private def traitsForPart(part: TMultiPart, client: Boolean) = - partTraitMap(client).getOrElseUpdate( - part.getClass, { - def heirachy(clazz: Class[_]): Seq[Class[_]] = { - var superClasses: Seq[Class[_]] = - clazz.getInterfaces.flatMap(c => heirachy(c)) :+ clazz - if (clazz.getSuperclass != null) - superClasses = superClasses ++ heirachy(clazz.getSuperclass) - return superClasses - } - - val map = interfaceTraitMap(client) - val traits = - heirachy(part.getClass).flatMap(c => map.get(c.nodeName)).distinct - - val bitset = new BitSet - traits.map(MultipartMixinFactory.getId).foreach(bitset.set) - bitset - } - ) - - private def setTraits(part: TMultiPart, client: Boolean): BitSet = - setTraits(Seq(part), client) - - private def setTraits(parts: Iterable[TMultiPart], client: Boolean) = { - val bitset = freshBitSet - parts.foreach(p => bitset.or(traitsForPart(p, client))) - if (client) bitset.set(clientTraitId) - bitset - } - - /** Check if part adds any new interfaces to tile, if so, replace tile with a - * new copy and call tile.addPart(part) returns true if tile was replaced - */ - private[multipart] def addPart( - world: World, - pos: BlockCoord, - part: TMultiPart - ): TileMultipart = { - val (tile, converted) = - if (world.isRemote) (TileMultipart.getTile(world, pos), false) - else TileMultipart.getOrConvertTile2(world, pos) - val bitset = setTraits(part, world.isRemote) - - var ntile = tile - if (ntile != null) { - if (converted) { // server-side conversion, then tell the clients - ntile.partList(0).invalidateConvertedTile() - world.setBlock(pos.x, pos.y, pos.z, MultipartProxy.block, 0, 0) - silentAddTile(world, pos, ntile) - PacketCustom.sendToChunk( - new S23PacketBlockChange(pos.x, pos.y, pos.z, world), - world, - pos.x >> 4, - pos.z >> 4 - ) - ntile.partList(0).onConverted() - ntile.writeAddPart(ntile.partList(0)) - } - - val tileTraits = tileTraitMap(tile.getClass) - bitset.andNot(tileTraits) - if (!bitset.isEmpty) { - bitset.or(tileTraits) - ntile = MultipartMixinFactory.construct(bitset) - tile.setValid(false) - silentAddTile(world, pos, ntile) - ntile.from(tile) - } - } else { - world.setBlock(pos.x, pos.y, pos.z, MultipartProxy.block, 0, 0) - ntile = MultipartMixinFactory.construct(bitset) - silentAddTile(world, pos, ntile) - } - ntile.addPart_impl(part) - return ntile - } - - /** Adds a tile entity to the world without notifying neighbor blocks or - * adding it to the tick list - */ - def silentAddTile(world: World, pos: BlockCoord, tile: TileEntity) { - tile.xCoord = pos.x; - tile.yCoord = pos.y; - tile.zCoord = pos.z; - - val chunk = world.getChunkFromBlockCoords(pos.x, pos.z) - if (chunk != null) { - chunk.addTileEntity(tile) - } - } - - /** Check if tile satisfies all the interfaces required by parts. If not, - * return a new generated copy of tile - */ - private[multipart] def generateCompositeTile( - tile: TileEntity, - parts: Iterable[TMultiPart], - client: Boolean - ) = { - val bitset = setTraits(parts, client) - if ( - tile != null && tile - .isInstanceOf[TileMultipart] && bitset == tileTraitMap(tile.getClass) - ) - tile.asInstanceOf[TileMultipart] - else - MultipartMixinFactory.construct(bitset) - } - - /** Check if there are any redundant interfaces on tile, if so, replace tile - * with new copy - */ - private[multipart] def partRemoved(tile: TileMultipart) = { - val ntile = - generateCompositeTile(tile, tile.partList, tile.getWorldObj.isRemote) - if (ntile != tile) { - tile.setValid(false) - silentAddTile(tile.getWorldObj, new BlockCoord(tile), ntile) - ntile.from(tile) - ntile.notifyTileChange() - } - ntile - } - - /** register s_trait to be applied to tiles containing parts implementing - * s_interface - */ - def registerTrait(s_interface: String, s_trait: String): Unit = - registerTrait(s_interface, s_trait, s_trait) - - /** register traits to be applied to tiles containing parts implementing - * s_interface c_trait for client worlds (may be null) s_trait for server - * worlds (may be null) - */ - def registerTrait( - s_interface$ : String, - c_trait$ : String, - s_trait$ : String - ) { - val s_interface = nodeName(s_interface$) - val c_trait = nodeName(c_trait$) - val s_trait = nodeName(s_trait$) - - def registerSide(map: Map[String, String], traitName: String) = if ( - traitName != null - ) { - if (map.contains(s_interface)) - logger.error("Trait already registered for " + s_interface) - else { - map.put(s_interface, traitName) - MultipartMixinFactory.registerTrait(traitName) - } - } - registerSide(interfaceTraitMap_c, c_trait) - registerSide(interfaceTraitMap_s, s_trait) - } - - def registerPassThroughInterface(s_interface: String): Unit = - registerPassThroughInterface(s_interface, true, true) - - /** A passthrough interface, is an interface to be implemented on the - * container tile instance, for which all calls are passed directly to the - * single implementing part. Registering a passthrough interface is - * equivalent to defining a mixin class as follows. - * 1. field 'impl' which contains the reference to the corresponding part - * 2. occlusionTest is overriden to prevent more than one part with - * s_interface existing in the block space 3. implementing s_interface - * and passing all calls directly to the part instance. - * - * This allows compatibility with APIs that expect interfaces on the tile - * entity. - */ - def registerPassThroughInterface( - s_interface: String, - client: Boolean, - server: Boolean - ) { - val tType = MultipartMixinFactory.generatePassThroughTrait(s_interface) - if (tType == null) - return - - registerTrait( - s_interface, - if (client) tType else null, - if (server) tType else null - ) - } - - private[multipart] def registerTileClass( - clazz: Class[_ <: TileMultipart], - traits: BitSet - ) { - tileTraitMap.put(clazz, traits.copy) - MultipartProxy.onTileClassBuilt(clazz) - } -} diff --git a/src/main/scala/codechicken/multipart/MultipartHelper$.java b/src/main/scala/codechicken/multipart/MultipartHelper$.java new file mode 100644 index 0000000..17b4627 --- /dev/null +++ b/src/main/scala/codechicken/multipart/MultipartHelper$.java @@ -0,0 +1,31 @@ +package codechicken.multipart; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +/** + * Scala companion singleton, kept because guidenh reflects on this name as well as on MultipartHelper. Pure forwarders. + */ +public final class MultipartHelper$ { + + public static final MultipartHelper$ MODULE$ = new MultipartHelper$(); + + private MultipartHelper$() {} + + public TileEntity createTileFromNBT(World world, NBTTagCompound tag) { + return MultipartHelper.createTileFromNBT(world, tag); + } + + public void sendDescPacket(World world, TileEntity tile) { + MultipartHelper.sendDescPacket(world, tile); + } + + public void registerTileConverter(MultipartHelper.IPartTileConverter converter) { + MultipartHelper.registerTileConverter(converter); + } + + public TileMultipart createTileFromParts(Iterable parts) { + return MultipartHelper.createTileFromParts(parts); + } +} diff --git a/src/main/scala/codechicken/multipart/MultipartHelper.java b/src/main/scala/codechicken/multipart/MultipartHelper.java new file mode 100644 index 0000000..7896a36 --- /dev/null +++ b/src/main/scala/codechicken/multipart/MultipartHelper.java @@ -0,0 +1,181 @@ +package codechicken.multipart; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import codechicken.lib.packet.PacketCustom; +import codechicken.multipart.handler.MultipartProxy; +import codechicken.multipart.handler.MultipartSPH; +import codechicken.multipart.handler.MultipartSaveLoad; +import scala.collection.JavaConversions; + +/** + * Static helper class for handling the unusual way that multipart tile entities load from nbt and send description + * packets. + *

+ * Multipart tile entities will all save themselves with the id "savedMultipart" which if normally loaded by minecraft, + * will create a dummy tile entity which just holds the NBT it was read from. These dummies are then converted to actual + * container tiles on the ChunkLoad event. The createTileFromNBT function should be used to construct a multipart tile + * from NBT without the ChunkLoad event. + *

+ * Multipart tile entities do not send description packets via the conventional means of one packet per tile when + * PlayerInstance calls for it, to do so would be terribly inefficient. Instead, the ChunkWatch event is used to batch + * all the describing data for a chunk into one packet which is compressed using relative positions. The sendDescPacket + * function should be used to send the description packet of a tile without a ChunkWatch event. + *

+ * An example of using this class to move blocks/tile entites around can be found at + * www.chickenbones.craftsaddle.org/Files/Other/ItemDevTool2.java + *

+ * The reference carried a commented-out sendDescPackets batching several tiles at once. It was removed for compilation + * until a PlayerInstance access transformer is pulled into forge, and is not reinstated here. + */ +public final class MultipartHelper { + + private MultipartHelper() {} + + public static TileEntity createTileFromNBT(World world, NBTTagCompound tag) { + if (!tag.getString("id").equals("savedMultipart")) { + return null; + } + + MultipartSaveLoad.loadingWorld_$eq(world); + return TileMultipart.createFromNBT(tag); + } + + /** + * Builds a render-ready client multipart tile from saved NBT without installing it into a world. Every registered + * part factory must support + * {@link MultiPartRegistry.IPartFactory2#createPartForClientPreview(String, NBTTagCompound)}; otherwise the whole + * preview is rejected and null is returned. Part order and saved state are preserved. + * + *

+ * A non-null world must be client-side. The tile receives its saved coordinates, binds every part, then runs + * {@link TMultiPart#onWorldJoin()} and local {@link TMultiPart#onPartChanged(TMultiPart)} callbacks before + * rebuilding its render state. It is not validated, placed in a chunk, or announced to neighboring blocks. A null + * world creates a worldless staged preview; render caches initialize lazily when a renderer uses the tile. + * + * @param world client preview world, or null for worldless staging + * @param tag saved multipart NBT; it is read but not mutated + * @return a prepared client tile, or null for a foreign/empty tag, missing factory, or unsupported preview part + * @throws IllegalArgumentException if world is server-side + */ + public static TileMultipart createPreviewTileFromNBT(World world, NBTTagCompound tag) { + if (tag == null || !tag.getString("id").equals("savedMultipart")) { + return null; + } + if (world != null && !world.isRemote) { + throw new IllegalArgumentException("Multipart previews require a client world"); + } + + NBTTagList partTags = tag.getTagList("parts", 10); + List parts = new ArrayList<>(partTags.tagCount()); + for (int i = 0; i < partTags.tagCount(); i++) { + NBTTagCompound partTag = partTags.getCompoundTagAt(i); + String partId = partTag.getString("id"); + MultiPartRegistry.IPartFactory2 factory = MultiPartRegistry.getPartFactory(partId); + if (factory == null) { + MultipartProxy.logger().error("Missing mapping for preview part with ID: " + partId); + return null; + } + + TMultiPart part = factory.createPartForClientPreview(partId, partTag); + if (part == null) { + MultipartProxy.logger().warn("Part factory does not support client previews for ID: " + partId); + return null; + } + part.load(partTag); + parts.add(part); + } + if (parts.isEmpty()) { + return null; + } + + TileMultipart tile = MultipartGenerator.generateCompositeTile(null, parts, true); + tile.readFromNBT(tag); + tile.loadPartList(parts); + tile.setWorldObj(world); + if (world != null) { + tile.forEachPart(TMultiPart::onWorldJoin); + } + tile.internalPartChange(null); + if (world != null) { + tile.markRender(); + } + return tile; + } + + /** + * Note. This method should only be used to send tiles that have been created on the server mid-game via an NBT load + * to clients. + */ + public static void sendDescPacket(World world, TileEntity tile) { + Chunk c = world.getChunkFromBlockCoords(tile.xCoord, tile.zCoord); + PacketCustom pkt = MultipartSPH.getDescPacket(c, Arrays.asList(tile).iterator()); + if (pkt != null) { + pkt.sendToChunk(world, c.xPosition, c.zPosition); + } + } + + public static void registerTileConverter(IPartTileConverter converter) { + MultipartSaveLoad.converters().$plus$eq(converter); + } + + public static TileMultipart createTileFromParts(Iterable parts) { + scala.collection.Iterable scalaParts = JavaConversions.iterableAsScalaIterable(parts); + TileMultipart tile = MultipartGenerator$.MODULE$.generateCompositeTile(null, scalaParts, false); + tile.loadParts(scalaParts); + return tile; + } + + /** Helper class for converting tile entities to multiparts on chunk load. */ + public abstract static class IPartTileConverter { + + private final Class clazz; + + public IPartTileConverter(Class clazz) { + this.clazz = clazz; + } + + public Class clazz() { + return clazz; + } + + /** + * @return true if this tile can be converted by this converter. If canConvert returns true, but convertMulti + * returns no parts, the tile will be deleted + */ + public boolean canConvert(TileEntity tile) { + return clazz.isInstance(tile); + } + + @SuppressWarnings("unchecked") + public Iterable convert(TileEntity tile) { + return convertMulti((T) tile); + } + + /** + * Convert the TileEntity into multiple parts + * + * @return An iterable list of parts or an empty list to delete the tile + */ + public Iterable convertMulti(T tile) { + TMultiPart part = convertOne(tile); + return part == null ? Collections.emptyList() : Collections.singletonList(part); + } + + /** + * Convert the TileEntity into a part + * + * @return The converted part, or null to delete the tile + */ + public abstract TMultiPart convertOne(T tile); + } +} diff --git a/src/main/scala/codechicken/multipart/MultipartHelper.scala b/src/main/scala/codechicken/multipart/MultipartHelper.scala deleted file mode 100644 index 6b85dc1..0000000 --- a/src/main/scala/codechicken/multipart/MultipartHelper.scala +++ /dev/null @@ -1,112 +0,0 @@ -package codechicken.multipart - -import net.minecraft.tileentity.TileEntity -import net.minecraft.nbt.NBTTagCompound -import net.minecraft.world.World -import codechicken.multipart.handler.MultipartSaveLoad -import com.google.common.collect.LinkedListMultimap -import scala.collection.JavaConversions._ -import scala.collection.JavaConverters._ -import codechicken.multipart.handler.MultipartSPH -import net.minecraft.world.WorldServer -import java.util.Arrays -import java.lang.Iterable - -/** Static helper class for handling the unusual way that multipart tile - * entities load from nbt and send description packets
Multipart tile - * entities will all save themselves with the id "savedMultipart" which if - * normally loaded by minecraft, will create a dummy tile entity which just - * holds the NBT it was read from. These dummies are then converted to actual - * container tiles on the ChunkLoad event. The createTileFromNBT function - * should be used to construct a multipart tile from NBT without the ChunkLoad - * event.
Multipart tile entities do not send description packets via the - * conventional means of one packet per tile when PlayerInstance calls for it, - * to do so would be terribly inefficient. Instead, the ChunkWatch event is - * used to batch all the describing data for a chunk into one packet which is - * compressed using relative positions. The sendDescPacket(s) functions should - * be used to send the description packet of a tile or tiles without a - * ChunkWatch event.
An example of using this class to move blocks/tile - * entites around can be found at - * www.chickenbones.craftsaddle.org/Files/Other/ItemDevTool2.java - */ -object MultipartHelper { - /*val f_playersInChunk = classOf[PlayerInstance].getDeclaredField( - new ObfMapping("net/minecraft/server/management/PlayerInstance", "playersInChunk", "Ljava/util/List;") - .toRuntime.s_name) - f_playersInChunk.setAccessible(true) - - def playersInChunk(inst:PlayerInstance) = f_playersInChunk.get(inst).asInstanceOf[List[_]]*/ - - def createTileFromNBT(world: World, tag: NBTTagCompound): TileEntity = { - if (!tag.getString("id").equals("savedMultipart")) - return null - - MultipartSaveLoad.loadingWorld = world - return TileMultipart.createFromNBT(tag) - } - - /** Note. This method should only be used to send tiles that have been created - * on the server mid-game via an NBT load to clients. - */ - def sendDescPacket(world: World, tile: TileEntity) { - val c = world.getChunkFromBlockCoords(tile.xCoord, tile.zCoord) - val pkt = MultipartSPH.getDescPacket(c, Arrays.asList(tile).iterator) - if (pkt != null) - pkt.sendToChunk(world, c.xPosition, c.zPosition) - } - - /* Removed for compilation until PlayerInstance access transformer is pulled in forge - def sendDescPackets(world:World, tiles:Iterable[TileEntity]) { - val map = LinkedListMultimap.create[Long, TileEntity]() - tiles.filter(_.isInstanceOf[TileMultipart]).foreach(t => map.put(t.xCoord.toLong<<32|t.zCoord, t)) - - val mgr = world.asInstanceOf[WorldServer].getPlayerManager - map.asMap.entrySet.foreach{e => - val coord = e.getKey - val c = world.getChunkFromBlockCoords((coord>>32).toInt, coord.toInt) - lazy val pkt = MultipartSPH.getDescPacket(c, e.getValue.iterator) - val inst = mgr.getOrCreateChunkWatcher(c.xPosition, c.zPosition, false) - if(!inst.playersWatchingChunk.isEmpty) - inst.sendToAllPlayersWatchingChunk(pkt.toPacket) - } - }*/ - - /** Helper class for converting tile entities to multiparts on chunk load - */ - abstract class IPartTileConverter[T <: TileEntity](val clazz: Class[T]) { - - /** @return - * true if this tile can be converted by this converter. If canConvert - * returns true, but convertMulti returns no parts, the tile will be - * deleted - */ - def canConvert(tile: TileEntity) = clazz.isInstance(tile) - - def convert(tile: TileEntity) = convertMulti(tile.asInstanceOf[T]) - - /** Convert the TileEntity into multiple parts - * @return - * An iterable list of parts or an empty list to delete the tile - */ - def convertMulti(tile: T): Iterable[TMultiPart] = convertOne(tile) match { - case null => Seq() - case p => Seq(p) - } - - /** Convert the TileEntity into a part - * @return - * The converted part, or null to delete the tile - */ - def convertOne(tile: T): TMultiPart - } - - def registerTileConverter(converter: IPartTileConverter[_]) { - MultipartSaveLoad.converters += converter - } - - def createTileFromParts(parts: Iterable[TMultiPart]) = { - val tile = MultipartGenerator.generateCompositeTile(null, parts, false) - tile.loadParts(parts) - tile - } -} diff --git a/src/main/scala/codechicken/multipart/MultipartRenderer$.java b/src/main/scala/codechicken/multipart/MultipartRenderer$.java new file mode 100644 index 0000000..60b24e6 --- /dev/null +++ b/src/main/scala/codechicken/multipart/MultipartRenderer$.java @@ -0,0 +1,99 @@ +package codechicken.multipart; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.MinecraftForgeClient; + +import codechicken.lib.render.CCRenderState; +import codechicken.lib.vec.Vector3; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Internal class for rendering callbacks. Should be moved to the handler package. + *

+ * This is the Scala companion singleton, and it is not a mere forwarder: Forge registers this instance itself, through + * both {@code RenderingRegistry.registerBlockHandler} and {@code ClientRegistry.bindTileEntitySpecialRenderer}, so the + * implementation has to live here. guidenh also reads {@code MODULE$} as its fallback path. + *

+ * Claiming the render id in the constructor preserves the reference's timing: a Scala object runs its body on first + * access, and this class is first touched from the client proxy's postInit. + */ +@SideOnly(Side.CLIENT) +public final class MultipartRenderer$ extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { + + public static final MultipartRenderer$ MODULE$ = new MultipartRenderer$(); + + private MultipartRenderer$() { + TileMultipart.renderID_$eq(RenderingRegistry.getNextAvailableRenderId()); + } + + @Override + public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f) { + TileMultipart tile = TileMultipart.class.cast((TileMultipartClient) t); + if (tile.partList().isEmpty() || !tile.hasDynamicParts()) { + return; + } + + CCRenderState state = CCRenderState.instance(); + state.resetInstance(); + state.pullLightmapInstance(); + state.useNormals = true; + + tile.renderDynamic(new Vector3(x, y, z), f, MinecraftForgeClient.getRenderPass()); + } + + @Override + public int getRenderId() { + return TileMultipart.renderID(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { + TileEntity t = world.getTileEntity(x, y, z); + if (!(t instanceof TileMultipartClient)) { + return false; + } + + TileMultipartClient client = (TileMultipartClient) t; + TileMultipart tile = (TileMultipart) t; + if (tile.partList().isEmpty()) { + return false; + } + + if (renderer.hasOverrideBlockTexture()) { + drawBreakingPart(world, x, y, z, renderer); + return false; + } + + CCRenderState state = CCRenderState.instance(); + state.resetInstance(); + state.lightMatrix.locate(world, x, y, z); + boolean b = tile.renderStatic(world, new Vector3(x, y, z), renderer); + state.lightMatrix.access = null; + return b; + } + + private static void drawBreakingPart(IBlockAccess world, int x, int y, int z, RenderBlocks renderer) { + TMultiPart part = RenderPartResolver.resolve(world, x, y, z); + if (part instanceof ISBRHPart) { + ((ISBRHPart) part).renderWorldBlock(world, x, y, z, renderer); + } else if (part != null) { + part.drawBreaking(renderer); + } + } + + @Override + public void renderInventoryBlock(Block block, int meta, int modelId, RenderBlocks renderer) {} + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return false; + } +} diff --git a/src/main/scala/codechicken/multipart/MultipartRenderer.java b/src/main/scala/codechicken/multipart/MultipartRenderer.java new file mode 100644 index 0000000..ebd1597 --- /dev/null +++ b/src/main/scala/codechicken/multipart/MultipartRenderer.java @@ -0,0 +1,40 @@ +package codechicken.multipart; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Static forwarders for {@link MultipartRenderer$}, which holds the implementation. guidenh resolves renderWorldBlock + * here first and only falls back to the companion's MODULE$, so these must keep their exact signatures. + */ +@SideOnly(Side.CLIENT) +public final class MultipartRenderer { + + private MultipartRenderer() {} + + public static void renderTileEntityAt(TileEntity t, double x, double y, double z, float f) { + MultipartRenderer$.MODULE$.renderTileEntityAt(t, x, y, z, f); + } + + public static int getRenderId() { + return MultipartRenderer$.MODULE$.getRenderId(); + } + + public static boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { + return MultipartRenderer$.MODULE$.renderWorldBlock(world, x, y, z, block, modelId, renderer); + } + + public static void renderInventoryBlock(Block block, int meta, int modelId, RenderBlocks renderer) { + MultipartRenderer$.MODULE$.renderInventoryBlock(block, meta, modelId, renderer); + } + + public static boolean shouldRender3DInInventory(int modelId) { + return MultipartRenderer$.MODULE$.shouldRender3DInInventory(modelId); + } +} diff --git a/src/main/scala/codechicken/multipart/MultipartRenderer.scala b/src/main/scala/codechicken/multipart/MultipartRenderer.scala deleted file mode 100644 index ab2fa4d..0000000 --- a/src/main/scala/codechicken/multipart/MultipartRenderer.scala +++ /dev/null @@ -1,95 +0,0 @@ -package codechicken.multipart - -import codechicken.lib.render.CCRenderState -import codechicken.lib.vec.Vector3 -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler -import cpw.mods.fml.client.registry.RenderingRegistry -import net.minecraft.block.Block -import net.minecraft.client.renderer.{RenderBlocks, Tessellator} -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer -import net.minecraft.tileentity.TileEntity -import net.minecraft.world.IBlockAccess -import net.minecraftforge.client.MinecraftForgeClient -import cpw.mods.fml.relauncher.SideOnly -import cpw.mods.fml.relauncher.Side -import codechicken.multipart.RenderPartResolver - -/** Internal class for rendering callbacks. Should be moved to the handler - * package - */ -@SideOnly(Side.CLIENT) -object MultipartRenderer - extends TileEntitySpecialRenderer - with ISimpleBlockRenderingHandler { - TileMultipart.renderID = RenderingRegistry.getNextAvailableRenderId - - override def renderTileEntityAt( - t: TileEntity, - x: Double, - y: Double, - z: Double, - f: Float - ) { - val tmpart = t.asInstanceOf[TileMultipartClient] - if (tmpart.partList.isEmpty | !tmpart.hasDynamicParts) - return - - val state = CCRenderState.instance - state.resetInstance() - state.pullLightmapInstance() - state.useNormals = true - - val pos = new Vector3(x, y, z) - tmpart.renderDynamic(pos, f, MinecraftForgeClient.getRenderPass) - } - - override def getRenderId = TileMultipart.renderID - - override def renderWorldBlock( - world: IBlockAccess, - x: Int, - y: Int, - z: Int, - block: Block, - modelId: Int, - renderer: RenderBlocks - ): Boolean = { - val t = world.getTileEntity(x, y, z) - if (!t.isInstanceOf[TileMultipartClient]) - return false - - val tmpart = t.asInstanceOf[TileMultipartClient] - if (tmpart.partList.isEmpty) - return false - - if (renderer.hasOverrideBlockTexture) { - val part = - RenderPartResolver.resolve(world, x, y, z) - if (part != null) { - part match { - case isbrh: ISBRHPart => - isbrh.renderWorldBlock(world, x, y, z, renderer) - case _ => - part.drawBreaking(renderer) - } - } - return false - } - - val state = CCRenderState.instance - state.resetInstance() - state.lightMatrix.locate(world, x, y, z) - val b = tmpart.renderStatic(world, new Vector3(x, y, z), renderer) - state.lightMatrix.access = null - b - } - - override def renderInventoryBlock( - block: Block, - meta: Int, - modelId: Int, - renderer: RenderBlocks - ) {} - - def shouldRender3DInInventory(modelId: Int) = false -} diff --git a/src/main/scala/codechicken/multipart/NormalOcclusionTest$.java b/src/main/scala/codechicken/multipart/NormalOcclusionTest$.java new file mode 100644 index 0000000..743aa96 --- /dev/null +++ b/src/main/scala/codechicken/multipart/NormalOcclusionTest$.java @@ -0,0 +1,27 @@ +package codechicken.multipart; + +import codechicken.lib.vec.Cuboid6; +import scala.collection.Traversable; + +/** + * Scala companion singleton. Retained because compiled Scala consumers read MODULE$ and call these instance methods. + */ +public final class NormalOcclusionTest$ { + + public static final NormalOcclusionTest$ MODULE$ = new NormalOcclusionTest$(); + + private NormalOcclusionTest$() {} + + /** + * @deprecated Use {@link NormalOcclusionTest#testBoxes(Iterable, Iterable)} with Java iterables. This companion + * entry remains available to previously compiled Scala callers. + */ + @Deprecated + public boolean apply(Traversable boxes1, Traversable boxes2) { + return NormalOcclusionTest.apply(boxes1, boxes2); + } + + public boolean apply(JNormalOcclusion part1, TMultiPart part2) { + return NormalOcclusionTest.apply(part1, part2); + } +} diff --git a/src/main/scala/codechicken/multipart/NormalOcclusionTest.java b/src/main/scala/codechicken/multipart/NormalOcclusionTest.java new file mode 100644 index 0000000..77d24f4 --- /dev/null +++ b/src/main/scala/codechicken/multipart/NormalOcclusionTest.java @@ -0,0 +1,90 @@ +package codechicken.multipart; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import codechicken.lib.vec.Cuboid6; +import scala.collection.JavaConversions; +import scala.collection.Traversable; + +/** + * Simple bounding box based occlusion testing. If any two parts have overlapping bounding boxes, the test fails. + * + * @see TIconHitEffects for notes on the Scala/Java composition setup. + */ +public final class NormalOcclusionTest { + + private NormalOcclusionTest() {} + + /** + * Tests two groups of boxes, returning true if no cross-group pair intersects according to + * {@link Cuboid6#intersects(Cuboid6)}, including its existing tolerance for touching bounds. + * + *

+ * Fully consumes the first input, then the second, once each, before testing any pairs. These shallow snapshots + * preserve order, duplicates, null entries and box identities. The first input is the outer loop; the first + * intersection returns false. Input and intersection exceptions propagate unchanged. Null inputs fail during + * copying; null entries fail only if an intersection call uses them. Empty inputs allow all boxes in the other + * group, but both inputs are still consumed. + * + *

+ * This only tests supplied geometry. It does not invoke part callbacks, perform aggregate partial-occlusion checks + * or approve placement. Boxes remain shared and mutable; changing their coordinates can affect the query. + */ + public static boolean testBoxes(Iterable boxes1, Iterable boxes2) { + List first = new ArrayList<>(); + addAll(first, boxes1); + List second = new ArrayList<>(); + addAll(second, boxes2); + return test(first, second); + } + + /** + * Performs the test, returns true if the parts may coexist. + * + * @deprecated Use {@link #testBoxes(Iterable, Iterable)} with Java iterables. Retained for existing Scala callers. + */ + @Deprecated + public static boolean apply(Traversable boxes1, Traversable boxes2) { + return test(collect(boxes1), collect(boxes2)); + } + + /** Performs the test, returns true if the parts may coexist. */ + public static boolean apply(JNormalOcclusion part1, TMultiPart part2) { + List boxes = new ArrayList<>(); + if (part2 instanceof JNormalOcclusion) { + addAll(boxes, ((JNormalOcclusion) part2).getOcclusionBoxes()); + } + if (part2 instanceof JPartialOcclusion) { + addAll(boxes, ((JPartialOcclusion) part2).getPartialOcclusionBoxes()); + } + return test(boxes, part1.getOcclusionBoxes()); + } + + private static boolean test(Iterable boxes1, Iterable boxes2) { + for (Cuboid6 v1 : boxes1) { + for (Cuboid6 v2 : boxes2) { + if (v1.intersects(v2)) { + return false; + } + } + } + return true; + } + + private static List collect(Traversable boxes) { + List result = new ArrayList<>(); + Iterator iterator = JavaConversions.asJavaIterator(boxes.toIterator()); + while (iterator.hasNext()) { + result.add(iterator.next()); + } + return result; + } + + private static void addAll(List target, Iterable boxes) { + for (Cuboid6 box : boxes) { + target.add(box); + } + } +} diff --git a/src/main/scala/codechicken/multipart/NormallyOccludedPart.java b/src/main/scala/codechicken/multipart/NormallyOccludedPart.java new file mode 100644 index 0000000..8487459 --- /dev/null +++ b/src/main/scala/codechicken/multipart/NormallyOccludedPart.java @@ -0,0 +1,34 @@ +package codechicken.multipart; + +import java.util.Collections; + +import codechicken.lib.vec.Cuboid6; + +/** Utility part class for performing 3rd party occlusion tests. */ +public class NormallyOccludedPart extends TMultiPart implements TNormalOcclusion { + + private final Iterable bounds; + + public NormallyOccludedPart(Iterable bounds) { + this.bounds = bounds; + } + + public NormallyOccludedPart(Cuboid6 bound) { + this(Collections.singletonList(bound)); + } + + @Override + public String getType() { + return null; + } + + @Override + public Iterable getOcclusionBoxes() { + return bounds; + } + + @Override + public boolean occlusionTest(TMultiPart npart) { + return NormalOcclusionTest.apply(this, npart) && super.occlusionTest(npart); + } +} diff --git a/src/main/scala/codechicken/multipart/PacketScheduler.java b/src/main/scala/codechicken/multipart/PacketScheduler.java new file mode 100644 index 0000000..2b4113b --- /dev/null +++ b/src/main/scala/codechicken/multipart/PacketScheduler.java @@ -0,0 +1,72 @@ +package codechicken.multipart; + +import codechicken.lib.data.MCDataOutput; +import scala.Option; +import scala.Tuple2; +import scala.collection.mutable.HashMap; +import scala.runtime.AbstractFunction1; +import scala.runtime.BoxedUnit; + +/** + * Static class for packing update data. When a specific property of a part changes and needs sending to the client, a + * bit can be set in the mask. This bit can then be checked in the writeScheduled callback. This prevents sending + * multiple packets if the same property updates more than once per tick. + */ +public final class PacketScheduler { + + private static final HashMap map = new HashMap<>(); + + private PacketScheduler() {} + + /** Add bits to the current update mask for part. (binary OR) */ + public static void schedulePacket(TMultiPart part, long mask) { + if (part.world().isRemote) { + throw new IllegalArgumentException("Cannot use PacketScheduler on a client world"); + } + + Option current = map.get(part); + map.put(part, (current.isEmpty() ? 0L : current.get()) | mask); + } + + /** + * Writes every scheduled part and clears the schedule. + *

+ * The reference declared this {@code private[multipart]}, which reaches the handler package. Java has no equivalent + * scope, so it is public. + */ + public static void sendScheduled() { + // Callbacks may modify the schedule. Keep Scala's original traversal and visibility of pending masks. + map.foreach(new AbstractFunction1, BoxedUnit>() { + + @Override + public BoxedUnit apply(Tuple2 entry) { + TMultiPart part = entry._1(); + long mask = entry._2(); + if (part.tile() != null) { + IScheduledPacketPart ipart = (IScheduledPacketPart) part; + MCDataOutput w = part.getWriteStream(); + switch (ipart.maskWidth()) { + case 1: + w.writeByte((int) mask); + break; + case 2: + w.writeShort((int) mask); + break; + case 4: + w.writeInt((int) mask); + break; + case 8: + w.writeLong(mask); + break; + default: + throw new IllegalArgumentException("Invalid maskWidth: " + ipart.maskWidth()); + } + + ipart.writeScheduled(mask, w); + } + return BoxedUnit.UNIT; + } + }); + map.clear(); + } +} diff --git a/src/main/scala/codechicken/multipart/PacketScheduler.scala b/src/main/scala/codechicken/multipart/PacketScheduler.scala deleted file mode 100644 index 30bbd3f..0000000 --- a/src/main/scala/codechicken/multipart/PacketScheduler.scala +++ /dev/null @@ -1,80 +0,0 @@ -package codechicken.multipart - -import scala.collection.mutable.{Map => MMap} -import codechicken.lib.data.MCDataOutput -import codechicken.lib.data.MCDataInput - -/** Static class for packing update data. When a specific property of a part - * changes and needs sending to the client, a bit can be set in the mask. This - * bit can then be checked in the writeScheduled callback. This prevents - * sending multiple packets if the same property updates more than once per - * tick. - */ -object PacketScheduler { - private val map = MMap[TMultiPart, Long]() - - /** Add bits to the current update mask for part. (binary OR) - */ - def schedulePacket(part: TMultiPart, mask: Long) { - if (part.world.isRemote) - throw new IllegalArgumentException( - "Cannot use PacketScheduler on a client world" - ) - - map.put(part, map.getOrElse(part, 0L) | mask) - } - - private[multipart] def sendScheduled() { - map.foreach { e => - val (part, mask) = e - if (part.tile != null) { - val ipart = part.asInstanceOf[IScheduledPacketPart] - val w = part.getWriteStream - ipart.maskWidth match { - case 1 => w.writeByte(mask.toInt) - case 2 => w.writeShort(mask.toInt) - case 4 => w.writeInt(mask.toInt) - case 8 => w.writeLong(mask) - } - - ipart.writeScheduled(mask, w) - } - } - map.clear() - } -} - -/** Callback interface for PacketScheduler - */ -trait IScheduledPacketPart { - - /** Write scheduled data to the packet, mask is the cumulative mask from calls - * to schedulePacket - */ - def writeScheduled(mask: Long, packet: MCDataOutput) - - /** Returns the width (in bytes) of the data type required to hold all valid - * mask bits. Valid values are 1, 2, 4 and 8 - */ - def maskWidth: Int - - /** Read data matching mask. Estiablishes a method for subclasses to override. - * This should be called from read - */ - def readScheduled(mask: Long, packet: MCDataInput) -} - -trait TScheduledPacketPart extends TMultiPart with IScheduledPacketPart { - final override def read(packet: MCDataInput) { - val mask = maskWidth match { - case 1 => packet.readUByte - case 2 => packet.readUShort - case 4 => packet.readInt - case 8 => packet.readLong - } - readScheduled(mask, packet) - } - - def writeScheduled(mask: Long, packet: MCDataOutput) {} - def readScheduled(mask: Long, packet: MCDataInput) {} -} diff --git a/src/main/scala/codechicken/multipart/RedstoneInteractions$.java b/src/main/scala/codechicken/multipart/RedstoneInteractions$.java new file mode 100644 index 0000000..eb714ab --- /dev/null +++ b/src/main/scala/codechicken/multipart/RedstoneInteractions$.java @@ -0,0 +1,151 @@ +package codechicken.multipart; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Objects; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Direction; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import codechicken.lib.vec.Rotation; +import scala.collection.JavaConversions; +import scala.collection.immutable.Set; + +/** Scala-compatible singleton carrying the redstone interaction implementation. */ +public final class RedstoneInteractions$ { + + public static final RedstoneInteractions$ MODULE$ = new RedstoneInteractions$(); + + private final int[] vanillaSideMap = { -2, -1, 0, 2, 3, 1 }; + private final int[] sideVanillaMap = { 1, 2, 5, 3, 4 }; + private final Set fullVanillaBlocks = JavaConversions.asScalaSet( + new HashSet<>( + Arrays.asList( + Blocks.redstone_torch, + Blocks.unlit_redstone_torch, + Blocks.lever, + Blocks.stone_button, + Blocks.wooden_button, + Blocks.redstone_block))) + .toSet(); + + private RedstoneInteractions$() {} + + public int[] vanillaSideMap() { + return vanillaSideMap; + } + + public int[] sideVanillaMap() { + return sideVanillaMap; + } + + public Set fullVanillaBlocks() { + return fullVanillaBlocks; + } + + public int getPowerTo(TMultiPart part, int side) { + TileMultipart tile = part.tile(); + return getPowerTo( + tile.getWorldObj(), + tile.xCoord, + tile.yCoord, + tile.zCoord, + side, + ((IRedstoneTile) tile).openConnections(side) & connectionMask(part, side)); + } + + public int getPowerTo(World world, int x, int y, int z, int side, int mask) { + return getPower( + world, + x + net.minecraft.util.Facing.offsetsXForSide[side], + y + net.minecraft.util.Facing.offsetsYForSide[side], + z + net.minecraft.util.Facing.offsetsZForSide[side], + side ^ 1, + mask); + } + + public int getPower(World world, int x, int y, int z, int side, int mask) { + TileEntity tile = world.getTileEntity(x, y, z); + if (tile instanceof IRedstoneConnector) { + return ((IRedstoneConnector) tile).weakPowerLevel(side, mask); + } + + Block block = world.getBlock(x, y, z); + if (block instanceof IRedstoneConnectorBlock) { + return ((IRedstoneConnectorBlock) block).weakPowerLevel(world, x, y, z, side, mask); + } + + if ((vanillaConnectionMask(block, world, x, y, z, side, true) & mask) > 0) { + int power = world.getIndirectPowerLevelTo(x, y, z, side ^ 1); + if (power < 15 && Objects.equals(block, Blocks.redstone_wire)) { + power = Math.max(power, world.getBlockMetadata(x, y, z)); + } + return power; + } + return 0; + } + + public int vanillaToSide(int vanillaSide) { + return sideVanillaMap[vanillaSide + 1]; + } + + public int otherConnectionMask(IBlockAccess world, int x, int y, int z, int side, boolean power) { + return getConnectionMask( + world, + x + net.minecraft.util.Facing.offsetsXForSide[side], + y + net.minecraft.util.Facing.offsetsYForSide[side], + z + net.minecraft.util.Facing.offsetsZForSide[side], + side ^ 1, + power); + } + + public int connectionMask(TMultiPart part, int side) { + if (!(part instanceof IRedstonePart) || !((IRedstonePart) part).canConnectRedstone(side)) { + return 0; + } + if (part instanceof IFaceRedstonePart) { + int face = ((IFaceRedstonePart) part).getFace(); + return (side & 6) == (face & 6) ? 0x10 : 1 << Rotation.rotationTo(side & 6, face); + } + if (part instanceof IMaskedRedstonePart) { + return ((IMaskedRedstonePart) part).getConnectionMask(side); + } + return 0x1F; + } + + public int getConnectionMask(IBlockAccess world, int x, int y, int z, int side, boolean power) { + TileEntity tile = world.getTileEntity(x, y, z); + if (tile instanceof IRedstoneConnector) { + return ((IRedstoneConnector) tile).getConnectionMask(side); + } + + Block block = world.getBlock(x, y, z); + if (block instanceof IRedstoneConnectorBlock) { + return ((IRedstoneConnectorBlock) block).getConnectionMask(world, x, y, z, side); + } + return vanillaConnectionMask(block, world, x, y, z, side, power); + } + + public int vanillaConnectionMask(Block block, IBlockAccess world, int x, int y, int z, int side, boolean power) { + if (fullVanillaBlocks.contains(block)) { + return 0x1F; + } + + if (Objects.equals(block, Blocks.redstone_wire) || Objects.equals(block, Blocks.powered_comparator) + || Objects.equals(block, Blocks.unpowered_comparator)) { + return side == 0 ? 0 : power ? 0x1F : 4; + } + + int vanillaSide = vanillaSideMap[side]; + if (Objects.equals(block, Blocks.powered_repeater) || Objects.equals(block, Blocks.unpowered_repeater)) { + int metadata = world.getBlockMetadata(x, y, z) & 3; + return vanillaSide == metadata || vanillaSide == Direction.rotateOpposite[metadata] ? power ? 0x1F : 4 : 0; + } + + return power || block.canConnectRedstone(world, x, y, z, vanillaSide) ? 0x1F : 0; + } +} diff --git a/src/main/scala/codechicken/multipart/RedstoneInteractions.java b/src/main/scala/codechicken/multipart/RedstoneInteractions.java new file mode 100644 index 0000000..730defa --- /dev/null +++ b/src/main/scala/codechicken/multipart/RedstoneInteractions.java @@ -0,0 +1,58 @@ +package codechicken.multipart; + +import net.minecraft.block.Block; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import scala.collection.immutable.Set; + +/** Static forwarders for Java and existing bytecode; implementation remains on {@link RedstoneInteractions$}. */ +public final class RedstoneInteractions { + + private RedstoneInteractions() {} + + public static int[] vanillaSideMap() { + return RedstoneInteractions$.MODULE$.vanillaSideMap(); + } + + public static int[] sideVanillaMap() { + return RedstoneInteractions$.MODULE$.sideVanillaMap(); + } + + public static Set fullVanillaBlocks() { + return RedstoneInteractions$.MODULE$.fullVanillaBlocks(); + } + + public static int getPowerTo(TMultiPart part, int side) { + return RedstoneInteractions$.MODULE$.getPowerTo(part, side); + } + + public static int getPowerTo(World world, int x, int y, int z, int side, int mask) { + return RedstoneInteractions$.MODULE$.getPowerTo(world, x, y, z, side, mask); + } + + public static int getPower(World world, int x, int y, int z, int side, int mask) { + return RedstoneInteractions$.MODULE$.getPower(world, x, y, z, side, mask); + } + + public static int vanillaToSide(int vanillaSide) { + return RedstoneInteractions$.MODULE$.vanillaToSide(vanillaSide); + } + + public static int otherConnectionMask(IBlockAccess world, int x, int y, int z, int side, boolean power) { + return RedstoneInteractions$.MODULE$.otherConnectionMask(world, x, y, z, side, power); + } + + public static int connectionMask(TMultiPart part, int side) { + return RedstoneInteractions$.MODULE$.connectionMask(part, side); + } + + public static int getConnectionMask(IBlockAccess world, int x, int y, int z, int side, boolean power) { + return RedstoneInteractions$.MODULE$.getConnectionMask(world, x, y, z, side, power); + } + + public static int vanillaConnectionMask(Block block, IBlockAccess world, int x, int y, int z, int side, + boolean power) { + return RedstoneInteractions$.MODULE$.vanillaConnectionMask(block, world, x, y, z, side, power); + } +} diff --git a/src/main/scala/codechicken/multipart/RenderPartResolver.java b/src/main/scala/codechicken/multipart/RenderPartResolver.java index 27dbd34..e1ab977 100644 --- a/src/main/scala/codechicken/multipart/RenderPartResolver.java +++ b/src/main/scala/codechicken/multipart/RenderPartResolver.java @@ -1,5 +1,7 @@ package codechicken.multipart; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -7,13 +9,10 @@ import net.minecraft.world.IBlockAccess; import codechicken.lib.raytracer.ExtendedMOP; import scala.Tuple2; -/** - * A helper class for resolving parts so we don't do a double look up - */ +/** Resolves the multipart selected by Minecraft's current hit result. */ public final class RenderPartResolver { public static TMultiPart resolve(IBlockAccess world, int x, int y, int z) { - if (world == null) { return null; } @@ -35,25 +34,16 @@ public final class RenderPartResolver { return null; } - int index = (Integer) indexObject; - TileMultipartClient tile = getMultipartTile(world, x, y, z); + TileMultipart tile = TileMultipart.class.cast(BlockMultipart.getClientTile(world, x, y, z)); if (tile == null) { return null; } - // Needed because scala is stupid and the client tile doesn't expose what we need. - TileMultipart multipart = (TileMultipart) tile; - - if (index < 0 || index >= multipart.jPartList().size()) { + List parts = tile.jPartList(); + int index = (Integer) indexObject; + if (index < 0 || index >= parts.size()) { return null; } - return multipart.jPartList().get(index); - } - - private static TileMultipartClient getMultipartTile(IBlockAccess world, int x, int y, int z) { - if (world.getTileEntity(x, y, z) instanceof TileMultipartClient) { - return (TileMultipartClient) world.getTileEntity(x, y, z); - } - return null; + return parts.get(index); } } diff --git a/src/main/scala/codechicken/multipart/TCuboidPart$class.java b/src/main/scala/codechicken/multipart/TCuboidPart$class.java new file mode 100644 index 0000000..b19f07a --- /dev/null +++ b/src/main/scala/codechicken/multipart/TCuboidPart$class.java @@ -0,0 +1,33 @@ +package codechicken.multipart; + +import net.minecraft.client.renderer.RenderBlocks; + +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.vec.Cuboid6; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Binary bridge for Scala implementations compiled against the original trait. Their forwarders call these statics + * directly, so the bodies cannot delegate back to the instance methods without recursing. + */ +@Deprecated +public abstract class TCuboidPart$class { + + private TCuboidPart$class() {} + + public static Iterable getSubParts(TCuboidPart part) { + return JCuboidPart.subParts(part); + } + + public static Iterable getCollisionBoxes(TCuboidPart part) { + return JCuboidPart.collisionBoxes(part); + } + + @SideOnly(Side.CLIENT) + public static void drawBreaking(TCuboidPart part, RenderBlocks renderBlocks) { + JCuboidPart.renderBreaking(part, renderBlocks); + } + + public static void $init$(TCuboidPart part) {} +} diff --git a/src/main/scala/codechicken/multipart/TCuboidPart.java b/src/main/scala/codechicken/multipart/TCuboidPart.java new file mode 100644 index 0000000..44a7c69 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TCuboidPart.java @@ -0,0 +1,28 @@ +package codechicken.multipart; + +import net.minecraft.client.renderer.RenderBlocks; + +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.vec.Cuboid6; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Interface for parts that are simply a cuboid, having one bounding box. + *

+ * Implementors must extend {@link TMultiPart} and route the three overridden methods to the implementations in + * {@link JCuboidPart}, which {@link JCuboidPart} itself already does. A superclass method beats an interface default on + * the JVM, so declaring these as default methods here would silently lose to {@link TMultiPart}'s empty versions. + */ +public interface TCuboidPart { + + /** Return the bounding Cuboid6 for this part. */ + Cuboid6 getBounds(); + + Iterable getSubParts(); + + Iterable getCollisionBoxes(); + + @SideOnly(Side.CLIENT) + void drawBreaking(RenderBlocks renderBlocks); +} diff --git a/src/main/scala/codechicken/multipart/TCuboidPart.scala b/src/main/scala/codechicken/multipart/TCuboidPart.scala deleted file mode 100644 index 4b2fafa..0000000 --- a/src/main/scala/codechicken/multipart/TCuboidPart.scala +++ /dev/null @@ -1,42 +0,0 @@ -package codechicken.multipart - -import codechicken.lib.vec.Cuboid6 -import codechicken.lib.raytracer.IndexedCuboid6 -import net.minecraft.client.renderer.RenderBlocks -import codechicken.lib.render.{BlockRenderer, CCRenderState, RenderUtils} -import scala.collection.JavaConversions._ -import java.lang.Iterable -import codechicken.lib.vec.Translation -import codechicken.lib.render.uv.IconTransformation -import cpw.mods.fml.relauncher.{Side, SideOnly} - -/** Java class implementation - */ -abstract class JCuboidPart extends TCuboidPart - -/** Trait for parts that are simply a cuboid, having one bounding box. Overrides - * multipart functions to this effect. - */ -trait TCuboidPart extends TMultiPart { - - /** Return the bounding Cuboid6 for this part. - */ - def getBounds: Cuboid6 - - override def getSubParts: Iterable[IndexedCuboid6] = Seq( - new IndexedCuboid6(0, getBounds) - ) - - override def getCollisionBoxes: Iterable[Cuboid6] = Seq(getBounds) - - @SideOnly(Side.CLIENT) - override def drawBreaking(renderBlocks: RenderBlocks) { - val state = CCRenderState.instance - state.resetInstance() - state.setPipelineInstance( - new Translation(x, y, z), - new IconTransformation(renderBlocks.overrideBlockTexture) - ) - BlockRenderer.renderCuboid(getBounds, 0) - } -} diff --git a/src/main/scala/codechicken/multipart/TEdgePart$class.java b/src/main/scala/codechicken/multipart/TEdgePart$class.java new file mode 100644 index 0000000..1ffb403 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TEdgePart$class.java @@ -0,0 +1,17 @@ +package codechicken.multipart; + +/** + * Binary bridge for Scala implementations compiled against the original trait. Their forwarders call these statics + * directly, so the body cannot delegate back to the instance method without recursing. + */ +@Deprecated +public abstract class TEdgePart$class { + + private TEdgePart$class() {} + + public static boolean conductsRedstone(TEdgePart part) { + return false; + } + + public static void $init$(TEdgePart part) {} +} diff --git a/src/main/scala/codechicken/multipart/TEdgePart.java b/src/main/scala/codechicken/multipart/TEdgePart.java new file mode 100644 index 0000000..7f39db6 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TEdgePart.java @@ -0,0 +1,14 @@ +package codechicken.multipart; + +/** + * Interface which must be implemented by parts that go in an edge slot. + *

+ * TMultiPart does not declare conductsRedstone, so it can safely be a default method. + */ +public interface TEdgePart extends TSlottedPart { + + /** Return true if this part can conduct redstone signal or let redstone signal pass through it. */ + default boolean conductsRedstone() { + return false; + } +} diff --git a/src/main/scala/codechicken/multipart/TEdgePart.scala b/src/main/scala/codechicken/multipart/TEdgePart.scala deleted file mode 100644 index 6f81250..0000000 --- a/src/main/scala/codechicken/multipart/TEdgePart.scala +++ /dev/null @@ -1,11 +0,0 @@ -package codechicken.multipart - -/** Interface which must be implemented by parts that go in an edge slot. - */ -trait TEdgePart extends TSlottedPart { - - /** Return true if this part can conduct redstone signal or let redstone - * signal pass through it. - */ - def conductsRedstone = false -} diff --git a/src/main/scala/codechicken/multipart/TFacePart$class.java b/src/main/scala/codechicken/multipart/TFacePart$class.java new file mode 100644 index 0000000..0f90d30 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TFacePart$class.java @@ -0,0 +1,21 @@ +package codechicken.multipart; + +/** + * Binary bridge for Scala implementations compiled against the original trait. Their forwarders call these statics + * directly, so the bodies cannot delegate back to the instance methods without recursing. + */ +@Deprecated +public abstract class TFacePart$class { + + private TFacePart$class() {} + + public static boolean solid(TFacePart part, int side) { + return true; + } + + public static int redstoneConductionMap(TFacePart part) { + return 0; + } + + public static void $init$(TFacePart part) {} +} diff --git a/src/main/scala/codechicken/multipart/TFacePart.java b/src/main/scala/codechicken/multipart/TFacePart.java new file mode 100644 index 0000000..78c0c05 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TFacePart.java @@ -0,0 +1,22 @@ +package codechicken.multipart; + +/** + * Interface which must be implemented by parts that go in a face part. + *

+ * TMultiPart declares neither member, so unlike the other converted traits these can safely be default methods. + */ +public interface TFacePart extends TSlottedPart { + + /** Passed down from Block.isSideSolid. Return true if this part is solid and opaque on the specified side. */ + default boolean solid(int side) { + return true; + } + + /** + * Return the redstone conduction map for which signal can pass through this part on the face. Eg, hollow covers + * return 0x10 as signal can pass through the center hole. + */ + default int redstoneConductionMap() { + return 0; + } +} diff --git a/src/main/scala/codechicken/multipart/TFacePart.scala b/src/main/scala/codechicken/multipart/TFacePart.scala deleted file mode 100644 index c41a949..0000000 --- a/src/main/scala/codechicken/multipart/TFacePart.scala +++ /dev/null @@ -1,17 +0,0 @@ -package codechicken.multipart - -/** Inteface which must be implemented by parts that go in a face part. - */ -trait TFacePart extends TSlottedPart { - - /** Passed down from Block.isSideSolid. Return true if this part is solid and - * opaque on the specified side - */ - def solid(side: Int): Boolean = true - - /** Return the redstone conduction map for which signal can pass through this - * part on the face. Eg, hollow covers return 0x10 as signal can pass through - * the center hole. - */ - def redstoneConductionMap = 0 -} diff --git a/src/main/scala/codechicken/multipart/TIconHitEffects$class.java b/src/main/scala/codechicken/multipart/TIconHitEffects$class.java new file mode 100644 index 0000000..9764df3 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TIconHitEffects$class.java @@ -0,0 +1,26 @@ +package codechicken.multipart; + +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.util.MovingObjectPosition; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** Binary bridge for Scala implementations compiled against the original trait. */ +@Deprecated +public abstract class TIconHitEffects$class { + + private TIconHitEffects$class() {} + + @SideOnly(Side.CLIENT) + public static void addHitEffects(TIconHitEffects part, MovingObjectPosition hit, EffectRenderer effectRenderer) { + IconHitEffects.addHitEffects(part, hit, effectRenderer); + } + + @SideOnly(Side.CLIENT) + public static void addDestroyEffects(TIconHitEffects part, EffectRenderer effectRenderer) { + IconHitEffects.addDestroyEffects(part, effectRenderer); + } + + public static void $init$(TIconHitEffects part) {} +} diff --git a/src/main/scala/codechicken/multipart/TIconHitEffects.java b/src/main/scala/codechicken/multipart/TIconHitEffects.java new file mode 100644 index 0000000..bb12c1b --- /dev/null +++ b/src/main/scala/codechicken/multipart/TIconHitEffects.java @@ -0,0 +1,23 @@ +package codechicken.multipart; + +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.util.MovingObjectPosition; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Particle callbacks for parts that also extend {@link TMultiPart}. + *

+ * TMultiPart declares both members, and a superclass method beats an interface default on the JVM, so implementors must + * override them themselves and call the {@link IconHitEffects} statics. Declaring them default here would silently lose + * to TMultiPart's empty versions. + */ +public interface TIconHitEffects extends JIconHitEffects { + + @SideOnly(Side.CLIENT) + void addHitEffects(MovingObjectPosition hit, EffectRenderer effectRenderer); + + @SideOnly(Side.CLIENT) + void addDestroyEffects(EffectRenderer effectRenderer); +} diff --git a/src/main/scala/codechicken/multipart/TIconHitEffects.scala b/src/main/scala/codechicken/multipart/TIconHitEffects.scala deleted file mode 100644 index 2ff57ea..0000000 --- a/src/main/scala/codechicken/multipart/TIconHitEffects.scala +++ /dev/null @@ -1,92 +0,0 @@ -package codechicken.multipart - -import codechicken.lib.vec.Cuboid6 -import cpw.mods.fml.relauncher.SideOnly -import cpw.mods.fml.relauncher.Side -import net.minecraft.util.IIcon -import net.minecraft.util.MovingObjectPosition -import net.minecraft.client.particle.EffectRenderer -import codechicken.lib.vec.Vector3 -import codechicken.lib.raytracer.ExtendedMOP -import codechicken.lib.render.EntityDigIconFX - -/** This suite of 3 classes provides simple functions for standard minecraft - * style hit and break particles. - * - * Scala|Java composition setup. Due to the lack of mixin inheritance in Java, - * the classes are structured to suit both languages as follows. IconHitEffects - * contains static implementations of the functions that would be overriden in - * TMultiPart JIconHitEffects is the interface that should be implemented by a - * Java class, which can then override the functions in TMultipart and call the - * static methods in IconHitEffects with 'this' as the first parameter - * TIconHitEffects is a trait for scala implementors that does includes the - * overrides/static calls that Java programmers need to include themselves. - */ -object IconHitEffects { - def addHitEffects( - part: JIconHitEffects, - hit: MovingObjectPosition, - effectRenderer: EffectRenderer - ) { - EntityDigIconFX.addBlockHitEffects( - part.tile.getWorldObj, - part.getBounds.copy.add(Vector3.fromTileEntity(part.tile)), - hit.sideHit, - part.getBreakingIcon(ExtendedMOP.getData(hit), hit.sideHit), - effectRenderer - ) - } - - def addDestroyEffects(part: JIconHitEffects, effectRenderer: EffectRenderer) { - addDestroyEffects(part, effectRenderer, true) - } - - def addDestroyEffects( - part: JIconHitEffects, - effectRenderer: EffectRenderer, - scaleDensity: Boolean - ) { - val icons = new Array[IIcon](6) - for (i <- 0 until 6) - icons(i) = part.getBrokenIcon(i) - val bounds = - if (scaleDensity) part.getBounds.copy - else Cuboid6.full.copy - EntityDigIconFX.addBlockDestroyEffects( - part.tile.getWorldObj, - bounds.add(Vector3.fromTileEntity(part.tile)), - icons, - effectRenderer - ) - } -} - -/** Java interface containing callbacks for particle rendering. Make sure to - * override addHitEffects and addDestroyEffects as in TIconHitEffects - */ -trait JIconHitEffects extends TMultiPart { - def getBounds: Cuboid6 - - @SideOnly(Side.CLIENT) - def getBreakingIcon(subPart: Any, side: Int): IIcon = getBrokenIcon(side) - - @SideOnly(Side.CLIENT) - def getBrokenIcon(side: Int): IIcon -} - -/** Trait for scala programmers - */ -trait TIconHitEffects extends JIconHitEffects { - @SideOnly(Side.CLIENT) - override def addHitEffects( - hit: MovingObjectPosition, - effectRenderer: EffectRenderer - ) { - IconHitEffects.addHitEffects(this, hit, effectRenderer) - } - - @SideOnly(Side.CLIENT) - override def addDestroyEffects(effectRenderer: EffectRenderer) { - IconHitEffects.addDestroyEffects(this, effectRenderer) - } -} diff --git a/src/main/scala/codechicken/multipart/TItemMultiPart$class.java b/src/main/scala/codechicken/multipart/TItemMultiPart$class.java new file mode 100644 index 0000000..a8133fd --- /dev/null +++ b/src/main/scala/codechicken/multipart/TItemMultiPart$class.java @@ -0,0 +1,28 @@ +package codechicken.multipart; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import codechicken.lib.vec.Vector3; + +/** + * Binary bridge for Scala implementations compiled against the original trait. Their forwarders call these statics + * directly, so the bodies cannot delegate back to the instance methods without recursing. + */ +@Deprecated +public abstract class TItemMultiPart$class { + + private TItemMultiPart$class() {} + + public static double getHitDepth(TItemMultiPart part, Vector3 vhit, int side) { + return JItemMultiPart.hitDepth(vhit, side); + } + + public static boolean onItemUse(TItemMultiPart part, ItemStack item, EntityPlayer player, World world, int x, int y, + int z, int side, float hitX, float hitY, float hitZ) { + return JItemMultiPart.onItemUse(part, item, player, world, x, y, z, side, hitX, hitY, hitZ); + } + + public static void $init$(TItemMultiPart part) {} +} diff --git a/src/main/scala/codechicken/multipart/TItemMultiPart.java b/src/main/scala/codechicken/multipart/TItemMultiPart.java new file mode 100644 index 0000000..596f5ac --- /dev/null +++ b/src/main/scala/codechicken/multipart/TItemMultiPart.java @@ -0,0 +1,29 @@ +package codechicken.multipart; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Vector3; + +/** + * Simple multipart item interface for easy placement. Override newPart and the part will be added to the block space if + * it passes the occlusion tests. + *

+ * Implementors must extend {@link net.minecraft.item.Item} and override onItemUse themselves, delegating to + * {@link JItemMultiPart#onItemUse}, as {@link JItemMultiPart} does. Item declares onItemUse and a superclass method + * beats an interface default on the JVM, so declaring it default here would silently lose. + */ +public interface TItemMultiPart { + + default double getHitDepth(Vector3 vhit, int side) { + return JItemMultiPart.hitDepth(vhit, side); + } + + boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, + float hitY, float hitZ); + + /** Create a new part based on the placement information parameters. */ + TMultiPart newPart(ItemStack item, EntityPlayer player, World world, BlockCoord pos, int side, Vector3 vhit); +} diff --git a/src/main/scala/codechicken/multipart/TMultiPart.java b/src/main/scala/codechicken/multipart/TMultiPart.java new file mode 100644 index 0000000..017aa36 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TMultiPart.java @@ -0,0 +1,404 @@ +package codechicken.multipart; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.raytracer.RayTracer; +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public abstract class TMultiPart { + + /** Reference to the container TileMultipart instance. */ + private TileMultipart tile; + + public TileMultipart tile() { + return tile; + } + + public void tile_$eq(TileMultipart t) { + tile = t; + } + + /** + * Legacy helper function for getting the tile entity (from when TileMultipart was a trait). Use tile() now. + * + * @deprecated use {@link #tile()} + */ + @Deprecated + public TileEntity getTile() { + return tile(); + } + + /** Getter for tile.worldObj. */ + public World world() { + return tile() == null ? null : tile().getWorldObj(); + } + + /** Short getter for xCoord. */ + public int x() { + return tile().xCoord; + } + + /** Short getter for yCoord. */ + public int y() { + return tile().yCoord; + } + + /** Short getter for zCoord. */ + public int z() { + return tile().zCoord; + } + + /** The unique string identifier for this class of multipart. */ + public abstract String getType(); + + /** Called when the container tile instance is changed to update reference. */ + public void bind(TileMultipart t) { + tile_$eq(t); + } + + /** Perform an occlusion test to determine whether this and npart can 'fit' in this block space. */ + public boolean occlusionTest(TMultiPart npart) { + return true; + } + + /** + * Return a list of entity collision boxes. Note all Cuboid6's returned by methods in TMultiPart should be within + * (0,0,0) to (1,1,1). + */ + public Iterable getCollisionBoxes() { + return Collections.emptyList(); + } + + /** + * Perform a raytrace of this part. The default implementation does a Cuboid6 ray trace on bounding boxes returned + * from getSubParts. This should only be overridden if you need special ray-tracing capabilities such as triangular + * faces. The returned ExtendedMOP will be passed to methods such as 'activate' so it is recommended to use the data + * field to indicate information about the hit area. + */ + public ExtendedMOP collisionRayTrace(Vec3 start, Vec3 end) { + Vector3 offset = new Vector3(x(), y(), z()); + List boxes = new ArrayList<>(); + for (IndexedCuboid6 c : getSubParts()) { + boxes.add(new IndexedCuboid6(c.data, c.copy().add(offset))); + } + return (ExtendedMOP) RayTracer.instance().rayTraceCuboids( + new Vector3(start), + new Vector3(end), + boxes, + new BlockCoord(x(), y(), z()), + tile().getBlockType()); + } + + /** + * For the default collisionRayTrace implementation, returns a list of indexed bounding boxes. The data field of + * ExtendedMOP will be set to the index of the cuboid the raytrace hit. + */ + public Iterable getSubParts() { + return Collections.emptyList(); + } + + /** Return a list of items that should be dropped when this part is destroyed. */ + public Iterable getDrops() { + return Collections.emptyList(); + } + + /** + * Return a value indicating how hard this part is to break. + * + * @param hit An instance of ExtendedMOP from collisionRayTrace + */ + public float getStrength(MovingObjectPosition hit, EntityPlayer player) { + return 1; + } + + /** + * Harvest this part, removing it from the container tile and dropping items if necessary. + * + * @param hit An instance of ExtendedMOP from collisionRayTrace + * @param player The player harvesting the part + */ + public void harvest(MovingObjectPosition hit, EntityPlayer player) { + if (!player.capabilities.isCreativeMode) { + tile().dropItems(getDrops()); + } + tile().remPart(this); + } + + /** The light level emitted by this part. */ + public int getLightValue() { + return 0; + } + + /** If any part returns true for this, torches can be placed. Vanilla hacks... */ + public boolean canPlaceTorchOnTop() { + return false; + } + + /** + * Explosion resistance of the host tile is the maximum explosion resistance of the contained parts. + * + * @param entity The entity responsible for this explosion + * @return The resistance of this part to the explosion + */ + public float explosionResistance(Entity entity) { + return 0f; + } + + /** + * Add particles and other effects when a player is mining this part. + * + * @param hit An instance of ExtendedMOP from collisionRayTrace + */ + @SideOnly(Side.CLIENT) + public void addHitEffects(MovingObjectPosition hit, EffectRenderer effectRenderer) {} + + /** + * Add particles and other effects when a player broke this part. + * + * @param hit An instance of ExtendedMOP from collisionRayTrace + */ + @SideOnly(Side.CLIENT) + public void addDestroyEffects(MovingObjectPosition hit, EffectRenderer effectRenderer) { + addDestroyEffects(effectRenderer); + } + + /** @deprecated use {@link #addDestroyEffects(MovingObjectPosition, EffectRenderer)} */ + @SideOnly(Side.CLIENT) + @Deprecated + public void addDestroyEffects(EffectRenderer effectRenderer) {} + + /** + * Render the static, unmoving faces of this part into the world renderer. The Tessellator is already drawing. + * + * @param pass The render pass, 1 or 0 + * @return true if vertices were added to the tessellator + */ + @SideOnly(Side.CLIENT) + public boolean renderStatic(Vector3 pos, int pass) { + return false; + } + + /** + * Render the dynamic, changing faces of this part and other gfx as in a TESR. The Tessellator will need to be + * started if it is to be used. + * + * @param pos The position of this block space relative to the renderer, same as x, y, z passed to TESR + * @param frame The partial interpolation frame value for animations between ticks + * @param pass The render pass, 1 or 0 + */ + @SideOnly(Side.CLIENT) + public void renderDynamic(Vector3 pos, float frame, int pass) {} + + /** Draw the breaking overlay for this part. The overrideIcon in RenderBlocks will be set to the fracture icon. */ + @SideOnly(Side.CLIENT) + public void drawBreaking(RenderBlocks renderBlocks) {} + + /** + * Override the drawing of the selection box around this part. + * + * @param hit An instance of ExtendedMOP from collisionRayTrace + * @return true if highlight rendering was overridden + */ + @SideOnly(Side.CLIENT) + public boolean drawHighlight(MovingObjectPosition hit, EntityPlayer player, float frame) { + return false; + } + + /** + * @return A Cuboid6 bounding the render of this part for frustum culling. The bounds are relative to the tile + * coordinates. + */ + public Cuboid6 getRenderBounds() { + return Cuboid6.full; + } + + /** + * Write all the data required to describe a client version of this part to the packet. Called serverside, when a + * client loads this part for the first time. + */ + public void writeDesc(MCDataOutput packet) {} + + /** + * Fill out this part with the description information contained in packet. Will be exactly as written from + * writeDesc. Called clientside when a client loads this part for the first time. + */ + public void readDesc(MCDataInput packet) {} + + /** Save part to NBT (only called serverside). */ + public void save(NBTTagCompound tag) {} + + /** Load part from NBT (only called serverside). */ + public void load(NBTTagCompound tag) {} + + /** + * Gets a MCDataOutput instance for writing update data to clients with this part loaded. The write stream functions + * as a buffer which is flushed in a compressed databurst packet at the end of the tick. + */ + public MCDataOutput getWriteStream() { + return tile().getWriteStream(this); + } + + /** + * Read and operate on data written to getWriteStream. Ensure all data this part wrote is read even if it's not + * going to be used. The default implementation assumes a call to sendDescUpdate as the only use of getWriteStream. + */ + public void read(MCDataInput packet) { + readDesc(packet); + tile().markRender(); + } + + /** + * Quick and easy method to re-describe the whole part on the client. This will call read on the client which calls + * readDesc unless overriden. Incremental changes should be sent rather than the whole description packet if + * possible. + */ + public void sendDescUpdate() { + if (tile() != null) { + writeDesc(getWriteStream()); + } + } + + /** + * Called when a part is added or removed from this block space. The part parameter may be null if several things + * have changed. + */ + public void onPartChanged(TMultiPart part) {} + + /** Called when a neighbor block changed. */ + public void onNeighborChanged() {} + + /** Called when this part is added to the block space. */ + public void onAdded() { + onWorldJoin(); + } + + /** Called when this part is removed from the block space. */ + public void onRemoved() { + onWorldSeparate(); + } + + /** Called when the containing chunk is loaded on the server. */ + public void onChunkLoad() { + onWorldJoin(); + } + + /** Called when the containing chunk is unloaded on the server. */ + public void onChunkUnload() { + onWorldSeparate(); + } + + /** + * Called when this part separates from the world (due to removal, chunk unload or other). Use this to sync with + * external data structures. Called on both client and server. + */ + public void onWorldSeparate() {} + + /** + * Called when this part joins the world (due to placement, chunkload or frame move etc). Use this to sync with + * external data structures. Called on both client and server. + */ + public void onWorldJoin() {} + + /** + * Called on committed server conversion after FMP replaces the source block and installs this part's tile, before + * writing its add-part description and adding the requested new part. Not called for conversion probes. The default + * delegates to onAdded; preserve that lifecycle when overriding unless the part intentionally replaces it. A later + * capability promotion may replace the tile again, so do not retain this tile as a permanent owner. + */ + public void onConverted() { + onAdded(); + } + + /** + * Called on committed server conversion immediately before the source block/tile is replaced. This part is already + * bound to a placeholder, while the world still contains the original tile. Use this to clear resources copied from + * the old tile so its removal does not drop them again. Never perform that destructive transfer in the converter, + * which also runs for discarded probes. The default is a no-op. Failures propagate; conversion is not + * transactional. + */ + public void invalidateConvertedTile() {} + + /** Called when this part has been moved without a save/load. */ + public void onMoved() { + onWorldJoin(); + } + + /** Called just before this part is actually removed from the container tile. */ + public void preRemove() {} + + /** + * Return whether this part needs update ticks. This will only be called on addition/removal so it should be a + * constant for this instance. + */ + public boolean doesTick() { + return true; + } + + /** + * Return whether this part needs to be included in the dynamic render loop (renderDynamic). Default is false. + * Override this to true for parts like lights that need per-frame rendering but no logic updates. + */ + public boolean shouldRenderDynamic() { + return false; + } + + /** Called once per world tick. This will be called even if doesTick returns false if another part needs ticks. */ + public void update() {} + + /** Called when a scheduled tick is executed. */ + public void scheduledTick() {} + + /** + * Sets a scheduledTick callback for this part ticks in the future. This is a world time value, so if the chunk is + * unloaded and reloaded some time later, the tick may fire immediately. + */ + public void scheduleTick(int ticks) { + TickScheduler.scheduleTick(this, ticks); + } + + /** Return the itemstack for the middle click pick-block function. */ + public ItemStack pickItem(MovingObjectPosition hit) { + return null; + } + + /** + * Called on block right click. item is the player's held item. This should not modify the part client side. If the + * client call returns false, the server will not call this function. + * + * @param hit An instance of ExtendedMOP from collisionRayTrace + */ + public boolean activate(EntityPlayer player, MovingObjectPosition hit, ItemStack item) { + return false; + } + + /** + * Called on block left click. item is the player's held item. + * + * @param hit An instance of ExtendedMOP from collisionRayTrace + */ + public void click(EntityPlayer player, MovingObjectPosition hit, ItemStack item) {} + + /** Called when an entity is within this block space. May not actually collide with this part. */ + public void onEntityCollision(Entity entity) {} +} diff --git a/src/main/scala/codechicken/multipart/TMultiPart.scala b/src/main/scala/codechicken/multipart/TMultiPart.scala deleted file mode 100644 index 1c99ffc..0000000 --- a/src/main/scala/codechicken/multipart/TMultiPart.scala +++ /dev/null @@ -1,368 +0,0 @@ -package codechicken.multipart - -import codechicken.lib.vec.Cuboid6 -import codechicken.lib.vec.Vector3 -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.ItemStack -import net.minecraft.nbt.NBTTagCompound -import net.minecraft.util.MovingObjectPosition -import codechicken.lib.raytracer.IndexedCuboid6 -import cpw.mods.fml.relauncher.SideOnly -import cpw.mods.fml.relauncher.Side -import net.minecraft.client.particle.EffectRenderer -import net.minecraft.client.renderer.RenderBlocks -import codechicken.lib.vec.BlockCoord -import net.minecraft.tileentity.TileEntity -import codechicken.lib.lighting.LightMatrix -import codechicken.lib.data.MCDataOutput -import codechicken.lib.data.MCDataInput -import net.minecraft.entity.Entity -import java.lang.Iterable -import scala.collection.JavaConversions._ -import net.minecraft.util.Vec3 -import codechicken.lib.raytracer.ExtendedMOP -import codechicken.lib.raytracer.RayTracer - -abstract class TMultiPart { - - /** Reference to the container TileMultipart instance - */ - var tile: TileMultipart = _ - - /** Legacy helper function for getting the tile entity (from when - * TileMultipart was a trait). Use tile() now. - */ - @Deprecated - def getTile: TileEntity = tile - - /** Getter for tile.worldObj - */ - def world = if (tile == null) null else tile.getWorldObj - - /** Short getter for xCoord - */ - def x = tile.xCoord - - /** Short getter for yCoord - */ - def y = tile.yCoord - - /** Short getter for zCoord - */ - def z = tile.zCoord - - /** The unique string identifier for this class of multipart. - */ - def getType: String - - /** Called when the container tile instance is changed to update reference - */ - def bind(t: TileMultipart) { - tile = t - } - - /** Perform an occlusion test to determine whether this and npart can 'fit' in - * this block space. - */ - def occlusionTest(npart: TMultiPart): Boolean = true - - /** Return a list of entity collision boxes. Note all Cuboid6's returned by - * methods in TMultiPart should be within (0,0,0)->(1,1,1) - */ - def getCollisionBoxes: Iterable[Cuboid6] = Seq() - - /** Perform a raytrace of this part. The default implementation does a Cuboid6 - * ray trace on bounding boxes returned from getSubParts. This should only be - * overridden if you need special ray-tracing capabilities such as triangular - * faces. The returned ExtendedMOP will be passed to methods such as - * 'activate' so it is recommended to use the data field to indicate - * information about the hit area. - */ - def collisionRayTrace(start: Vec3, end: Vec3): ExtendedMOP = { - val offset = new Vector3(x, y, z) - val boxes = - getSubParts.map(c => new IndexedCuboid6(c.data, c.copy.add(offset))) - return RayTracer.instance - .rayTraceCuboids( - new Vector3(start), - new Vector3(end), - boxes.toList, - new BlockCoord(x, y, z), - tile.getBlockType - ) - .asInstanceOf[ExtendedMOP] - } - - /** For the default collisionRayTrace implementation, returns a list of - * indexed bounding boxes. The data field of ExtendedMOP will be set to the - * index of the cuboid the raytrace hit. - */ - def getSubParts: Iterable[IndexedCuboid6] = Seq() - - /** Return a list of items that should be dropped when this part is destroyed. - */ - def getDrops: Iterable[ItemStack] = Seq() - - /** Return a value indicating how hard this part is to break - * @param hit - * An instance of ExtendedMOP from collisionRayTrace - */ - def getStrength(hit: MovingObjectPosition, player: EntityPlayer): Float = 1 - - /** Harvest this part, removing it from the container tile and dropping items - * if necessary. - * @param hit - * An instance of ExtendedMOP from collisionRayTrace - * @param player - * The player harvesting the part - */ - def harvest(hit: MovingObjectPosition, player: EntityPlayer) { - if (!player.capabilities.isCreativeMode) - tile.dropItems(getDrops) - tile.remPart(this) - } - - /** The light level emitted by this part - */ - def getLightValue = 0 - - /** If any part returns true for this, torches can be placed. Vanilla hacks... - */ - def canPlaceTorchOnTop = false - - /** Explosion resistance of the host tile is the maximum explosion resistance - * of the contained parts - * @param entity - * The entity responsible for this explosion - * @return - * The resistance of this part the the explosion - */ - def explosionResistance(entity: Entity) = 0f - - /** Add particles and other effects when a player is mining this part - * @param hit - * An instance of ExtendedMOP from collisionRayTrace - */ - @SideOnly(Side.CLIENT) - def addHitEffects( - hit: MovingObjectPosition, - effectRenderer: EffectRenderer - ) {} - - /** Add particles and other effects when a player broke this part - * @param hit - * An instance of ExtendedMOP from collisionRayTrace - */ - @SideOnly(Side.CLIENT) - def addDestroyEffects( - hit: MovingObjectPosition, - effectRenderer: EffectRenderer - ) { addDestroyEffects(effectRenderer) } - - @SideOnly(Side.CLIENT) - @Deprecated - def addDestroyEffects(effectRenderer: EffectRenderer) {} - - /** Render the static, unmoving faces of this part into the world renderer. - * The Tessellator is already drawing. - * @param pass - * The render pass, 1 or 0 - * @return - * true if vertices were added to the tessellator - */ - @SideOnly(Side.CLIENT) - def renderStatic(pos: Vector3, pass: Int) = false - - /** Render the dynamic, changing faces of this part and other gfx as in a - * TESR. The Tessellator will need to be started if it is to be used. - * @param pos - * The position of this block space relative to the renderer, same as x, y, - * z passed to TESR. - * @param frame - * The partial interpolation frame value for animations between ticks - * @param pass - * The render pass, 1 or 0 - */ - @SideOnly(Side.CLIENT) - def renderDynamic(pos: Vector3, frame: Float, pass: Int) {} - - /** Draw the breaking overlay for this part. The overrideIcon in RenderBlocks - * will be set to the fracture icon. - */ - @SideOnly(Side.CLIENT) - def drawBreaking(renderBlocks: RenderBlocks) {} - - /** Override the drawing of the selection box around this part. - * @param hit - * An instance of ExtendedMOP from collisionRayTrace - * @return - * true if highlight rendering was overridden. - */ - @SideOnly(Side.CLIENT) - def drawHighlight( - hit: MovingObjectPosition, - player: EntityPlayer, - frame: Float - ): Boolean = false - - /** @return - * A Cuboid6 bounding the render of this part for frustum culling. The - * bounds are relative to the tile coordinates. - */ - def getRenderBounds = Cuboid6.full - - /** Write all the data required to describe a client version of this part to - * the packet. Called serverside, when a client loads this part for the first - * time. - */ - def writeDesc(packet: MCDataOutput) {} - - /** Fill out this part with the description information contained in packet. - * Will be exactly as written from writeDesc. Called clientside when a client - * loads this part for the first time. - */ - def readDesc(packet: MCDataInput) {} - - /** Save part to NBT (only called serverside) - */ - def save(tag: NBTTagCompound) {} - - /** Load part from NBT (only called serverside) - */ - def load(tag: NBTTagCompound) {} - - /** Gets a MCDataOutput instance for writing update data to clients with this - * part loaded. The write stream functions as a buffer which is flushed in a - * compressed databurst packet at the end of the tick. - */ - def getWriteStream: MCDataOutput = tile.getWriteStream(this) - - /** Read and operate on data written to getWriteStream. Ensure all data this - * part wrote is read even if it's not going to be used. The default - * implementation assumes a call to sendDescUpdate as the only use of - * getWriteStream. - */ - def read(packet: MCDataInput) { - readDesc(packet) - tile.markRender() - } - - /** Quick and easy method to re-describe the whole part on the client. This - * will call read on the client which calls readDesc unless overriden. - * Incremental changes should be sent rather than the whole description - * packet if possible. - */ - def sendDescUpdate() { - if (tile != null) writeDesc(getWriteStream) - } - - /** Called when a part is added or removed from this block space. The part - * parameter may be null if several things have changed. - */ - def onPartChanged(part: TMultiPart) {} - - /** Called when a neighbor block changed - */ - def onNeighborChanged() {} - - /** Called when this part is added to the block space - */ - def onAdded() = onWorldJoin() - - /** Called when this part is removed from the block space - */ - def onRemoved() = onWorldSeparate() - - /** Called when the containing chunk is loaded on the server. - */ - def onChunkLoad() = onWorldJoin() - - /** Called when the containing chunk is unloaded on the server. - */ - def onChunkUnload() = onWorldSeparate() - - /** Called when this part separates from the world (due to removal, chunk - * unload or other). Use this to sync with external data structures. Called - * on both client and server - */ - def onWorldSeparate() {} - - /** Called when this part joins the world (due to placement, chunkload or - * frame move etc). Use this to sync with external data structures. Called on - * both client and server - */ - def onWorldJoin() {} - - /** Called when this part is converted from a normal block/tile (only - * applicable if a converter has been registered) - */ - def onConverted() = onAdded() - - /** Called when this part is converted from a normal block/tile (only - * applicable if a converter has been registered) before the original tile - * has been replaced Use this to clear out things like inventory from the old - * tile. - */ - def invalidateConvertedTile() {} - - /** Called when this part has been moved without a save/load. - */ - def onMoved() = onWorldJoin() - - /** Called just before this part is actually removed from the container tile - */ - def preRemove() {} - - /** Return whether this part needs update ticks. This will only be called on - * addition/removal so it should be a constant for this instance. - */ - def doesTick = true - - /** Return whether this part needs to be included in the dynamic render loop - * (renderDynamic). Default is false. Override this to true for parts like - * lights that need per-frame rendering but no logic updates. - */ - def shouldRenderDynamic = false - - /** Called once per world tick. This will be called even if doesTick returns - * false if another part in the space needs ticks. - */ - def update() {} - - /** Called when a scheduled tick is executed. - */ - def scheduledTick() {} - - /** Sets a scheduledTick callback for this part ticks in the future. This is a - * world time value, so if the chunk is unloaded and reloaded some time - * later, the tick may fire immediately. - */ - def scheduleTick(ticks: Int) = TickScheduler.scheduleTick(this, ticks) - - /** Return the itemstack for the middle click pick-block function. - */ - def pickItem(hit: MovingObjectPosition): ItemStack = null - - /** Called on block right click. item is the player's held item. This should - * not modify the part client side. If the client call returns false, the - * server will not call this function. - * @param hit - * An instance of ExtendedMOP from collisionRayTrace - */ - def activate( - player: EntityPlayer, - hit: MovingObjectPosition, - item: ItemStack - ) = false - - /** Called on block left click. item is the player's held item. - * @param hit - * An instance of ExtendedMOP from collisionRayTrace - */ - def click(player: EntityPlayer, hit: MovingObjectPosition, item: ItemStack) {} - - /** Called when an entity is within this block space. May not actually collide - * with this part. - */ - def onEntityCollision(entity: Entity) {} -} diff --git a/src/main/scala/codechicken/multipart/TNormalOcclusion$class.java b/src/main/scala/codechicken/multipart/TNormalOcclusion$class.java new file mode 100644 index 0000000..a6430bd --- /dev/null +++ b/src/main/scala/codechicken/multipart/TNormalOcclusion$class.java @@ -0,0 +1,15 @@ +package codechicken.multipart; + +/** Binary bridge for Scala implementations compiled against the original trait. */ +@Deprecated +public abstract class TNormalOcclusion$class { + + private TNormalOcclusion$class() {} + + public static boolean occlusionTest(TNormalOcclusion part, TMultiPart npart) { + return NormalOcclusionTest.apply(part, npart) + && part.codechicken$multipart$TNormalOcclusion$$super$occlusionTest(npart); + } + + public static void $init$(TNormalOcclusion part) {} +} diff --git a/src/main/scala/codechicken/multipart/TNormalOcclusion.java b/src/main/scala/codechicken/multipart/TNormalOcclusion.java new file mode 100644 index 0000000..7494a85 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TNormalOcclusion.java @@ -0,0 +1,23 @@ +package codechicken.multipart; + +/** + * Normal occlusion for parts that also extend {@link TMultiPart}. + *

+ * A superclass method beats an interface default on the JVM, so implementors must override occlusionTest themselves + * with {@code NormalOcclusionTest.apply(this, npart) && super.occlusionTest(npart)}, as {@link NormallyOccludedPart} + * does. Declaring it default here would silently lose to TMultiPart's version. + */ +public interface TNormalOcclusion extends JNormalOcclusion { + + boolean occlusionTest(TMultiPart npart); + + /** + * Super accessor generated by Scala for classes compiled against the original trait, called by + * {@link TNormalOcclusion$class#occlusionTest}. Those classes supply their own override carrying their real super + * chain; the default here is the identity for that chain and is only reached if the deprecated bridge is used on a + * class that never had one. + */ + default boolean codechicken$multipart$TNormalOcclusion$$super$occlusionTest(TMultiPart npart) { + return true; + } +} diff --git a/src/main/scala/codechicken/multipart/TNormalOcclusion.scala b/src/main/scala/codechicken/multipart/TNormalOcclusion.scala deleted file mode 100644 index 0b91219..0000000 --- a/src/main/scala/codechicken/multipart/TNormalOcclusion.scala +++ /dev/null @@ -1,65 +0,0 @@ -package codechicken.multipart - -import codechicken.lib.vec.Cuboid6 -import scala.collection.JavaConversions._ -import java.lang.Iterable - -/** This suite of 3 classes provides simple functions for standard bounding box - * based occlusion testing. If any two parts have overlapping bounding boxes, - * the test fails - * - * See TIconHitEffects for notes on the Scala|Java composition setup. - */ -object NormalOcclusionTest { - - /** Performs the test, returns true if the test fails - */ - def apply( - boxes1: Traversable[Cuboid6], - boxes2: Traversable[Cuboid6] - ): Boolean = - boxes1.forall(v1 => boxes2.forall(v2 => !v1.intersects(v2))) - - /** Performs the test, returns true if the test fails - */ - def apply(part1: JNormalOcclusion, part2: TMultiPart): Boolean = { - var boxes = Seq[Cuboid6]() - if (part2.isInstanceOf[JNormalOcclusion]) - boxes = boxes ++ part2.asInstanceOf[JNormalOcclusion].getOcclusionBoxes - - if (part2.isInstanceOf[JPartialOcclusion]) - boxes = - boxes ++ part2.asInstanceOf[JPartialOcclusion].getPartialOcclusionBoxes - - return NormalOcclusionTest(boxes, part1.getOcclusionBoxes) - } -} - -/** Java interface containing callbacks for normal occlusion testing. Make sure - * to override occlusionTest as in TNormalOcclusion - */ -trait JNormalOcclusion { - - /** Return a list of normal occlusion boxes - */ - def getOcclusionBoxes: Iterable[Cuboid6] -} - -/** Trait for scala programmers - */ -trait TNormalOcclusion extends TMultiPart with JNormalOcclusion { - override def occlusionTest(npart: TMultiPart): Boolean = - NormalOcclusionTest(this, npart) && super.occlusionTest(npart) -} - -/** Utility part class for performing 3rd party occlusion tests - */ -class NormallyOccludedPart(bounds: Iterable[Cuboid6]) - extends TMultiPart - with TNormalOcclusion { - def this(bound: Cuboid6) = this(Seq(bound)) - - def getType = null - - def getOcclusionBoxes = bounds -} diff --git a/src/main/scala/codechicken/multipart/TPartialOcclusion.scala b/src/main/scala/codechicken/multipart/TPartialOcclusion.scala deleted file mode 100644 index 6933e81..0000000 --- a/src/main/scala/codechicken/multipart/TPartialOcclusion.scala +++ /dev/null @@ -1,73 +0,0 @@ -package codechicken.multipart - -import codechicken.lib.vec.Cuboid6 -import scala.collection.JavaConversions._ -import java.lang.Iterable - -/** This class provides a special type of occlusion model used by microblocks. - * The partial occlusion test defines bounding boxes that may intersect, so - * long as no part is completely obscured by a combination of the others. - * Partial bounding boxes may not intersect with normal bounding boxes from - * NormalOcclusionTest - * - * This test is actually managed by the mixin trait TPartialOcclusionTile which - * is generated when the marker interface JPartialOcclusion is found - */ -class PartialOcclusionTest(size: Int) { - - /** The resolution of the test, set to 1/8th of a block - */ - val res = 8 - val bits = new Array[Byte](res * res * res) - val partial = new Array[Boolean](size) - - def fill(i: Int, part: JPartialOcclusion) { - fill(i, part.getPartialOcclusionBoxes, part.allowCompleteOcclusion) - } - - def fill(i: Int, boxes: Iterable[Cuboid6], complete: Boolean) { - partial(i) = !complete - boxes.foreach(box => fill(i + 1, box)) - } - - def fill(v: Int, box: Cuboid6) { - for (x <- (box.min.x * res + 0.5).toInt until (box.max.x * res + 0.5).toInt) - for ( - y <- (box.min.y * res + 0.5).toInt until (box.max.y * res + 0.5).toInt - ) - for ( - z <- (box.min.z * res + 0.5).toInt until (box.max.z * res + 0.5).toInt - ) { - val i = (x * res + y) * res + z - if (bits(i) == 0) - bits(i) = v.toByte - else - bits(i) = -1 - } - } - - def apply(): Boolean = { - val visible = new Array[Boolean](size) - bits.foreach(n => if (n > 0) visible(n - 1) = true) - - var i = 0 - while (i < partial.length) { - if (partial(i) && !visible(i)) - return false - i += 1 - } - - return true - } -} - -trait JPartialOcclusion { - - /** Return a list of partial occlusion boxes - */ - def getPartialOcclusionBoxes: Iterable[Cuboid6] - - /** Return true if this part may be completely obscured - */ - def allowCompleteOcclusion = false -} diff --git a/src/main/scala/codechicken/multipart/TRandomUpdateTick.java b/src/main/scala/codechicken/multipart/TRandomUpdateTick.java new file mode 100644 index 0000000..6940df1 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TRandomUpdateTick.java @@ -0,0 +1,30 @@ +package codechicken.multipart; + +/** + * Interface for parts with random update ticks. Used in conjunction with TickScheduler. + *

+ * The Scala trait extended TMultiPart, but a trait extending a class is a bare interface in bytecode, so implementors + * must extend TMultiPart themselves. + */ +public interface TRandomUpdateTick { + + /** + * Called on random update. Random ticks are between 800 and 1600 ticks from their last scheduled/random tick. + */ + void randomUpdate(); + + /** + * Registers the part for random ticking. This cannot be a default method: TMultiPart declares onWorldJoin, and a + * superclass method always beats an interface default, so the default would never run. Every implementor must + * declare it and call {@link TickScheduler#loadRandomTick(TRandomUpdateTick)} itself. + * + *

+     * 
+     * @Override
+     * public void onWorldJoin() {
+     *     TickScheduler.loadRandomTick(this);
+     * }
+     * 
+ */ + void onWorldJoin(); +} diff --git a/src/main/scala/codechicken/multipart/TRandomUpdateTick.scala b/src/main/scala/codechicken/multipart/TRandomUpdateTick.scala deleted file mode 100644 index 9a5f9e1..0000000 --- a/src/main/scala/codechicken/multipart/TRandomUpdateTick.scala +++ /dev/null @@ -1,19 +0,0 @@ -package codechicken.multipart - -/** Interface for parts with random update ticks. Used in conjuction with - * TickScheduler - */ -trait TRandomUpdateTick extends TMultiPart { - - /** Called on random update. Random ticks are between 800 and 1600 ticks from - * their last scheduled/random tick - */ - def randomUpdate() - - /** If implementing interface in java, be sure to implement this method - * yourself - */ - override def onWorldJoin() { - TickScheduler.loadRandomTick(this) - } -} diff --git a/src/main/scala/codechicken/multipart/TScheduledPacketPart.java b/src/main/scala/codechicken/multipart/TScheduledPacketPart.java new file mode 100644 index 0000000..12f189a --- /dev/null +++ b/src/main/scala/codechicken/multipart/TScheduledPacketPart.java @@ -0,0 +1,54 @@ +package codechicken.multipart; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; + +/** + * Mixin interface for parts whose updates are batched through {@link PacketScheduler}. Implementors must also extend + * {@link TMultiPart}; the Scala trait declared that, but a trait extending a class is a bare interface in bytecode. + */ +public interface TScheduledPacketPart extends IScheduledPacketPart { + + /** + * This cannot be a default method: {@link TMultiPart} declares read, and a superclass method always beats an + * interface default, so the default would never run and the part would read a description instead of a mask. Every + * implementor must declare it and delegate to {@link #readMask(TScheduledPacketPart, MCDataInput)}. + * + *
+     * 
+     * @Override
+     * public final void read(MCDataInput packet) {
+     *     TScheduledPacketPart.readMask(this, packet);
+     * }
+     * 
+ */ + void read(MCDataInput packet); + + @Override + default void writeScheduled(long mask, MCDataOutput packet) {} + + @Override + default void readScheduled(long mask, MCDataInput packet) {} + + /** Reads a mask of the part's own width and hands it to readScheduled. */ + static void readMask(TScheduledPacketPart part, MCDataInput packet) { + long mask; + switch (part.maskWidth()) { + case 1: + mask = packet.readUByte(); + break; + case 2: + mask = packet.readUShort(); + break; + case 4: + mask = packet.readInt(); + break; + case 8: + mask = packet.readLong(); + break; + default: + throw new IllegalArgumentException("Invalid maskWidth: " + part.maskWidth()); + } + part.readScheduled(mask, packet); + } +} diff --git a/src/main/scala/codechicken/multipart/TSlottedPart.java b/src/main/scala/codechicken/multipart/TSlottedPart.java new file mode 100644 index 0000000..df5b3ac --- /dev/null +++ b/src/main/scala/codechicken/multipart/TSlottedPart.java @@ -0,0 +1,16 @@ +package codechicken.multipart; + +/** + * Interface for parts that fill a slot based configuration as defined in PartMap. If this is implemented, calling + * partMap(slot) on the host tile will return this part if the corresponding bit in the slotMask is set. + *

+ * Marker interface for TSlottedTile. + *

+ * The Scala trait extended TMultiPart, but a trait extending a class is a bare interface in bytecode, so implementors + * must extend TMultiPart themselves. + */ +public interface TSlottedPart { + + /** A bitmask of slots that this part fills. Slot x is 1<<x. */ + int getSlotMask(); +} diff --git a/src/main/scala/codechicken/multipart/TSlottedPart.scala b/src/main/scala/codechicken/multipart/TSlottedPart.scala deleted file mode 100644 index 192e30d..0000000 --- a/src/main/scala/codechicken/multipart/TSlottedPart.scala +++ /dev/null @@ -1,14 +0,0 @@ -package codechicken.multipart - -/** Interface for parts that fill a slot based configuration as defined in - * PartMap. If this is implemented, calling partMap(slot) on the host tile will - * return this part if the corresponding bit in the slotMask is set - * - * Marker interface for TSlottedTile - */ -trait TSlottedPart extends TMultiPart { - - /** a bitmask of slots that this part fills. slot x is 1< tickChunks = new HashSet<>(); + private boolean processing = false; + private boolean processingChunks = false; + private final List pending = new ArrayList<>(); + private final List pendingMoves = new ArrayList<>(); + + WorldTickScheduler(World world) { + super(world); + } + + void scheduleTick(TMultiPart part, int ticks, boolean random) { + if (processing) { + pending.add(new PartTickEntry(part, schedTime + ticks, random)); + } else { + doScheduleTick(part, schedTime + ticks, random); + } + } + + void doScheduleTick(TMultiPart part, long time, boolean random) { + if (part.tile() != null) { + ((ChunkTickScheduler) getChunkExtension(part.tile().xCoord >> 4, part.tile().zCoord >> 4)) + .scheduleTick(part, time, random); + } + } + + void loadRandom(TRandomUpdateTick part) { + scheduleTick((TMultiPart) part, nextRandomTick(), true); + } + + ChunkTickScheduler chunkScheduler(int chunkX, int chunkZ) { + return (ChunkTickScheduler) getChunkExtension(chunkX, chunkZ); + } + + void moveTile(TileMultipart tile) { + // Chunk tick lists cannot change while a callback is iterating them. + if (processingChunks) { + pendingMoves.add(tile); + } else { + doMoveTile(tile); + } + } + + /** Hands pending entries for the tile's parts to the chunk that now contains it, keeping their deadlines. */ + void doMoveTile(TileMultipart tile) { + ChunkTickScheduler target = chunkScheduler(tile.xCoord >> 4, tile.zCoord >> 4); + if (target == null) { + return; + } + + List moved = new ArrayList<>(); + for (ChunkTickScheduler chunk : JavaConversions.seqAsJavaList(tickChunks.toList())) { + if (chunk != target && chunk.removeEntriesFor(tile, moved) && chunk.tickList.isEmpty()) { + tickChunks.remove(chunk); + } + } + for (PartTickEntry e : moved) { + target.scheduleTick(e.part(), e.time(), e.random()); + } + } + + @Override + public void preTick() { + processing = true; + } + + @Override + public void postTick() { + if (!tickChunks.isEmpty()) { + processingChunks = true; + try { + // Callbacks may unload chunks. Keep the reference's mutation-tolerant Scala traversal. + tickChunks = (Set) tickChunks + .filter(new AbstractFunction1() { + + @Override + public Object apply(ChunkTickScheduler chunk) { + return chunk.processTicks(); + } + }); + } finally { + processingChunks = false; + } + } + + processing = false; + for (PartTickEntry e : pending) { + doScheduleTick(e.part(), e.time(), e.random()); + } + pending.clear(); + for (TileMultipart tile : pendingMoves) { + doMoveTile(tile); + } + pendingMoves.clear(); + + schedTime += 1; + } + + File saveDir() { + // Calling DimensionManager.getCurrentSaveRootDirectory too early breaks game saves, we have a world + // reference, use it + if (world.provider.dimensionId == 0) { + return ((SaveHandler) world.getSaveHandler()).getWorldDirectory(); + } + + return new File(DimensionManager.getCurrentSaveRootDirectory(), world.provider.getSaveFolder()); + } + + File saveFile() { + return new File(saveDir(), "multipart.dat"); + } + + @Override + public void load() { + try (FileInputStream in = new FileInputStream(saveFile())) { + loadTag(CompressedStreamTools.readCompressed(in)); + } catch (Exception e) { + // Keep the world-time fallback for missing or unreadable saved schedules. + loadTag(new NBTTagCompound()); + } + } + + void loadTag(NBTTagCompound tag) { + if (tag.hasKey("schedTime")) { + schedTime = tag.getLong("schedTime"); + } else { + schedTime = world.getTotalWorldTime(); + } + } + + NBTTagCompound saveTag() { + NBTTagCompound tag = new NBTTagCompound(); + tag.setLong("schedTime", schedTime); + return tag; + } + + @Override + public void save() { + try { + File file = saveFile(); + if (!file.getParentFile().exists()) { + file.getParentFile().mkdirs(); + } + if (!file.exists()) { + file.createNewFile(); + } + + DataOutputStream dout = new DataOutputStream(new FileOutputStream(file)); + CompressedStreamTools.writeCompressed(saveTag(), dout); + dout.close(); + } catch (java.io.IOException e) { + throw TickScheduler.rethrow(e); + } + } + + int nextRandomTick() { + return world.rand.nextInt(800) + 800; + } + } + + static class ChunkTickScheduler extends ChunkExtension { + + private List tickList = new ArrayList<>(); + + ChunkTickScheduler(Chunk chunk, WorldTickScheduler world) { + super(chunk, world); + } + + private WorldTickScheduler scheduler() { + return (WorldTickScheduler) world; + } + + long schedTime() { + return scheduler().schedTime; + } + + void scheduleTick(TMultiPart part, long time, boolean random) { + for (PartTickEntry e : tickList) { + if (Objects.equals(e.part(), part)) { + // only override an existing tick if we're going from random to scheduled + if (e.random() && !random) { + e.time_$eq(time); + e.random_$eq(random); + } + return; + } + } + tickList.add(new PartTickEntry(part, time, random)); + if (tickList.size() == 1) { + scheduler().tickChunks.add(this); + } + } + + int nextRandomTick() { + return scheduler().nextRandomTick(); + } + + /** Moves this chunk's entries for parts bound to {@code tile} into {@code out}; returns whether any moved. */ + boolean removeEntriesFor(TileMultipart tile, List out) { + boolean removed = false; + java.util.Iterator it = tickList.iterator(); + while (it.hasNext()) { + PartTickEntry e = it.next(); + if (e.part().tile() == tile) { + out.add(e); + it.remove(); + removed = true; + } + } + return removed; + } + + boolean processTicks() { + List kept = new ArrayList<>(); + for (PartTickEntry e : tickList) { + if (processTick(e)) { + kept.add(e); + } + } + tickList = kept; + return !tickList.isEmpty(); + } + + boolean processTick(PartTickEntry e) { + if (e.time() <= schedTime()) { + if (e.part().tile() != null) { + if (e.random() && e.part() instanceof TRandomUpdateTick) { + ((TRandomUpdateTick) e.part()).randomUpdate(); + } else { + e.part().scheduledTick(); + } + + if (e.part() instanceof TRandomUpdateTick) { + e.time_$eq(schedTime() + nextRandomTick()); + e.random_$eq(true); + return true; + } + } + return false; + } + return true; + } + + @Override + public void saveData(NBTTagCompound data) { + NBTTagList tagList = new NBTTagList(); + for (PartTickEntry e : tickList) { + TMultiPart part = e.part(); + if (part.tile() != null && !e.random()) { + NBTTagCompound tag = new NBTTagCompound(); + tag.setShort("pos", (short) MultipartProxy.indexInChunk(new BlockCoord(part.tile()))); + tag.setByte("i", (byte) part.tile().partList().indexOf(part)); + tag.setLong("time", e.time()); + tagList.appendTag(tag); + } + } + if (tagList.tagCount() > 0) { + data.setTag("multipartTicks", tagList); + } + } + + @Override + public void loadData(NBTTagCompound data) { + tickList.clear(); + if (!data.hasKey("multipartTicks")) { + return; + } + + NBTTagList tagList = data.getTagList("multipartTicks", 10); + ChunkCoordIntPair cc = new ChunkCoordIntPair(0, 0); + for (int i = 0; i < tagList.tagCount(); i++) { + NBTTagCompound tag = tagList.getCompoundTagAt(i); + BlockCoord pos = MultipartProxy.indexInChunk(cc, tag.getShort("pos")); + Object tile = chunk.chunkTileEntityMap.get(new ChunkPosition(pos.x, pos.y, pos.z)); + if (tile instanceof TileMultipart) { + TMultiPart part = ((TileMultipart) tile).partFromSavedIndex(tag.getByte("i") & 0xFF); + if (part != null) { + tickList.add(new PartTickEntry(part, tag.getLong("time"), false)); + } + } + } + if (!tickList.isEmpty()) { + scheduler().tickChunks.add(this); + } + } + + @Override + public void unload() { + if (!tickList.isEmpty()) { + scheduler().tickChunks.remove(this); + } + } + } + + public static WorldExtension createWorldExtension(World world) { + return new WorldTickScheduler(world); + } + + @SuppressWarnings("unchecked") + private static RuntimeException rethrow(Throwable throwable) throws T { + throw (T) throwable; + } + + public static ChunkExtension createChunkExtension(Chunk chunk, WorldExtension world) { + return new ChunkTickScheduler(chunk, (WorldTickScheduler) world); + } + + public static WorldExtension getExtension(World world) { + return TickScheduler$.MODULE$.getExtension(world); + } + + /** Start random ticking for a part. Should be called from TMultiPart.onWorldJoin. */ + public static void loadRandomTick(TRandomUpdateTick part) { + TMultiPart multiPart = (TMultiPart) part; + ((WorldTickScheduler) getExtension(multiPart.tile().getWorldObj())).loadRandom(part); + } + + /** + * Hands pending scheduled and random ticks of the tile's parts to the chunk that now contains it, keeping their + * deadlines. Called from {@link TileMultipart#onMoved()} after the tile's coordinates change; same-world moves + * only. + */ + public static void onTileMoved(TileMultipart tile) { + World world = tile.getWorldObj(); + if (world == null || world.isRemote) { + return; + } + WorldExtension extension = getExtension(world); + if (extension instanceof WorldTickScheduler) { + ((WorldTickScheduler) extension).moveTile(tile); + } + } + + /** Schedule a tick for part relative to the current time. */ + public static void scheduleTick(TMultiPart part, int ticks) { + ((WorldTickScheduler) getExtension(part.tile().getWorldObj())).scheduleTick(part, ticks, false); + } + + /** + * Returns the current scheduler time. Like the world time, but unaffected by the time set command and other things + * changing time of day. + * + * @deprecated in favor of world.getTotalWorldTime + */ + @Deprecated + public static long getSchedulerTime(World world) { + return ((WorldTickScheduler) getExtension(world)).schedTime; + } +} diff --git a/src/main/scala/codechicken/multipart/TickScheduler.scala b/src/main/scala/codechicken/multipart/TickScheduler.scala deleted file mode 100644 index 1ee1796..0000000 --- a/src/main/scala/codechicken/multipart/TickScheduler.scala +++ /dev/null @@ -1,259 +0,0 @@ -package codechicken.multipart - -import codechicken.lib.world.WorldExtensionInstantiator -import codechicken.lib.world.WorldExtension -import codechicken.lib.world.ChunkExtension -import net.minecraft.world.chunk.Chunk -import net.minecraft.world.World -import net.minecraft.nbt.{NBTTagCompound, NBTTagList, CompressedStreamTools} -import scala.collection.mutable.ListBuffer -import codechicken.lib.vec.BlockCoord -import net.minecraft.world.ChunkCoordIntPair -import net.minecraft.world.ChunkPosition -import scala.collection.mutable.HashSet -import java.io.DataOutputStream -import net.minecraftforge.common.DimensionManager -import java.io.File -import java.io.FileOutputStream -import java.io.FileInputStream -import net.minecraft.world.storage.SaveHandler - -/** Used for scheduling delayed callbacks to parts. Do not use this for redstone - * applications that require precise timing. If 2 parts are both scheduled for - * an update on the same tick, there is no guarantee which one will update - * first. These parts should not depend on a state of another part that may - * have changed before/after them. - */ -object TickScheduler extends WorldExtensionInstantiator { - class PartTickEntry( - val part: TMultiPart, - var time: Long, - var random: Boolean - ) { - def this(part: TMultiPart, ticks: Int) = this(part, ticks, false) - } - - private class WorldTickScheduler(world$ : World) - extends WorldExtension(world$) { - var schedTime = 0L - var tickChunks = HashSet[ChunkTickScheduler]() - private var processing = false - private val pending = ListBuffer[PartTickEntry]() - - def scheduleTick(part: TMultiPart, ticks: Int, random: Boolean) { - if (processing) - pending += new PartTickEntry(part, schedTime + ticks, random) - else - _scheduleTick(part, schedTime + ticks, random) - } - - def _scheduleTick(part: TMultiPart, time: Long, random: Boolean) { - if (part.tile != null) - getChunkExtension(part.tile.xCoord >> 4, part.tile.zCoord >> 4) - .asInstanceOf[ChunkTickScheduler] - .scheduleTick(part, time, random) - } - - def loadRandom(part: TRandomUpdateTick) = - scheduleTick(part, nextRandomTick, true) - - override def preTick() { - processing = true - } - - override def postTick() { - if (!tickChunks.isEmpty) - tickChunks = tickChunks.filter(_.processTicks()) - - processing = false - pending.foreach(e => _scheduleTick(e.part, e.time, e.random)) - pending.clear() - - schedTime += 1 - } - - def saveDir: File = { - if ( - world.provider.dimensionId == 0 - ) // Calling DimensionManager.getCurrentSaveRootDirectory too early breaks game saves, we have a world reference, use it - return world.getSaveHandler.asInstanceOf[SaveHandler].getWorldDirectory - - return new File( - DimensionManager.getCurrentSaveRootDirectory, - world.provider.getSaveFolder - ) - } - - def saveFile: File = new File(saveDir, "multipart.dat") - - override def load() { - try { - val in = new FileInputStream(saveFile) - loadTag(CompressedStreamTools.readCompressed(in)) - in.close() - } catch { - case e: Exception => - } - - loadTag(new NBTTagCompound) - } - - def loadTag(tag: NBTTagCompound) { - if (tag.hasKey("schedTime")) - schedTime = tag.getLong("schedTime") - else - schedTime = world.getTotalWorldTime - } - - def saveTag: NBTTagCompound = { - val tag = new NBTTagCompound - tag.setLong("schedTime", schedTime) - return tag - } - - override def save() { - val file = saveFile - if (!file.getParentFile.exists) - file.getParentFile.mkdirs() - if (!file.exists) - file.createNewFile() - - val dout = new DataOutputStream(new FileOutputStream(file)) - CompressedStreamTools.writeCompressed(saveTag, dout) - dout.close() - } - - def nextRandomTick = world.rand.nextInt(800) + 800 - } - - def createWorldExtension(world: World): WorldExtension = - new WorldTickScheduler(world) - - private class ChunkTickScheduler(chunk$ : Chunk, world: WorldTickScheduler) - extends ChunkExtension(chunk$, world) { - import codechicken.multipart.handler.MultipartProxy._ - - var tickList = ListBuffer[PartTickEntry]() - - def schedTime = world.schedTime - - def scheduleTick(part: TMultiPart, time: Long, random: Boolean) { - val it = tickList.iterator - while (it.hasNext) { - val e = it.next() - if (e.part == part) { - if ( - e.random && !random - ) // only override an existing tick if we're going from random->scheduled - { - e.time = time - e.random = random - } - return - } - } - tickList += new PartTickEntry(part, time, random) - if (tickList.size == 1) - world.tickChunks += this - } - - def nextRandomTick = world.nextRandomTick - - def processTicks(): Boolean = { - tickList = tickList.filter(processTick) - return !tickList.isEmpty - } - - def processTick(e: PartTickEntry): Boolean = { - if (e.time <= schedTime) { - if (e.part.tile != null) { - if (e.random && e.part.isInstanceOf[TRandomUpdateTick]) - e.part.asInstanceOf[TRandomUpdateTick].randomUpdate() - else - e.part.scheduledTick() - - if (e.part.isInstanceOf[TRandomUpdateTick]) { - e.time = schedTime + nextRandomTick - e.random = true - return true - } - } - return false - } - return true - } - - override def saveData(data: NBTTagCompound) { - val tagList = new NBTTagList - tickList.foreach { e => - val part = e.part - if (part.tile != null && !e.random) { - val tag = new NBTTagCompound - tag.setShort("pos", indexInChunk(new BlockCoord(part.tile)).toShort) - tag.setByte("i", part.tile.partList.indexOf(part).toByte) - tag.setLong("time", e.time) - tagList.appendTag(tag) - } - } - if (tagList.tagCount > 0) - data.setTag("multipartTicks", tagList) - } - - override def loadData(data: NBTTagCompound) { - tickList.clear() - if (!data.hasKey("multipartTicks")) - return - - val tagList = data.getTagList("multipartTicks", 10) - val cc = new ChunkCoordIntPair(0, 0) - for (i <- 0 until tagList.tagCount) { - val tag = tagList.getCompoundTagAt(i) - val pos = indexInChunk(cc, tag.getShort("pos")) - val tile = - chunk.chunkTileEntityMap.get(new ChunkPosition(pos.x, pos.y, pos.z)) - if (tile.isInstanceOf[TileMultipart]) - tickList += new PartTickEntry( - tile.asInstanceOf[TileMultipart].partList(tag.getByte("i")), - tag.getLong("time"), - false - ) - } - } - - override def unload() { - if (!tickList.isEmpty) - world.tickChunks -= this - } - } - - def createChunkExtension( - chunk: Chunk, - world: WorldExtension - ): ChunkExtension = - new ChunkTickScheduler(chunk, world.asInstanceOf[WorldTickScheduler]) - - /** Start random ticking for a part. Should be called from - * TMultiPart.onWorldJoin - */ - def loadRandomTick(part: TRandomUpdateTick) { - getExtension(part.tile.getWorldObj) - .asInstanceOf[WorldTickScheduler] - .loadRandom(part) - } - - /** Schedule a tick for part relative to the current time. - */ - def scheduleTick(part: TMultiPart, ticks: Int) { - getExtension(part.tile.getWorldObj) - .asInstanceOf[WorldTickScheduler] - .scheduleTick(part, ticks, false) - } - - /** Returns the current scheduler time. Like the world time, but unaffected by - * the time set command and other things changing time of day. Deprecated in - * favor of world.getTotalWorldTime - */ - @Deprecated - def getSchedulerTime(world: World): Long = - getExtension(world).asInstanceOf[WorldTickScheduler].schedTime -} diff --git a/src/main/scala/codechicken/multipart/TileCache.java b/src/main/scala/codechicken/multipart/TileCache.java new file mode 100644 index 0000000..7645312 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TileCache.java @@ -0,0 +1,82 @@ +package codechicken.multipart; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.world.World; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.handler.MultipartProxy; + +/** + * In order to maintain tight client/server synchronisation without bandwidth overhead, all data written must be read. + * Sometimes the client tile is removed from the chunk before the packet arrives. This class maintains a reference to + * all multipart tiles. The original design placed tiles that were invalidated into a map that was cleared upon arrival + * of the update packet. Due to other factors that have eluded identification, references to all tiles held until they + * are replaced or the world is reloaded. + */ +public final class TileCache { + + private static final Map map = new HashMap<>(); + + private TileCache() {} + + public static Map map() { + return map; + } + + public static void add(TileMultipart t) { + map.put(new BlockCoord(t), new FlaggedTile(t, false)); + } + + public static void remove(TileMultipart t) { + map.put(new BlockCoord(t), new FlaggedTile(t, true)); + } + + public static FlaggedTile apply(BlockCoord c) { + return map.get(c); + } + + public static void clear() { + map.clear(); + } + + public static TileMultipart findTile(World world, BlockCoord c) { + TileMultipart inWorld = BlockMultipart.getTile(world, c.x, c.y, c.z); + if (inWorld != null) { + return inWorld; + } + + FlaggedTile entry = map.get(c); + if (entry == null) { + throw new RuntimeException("DC: Client multipart @" + c + " not found"); + } + + // A tile flagged removed is still returned; the flag only says the warning is expected. + if (!entry.removed()) { + MultipartProxy.logger().warn( + "Client multipart @" + c + + " vanished from world but was recovered. If possible causes can be identified, please report to the github issue tracker."); + } + return entry.t(); + } + + public static final class FlaggedTile { + + private final TileMultipart t; + private final boolean removed; + + public FlaggedTile(TileMultipart t, boolean removed) { + this.t = t; + this.removed = removed; + } + + public TileMultipart t() { + return t; + } + + public boolean removed() { + return removed; + } + } +} diff --git a/src/main/scala/codechicken/multipart/TileCache.scala b/src/main/scala/codechicken/multipart/TileCache.scala deleted file mode 100644 index 07402c4..0000000 --- a/src/main/scala/codechicken/multipart/TileCache.scala +++ /dev/null @@ -1,46 +0,0 @@ -package codechicken.multipart - -import codechicken.lib.vec.BlockCoord -import scala.collection.mutable.{Map => MMap} -import net.minecraft.world.World -import codechicken.multipart.handler.MultipartProxy - -/** In order to maintain tight client/server synchronisation without bandwidth - * overhead, all data written must be read. Sometimes the client tile is - * removed from the chunk before the packet arrives. This class maintains a - * reference to all multipart tiles. The original design placed tiles that were - * invalidated into a map that was cleared upon arrival of the update packet. - * Due to other factors that have eluded identification, references to all - * tiles held until they are replaced or the world is reloaded. - */ -object TileCache { - case class FlaggedTile(t: TileMultipart, removed: Boolean) - - val map = MMap[BlockCoord, FlaggedTile]() - - def add(t: TileMultipart) = map.put(new BlockCoord(t), FlaggedTile(t, false)) - def remove(t: TileMultipart) = - map.put(new BlockCoord(t), FlaggedTile(t, true)) - def apply(c: BlockCoord) = map.get(c) - def clear() = map.clear() - - def findTile(world: World, c: BlockCoord) = - BlockMultipart.getTile(world, c.x, c.y, c.z) match { - case null => - apply(c) match { - case Some(FlaggedTile(t, rem)) => - if (!rem) - MultipartProxy.logger.warn( - "Client multipart @" + c + " vanished from world but was recovered. If possible causes can be identified, please report to the github issue tracker." - ) - t - case None => - throw new RuntimeException( - "DC: Client multipart @" + c + " not found" - ) - case _ => - null - } - case t => t - } -} diff --git a/src/main/scala/codechicken/multipart/TileConversionResult.java b/src/main/scala/codechicken/multipart/TileConversionResult.java new file mode 100644 index 0000000..a775a26 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TileConversionResult.java @@ -0,0 +1,29 @@ +package codechicken.multipart; + +/** + * Immutable outcome of a tile lookup. The referenced tile remains mutable; this result does not track later world + * changes or own the tile's lifecycle. Obtain results through {@link TileMultipart#getOrConvertTileResult}. + */ +public final class TileConversionResult { + + private final TileMultipart tile; + private final boolean converted; + + TileConversionResult(TileMultipart tile, boolean converted) { + this.tile = tile; + this.converted = converted; + } + + /** Returns the existing tile or converted placeholder, or null if neither is available. */ + public TileMultipart getTile() { + return tile; + } + + /** + * Returns true only when this lookup created a converted placeholder. Such a tile has a bound part, world and + * coordinates, but has not been installed in the world. False covers both an existing tile and a null tile. + */ + public boolean isConverted() { + return converted; + } +} diff --git a/src/main/scala/codechicken/multipart/TileMultipart$.java b/src/main/scala/codechicken/multipart/TileMultipart$.java new file mode 100644 index 0000000..a4193f8 --- /dev/null +++ b/src/main/scala/codechicken/multipart/TileMultipart$.java @@ -0,0 +1,78 @@ +package codechicken.multipart; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Vector3; +import scala.Tuple2; + +/** + * Scala companion singleton. Retained because compiled Scala consumers read MODULE$ and call these instance methods. + */ +public final class TileMultipart$ { + + public static final TileMultipart$ MODULE$ = new TileMultipart$(); + + private TileMultipart$() {} + + /** @deprecated Use {@link TileMultipart#getRenderID()}. Retained for compiled companion callers. */ + @Deprecated + public int renderID() { + return TileMultipart.renderID(); + } + + /** @deprecated Use {@link TileMultipart#setRenderID(int)}. Retained for compiled companion callers. */ + @Deprecated + public void renderID_$eq(int value) { + TileMultipart.renderID_$eq(value); + } + + public TileMultipart getOrConvertTile(World world, BlockCoord pos) { + return TileMultipart.getOrConvertTile(world, pos); + } + + /** @deprecated Use {@link TileMultipart#getOrConvertTileResult(World, BlockCoord)}. */ + @Deprecated + public Tuple2 getOrConvertTile2(World world, BlockCoord pos) { + return TileMultipart.getOrConvertTile2(world, pos); + } + + public TileMultipart getTile(World world, BlockCoord pos) { + return TileMultipart.getTile(world, pos); + } + + public boolean checkNoEntityCollision(World world, BlockCoord pos, TMultiPart part) { + return TileMultipart.checkNoEntityCollision(world, pos, part); + } + + public boolean canPlacePart(World world, BlockCoord pos, TMultiPart part) { + return TileMultipart.canPlacePart(world, pos, part); + } + + public boolean replaceable(World world, BlockCoord pos) { + return TileMultipart.replaceable(world, pos); + } + + public TileMultipart addPart(World world, BlockCoord pos, TMultiPart part) { + return TileMultipart.addPart(world, pos, part); + } + + public void handleDescPacket(World world, BlockCoord pos, PacketCustom packet) { + TileMultipart.handleDescPacket(world, pos, packet); + } + + public void handlePacket(BlockCoord pos, World world, int i, PacketCustom packet) { + TileMultipart.handlePacket(pos, world, i, packet); + } + + public TileMultipart createFromNBT(NBTTagCompound tag) { + return TileMultipart.createFromNBT(tag); + } + + public void dropItem(ItemStack stack, World world, Vector3 pos) { + TileMultipart.dropItem(stack, world, pos); + } +} diff --git a/src/main/scala/codechicken/multipart/TileMultipart.java b/src/main/scala/codechicken/multipart/TileMultipart.java new file mode 100644 index 0000000..68d490e --- /dev/null +++ b/src/main/scala/codechicken/multipart/TileMultipart.java @@ -0,0 +1,1048 @@ +package codechicken.multipart; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.function.Consumer; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Vec3; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.lib.world.IChunkLoadTile; +import codechicken.multipart.handler.MultipartCompatiblity; +import codechicken.multipart.handler.MultipartProxy; +import codechicken.multipart.handler.MultipartSPH; +import scala.Function1; +import scala.Tuple2; +import scala.collection.Iterator; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.runtime.AbstractFunction1; +import scala.runtime.BoxedUnit; + +public class TileMultipart extends TileEntity implements IChunkLoadTile { + + /** List of parts in this tile space. */ + private Seq partList = emptyParts(); + + private boolean doesTick = false; + + // Original NBT indices are needed until chunk tick data has been restored. + private int[] loadedPartIndices; + + TMultiPart partFromSavedIndex(int index) { + if (loadedPartIndices != null) { + if (index < 0 || index >= loadedPartIndices.length) return null; + index = loadedPartIndices[index]; + } + return index >= 0 && index < partList().size() ? partList().apply(index) : null; + } + + /** + * @deprecated Use {@link #jPartList()} for Java collection access. Retained as the virtual storage accessor for + * existing subclasses and binaries. + */ + @Deprecated + public Seq partList() { + return partList; + } + + /** + * @deprecated Use {@link #setPartList(List)} for Java storage assignment. This legacy hook retains the exact + * supplied sequence, including mutable storage or null; existing overrides remain supported. + */ + @Deprecated + public void partList_$eq(Seq parts) { + partList = parts; + } + + /** + * Assigns a shallow, immutable copy of the supplied list through the legacy {@link #partList_$eq(Seq)} hook. + * Preserves order, duplicate entries and part identities. Later list edits do not affect the stored sequence. + * + *

+ * This is low-level storage assignment for reconstruction. It does not bind parts, rebuild trait caches, change + * ticking or send notifications. Use {@link #loadPartList(Collection)} to load a correctly prepared composite tile; + * use {@link #addPart(World, BlockCoord, TMultiPart)} / {@link #remPart(TMultiPart)} for normal world changes. + * Existing setter overrides can customize storage. Internal writes still call the legacy hook directly. + * + * @param parts list to copy; null preserves the legacy unset-state sentinel, and null entries are not validated + */ + public void setPartList(List parts) { + partList_$eq(parts == null ? null : toSeq(parts)); + } + + /** + * Internal FMP composite-transition hook: copies trait state, then rebinds the stored parts. Not a consumer entry + * point. + */ + public void from(TileMultipart that) { + copyFrom(that); + loadFrom(that); + } + + /** + * Internal FMP composite-transition hook; do not call directly from consumers. + * + * This method should be used for copying all the data from the fields in that container tile. This method will be + * automatically generated on java tile traits with fields if it is not overridden. + */ + public void copyFrom(TileMultipart that) { + partList_$eq(that.partList()); + doesTick = that.doesTick; + } + + /** + * Internal FMP composite-transition hook: rebinds this tile's stored parts and restores ticking after state copy. + * For consumer reconstruction, use {@link #loadPartList(Collection)} on a prepared composite instead. + */ + public void loadFrom(TileMultipart that) { + Iterator iterator = partList().iterator(); + while (iterator.hasNext()) { + iterator.next().bind(this); + } + if (doesTick) { + doesTick = false; + setTicking(true); + } + } + + /** Overidden in TSlottedTile when a part that goes in a slot is added. */ + public TMultiPart partMap(int slot) { + return null; + } + + /** + * Returns an ordered Java view of the sequence returned by {@link #partList()} at this call. Includes detached + * parts; replacing the tile's sequence does not update an existing view. Normally the sequence is immutable, but a + * mutable sequence supplied through the legacy setter remains live through this view. + * + *

+ * Treat the view as read-only: list edits do not perform multipart binding, notifications or synchronization. Use + * {@link #addPart(World, BlockCoord, TMultiPart)} and {@link #remPart(TMultiPart)} for world changes. Copy into an + * {@link ArrayList} when independent list storage is needed; the parts themselves remain shared. + * + * @return a view of the captured sequence, with its original order and part identities + */ + public List jPartList() { + return JavaConversions.seqAsJavaList(partList()); + } + + /** + * Visits parts in sequence order, skipping those whose {@link TMultiPart#tile()} is null when reached. Delegates + * through the legacy {@link #operate(Function1)} hook, so existing overrides still control traversal. + * + *

+ * The default hook captures {@link #partList()} once. Normal additions publish a new sequence and are not visited + * by the current call; parts detached or rebound to another tile by an earlier callback are skipped. Legacy mutable + * sequences retain their own iterator behavior and must not be structurally edited during traversal. Each nested + * call captures its own sequence. Callback exceptions propagate immediately, stopping the current traversal. + * + *

+ * Call on the game thread. Lifecycle callbacks continue to dispatch through {@code operate}, not through overrides + * of this convenience method. With the default hook, a null callback fails only when a bound part is visited. + * + * @param consumer action to apply to each visited part + */ + public void forEachPart(Consumer consumer) { + operate(action(consumer)); + } + + @Override + public boolean canUpdate() { + return doesTick; + } + + /** + * Legacy traversal hook, also used by multipart lifecycle callbacks. + * + * @deprecated Call {@link #forEachPart(Consumer)} from Java. Existing overrides remain supported and intercept both + * that API and lifecycle callbacks; keep such overrides here while this compatibility hook is retained. + */ + @Deprecated + // Direct list traversal avoids measured iterator/wrapper allocations; the setter also accepts other Seq types. + @SuppressWarnings("unchecked") + public void operate(Function1 f) { + Seq current = partList(); + if (!(current instanceof scala.collection.immutable.List)) { + scala.collection.Iterator iterator = current.iterator(); + while (iterator.hasNext()) { + applyIfBound(f, iterator.next()); + } + return; + } + + scala.collection.immutable.List list = (scala.collection.immutable.List) current; + while (!list.isEmpty()) { + TMultiPart p = list.head(); + list = (scala.collection.immutable.List) list.tail(); + applyIfBound(f, p); + } + } + + private void applyIfBound(Function1 f, TMultiPart p) { + // A replaced tile can still receive queued callbacks after its parts have moved. + if (p.tile() == this) { + f.apply(p); + } + } + + @Override + public void updateEntity() { + operate(action(TMultiPart::update)); + } + + @Override + public void onChunkUnload() { + operate(action(TMultiPart::onChunkUnload)); + } + + @Override + public void onChunkLoad() { + loadedPartIndices = null; + operate(action(TMultiPart::onChunkLoad)); + } + + /** Internal FMP validity update that bypasses multipart lifecycle callbacks. Not a consumer entry point. */ + public final void setValid(boolean b) { + if (b) { + super.validate(); + } else { + super.invalidate(); + } + } + + public void onMoved() { + TickScheduler.onTileMoved(this); + operate(action(TMultiPart::onMoved)); + } + + @Override + public void invalidate() { + if (!isInvalid()) { + super.invalidate(); + if (worldObj != null) { + Iterator iterator = partList().iterator(); + while (iterator.hasNext()) { + iterator.next().onWorldSeparate(); + } + if (worldObj.isRemote) { + TileCache.remove(this); + } + } + } + } + + @Override + public void validate() { + super.validate(); + + if (worldObj != null && worldObj.isRemote) { + TileCache.add(this); + } + } + + /** + * Called by parts when they have changed in some form that affects the world. Notifies neighbor blocks, the world + * and parts that share this host and recalculates lighting. + */ + public void notifyPartChange(TMultiPart part) { + internalPartChange(part); + + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, MultipartProxy.block()); + worldObj.func_147451_t(xCoord, yCoord, zCoord); + } + + /** + * Supported consumer API for local part-change notifications, used by ProjectRed. Calls + * {@link TMultiPart#onPartChanged(TMultiPart)} through the retained {@link #operate(Function1)} hook. Its base + * traversal captures the current list/order and visits only parts still bound to this tile at callback time. Parts + * equal to {@code part} (using {@code part.equals(p)}) are excluded; null broadcasts to all eligible parts. + * Callback failures propagate and stop traversal. + * + * This method does not mark the tile dirty, send updates or notify neighboring blocks/lighting. Keep the caller's + * synchronization and external-notification policy, or use {@link #notifyPartChange(TMultiPart)} when world + * notifications are needed as well. + */ + public void internalPartChange(TMultiPart part) { + operate(action(p -> { + if (part == null ? p != null : !part.equals(p)) { + p.onPartChanged(part); + } + })); + } + + /** Notifies all parts not in the passed collection of a change from all the parts in the collection. */ + public void multiPartChange(Collection parts) { + operate(action(p -> { + if (!parts.contains(p)) { + for (TMultiPart changed : parts) { + p.onPartChanged(changed); + } + } + })); + } + + /** Notifies neighboring blocks that this tile has changed. */ + public void notifyTileChange() { + worldObj.func_147453_f(xCoord, yCoord, zCoord, MultipartProxy.block()); + } + + public void onNeighborBlockChange() { + operate(action(TMultiPart::onNeighborChanged)); + } + + /** Blank implementation, overriden by TTileChangeTile. */ + public void onNeighborTileChange(int tileX, int tileY, int tileZ) {} + + /** Blank implementation, overriden by TTileChangeTile. */ + public boolean getWeakChanges() { + return false; + } + + @SuppressWarnings("unchecked") + public int getLightValue() { + if (partList().isEmpty()) { + return 0; + } + int max = 0; + Seq current = partList(); + if (!(current instanceof scala.collection.immutable.List)) { + Iterator iterator = current.iterator(); + while (iterator.hasNext()) { + max = Math.max(max, iterator.next().getLightValue()); + } + return max; + } + + scala.collection.immutable.List list = (scala.collection.immutable.List) current; + while (!list.isEmpty()) { + max = Math.max(max, list.head().getLightValue()); + list = (scala.collection.immutable.List) list.tail(); + } + return max; + } + + public float getExplosionResistance(Entity entity) { + Seq current = partList(); + if (current.isEmpty()) { + // Matches the reference, where max on an empty view throws. + throw new UnsupportedOperationException("empty.max"); + } + float max = Float.NEGATIVE_INFINITY; + Iterator iterator = current.iterator(); + while (iterator.hasNext()) { + max = Math.max(max, iterator.next().explosionResistance(entity)); + } + return max; + } + + /** Callback for parts to mark the chunk as needs saving. */ + @Override + public void markDirty() { + worldObj.markTileEntityChunkModified(xCoord, yCoord, zCoord, this); + } + + /** Mark this block space for a render update. */ + public void markRender() { + worldObj.func_147479_m(xCoord, yCoord, zCoord); + } + + /** Stable class-call target for the flag getter generated by the TileMultipartClient runtime interface. */ + public boolean hasDynamicParts() { + return false; + } + + /** Client render hook overridden by generated tiles carrying TileMultipartClient. */ + public boolean renderStatic(IBlockAccess world, Vector3 position, RenderBlocks renderer) { + return false; + } + + /** Client render hook overridden by generated tiles carrying TileMultipartClient. */ + public void renderDynamic(Vector3 position, float frame, int pass) {} + + /** Client particle hook overridden by generated tiles carrying TRandomDisplayTickTile. */ + public void randomDisplayTick(Random random) {} + + /** Helper function for calling a second level notify on a side (eg indirect power from a lever). */ + public void notifyNeighborChange(int side) { + BlockCoord pos = new BlockCoord(this).offset(side); + worldObj.notifyBlocksOfNeighborChange(pos.x, pos.y, pos.z, MultipartProxy.block()); + } + + public boolean isSolid(int side) { + TMultiPart part = partMap(side); + return part instanceof TFacePart && ((TFacePart) part).solid(side); + } + + public boolean canPlaceTorchOnTop() { + Iterator iterator = partList().iterator(); + while (iterator.hasNext()) { + if (iterator.next().canPlaceTorchOnTop()) { + return true; + } + } + return isSolid(1); + } + + private void setTicking(boolean tick) { + if (doesTick == tick) { + return; + } + + doesTick = tick; + if (worldObj != null && worldObj.getTileEntity(xCoord, yCoord, zCoord) == this) { + if (tick) { + worldObj.addTileEntity(this); + } else { + worldObj.func_147457_a(this); + } + } + } + + /** Returns true if part can be added to this space. */ + public boolean canAddPart(TMultiPart part) { + return compatibilityAllows(worldObj, xCoord, yCoord, zCoord) && !partList().contains(part) + && occlusionTest(partList(), part); + } + + /** + * Returns true if opart can be replaced with npart (note opart and npart may be the exact same object). + *

+ * This function should be used for testing if a part can change it's shape (eg. rotation, expansion, cable + * connection). For example, to test whether a cable part can connect to it's neighbor: set the cable part's + * bounding boxes as if the connection is established, call canReplacePart(part, part), and if it succeeds perform + * the connection, else revert the bounding box. + */ + public boolean canReplacePart(TMultiPart opart, TMultiPart npart) { + List olist = new ArrayList<>(); + Iterator iterator = partList().iterator(); + while (iterator.hasNext()) { + TMultiPart part = iterator.next(); + if (part == null ? opart != null : !part.equals(opart)) { + olist.add(part); + } + } + Seq others = toSeq(olist); + if (others.contains(npart)) { + return false; + } + + return occlusionTest(others, npart); + } + + /** + * Tests a candidate against a shallow snapshot of the supplied parts through the legacy + * {@link #occlusionTest(Seq, TMultiPart)} hook, including generated partial-occlusion overrides. Preserves + * collection iteration order, duplicates and part identities; changes to the caller's collection during callbacks + * do not change this query's sequence. + * + *

+ * The default hook calls each existing part's occlusion test first, then the candidate's reverse test, stopping + * immediately on rejection or an exception. It includes detached parts and does not exclude the candidate itself. + * Part objects remain shared, so callback changes to their state are visible. Existing overrides may add checks. + * + *

+ * This tests the supplied geometry, not full placement validity: it does not select tile capabilities, check + * placement permissions or slot occupancy, bind parts or change stored parts. Use the appropriate composite tile + * for the candidate's capabilities; use {@link #canAddPart(TMultiPart)} / + * {@link #canReplacePart(TMultiPart, TMultiPart)} for normal tile checks. Those methods still dispatch directly + * through the legacy hook. + * + * @param parts parts to copy before dispatch; null fails before calling the legacy hook + * @param candidate part to test; no eager null check, so the default hook accepts null against an empty collection + * @return true when all applicable occlusion checks allow the candidate + */ + public boolean testOcclusion(Collection parts, TMultiPart candidate) { + return occlusionTest(toSeq(new ArrayList<>(parts)), candidate); + } + + /** + * Returns true if parts do not occlude npart. + * + * @deprecated Call {@link #testOcclusion(Collection, TMultiPart)} from Java. Retained as the virtual hook for + * existing subclasses, generated traits and tile placement/replacement checks; its sequence behavior is + * unchanged. + */ + @Deprecated + public boolean occlusionTest(Seq parts, TMultiPart npart) { + for (TMultiPart part : JavaConversions.seqAsJavaList(parts)) { + if (!part.occlusionTest(npart) || !npart.occlusionTest(part)) { + return false; + } + } + return true; + } + + /** Get the write stream for updates to part. */ + public MCDataOutput getWriteStream(TMultiPart part) { + return writeStream().writeByte(partList().indexOf(part)); + } + + private MCDataOutput writeStream() { + return MultipartSPH.getTileStream(worldObj, new BlockCoord(this)); + } + + /** + * Internal FMP placement lifecycle and synchronization hook. Consumers use + * {@link #addPart(World, BlockCoord, TMultiPart)} so composite selection and world installation also run. + */ + public void addPart_impl(TMultiPart part) { + if (!worldObj.isRemote) { + writeAddPart(part); + } + + addPart_do(part); + part.onAdded(); + partAdded(part); + notifyPartChange(part); + notifyTileChange(); + markDirty(); + markRender(); + } + + /** Internal FMP add-part packet writer; not a consumer entry point. Use the public placement API. */ + public void writeAddPart(TMultiPart part) { + MCDataOutput stream = writeStream().writeByte(253); + MultiPartRegistry.writePartID(stream, part); + part.writeDesc(stream); + } + + /** + * Internal FMP storage/cache/binding step, without the complete placement lifecycle. Consumers use + * {@link #addPart(World, BlockCoord, TMultiPart)} or {@link #loadPartList(Collection)} for prepared reconstruction. + */ + public void addPart_do(TMultiPart part) { + if (partList().size() >= 250) { + throw new AssertionError( + "assertion failed: Tried to add more than 250 parts to the one tile. You're doing it wrong"); + } + + List next = mutablePartsSnapshot(); + next.add(part); + partList_$eq(toSeq(next)); + bindPart(part); + part.bind(this); + + if (!doesTick && part.doesTick()) { + setTicking(true); + } + } + + /** + * Supported advanced consumer API and trait override hook for adding a part to this tile's capability caches. The + * base implementation is empty; generated traits supply cache behavior. Does not insert the part into the part + * list, change {@link TMultiPart#tile()}, run placement callbacks or send notifications. + * + * OpenComputers uses this to refresh a changed slot mask after clearing that part's old slot entries. Rebinding + * alone does not clear obsolete slots, and other traits may append cache entries on every call; this is not a + * general-purpose idempotent refresh. Only use it with known capability/cache semantics. For placement use + * {@link #addPart(World, BlockCoord, TMultiPart)}; for full reconstruction use {@link #loadPartList(Collection)}. + */ + public void bindPart(TMultiPart part) {} + + /** + * Refreshes the generated slot cache after an already stored part changes its {@link TSlottedPart#getSlotMask()}. + * Generated slotted tiles remove every cached entry equal to {@code part}, then dispatch + * {@link #bindPart(TMultiPart)} once to add its current slots. A tile without the slotted capability does nothing. + * + *

+ * This does not validate placement, insert or bind the part, change the stored list, send notifications, mark the + * tile dirty/renderable or schedule updates. Call only after the part has validated its new shape and updated its + * mask, on the owning world thread. The part normally remains stored and bound to this tile; no eager validation is + * added. Other generated bind hooks also run, so callers must retain their existing cache-specific assumptions and + * perform their own notifications afterward. + */ + public void refreshPartSlots(TMultiPart part) {} + + /** + * Recomputes the generated inventory's flattened slot mapping after an inventory part already stored in this tile + * changes its {@link net.minecraft.inventory.IInventory#getSizeInventory()}. Tiles holding an {@code IInventory} + * part rebuild the mapping in part order; a tile without the inventory capability does nothing. + * + *

+ * Adding, removing and loading parts already rebuild the mapping; call this only for a size change FMP cannot see. + * It does not add or remove inventories, move items, mark the tile dirty or notify neighbors. Callers keep their + * own notifications afterward. Replaces direct calls to the generated {@code TIInventoryTile.rebuildSlotMap()}. + */ + public void refreshInventorySlots() {} + + /** Internal FMP placement callback for trait overrides; do not call directly from consumers. */ + public void partAdded(TMultiPart part) {} + + /** + * Removes part from this tile. Note that due to the operation sync, the part may not be removed until the call + * stack has been passed to all other parts in the space. + */ + public TileMultipart remPart(TMultiPart part) { + if (worldObj.isRemote) { + throw new AssertionError("assertion failed: Cannot remove multi parts from a client tile"); + } + return remPart_impl(part); + } + + /** Internal FMP removal/synchronization hook. Consumers use {@link #remPart(TMultiPart)} on the server. */ + public TileMultipart remPart_impl(TMultiPart part) { + remPart_do(part, !worldObj.isRemote); + + if (!isInvalid()) { + TileMultipart tile = MultipartGenerator$.MODULE$.partRemoved(this); + tile.notifyPartChange(part); + tile.markDirty(); + tile.markRender(); + return tile; + } + + return null; + } + + private int remPart_do(TMultiPart part, boolean sendPacket) { + int r = partList().indexOf(part); + if (r < 0) { + throw new IllegalArgumentException("Tried to remove a non-existant part"); + } + + // The reference read an unused removedLightValue here; the virtual call is observable, so keep it. + part.getLightValue(); + part.preRemove(); + List current = mutablePartsSnapshot(); + current.removeIf(p -> p == null ? part == null : p.equals(part)); + partList_$eq(toSeq(current)); + + if (sendPacket) { + writeStream().writeByte(254).writeByte(r); + } + + partRemoved(part, r); + part.onRemoved(); + part.tile_$eq(null); + + if (partList().isEmpty()) { + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + } else if (part.doesTick() && doesTick) { + boolean ntick = false; + Iterator iterator = partList().iterator(); + while (iterator.hasNext()) { + ntick |= iterator.next().doesTick(); + } + if (!ntick) { + setTicking(false); + } + } + return r; + } + + /** Internal FMP cache-removal callback for trait overrides; do not call directly from consumers. */ + public void partRemoved(TMultiPart part, int p) {} + + /** + * Loads parts into an already prepared composite tile through the legacy + * {@link #loadParts(scala.collection.Iterable)} hook. Clears trait caches, then stores and binds each input part in + * collection iteration order. The collection is viewed during the call, not copied in advance; do not structurally + * modify it from callbacks. + * + *

+ * With a world, the default hook calls {@code onWorldJoin} on the client and then + * {@link #notifyPartChange(TMultiPart)} with null on either side. Without a world it only loads/binds. It does not + * generate capabilities, remove/unbind old parts, call {@code onAdded}, reset the existing ticking flag or send a + * complete description packet. Use {@link MultipartHelper#createTileFromParts(Iterable)} when constructing a new + * server tile from parts. + * + *

+ * Call on the game thread. Loading is not atomic: failures propagate with cleared or partially loaded state. The + * default hook clears before reading the collection, so a null collection also fails after clearing. Existing + * legacy overrides still control loading; internal reconstruction continues to call that hook directly. + * + * @param parts parts to load; iteration order, duplicates and callback failure behavior are retained + */ + public void loadPartList(Collection parts) { + loadParts(JavaConversions.iterableAsScalaIterable(parts)); + } + + /** + * @deprecated Call {@link #loadPartList(Collection)} from Java. Retained for legacy overrides, compiled callers and + * exact Scala-parameter reflection; behavior is unchanged. + */ + @Deprecated + public void loadParts(scala.collection.Iterable parts) { + clearParts(); + for (TMultiPart p : JavaConversions.asJavaIterable(parts)) { + addPart_do(p); + } + + if (worldObj != null) { + if (worldObj.isRemote) { + operate(action(TMultiPart::onWorldJoin)); + } + notifyPartChange(null); + } + } + + /** Remove all parts from internal cache. Provided for trait overrides, do not call externally. */ + public void clearParts() { + partList_$eq(emptyParts()); + } + + /** Writes the description of this tile, and all parts composing it, to packet. */ + public void writeDesc(MCDataOutput packet) { + packet.writeByte(partList().size()); + Iterator iterator = partList().iterator(); + while (iterator.hasNext()) { + TMultiPart part = iterator.next(); + MultiPartRegistry.writePartID(packet, part); + part.writeDesc(packet); + } + } + + /** Perform a raytrace returning all intersecting parts sorted nearest to farthest. */ + public Iterable rayTraceAll(Vec3 start, Vec3 end) { + List list = new ArrayList<>(); + Iterator iterator = partList().iterator(); + int i = 0; + while (iterator.hasNext()) { + Object mop = iterator.next().collisionRayTrace(start, end); + if (mop instanceof ExtendedMOP) { + ExtendedMOP extended = (ExtendedMOP) mop; + extended.data = new Tuple2<>(i, extended.data); + list.add(extended); + } + i++; + } + + Collections.sort(list); + return list; + } + + /** Perform a raytrace returning the nearest intersecting part. */ + public ExtendedMOP collisionRayTrace(Vec3 start, Vec3 end) { + for (ExtendedMOP mop : rayTraceAll(start, end)) { + return mop; + } + return null; + } + + /** Drop and remove part at index (internal mining callback). */ + public void harvestPart(int index, ExtendedMOP hit, EntityPlayer player) { + TMultiPart part = partList().apply(index); + if (part != null) { + part.harvest(hit, player); + } + } + + /** Utility function for dropping items around the center of this space. */ + public void dropItems(Iterable items) { + Vector3 pos = Vector3.fromTileEntityCenter(this); + for (ItemStack item : items) { + dropItem(item, worldObj, pos); + } + } + + @Override + public final void writeToNBT(NBTTagCompound tag) { + super.writeToNBT(tag); + NBTTagList taglist = new NBTTagList(); + Iterator iterator = partList().iterator(); + while (iterator.hasNext()) { + TMultiPart part = iterator.next(); + NBTTagCompound parttag = new NBTTagCompound(); + parttag.setString("id", part.getType()); + part.save(parttag); + taglist.appendTag(parttag); + } + tag.setTag("parts", taglist); + } + + /** Internal callback. */ + public void onEntityCollision(Entity entity) { + operate(action(p -> p.onEntityCollision(entity))); + } + + /** Internal callback, overriden in TRedstoneTile. */ + public int strongPowerLevel(int side) { + return 0; + } + + /** Internal callback, overriden in TRedstoneTile. */ + public int weakPowerLevel(int side) { + return 0; + } + + /** Internal callback, overriden in TRedstoneTile. */ + public boolean canConnectRedstone(int side) { + return false; + } + + /** Mutable snapshot used only while publishing a replacement Seq. */ + private List mutablePartsSnapshot() { + return new ArrayList<>(JavaConversions.seqAsJavaList(partList())); + } + + private static Seq toSeq(List parts) { + return JavaConversions.asScalaBuffer(parts).toList(); + } + + private static Seq emptyParts() { + return toSeq(Collections.emptyList()); + } + + /** Wraps a Java action as the Scala function operate takes, so overrides of operate still see every call. */ + private static Function1 action(Consumer action) { + return new AbstractFunction1() { + + @Override + public BoxedUnit apply(TMultiPart part) { + action.accept(part); + return BoxedUnit.UNIT; + } + }; + } + + @SuppressWarnings("unchecked") + private static boolean compatibilityAllows(World world, int x, int y, int z) { + return (Boolean) MultipartCompatiblity.canAddPart() + .apply(world, Integer.valueOf(x), Integer.valueOf(y), Integer.valueOf(z)); + } + + // Static helpers, formerly the TileMultipart companion object. + + private static int renderID = -1; + + /** + * Returns FMP's global block-render registration ID. Initially -1; reading it does not initialize the client + * renderer or allocate an ID. This is shared state, not a per-tile or persistent part ID. + */ + public static int getRenderID() { + return renderID(); + } + + /** + * Assigns the global render ID, preserving all integer values including -1. Intended for controlled render setup; + * this only changes the stored value and does not allocate an ID, register a handler or update Forge's mapping. + * FMP's client renderer still performs its own allocation when first initialized. Use on the initialization/game + * thread, not as a per-tile rendering control. + */ + public static void setRenderID(int value) { + renderID_$eq(value); + } + + /** @deprecated Use {@link #getRenderID()}. Retained for existing static/companion callers. */ + @Deprecated + public static int renderID() { + return renderID; + } + + /** @deprecated Use {@link #setRenderID(int)}. Retained with unchanged shared-state behavior. */ + @Deprecated + public static void renderID_$eq(int value) { + renderID = value; + } + + /** + * Gets an existing tile or converted placeholder, or null. Conversion does not install the tile in the world. Use + * {@link #getOrConvertTileResult(World, BlockCoord)} when the conversion flag is also needed. + */ + public static TileMultipart getOrConvertTile(World world, BlockCoord pos) { + return getOrConvertTile2(world, pos)._1(); + } + + /** + * Looks up an existing tile, otherwise asks registered block converters for a multipart representation. An existing + * tile is returned by identity with {@link TileConversionResult#isConverted()} false. A successful conversion + * returns a fresh, uninstalled placeholder with the flag true; no match returns a null tile and false. + * + *

+ * A placeholder uses the world's client/server side and has its coordinates, world and converted part bound. This + * lookup does not replace the block, install the tile or invoke the part's placement/conversion callbacks. Repeated + * lookups can construct different placeholders. Converter callbacks run normally and their exceptions propagate; + * this is not a side-effect-free query. Use on the appropriate world thread after FMP initialization. + * + *

+ * For ordinary placement, use {@link #canPlacePart(World, BlockCoord, TMultiPart)} followed by + * {@link #addPart(World, BlockCoord, TMultiPart)} and retain the tile returned by the addition. Do not install this + * placeholder directly. Use {@link #getTile(World, BlockCoord)} if conversion should not be attempted. + * + * @return a non-null result recording this lookup; its tile reference may be null + */ + public static TileConversionResult getOrConvertTileResult(World world, BlockCoord pos) { + Tuple2 result = getOrConvertTile2(world, pos); + return new TileConversionResult(result._1(), (Boolean) result._2()); + } + + /** + * Gets a multipart tile instance at pos, converting if necessary. Note converted tiles are merely a structure + * formality, they do not actually exist in world until they are required to by the addition of another multipart to + * their space. + * + * @return the tile or null if there was none, and true if the tile is a result of a conversion + * @deprecated Use {@link #getOrConvertTileResult(World, BlockCoord)} for a Java result with named accessors. + */ + @Deprecated + public static Tuple2 getOrConvertTile2(World world, BlockCoord pos) { + TileEntity t = world.getTileEntity(pos.x, pos.y, pos.z); + if (t instanceof TileMultipart) { + return new Tuple2<>((TileMultipart) t, Boolean.FALSE); + } + + TMultiPart p = MultiPartRegistry.convertBlock(world, pos, world.getBlock(pos.x, pos.y, pos.z)); + if (p != null) { + TileMultipart tile = MultipartGenerator$.MODULE$ + .generateCompositeTile(null, toSeq(Collections.singletonList(p)), world.isRemote); + tile.xCoord = pos.x; + tile.yCoord = pos.y; + tile.zCoord = pos.z; + tile.setWorldObj(world); + tile.addPart_do(p); + return new Tuple2<>(tile, Boolean.TRUE); + } + return new Tuple2<>(null, Boolean.FALSE); + } + + /** Gets the multipart tile instance at pos, or null if it doesn't exist or is not a multipart tile. */ + public static TileMultipart getTile(World world, BlockCoord pos) { + TileEntity t = world.getTileEntity(pos.x, pos.y, pos.z); + return t instanceof TileMultipart ? (TileMultipart) t : null; + } + + public static boolean checkNoEntityCollision(World world, BlockCoord pos, TMultiPart part) { + for (Cuboid6 b : part.getCollisionBoxes()) { + if (!world.checkNoEntityCollision(b.toAABB().offset(pos.x, pos.y, pos.z))) { + return false; + } + } + return true; + } + + /** + * Returns whether part can be added to the space at pos. Will do conversions as necessary. This function is the + * recommended way to add parts to the world. + */ + public static boolean canPlacePart(World world, BlockCoord pos, TMultiPart part) { + if (!checkNoEntityCollision(world, pos, part)) { + return false; + } + + TileMultipart t = getOrConvertTile(world, pos); + if (t != null) { + return t.canAddPart(part); + } else if (!compatibilityAllows(world, pos.x, pos.y, pos.z)) { + return false; + } + + return replaceable(world, pos); + } + + /** Returns if the block at pos is replaceable (air, vines etc). */ + public static boolean replaceable(World world, BlockCoord pos) { + net.minecraft.block.Block block = world.getBlock(pos.x, pos.y, pos.z); + return block.isAir(world, pos.x, pos.y, pos.z) || block.isReplaceable(world, pos.x, pos.y, pos.z); + } + + /** + * Adds a part to a block space. canPlacePart should always be called first. The addition of parts on the client is + * handled internally. + */ + public static TileMultipart addPart(World world, BlockCoord pos, TMultiPart part) { + if (world.isRemote) { + throw new AssertionError("assertion failed: Cannot add multi parts to a client tile."); + } + return MultipartGenerator$.MODULE$.addPart(world, pos, part); + } + + /** Constructs this tile and its parts from a desc packet. */ + public static void handleDescPacket(World world, BlockCoord pos, PacketCustom packet) { + int nparts = packet.readUByte(); + List parts = new ArrayList<>(); + for (int i = 0; i < nparts; i++) { + TMultiPart part = MultiPartRegistry.readPart(packet); + part.readDesc(packet); + parts.add(part); + } + + if (parts.isEmpty()) { + return; + } + + TileEntity t = world.getTileEntity(pos.x, pos.y, pos.z); + TileMultipart tilemp = MultipartGenerator$.MODULE$.generateCompositeTile(t, toSeq(parts), true); + if (tilemp != t) { + world.setBlock(pos.x, pos.y, pos.z, MultipartProxy.block()); + MultipartGenerator.silentAddTile(world, pos, tilemp); + } + + tilemp.loadParts(toSeq(parts)); + tilemp.notifyTileChange(); + tilemp.markRender(); + } + + /** Handles an update packet, addition, removal and otherwise. */ + public static void handlePacket(BlockCoord pos, World world, int i, PacketCustom packet) { + if (i == 253) { + TMultiPart part = MultiPartRegistry.readPart(packet); + part.readDesc(packet); + MultipartGenerator$.MODULE$.addPart(world, pos, part); + } else if (i == 254) { + // The reference resolves the tile separately for the receiver and the argument. + TileMultipart receiver = TileCache.findTile(world, pos); + TMultiPart removed = TileCache.findTile(world, pos).partList().apply(packet.readUByte()); + receiver.remPart_impl(removed); + } else { + TileCache.findTile(world, pos).partList().apply(i).read(packet); + } + } + + /** Creates this tile from an NBT tag. */ + public static TileMultipart createFromNBT(NBTTagCompound tag) { + NBTTagList partList = tag.getTagList("parts", 10); + List parts = new ArrayList<>(); + int[] loadedIndices = new int[partList.tagCount()]; + + for (int i = 0; i < partList.tagCount(); i++) { + NBTTagCompound partTag = partList.getCompoundTagAt(i); + String partID = partTag.getString("id"); + TMultiPart part = MultiPartRegistry.loadPart(partID, partTag); + loadedIndices[i] = part == null ? -1 : parts.size(); + if (part != null) { + part.load(partTag); + parts.add(part); + } + } + + if (parts.isEmpty()) { + return null; + } + + TileMultipart tmb = MultipartGenerator$.MODULE$.generateCompositeTile(null, toSeq(parts), false); + tmb.readFromNBT(tag); + tmb.loadParts(toSeq(parts)); + tmb.loadedPartIndices = loadedIndices; + return tmb; + } + + /** Drops an item around pos. */ + public static void dropItem(ItemStack stack, World world, Vector3 pos) { + EntityItem item = new EntityItem(world, pos.x, pos.y, pos.z, stack); + item.motionX = world.rand.nextGaussian() * 0.05; + item.motionY = world.rand.nextGaussian() * 0.05 + 0.2; + item.motionZ = world.rand.nextGaussian() * 0.05; + item.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(item); + } +} diff --git a/src/main/scala/codechicken/multipart/TileMultipart.scala b/src/main/scala/codechicken/multipart/TileMultipart.scala deleted file mode 100644 index 71f56ce..0000000 --- a/src/main/scala/codechicken/multipart/TileMultipart.scala +++ /dev/null @@ -1,819 +0,0 @@ -package codechicken.multipart - -import net.minecraft.tileentity.TileEntity - -import scala.collection.mutable.ListBuffer -import codechicken.lib.packet.PacketCustom -import codechicken.lib.vec.{BlockCoord, Cuboid6, Vector3} -import net.minecraft.world.{IBlockAccess, World} - -import java.util.List -import net.minecraft.nbt.NBTTagCompound -import codechicken.lib.data.MCDataOutput -import codechicken.multipart.handler.{ - MultipartCompatiblity, - MultipartProxy, - MultipartSPH -} -import net.minecraft.item.ItemStack -import net.minecraft.nbt.NBTTagList - -import java.util.Random -import net.minecraft.entity.item.EntityItem -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.entity.Entity - -import scala.collection.JavaConversions._ -import java.util.Collection -import codechicken.lib.raytracer.ExtendedMOP -import net.minecraft.util.{AxisAlignedBB, Vec3} - -import java.lang.Iterable -import codechicken.lib.world.IChunkLoadTile -import com.gtnewhorizon.gtnhlib.client.model.ModelISBRH -import net.minecraft.client.renderer.RenderBlocks -import net.minecraftforge.client.ForgeHooksClient - -class TileMultipart extends TileEntity with IChunkLoadTile { - - /** List of parts in this tile space - */ - var partList = Seq[TMultiPart]() - - private var doesTick = false - - private[multipart] def from(that: TileMultipart) { - copyFrom(that) - loadFrom(that) - } - - /** This method should be used for copying all the data from the fields in - * that container tile. This method will be automatically generated on java - * tile traits with fields if it is not overridden. - */ - def copyFrom(that: TileMultipart) { - partList = that.partList - doesTick = that.doesTick - } - - def loadFrom(that: TileMultipart) { - partList.foreach(_.bind(this)) - if (doesTick) { - doesTick = false - setTicking(true) - } - } - - /** Overidden in TSlottedTile when a part that goes in a slot is added - */ - def partMap(slot: Int): TMultiPart = null - - /** Implicit java conversion of part list - */ - def jPartList(): List[TMultiPart] = partList - - override def canUpdate = doesTick - - def operate(f: (TMultiPart) => Unit) { - val it = partList.iterator - while (it.hasNext) { - val p = it.next() - // A replaced tile can still receive queued callbacks after its parts have moved. - if (p.tile == this) f(p) - } - } - - override def updateEntity() { - operate(_.update()) - } - - override def onChunkUnload() { - operate(_.onChunkUnload()) - } - - override def onChunkLoad() { - operate(_.onChunkLoad()) - } - - final def setValid(b: Boolean) { - if (b) - super.validate() - else - super.invalidate() - } - - def onMoved() { - operate(_.onMoved()) - } - - override def invalidate() { - if (!isInvalid) { - super.invalidate() - if (worldObj != null) { - partList.foreach(_.onWorldSeparate()) - if (worldObj.isRemote) - TileCache.remove(this) - } - } - } - - override def validate() { - super.validate() - - if (worldObj != null && worldObj.isRemote) - TileCache.add(this) - } - - /** Called by parts when they have changed in some form that affects the - * world. Notifies neighbor blocks, the world and parts that share this host - * and recalculates lighting - */ - def notifyPartChange(part: TMultiPart) { - internalPartChange(part) - - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord) - worldObj.notifyBlocksOfNeighborChange( - xCoord, - yCoord, - zCoord, - MultipartProxy.block - ) - worldObj.func_147451_t(xCoord, yCoord, zCoord) - } - - /** Notifies parts sharing this host of a change - */ - def internalPartChange(part: TMultiPart) { - operate(p => if (part != p) p.onPartChanged(part)) - } - - /** Notifies all parts not in the passed collection of a change from all the - * parts in the collection - */ - def multiPartChange(parts: Collection[TMultiPart]) { - operate(p => if (!parts.contains(p)) parts.foreach(p.onPartChanged)) - } - - /** Notifies neighboring blocks that this tile has changed - */ - def notifyTileChange() { - worldObj.func_147453_f(xCoord, yCoord, zCoord, MultipartProxy.block) - } - - def onNeighborBlockChange() { - operate(_.onNeighborChanged()) - } - - /** Blank implementation, overriden by TTileChangeTile - */ - def onNeighborTileChange(tileX: Int, tileY: Int, tileZ: Int) {} - - /** Blank implementation, overriden by TTileChangeTile - */ - def getWeakChanges = false - - def getLightValue: Int = { - if (partList.isEmpty) { - return 0 - } - - var max = 0 - val it = partList.iterator - while (it.hasNext) { - val l = it.next().getLightValue - if (l > max) max = l - } - - max - } - - def getExplosionResistance(entity: Entity) = - partList.view.map(_.explosionResistance(entity)).max - - /** Callback for parts to mark the chunk as needs saving - */ - override def markDirty() { - worldObj.markTileEntityChunkModified(xCoord, yCoord, zCoord, this) - } - - /** Mark this block space for a render update. - */ - def markRender() { - worldObj.func_147479_m(xCoord, yCoord, zCoord) - } - - /** Helper function for calling a second level notify on a side (eg indirect - * power from a lever) - */ - def notifyNeighborChange(side: Int) { - val pos = new BlockCoord(this).offset(side) - worldObj.notifyBlocksOfNeighborChange( - pos.x, - pos.y, - pos.z, - MultipartProxy.block - ) - } - - def isSolid(side: Int) = partMap(side) match { - case face: TFacePart => face.solid(side) - case _ => false - } - - def canPlaceTorchOnTop = partList.exists(_.canPlaceTorchOnTop) || isSolid(1) - - private def setTicking(tick: Boolean) { - if (doesTick == tick) - return - - doesTick = tick - if ( - worldObj != null && worldObj.getTileEntity(xCoord, yCoord, zCoord) == this - ) { - if (tick) - worldObj.addTileEntity(this) - else - worldObj.func_147457_a(this) - } - } - - /** Returns true if part can be added to this space - */ - def canAddPart(part: TMultiPart) = - MultipartCompatiblity.canAddPart(worldObj, xCoord, yCoord, zCoord) && - !partList.contains(part) && - occlusionTest(partList, part) - - /** Returns true if opart can be replaced with npart (note opart and npart may - * be the exact same object) - * - * This function should be used for testing if a part can change it's shape - * (eg. rotation, expansion, cable connection) For example, to test whether a - * cable part can connect to it's neighbor: - * 1. Set the cable part's bounding boxes as if the connection is - * established 2. Call canReplacePart(part, part) 3. If canReplacePart - * succeeds, perform connection, else, revert bounding box - */ - def canReplacePart(opart: TMultiPart, npart: TMultiPart): Boolean = { - val olist = partList.filterNot(_ == opart) - if (olist.contains(npart)) - return false - - return occlusionTest(olist, npart) - } - - /** Returns true if parts do not occlude npart - */ - def occlusionTest(parts: Seq[TMultiPart], npart: TMultiPart): Boolean = { - return parts.forall(part => - part.occlusionTest(npart) && npart.occlusionTest(part) - ) - } - - /** Get the write stream for updates to part - */ - def getWriteStream(part: TMultiPart): MCDataOutput = - getWriteStream.writeByte(partList.indexOf(part)) - - private def getWriteStream = - MultipartSPH.getTileStream(worldObj, new BlockCoord(this)) - - private[multipart] def addPart_impl(part: TMultiPart) { - if (!worldObj.isRemote) - writeAddPart(part) - - addPart_do(part) - part.onAdded() - partAdded(part) - notifyPartChange(part) - notifyTileChange() - markDirty() - markRender() - } - - private[multipart] def writeAddPart(part: TMultiPart) { - val stream = getWriteStream.writeByte(253) - MultiPartRegistry.writePartID(stream, part) - part.writeDesc(stream) - } - - private[multipart] def addPart_do(part: TMultiPart) { - assert( - partList.size < 250, - "Tried to add more than 250 parts to the one tile. You're doing it wrong" - ) - - partList = partList :+ part - bindPart(part) - part.bind(this) - - if (!doesTick && part.doesTick) - setTicking(true) - } - - /** Bind this part to an internal cache. Provided for trait overrides, do not - * call externally. - */ - def bindPart(part: TMultiPart) {} - - /** Called when a part is added (placement) Provided for trait overrides, do - * not call externally. - */ - def partAdded(part: TMultiPart) {} - - /** Removes part from this tile. Note that due to the operation sync, the part - * may not be removed until the call stack has been passed to all other parts - * in the space. - */ - def remPart(part: TMultiPart): TileMultipart = { - assert(!worldObj.isRemote, "Cannot remove multi parts from a client tile") - remPart_impl(part) - } - - private[multipart] def remPart_impl(part: TMultiPart): TileMultipart = { - remPart_do(part, !worldObj.isRemote) - - if (!isInvalid) { - val tile = MultipartGenerator.partRemoved(this) - tile.notifyPartChange(part) - tile.markDirty() - tile.markRender() - return tile - } - - return null - } - - private def remPart_do(part: TMultiPart, sendPacket: Boolean): Int = { - val r = partList.indexOf(part) - if (r < 0) - throw new IllegalArgumentException("Tried to remove a non-existant part") - - val removedLightValue = part.getLightValue - - part.preRemove() - partList = partList.filterNot(_ == part) - - if (sendPacket) - getWriteStream.writeByte(254).writeByte(r) - - partRemoved(part, r) - part.onRemoved() - part.tile = null - - if (partList.isEmpty) { - worldObj.setBlockToAir(xCoord, yCoord, zCoord) - } else { - if (part.doesTick && doesTick) { - var ntick = false - partList.foreach(part => ntick |= part.doesTick) - if (!ntick) - setTicking(false) - } - } - return r - } - - /** Remove this part from internal cache. Provided for trait overrides, do not - * call externally. - */ - def partRemoved(part: TMultiPart, p: Int) {} - - private[multipart] def loadParts(parts: scala.Iterable[TMultiPart]) { - clearParts() - parts.foreach(p => addPart_do(p)) - - if (worldObj != null) { - if (worldObj.isRemote) - operate(_.onWorldJoin()) - notifyPartChange(null) - } - } - - /** Remove all parts from internal cache Provided for trait overrides, do not - * call externally. - */ - def clearParts() { - partList = Seq() - } - - /** Writes the description of this tile, and all parts composing it, to packet - */ - def writeDesc(packet: MCDataOutput) { - packet.writeByte(partList.size) - partList.foreach { part => - MultiPartRegistry.writePartID(packet, part) - part.writeDesc(packet) - } - } - - /** Perform a raytrace returning all intersecting parts sorted nearest to - * farthest - */ - def rayTraceAll(start: Vec3, end: Vec3): Iterable[ExtendedMOP] = { - var list = ListBuffer[ExtendedMOP]() - for ((p, i) <- partList.view.zipWithIndex) - p.collisionRayTrace(start, end) match { - case mop: ExtendedMOP => - mop.data = (i, mop.data) - list += mop - case _ => - } - - return list.sorted - } - - /** Perform a raytrace returning the nearest intersecting part - */ - def collisionRayTrace(start: Vec3, end: Vec3): ExtendedMOP = - rayTraceAll(start, end).headOption.getOrElse(null) - - /** Drop and remove part at index (internal mining callback) - */ - def harvestPart(index: Int, hit: ExtendedMOP, player: EntityPlayer) = - partList(index) match { - case null => - case part => part.harvest(hit, player) - } - - /** Utility function for dropping items around the center of this space - */ - def dropItems(items: Iterable[ItemStack]) { - val pos = Vector3.fromTileEntityCenter(this) - items.foreach(item => TileMultipart.dropItem(item, worldObj, pos)) - } - - final override def writeToNBT(tag: NBTTagCompound) { - super.writeToNBT(tag) - val taglist = new NBTTagList - partList.foreach { part => - val parttag = new NBTTagCompound - parttag.setString("id", part.getType) - part.save(parttag) - taglist.appendTag(parttag) - } - tag.setTag("parts", taglist) - } - - /** Internal callback - */ - def onEntityCollision(entity: Entity) { - operate(_.onEntityCollision(entity)) - } - - /** Internal callback, overriden in TRedstoneTile - */ - def strongPowerLevel(side: Int) = 0 - - /** Internal callback, overriden in TRedstoneTile - */ - def weakPowerLevel(side: Int) = 0 - - /** Internal callback, overriden in TRedstoneTile - */ - def canConnectRedstone(side: Int) = false -} - -trait TileMultipartClient extends TileMultipart { - private var cachedRenderBounds: AxisAlignedBB = null - private var staticCache: Array[TMultiPart] = null - private var dynamicCache: Array[TMultiPart] = null - - var hasDynamicParts: Boolean = false - - def updateRenderCache() { - if (partList != null) { - val (dynamic, static) = - partList.partition(p => p.doesTick || p.shouldRenderDynamic) - val sArr = static.toArray - val dArr = dynamic.toArray - - var c: Cuboid6 = null - var i = 0 - val allParts = sArr ++ dArr - while (i < allParts.length) { - val b = allParts(i).getRenderBounds - if (c == null) c = b.copy - else c.enclose(b) - i += 1 - } - - if (c == null) c = Cuboid6.full - - c.add(Vector3.fromTileEntity(this)) - cachedRenderBounds = c.toAABB - staticCache = sArr - dynamicCache = dArr - hasDynamicParts = dArr.length > 0 - } else { - staticCache = Array.empty - dynamicCache = Array.empty - hasDynamicParts = false - cachedRenderBounds = AxisAlignedBB.getBoundingBox( - xCoord, - yCoord, - zCoord, - xCoord + 1, - yCoord + 1, - zCoord + 1 - ) - } - } - - def renderStatic( - world: IBlockAccess, - vec: Vector3, - renderer: RenderBlocks - ) = { - if (staticCache == null) - updateRenderCache() - - var rendered = false - - def renderPart(part: TMultiPart): Unit = { - if (part == null) - return - - part match { - case jsonModeledPart: JsonModeledPart => - if ( - ModelISBRH.INSTANCE - .get() - .renderWorldBlock( - jsonModeledPart.getRenderWorld, - vec.x.toInt, - vec.y.toInt, - vec.z.toInt, - jsonModeledPart.getBlock, - ModelISBRH.JSON_ISBRH_ID, - renderer - ) - ) { - rendered = true - } - case isbrh: ISBRHPart => - if ( - isbrh.renderWorldBlock( - world, - vec.x.toInt, - vec.y.toInt, - vec.z.toInt, - renderer - ) - ) { - rendered = true - } - - case _ => - if ( - part.renderStatic( - vec, - ForgeHooksClient.getWorldRenderPass - ) - ) { - rendered = true - } - } - } - - val statics = staticCache - if (statics != null) { - var i = 0 - val len = statics.length - - while (i < len) { - renderPart(statics(i)) - i += 1 - } - } - - val dynamics = dynamicCache - if (dynamics != null) { - var i = 0 - val len = dynamics.length - - while (i < len) { - renderPart(dynamics(i)) - i += 1 - } - } - - rendered - } - - def renderDynamic(pos: Vector3, frame: Float, pass: Int) { - if (!hasDynamicParts) return - - val dynamics = dynamicCache - if (dynamics != null) { - var i = 0 - val len = dynamics.length - while (i < len) { - if (dynamics(i) != null) dynamics(i).renderDynamic(pos, frame, pass) - i += 1 - } - } - } - - def randomDisplayTick(random: Random) {} - - override def shouldRenderInPass(pass: Int) = { - if (staticCache == null) updateRenderCache() - hasDynamicParts - } - - override def getRenderBoundingBox = { - if (cachedRenderBounds == null) updateRenderCache() - cachedRenderBounds - } - - override def markRender(): Unit = { - super.markRender() - updateRenderCache() - } -} - -/** Static class with multipart manipulation helper functions - */ -object TileMultipart { - var renderID = -1 - - /** Gets a multipar ttile instance at pos, converting if necessary. - */ - def getOrConvertTile(world: World, pos: BlockCoord) = - getOrConvertTile2(world, pos)._1 - - /** Gets a multipart tile instance at pos, converting if necessary. Note - * converted tiles are merely a structure formality, they do not actually - * exist in world until they are required to by the addition of another - * multipart to their space. - * @return - * (The tile or null if there was none, true if the tile is a result of a - * conversion) - */ - def getOrConvertTile2( - world: World, - pos: BlockCoord - ): (TileMultipart, Boolean) = { - val t = world.getTileEntity(pos.x, pos.y, pos.z) - if (t.isInstanceOf[TileMultipart]) - return (t.asInstanceOf[TileMultipart], false) - - val p = MultiPartRegistry.convertBlock( - world, - pos, - world.getBlock(pos.x, pos.y, pos.z) - ) - if (p != null) { - val t = - MultipartGenerator.generateCompositeTile(null, Seq(p), world.isRemote) - t.xCoord = pos.x - t.yCoord = pos.y - t.zCoord = pos.z - t.setWorldObj(world) - t.addPart_do(p) - return (t, true) - } - return (null, false) - } - - /** Gets the multipart tile instance at pos, or null if it doesn't exist or is - * not a multipart tile - */ - def getTile(world: World, pos: BlockCoord) = - world.getTileEntity(pos.x, pos.y, pos.z) match { - case t: TileMultipart => t - case _ => null - } - - def checkNoEntityCollision(world: World, pos: BlockCoord, part: TMultiPart) = - part.getCollisionBoxes.forall(b => - world.checkNoEntityCollision(b.toAABB.offset(pos.x, pos.y, pos.z)) - ) - - /** Returns whether part can be added to the space at pos. Will do conversions - * as necessary. This function is the recommended way to add parts to the - * world. - */ - def canPlacePart(world: World, pos: BlockCoord, part: TMultiPart): Boolean = { - if (!checkNoEntityCollision(world, pos, part)) - return false - - val t = getOrConvertTile(world, pos) - if (t != null) - return t.canAddPart(part) - else if (!MultipartCompatiblity.canAddPart(world, pos.x, pos.y, pos.z)) - return false - - if (!replaceable(world, pos)) - return false - - return true - } - - /** Returns if the block at pos is replaceable (air, vines etc) - */ - def replaceable(world: World, pos: BlockCoord): Boolean = { - val block = world.getBlock(pos.x, pos.y, pos.z) - return block.isAir(world, pos.x, pos.y, pos.z) || block.isReplaceable( - world, - pos.x, - pos.y, - pos.z - ) - } - - /** Adds a part to a block space. canPlacePart should always be called first. - * The addition of parts on the client is handled internally. - */ - def addPart( - world: World, - pos: BlockCoord, - part: TMultiPart - ): TileMultipart = { - assert(!world.isRemote, "Cannot add multi parts to a client tile.") - return MultipartGenerator.addPart(world, pos, part) - } - - /** Constructs this tile and its parts from a desc packet - */ - def handleDescPacket(world: World, pos: BlockCoord, packet: PacketCustom) { - val nparts = packet.readUByte - val parts = new ListBuffer[TMultiPart]() - for (i <- 0 until nparts) { - val part = MultiPartRegistry.readPart(packet) - part.readDesc(packet) - parts += part - } - - if (parts.size == 0) - return - - val t = world.getTileEntity(pos.x, pos.y, pos.z) - val tilemp = MultipartGenerator.generateCompositeTile(t, parts, true) - if (tilemp != t) { - world.setBlock(pos.x, pos.y, pos.z, MultipartProxy.block) - MultipartGenerator.silentAddTile(world, pos, tilemp) - } - - tilemp.loadParts(parts) - tilemp.notifyTileChange() - tilemp.markRender() - } - - /** Handles an update packet, addition, removal and otherwise - */ - def handlePacket( - pos: BlockCoord, - world: World, - i: Int, - packet: PacketCustom - ) { - def tilemp = TileCache.findTile(world, pos) - - i match { - case 253 => - val part = MultiPartRegistry.readPart(packet) - part.readDesc(packet) - MultipartGenerator.addPart(world, pos, part) - case 254 => tilemp.remPart_impl(tilemp.partList(packet.readUByte)) - case _ => tilemp.partList(i).read(packet) - } - } - - /** Creates this tile from an NBT tag - */ - def createFromNBT(tag: NBTTagCompound): TileMultipart = { - val partList = tag.getTagList("parts", 10) - val parts = ListBuffer[TMultiPart]() - - for (i <- 0 until partList.tagCount) { - val partTag = partList.getCompoundTagAt(i) - val partID = partTag.getString("id") - val part = MultiPartRegistry.loadPart(partID, partTag) - if (part != null) { - part.load(partTag) - parts += part - } - } - - if (parts.size == 0) - return null - - val tmb = MultipartGenerator.generateCompositeTile(null, parts, false) - tmb.readFromNBT(tag) - tmb.loadParts(parts) - return tmb - } - - /** Drops an item around pos - */ - def dropItem(stack: ItemStack, world: World, pos: Vector3) { - val item = new EntityItem(world, pos.x, pos.y, pos.z, stack) - item.motionX = world.rand.nextGaussian() * 0.05 - item.motionY = world.rand.nextGaussian() * 0.05 + 0.2 - item.motionZ = world.rand.nextGaussian() * 0.05 - item.delayBeforeCanPickup = 10 - world.spawnEntityInWorld(item) - } -} diff --git a/src/main/scala/codechicken/multipart/TileMultipartClient.java b/src/main/scala/codechicken/multipart/TileMultipartClient.java new file mode 100644 index 0000000..e8e771b --- /dev/null +++ b/src/main/scala/codechicken/multipart/TileMultipartClient.java @@ -0,0 +1,196 @@ +package codechicken.multipart; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.ForgeHooksClient; + +import com.gtnewhorizon.gtnhlib.client.model.ModelISBRH; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import scala.collection.Iterator; +import scala.collection.Seq; + +/** Client-side multipart render-cache mixin. */ +public class TileMultipartClient extends TileMultipart { + + private transient AxisAlignedBB cachedRenderBounds; + private transient TMultiPart[] staticCache; + private transient TMultiPart[] dynamicCache; + + public transient boolean hasDynamicParts; + + public boolean hasDynamicParts() { + return hasDynamicParts; + } + + public void hasDynamicParts_$eq(boolean value) { + hasDynamicParts = value; + } + + public void updateRenderCache() { + Seq parts = TileMultipartClientAccess.partList(this); + if (parts != null) { + List dynamicParts = new ArrayList<>(); + List staticParts = new ArrayList<>(); + Iterator iterator = parts.iterator(); + while (iterator.hasNext()) { + TMultiPart part = iterator.next(); + if (part.doesTick() || part.shouldRenderDynamic()) { + dynamicParts.add(part); + } else { + staticParts.add(part); + } + } + + TMultiPart[] statics = staticParts.toArray(new TMultiPart[staticParts.size()]); + TMultiPart[] dynamics = dynamicParts.toArray(new TMultiPart[dynamicParts.size()]); + Cuboid6 bounds = null; + for (TMultiPart part : statics) { + Cuboid6 partBounds = part.getRenderBounds(); + if (bounds == null) { + bounds = partBounds.copy(); + } else { + bounds.enclose(partBounds); + } + } + for (TMultiPart part : dynamics) { + Cuboid6 partBounds = part.getRenderBounds(); + if (bounds == null) { + bounds = partBounds.copy(); + } else { + bounds.enclose(partBounds); + } + } + if (bounds == null) { + bounds = Cuboid6.full; + } + + bounds.add(TileMultipartClientAccess.position(this)); + cachedRenderBounds = bounds.toAABB(); + staticCache = statics; + dynamicCache = dynamics; + hasDynamicParts = dynamics.length > 0; + } else { + staticCache = new TMultiPart[0]; + dynamicCache = new TMultiPart[0]; + hasDynamicParts = false; + cachedRenderBounds = TileMultipartClientAccess.fullBlockBounds(this); + } + } + + @Override + public boolean renderStatic(IBlockAccess world, Vector3 vector, RenderBlocks renderer) { + if (staticCache == null) { + updateRenderCache(); + } + + boolean rendered = false; + TMultiPart[] statics = staticCache; + if (statics != null) { + for (TMultiPart part : statics) { + rendered |= TileMultipartClientAccess.renderPart(part, world, vector, renderer); + } + } + + TMultiPart[] dynamics = dynamicCache; + if (dynamics != null) { + for (TMultiPart part : dynamics) { + rendered |= TileMultipartClientAccess.renderPart(part, world, vector, renderer); + } + } + return rendered; + } + + @Override + public void renderDynamic(Vector3 position, float frame, int pass) { + if (!hasDynamicParts) { + return; + } + + TMultiPart[] dynamics = dynamicCache; + if (dynamics != null) { + for (TMultiPart part : dynamics) { + if (part != null) { + part.renderDynamic(position, frame, pass); + } + } + } + } + + @Override + public void randomDisplayTick(Random random) {} + + @Override + public boolean shouldRenderInPass(int pass) { + if (staticCache == null) { + updateRenderCache(); + } + return hasDynamicParts; + } + + @Override + public AxisAlignedBB getRenderBoundingBox() { + if (cachedRenderBounds == null) { + updateRenderCache(); + } + return cachedRenderBounds; + } + + @Override + public void markRender() { + super.markRender(); + updateRenderCache(); + } +} + +/** Keeps inherited tile access and client rendering calls outside the generated trait transformer. */ +final class TileMultipartClientAccess { + + private TileMultipartClientAccess() {} + + static Seq partList(Object tile) { + return ((TileMultipart) tile).partList(); + } + + static Vector3 position(Object tile) { + return Vector3.fromTileEntity((TileMultipart) tile); + } + + static AxisAlignedBB fullBlockBounds(Object tile) { + TileMultipart multipart = (TileMultipart) tile; + return AxisAlignedBB.getBoundingBox( + multipart.xCoord, + multipart.yCoord, + multipart.zCoord, + multipart.xCoord + 1, + multipart.yCoord + 1, + multipart.zCoord + 1); + } + + static boolean renderPart(TMultiPart part, IBlockAccess world, Vector3 vector, RenderBlocks renderer) { + if (part == null) { + return false; + } + if (part instanceof JsonModeledPart) { + JsonModeledPart modeledPart = (JsonModeledPart) part; + return ModelISBRH.INSTANCE.get().renderWorldBlock( + modeledPart.getRenderWorld(), + (int) vector.x, + (int) vector.y, + (int) vector.z, + modeledPart.getBlock(), + ModelISBRH.JSON_ISBRH_ID, + renderer); + } + if (part instanceof ISBRHPart) { + return ((ISBRHPart) part).renderWorldBlock(world, (int) vector.x, (int) vector.y, (int) vector.z, renderer); + } + return part.renderStatic(vector, ForgeHooksClient.getWorldRenderPass()); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ASMBridgeEmitter.java b/src/main/scala/codechicken/multipart/asm/ASMBridgeEmitter.java new file mode 100644 index 0000000..67a2eef --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ASMBridgeEmitter.java @@ -0,0 +1,60 @@ +package codechicken.multipart.asm; + +import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Type.*; + +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import scala.Predef$; +import scala.Tuple2; + +/** Descriptor and instruction helpers behind the retained compiler companion. */ +final class ASMBridgeEmitter { + + private ASMBridgeEmitter() {} + + static Tuple2 seperateDesc(String nameDesc) { + int split = nameDesc.indexOf('('); + return new Tuple2<>(nameDesc.substring(0, split), nameDesc.substring(split)); + } + + static String staticDesc(String owner, String desc) { + Type method = getMethodType(desc); + Type result = method.getReturnType(); + Type receiver = getType("L" + owner + ";"); + Type[] args = method.getArgumentTypes(); + Type[] staticArgs = new Type[args.length + 1]; + staticArgs[0] = receiver; + System.arraycopy(args, 0, staticArgs, 1, args.length); + return getMethodDescriptor(result, staticArgs); + } + + static void finishBridgeCall(MethodVisitor mv, String mvdesc, int opcode, String owner, String name, String desc) { + Type[] args = getArgumentTypes(mvdesc); + Type result = getReturnType(mvdesc); + int localIndex = 1; + for (Type arg : args) { + mv.visitVarInsn(arg.getOpcode(ILOAD), localIndex); + localIndex += StackAnalyser$.MODULE$.width(arg); + } + mv.visitMethodInsn(opcode, owner, name, desc, opcode == INVOKEINTERFACE); + mv.visitInsn(result.getOpcode(IRETURN)); + mv.visitMaxs( + Math.max( + StackAnalyser$.MODULE$.width(Predef$.MODULE$.wrapRefArray(args)) + 1, + StackAnalyser$.MODULE$.width(result)), + StackAnalyser$.MODULE$.width(Predef$.MODULE$.wrapRefArray(args)) + 1); + } + + static void writeBridge(MethodVisitor mv, String mvdesc, int opcode, String owner, String name, String desc) { + mv.visitVarInsn(ALOAD, 0); + finishBridgeCall(mv, mvdesc, opcode, owner, name, desc); + } + + static void writeStaticBridge(MethodNode mv, String name, MixinInfo mixin) { + writeBridge(mv, mv.desc, INVOKESTATIC, mixin.tname(), name, staticDesc(mixin.name(), mv.desc)); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ASMImplicits$.java b/src/main/scala/codechicken/multipart/asm/ASMImplicits$.java new file mode 100644 index 0000000..7271ded --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ASMImplicits$.java @@ -0,0 +1,22 @@ +package codechicken.multipart.asm; + +import java.util.BitSet; + +public final class ASMImplicits$ { + + public static final ASMImplicits$ MODULE$ = new ASMImplicits$(); + + private ASMImplicits$() {} + + public BitSet ExtBitSet(BitSet bitset) { + return bitset; + } + + public Class ExtClass(Class clazz) { + return clazz; + } + + public String nodeName(String name) { + return name == null ? null : name.replace('.', '/'); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ASMImplicits.java b/src/main/scala/codechicken/multipart/asm/ASMImplicits.java new file mode 100644 index 0000000..0a273d3 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ASMImplicits.java @@ -0,0 +1,128 @@ +package codechicken.multipart.asm; + +import java.util.BitSet; +import java.util.Objects; + +/** Name and BitSet helpers, retaining the Scala value-class entry points for compiled callers. */ +public final class ASMImplicits { + + private ASMImplicits() {} + + public static BitSet ExtBitSet(BitSet bitset) { + return ASMImplicits$.MODULE$.ExtBitSet(bitset); + } + + public static Class ExtClass(Class clazz) { + return ASMImplicits$.MODULE$.ExtClass(clazz); + } + + public static String nodeName(String name) { + return ASMImplicits$.MODULE$.nodeName(name); + } + + public static final class ExtBitSet { + + private final BitSet bitset; + + public ExtBitSet(BitSet bitset) { + this.bitset = bitset; + } + + public BitSet bitset() { + return bitset; + } + + public BitSet set(BitSet other) { + return ExtBitSet$.MODULE$.set$extension(bitset, other); + } + + public BitSet copy() { + return ExtBitSet$.MODULE$.copy$extension(bitset); + } + + @Override + public int hashCode() { + return ExtBitSet$.MODULE$.hashCode$extension(bitset); + } + + @Override + public boolean equals(Object other) { + return ExtBitSet$.MODULE$.equals$extension(bitset, other); + } + } + + public static class ExtBitSet$ { + + public static final ExtBitSet$ MODULE$ = new ExtBitSet$(); + + public ExtBitSet$() {} + + public final BitSet set$extension(BitSet bitset, BitSet other) { + // Preserve clear-before-read: self-replacement empties the set, and a null source fails after clearing. + bitset.clear(); + bitset.or(other); + return bitset; + } + + public final BitSet copy$extension(BitSet bitset) { + return set$extension(new BitSet(), bitset); + } + + public final int hashCode$extension(BitSet bitset) { + return bitset.hashCode(); + } + + public final boolean equals$extension(BitSet bitset, Object other) { + if (!(other instanceof ExtBitSet)) return false; + BitSet otherBits = ((ExtBitSet) other).bitset(); + // Scala still dispatches equals for identical non-null references; Objects.equals would skip it. + return bitset == null ? otherBits == null : bitset.equals(otherBits); + } + } + + public static final class ExtClass { + + private final Class clazz; + + public ExtClass(Class clazz) { + this.clazz = clazz; + } + + public Class clazz() { + return clazz; + } + + public String nodeName() { + return ExtClass$.MODULE$.nodeName$extension(clazz); + } + + @Override + public int hashCode() { + return ExtClass$.MODULE$.hashCode$extension(clazz); + } + + @Override + public boolean equals(Object other) { + return ExtClass$.MODULE$.equals$extension(clazz, other); + } + } + + public static class ExtClass$ { + + public static final ExtClass$ MODULE$ = new ExtClass$(); + + public ExtClass$() {} + + public final String nodeName$extension(Class clazz) { + return ASMImplicits$.MODULE$.nodeName(clazz.getName()); + } + + public final int hashCode$extension(Class clazz) { + return clazz.hashCode(); + } + + public final boolean equals$extension(Class clazz, Object other) { + return other instanceof ExtClass && Objects.equals(clazz, ((ExtClass) other).clazz()); + } + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ASMImplicits.scala b/src/main/scala/codechicken/multipart/asm/ASMImplicits.scala deleted file mode 100644 index 870e150..0000000 --- a/src/main/scala/codechicken/multipart/asm/ASMImplicits.scala +++ /dev/null @@ -1,22 +0,0 @@ -package codechicken.multipart.asm - -import java.util.BitSet - -object ASMImplicits { - implicit class ExtBitSet(val bitset: BitSet) extends AnyVal { - def set(b: BitSet) = { - bitset.clear() - bitset.or(b) - bitset - } - - def copy = new BitSet().set(bitset) - } - - def nodeName(name: String) = - if (name == null) null else name.replace('.', '/') - - implicit class ExtClass(val clazz: Class[_]) extends AnyVal { - def nodeName = ASMImplicits.nodeName(clazz.getName) - } -} diff --git a/src/main/scala/codechicken/multipart/asm/ASMMixinCompiler.scala b/src/main/scala/codechicken/multipart/asm/ASMMixinCompiler.scala index ca2bfed..d09edee 100644 --- a/src/main/scala/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/src/main/scala/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -1,154 +1,48 @@ package codechicken.multipart.asm -import scala.collection.mutable.{Map => MMap, ListBuffer => MList, Set => MSet} -import java.util.{Set => JSet} +import scala.collection.mutable.{Map => MMap} import scala.collection.JavaConversions._ import org.objectweb.asm.tree._ import org.objectweb.asm.Opcodes._ -import org.objectweb.asm.ClassReader -import org.objectweb.asm.Type import org.objectweb.asm.MethodVisitor -import Type._ +import org.objectweb.asm.Type._ import codechicken.lib.asm.ASMHelper._ -import codechicken.lib.asm.{ - InsnListSection, - InsnComparator, - ASMHelper, - ObfMapping -} -import java.io.File import java.lang.reflect.Method import java.lang.reflect.Modifier import net.minecraft.launchwrapper.LaunchClassLoader -import codechicken.multipart.handler.MultipartProxy -import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper -import org.apache.logging.log4j.LogManager import ASMImplicits._ -import cpw.mods.fml.relauncher.FMLLaunchHandler - -object DebugPrinter { - val debug = MultipartProxy.config - .getTag("debug_asm") - .getBooleanValue(!ObfMapping.obfuscated) - val logger = LogManager.getLogger("Multipart ASM") - - private var permGenUsed = 0 - val dir = new File("asm/multipart") - if (debug) { - if (!dir.exists) - dir.mkdirs() - for (file <- dir.listFiles) - file.delete - } - - def dump(name: String, bytes: Array[Byte]) { - if (debug) - ASMHelper.dump( - bytes, - new File(dir, name.replace('/', '#') + ".txt"), - false, - false - ) - } - - def defined(name: String, bytes: Array[Byte]) { - if ((permGenUsed + bytes.length) / 16000 != permGenUsed / 16000) - logger.debug( - (permGenUsed + bytes.length) + " bytes of permGen has been used by ASMMixinCompiler" - ) - - permGenUsed += bytes.length - } -} object ASMMixinCompiler { - val cl = getClass.getClassLoader.asInstanceOf[LaunchClassLoader] - val m_defineClass = classOf[ClassLoader].getDeclaredMethod( - "defineClass", - classOf[Array[Byte]], - Integer.TYPE, - Integer.TYPE - ) - val m_runTransformers = classOf[LaunchClassLoader].getDeclaredMethod( - "runTransformers", - classOf[String], - classOf[String], - classOf[Array[Byte]] - ) + val cl = CompilerBootstrap.loader(getClass) + val m_defineClass = CompilerBootstrap.defineClassMethod() + val m_runTransformers = CompilerBootstrap.runTransformersMethod() val f_transformerExceptions = - classOf[LaunchClassLoader].getDeclaredField("transformerExceptions") - m_defineClass.setAccessible(true) - m_runTransformers.setAccessible(true) - f_transformerExceptions.setAccessible(true) + CompilerBootstrap.transformerExceptionsField() + CompilerBootstrap.open( + m_defineClass, + m_runTransformers, + f_transformerExceptions + ) - private val traitByteMap = MMap[String, Array[Byte]]() - private val mixinMap = MMap[String, MixinInfo]() + private val traitByteMap = CompilerBootstrap.mutableMap[String, Array[Byte]]() + private val mixinMap = CompilerBootstrap.mutableMap[String, MixinInfo]() - def define(name: String, bytes: Array[Byte]) = { - internalDefine(name, bytes) - DebugPrinter.defined(name, bytes) + def define(name: String, bytes: Array[Byte]) = ClassBytes.define(name, bytes) - try { - m_defineClass - .invoke(cl, bytes, 0: Integer, bytes.length: Integer) - .asInstanceOf[Class[_]] - } catch { - case link: LinkageError if link.getMessage.contains("duplicate") => - throw new IllegalStateException( - "class with name: " + name + " already loaded. Do not reference your java mixin classes before registering", - link - ) - } - } + CompilerBootstrap.warmupSanityChecker() - getBytes("cpw/mods/fml/common/asm/FMLSanityChecker") + def getBytes(name: String): Array[Byte] = ClassBytes.getBytes(name) - def getBytes(name: String): Array[Byte] = { - val jName = name.replace('/', '.') - if (jName == "java.lang.Object") - return null + def internalDefine(name$ : String, bytes: Array[Byte]) = + ClassBytes.internalDefine(traitByteMap, name$, bytes) - def useTransformers = f_transformerExceptions - .get(cl) - .asInstanceOf[JSet[String]] - .find(jName.startsWith) - .isEmpty - - val obfName = - if (ObfMapping.obfuscated) - FMLDeobfuscatingRemapper.INSTANCE.unmap(name).replace('/', '.') - else jName - val bytes = cl.getClassBytes(obfName) - if (bytes != null && useTransformers) - return m_runTransformers - .invoke(cl, jName, obfName, bytes) - .asInstanceOf[Array[Byte]] - - return bytes - } - - def internalDefine(name$ : String, bytes: Array[Byte]) { - val name = nodeName(name$) - traitByteMap.put(name, bytes) - remClassInfo(name) - DebugPrinter.dump(name, bytes) - } - - def classNode(name$ : String) = { - val name = nodeName(name$) - traitByteMap.getOrElseUpdate(name, getBytes(name)) match { - case null => null - case v => createClassNode(v, ClassReader.EXPAND_FRAMES) - } - } + def classNode(name$ : String) = ClassBytes.classNode(traitByteMap, name$) def getMixinInfo(name: String) = mixinMap.get(name) case class FieldMixin(name: String, desc: String, access: Int) { - def accessName(owner: String) = if ((access & ACC_PRIVATE) != 0) - owner.replace('/', '$') + "$$" + name - else - name + def accessName(owner: String) = + MixinClassGenerator.fieldAccessName(this, owner) } case class MixinInfo( @@ -159,7 +53,7 @@ object ASMMixinCompiler { methods: Seq[MethodNode], supers: Seq[String] ) { - def linearise: Seq[MixinInfo] = parentTraits.flatMap(_.linearise) :+ this + def linearise: Seq[MixinInfo] = MixinClassGenerator.linearise(this) def tname = name + "$class" } @@ -183,11 +77,12 @@ object ASMMixinCompiler { override def toString = getClass.getName.replaceAll(".+[\\$\\.]", "") + "(" + name + ")" - def parentMethods = (superClass ++ interfaces).view.flatMap(_.allMethods) - def allMethods: Iterable[MethodInfo] = methods ++ parentMethods - def findPublicImpl(name: String, desc: String) = allMethods.find(m => - m.name == name && m.desc == desc && !m.isAbstract && !m.isPrivate - ) + // javac reads view()'s generic return as Object instead of its IterableView descriptor. + def parentMethods = + ClassInfoLookup.parentMethods((superClass ++ interfaces).view) + def allMethods: Iterable[MethodInfo] = ClassInfoLookup.allMethods(this) + def findPublicImpl(name: String, desc: String) = + ClassInfoLookup.findPublicImpl(this, name, desc) def isScala = false def isTrait = false @@ -195,16 +90,16 @@ object ASMMixinCompiler { def moduleName = name } - private val infoCache = MMap[String, ClassInfo]() + private val infoCache = CompilerBootstrap.mutableMap[String, ClassInfo]() def remClassInfo(name: String) = infoCache.remove(name) implicit def getClassInfo(name: String) = - infoCache.getOrElseUpdate(name, ClassInfo.obtainInfo(name)) + ClassInfoLookup.getClassInfo(infoCache, name) implicit def getClassInfo(cnode: ClassNode): ClassInfo = getClassInfo( cnode.name ) implicit def getClassInfo(clazz: Class[_]): ClassInfo = - if (clazz == null) null else getClassInfo(clazz.nodeName) + if (clazz == null) null else getClassInfo(nodeName(clazz.getName)) object ClassInfo { class ReflectionClassInfo(clazz: Class[_]) extends ClassInfo { @@ -212,15 +107,16 @@ object ASMMixinCompiler { def owner = ReflectionClassInfo.this def name = method.getName def desc = getType(method).getDescriptor - def exceptions = method.getExceptionTypes.map(_.nodeName) + def exceptions = ClassInfoLookup.exceptionNames(method) def isPrivate = Modifier.isPrivate(method.getModifiers) def isAbstract = Modifier.isAbstract(method.getModifiers) } - def name = clazz.nodeName + def name = nodeName(clazz.getName) def superClass = Option(clazz.getSuperclass) - def interfaces = clazz.getInterfaces.map(getClassInfo) - def methods = clazz.getMethods.map(ReflectionMethodInfo(_)) + def interfaces = ClassInfoLookup.reflectionInterfaces(clazz) + def methods = + ClassInfoLookup.reflectionMethods(clazz, ReflectionMethodInfo(_)) } class ClassNodeInfo(val cnode: ClassNode) extends ClassInfo { @@ -228,15 +124,16 @@ object ASMMixinCompiler { def owner = ClassNodeInfo.this def name = mnode.name def desc = mnode.desc - def exceptions = Array(mnode.exceptions: _*) + def exceptions = ClassInfoLookup.exceptionNames(mnode.exceptions) def isPrivate = (mnode.access & ACC_PRIVATE) != 0 def isAbstract = (mnode.access & ACC_ABSTRACT) != 0 } def name = cnode.name def superClass = Some(cnode.superName) - def interfaces: Seq[ClassInfo] = cnode.interfaces.map(getClassInfo) - def methods = cnode.methods.map(MethodNodeInfoSource) + def interfaces: Seq[ClassInfo] = ClassInfoLookup.nodeInterfaces(cnode) + def methods = + ClassInfoLookup.nodeMethods(cnode.methods, MethodNodeInfoSource) } class ScalaClassInfo( @@ -245,43 +142,25 @@ object ASMMixinCompiler { val csym: ScalaSignature#ClassSymbolRef ) extends ClassNodeInfo(cnode$) { override def superClass = Some(csym.jParent) - override def interfaces = csym.jInterfaces.map(getClassInfo) + override def interfaces = ClassInfoLookup.scalaInterfaces(csym) override def isScala = true override def isTrait = csym.isTrait override def isObject = csym.isObject } - private[ASMMixinCompiler] def obtainInfo(name: String): ClassInfo = { - if (name == null) return null - - def scalaInfo(cnode: ClassNode, obj: Boolean) = - ScalaSigReader.ann(cnode).flatMap { ann => - val sig = ScalaSigReader.read(ann) - val name = cnode.name.replace('/', '.') - (if (obj) sig.findObject(name) else sig.findClass(name)) - .map(csym => new ScalaClassInfo(cnode, sig, csym)) - } - - if (name.endsWith("$")) { // find scala object - val baseName = name.substring(0, name.length - 1) - val baseNode = classNode(baseName) - if (baseNode != null) scalaInfo(baseNode, true) match { - case Some(info) => return info - case None => - } - } - - classNode(name) match { - case null => - cl.findClass(name.replace('/', '.')) match { - case null => null - case c => new ReflectionClassInfo(c) - } - case cnode => - scalaInfo(cnode, false).getOrElse(new ClassNodeInfo(cnode)) - } - } + private[ASMMixinCompiler] def obtainInfo(name: String): ClassInfo = + ClassInfoLookup.obtainInfo( + name, + (node, sig, symbol) => + new ScalaClassInfo( + node, + sig, + symbol.asInstanceOf[ScalaSignature#ClassSymbolRef] + ), + node => new ClassNodeInfo(node), + clazz => new ReflectionClassInfo(clazz) + ) } import StackAnalyser.width @@ -294,16 +173,7 @@ object ASMMixinCompiler { name: String, desc: String ) { - val args = getArgumentTypes(mvdesc) - val ret = getReturnType(mvdesc) - var localIndex = 1 - args.foreach { arg => - mv.visitVarInsn(arg.getOpcode(ILOAD), localIndex) - localIndex += width(arg) - } - mv.visitMethodInsn(opcode, owner, name, desc, opcode == INVOKEINTERFACE) - mv.visitInsn(ret.getOpcode(IRETURN)) - mv.visitMaxs(Math.max(width(args) + 1, width(ret)), width(args) + 1) + ASMBridgeEmitter.finishBridgeCall(mv, mvdesc, opcode, owner, name, desc) } def writeBridge( @@ -314,559 +184,59 @@ object ASMMixinCompiler { name: String, desc: String ) { - mv.visitVarInsn(ALOAD, 0) - finishBridgeCall(mv, mvdesc, opcode, owner, name, desc) + ASMBridgeEmitter.writeBridge(mv, mvdesc, opcode, owner, name, desc) } def writeStaticBridge(mv: MethodNode, mname: String, t: MixinInfo) = - writeBridge( - mv, - mv.desc, - INVOKESTATIC, - t.tname, - mname, - staticDesc(t.name, mv.desc) - ) + ASMBridgeEmitter.writeStaticBridge(mv, mname, t) def mixinClasses( name: String, superClass: String, traits: Seq[String] ): Class[_] = { - if (traits.isEmpty) - return cl.findClass(superClass.name.replace('/', '.')) - - val startTime = System.currentTimeMillis - - val baseTraits = traits.map(mixinMap) - val mixinInfos = baseTraits.flatMap(_.linearise).distinct - val baseInfo = getClassInfo(superClass) - val traitInfos = mixinInfos.map(i => getClassInfo(i.name)) - - val cnode = new ClassNode() - // implements list - cnode.visit( - V1_6, - ACC_PUBLIC, - name, - null, - superClass, - baseTraits.map(_.name).toArray[String] - ) - - val cinit = baseInfo.methods.find(_.name == "").get - val minit = cnode - .visitMethod(ACC_PUBLIC, "", cinit.desc, null, null) - .asInstanceOf[MethodNode] - writeBridge( - minit, - cinit.desc, - INVOKESPECIAL, - superClass, - "", - cinit.desc - ) - minit.instructions.remove( - minit.instructions.getLast - ) // remove the RETURN from writeBridge - - val prevInfos = MList[MixinInfo]() - - mixinInfos.foreach { t => - minit.visitVarInsn(ALOAD, 0) - minit.visitMethodInsn( - INVOKESTATIC, - t.tname, - "$init$", - "(L" + t.name + ";)V", - false - ) - - t.fields.foreach { f => - val fv = cnode - .visitField(ACC_PRIVATE, f.accessName(t.name), f.desc, null, null) - .asInstanceOf[FieldNode] - - val ftype = getType(fv.desc) - var mv = - cnode.visitMethod(ACC_PUBLIC, fv.name, "()" + f.desc, null, null) - mv.visitVarInsn(ALOAD, 0) - mv.visitFieldInsn(GETFIELD, name, fv.name, fv.desc) - mv.visitInsn(ftype.getOpcode(IRETURN)) - mv.visitMaxs(1, 1) - - mv = cnode.visitMethod( - ACC_PUBLIC, - fv.name + "_$eq", - "(" + f.desc + ")V", - null, - null - ) - mv.visitVarInsn(ALOAD, 0) - mv.visitVarInsn(ftype.getOpcode(ILOAD), 1) - mv.visitFieldInsn(PUTFIELD, name, fv.name, fv.desc) - mv.visitInsn(RETURN) - mv.visitMaxs(width(ftype) + 1, width(ftype) + 1) - } - - t.supers.foreach { s => - val (name, desc) = seperateDesc(s) - val mv = cnode - .visitMethod( - ACC_PUBLIC, - t.name.replace('/', '$') + "$$super$" + name, - desc, - null, - null - ) - .asInstanceOf[MethodNode] - - prevInfos.reverse.find( - _.methods.exists(m => m.name == name && m.desc == desc) - ) match { - // each super goes to the one before - case Some(st) => writeStaticBridge(mv, name, st) - case None => - writeBridge( - mv, - desc, - INVOKESPECIAL, - baseInfo.findPublicImpl(name, desc).get.owner.name, - name, - desc - ) - } - } - - prevInfos += t - } - - val methodSigs = MSet[String]() - mixinInfos.reverse.foreach { t => // last trait gets first pick on methods - t.methods.foreach { m => - if (!methodSigs(m.name + m.desc)) { - val mv = cnode - .visitMethod( - ACC_PUBLIC, - m.name, - m.desc, - null, - Array(m.exceptions: _*) - ) - .asInstanceOf[MethodNode] - writeStaticBridge(mv, m.name, t) - methodSigs += m.name + m.desc - } - } - } - - minit.visitInsn(RETURN) - - // generate synthetic bridge methods for covariant return types + // Retain the compiler-emitted public local-helper binary name. def allParents(info: ClassInfo): Iterable[ClassInfo] = - info +: (info.superClass ++ info.interfaces).toSeq.flatMap(allParents) - val allParentInfos = (baseInfo +: traitInfos).flatMap(allParents).distinct - val allParentMethods = allParentInfos.flatMap(_.methods) - methodSigs.toSeq.foreach { nameDesc => - val (name, desc) = seperateDesc(nameDesc) - val pDesc = desc.substring(0, desc.lastIndexOf(')') + 1) - - allParentMethods - .filter(m => m.name == name && m.desc.startsWith(pDesc)) - .foreach { m => - if (!methodSigs(m.name + m.desc)) { - val mv = cnode - .visitMethod( - ACC_PUBLIC | ACC_SYNTHETIC | ACC_BRIDGE, - m.name, - m.desc, - null, - m.exceptions - ) - .asInstanceOf[MethodNode] - writeBridge(mv, mv.desc, INVOKEVIRTUAL, cnode.name, name, desc) - methodSigs += m.name + m.desc - } - } - } - - val c = define(name, createBytes(cnode, 0)) - - DebugPrinter.logger.debug( - "Generation [" + superClass + " with " + traits.mkString( - ", " - ) + "] took " + (System.currentTimeMillis - startTime) + "ms" - ) - c - } - - def seperateDesc(nameDesc: String) = { - val n = nameDesc.indexOf('(') - (nameDesc.substring(0, n), nameDesc.substring(n)) - } - - def staticDesc(owner: String, desc: String) = { - val descT = getMethodType(desc) - getMethodDescriptor( - descT.getReturnType, - getType("L" + owner + ";") +: descT.getArgumentTypes: _* + MixinClassGenerator.allParents(info) + MixinClassGenerator.mixinClasses( + name, + superClass, + traits, + mixinMap, + allParents ) } + def seperateDesc(nameDesc: String) = ASMBridgeEmitter.seperateDesc(nameDesc) + + def staticDesc(owner: String, desc: String) = + ASMBridgeEmitter.staticDesc(owner, desc) def getSuper( minsn: MethodInsnNode, stack: StackAnalyser - ): Option[MethodInfo] = { - import StackAnalyser._ - - if (minsn.owner == stack.owner.getInternalName) - return None // not a super call - - // super calls are either to methods with the same name or contain a pattern 'target$$super$name' from the scala compiler - val methodName = stack.m.name.replaceAll(".+\\Q$$super$\\E", "") - if (minsn.name != methodName) - return None - - stack.peek(Type.getType(minsn.desc).getArgumentTypes.length) match { - case Load(This(o)) => - case _ => return None // have to be invoked on this - } - - getClassInfo(stack.owner.getInternalName).superClass - .flatMap(_.findPublicImpl(methodName, minsn.desc)) - } + ): Option[MethodInfo] = ClassInfoLookup.getSuper(minsn, stack) + // javac expects an extra '$' in the retained ClassInfo$ nested binary names. def getAndRegisterParentTraits(cnode: ClassNode) = - cnode.interfaces.map(getClassInfo).collect { - case i: ClassInfo.ScalaClassInfo if i.isTrait && !i.csym.isInterface => - registerScalaTrait(i.cnode) - } - - def registerJavaTrait(cnode: ClassNode) { - if ((cnode.access & ACC_INTERFACE) != 0) - throw new IllegalArgumentException( - "Cannot register java interface " + cnode.name + " as a mixin trait. Try register passThroughInterface" - ) - if (!cnode.innerClasses.isEmpty) - throw new IllegalArgumentException( - "Inner classes are not permitted for " + cnode.name + " as a java mixin trait. Use scala" - ) - if ((cnode.access & ACC_ABSTRACT) != 0) - throw new IllegalArgumentException( - "Cannot register abstract class " + cnode.name + " as a java mixin trait. Use scala" - ) - - // val parentTraits = getAndRegisterParentTraits(cnode) - val fields = cnode.fields - .map(f => (f.name, FieldMixin(f.name, f.desc, f.access))) - .toMap - val supers = MList[String]() // nameDesc to super owner - val methods = MList[MethodNode]() - val methodSigs = cnode.methods.map(m => m.name + m.desc).toSet - - /*if ((cnode.access & ACC_ABSTRACT) != 0) {//verify all methods are implemented - def getInterfaces(cnode:ClassNode):Seq[ClassNode] = cnode.interfaces.map(classNode).flatMap(i => getInterfaces(i) :+ i) - val interfaces = getInterfaces(cnode).distinct - val implementedSigs = (cnode.methods.filter(m => (m.access & ACC_ABSTRACT) == 0)++parentTraits.flatMap(_.methods)).map(m => m.name + m.desc).toSet - val missing = interfaces.flatMap(_.methods).map(m => m.name + m.desc).filterNot(implementedSigs) - if(!missing.isEmpty) - throw new IllegalArgumentException("Abstract java trait "+cnode.name+" needs to implement "+missing.mkString(", ")) - }*/ - - val inode = new ClassNode() // impl node - inode.visit( - V1_6, - ACC_ABSTRACT | ACC_PUBLIC, - cnode.name + "$class", - null, - "java/lang/Object", - null - ) - inode.sourceFile = cnode.sourceFile - - val tnode = new ClassNode() // trait node (interface) - tnode.visit( - V1_6, - ACC_INTERFACE | ACC_ABSTRACT | ACC_PUBLIC, - cnode.name, - null, - "java/lang/Object", - Array(cnode.interfaces: _*) + ScalaTraitRegistration.getAndRegisterParentTraits( + cnode, + info => + info match { + case i: ClassInfo.ScalaClassInfo => i.isTrait && !i.csym.isInterface + case _ => false + }, + info => info.asInstanceOf[ClassInfo.ScalaClassInfo].cnode ) - def fname(name: String) = fields(name).accessName(cnode.name) + def registerJavaTrait(cnode: ClassNode) = + JavaTraitRegistration.register(cnode, mixinMap) + def listSideOnly(sig: ScalaSignature) = ClassInfoLookup.listSideOnly(sig) - fields.values.foreach { fnode => - tnode.visitMethod( - ACC_PUBLIC | ACC_ABSTRACT, - fname(fnode.name), - "()" + fnode.desc, - null, - null - ) - tnode.visitMethod( - ACC_PUBLIC | ACC_ABSTRACT, - fname(fnode.name) + "_$eq", - "(" + fnode.desc + ")V", - null, - null - ) - } - - def superInsn(minsn: MethodInsnNode) = { - val bridgeName = cnode.name.replace('/', '$') + "$$super$" + minsn.name - if (!supers.contains(minsn.name + minsn.desc)) { - tnode.visitMethod( - ACC_PUBLIC | ACC_ABSTRACT, - bridgeName, - minsn.desc, - null, - null - ) - supers += minsn.name + minsn.desc - } - new MethodInsnNode( - INVOKEINTERFACE, - cnode.name, - bridgeName, - minsn.desc, - true - ) - } - - def staticClone(mnode: MethodNode, name: String, access: Int) = { - val mv = inode - .visitMethod( - access | ACC_STATIC, - name, - staticDesc(cnode.name, mnode.desc), - null, - Array(mnode.exceptions: _*) - ) - .asInstanceOf[MethodNode] - copy(mnode, mv) - mv - } - - def staticTransform(mnode: MethodNode, base: MethodNode) { - val stack = new StackAnalyser( - getType(Type.getObjectType(cnode.name).getDescriptor), - base - ) - val insnList = mnode.instructions - var insn = insnList.getFirst - - def replace(newinsn: AbstractInsnNode) { - insnList.insert(insn, newinsn) - insnList.remove(insn) - insn = newinsn - } - - // transform - while (insn != null) { - insn match { - case finsn: FieldInsnNode => - insn.getOpcode match { - case GETFIELD => - replace( - new MethodInsnNode( - INVOKEINTERFACE, - cnode.name, - fname(finsn.name), - "()" + finsn.desc, - true - ) - ) - case PUTFIELD => - replace( - new MethodInsnNode( - INVOKEINTERFACE, - cnode.name, - fname(finsn.name) + "_$eq", - "(" + finsn.desc + ")V", - true - ) - ) - case _ => - } - case minsn: MethodInsnNode => - insn.getOpcode match { - case INVOKESPECIAL => - if (getSuper(minsn, stack).isDefined) - replace(superInsn(minsn)) - case INVOKEVIRTUAL => - if (minsn.owner == cnode.name) { - if (methodSigs.contains(minsn.name + minsn.desc)) { // call the interface method - replace( - new MethodInsnNode( - INVOKEINTERFACE, - minsn.owner, - minsn.name, - minsn.desc, - true - ) - ) - } else { - // cast to parent class and call - val mType = Type.getMethodType(minsn.desc) - val instanceEntry = - stack.peek(width(mType.getArgumentTypes)) - insnList.insert( - instanceEntry.insn, - new TypeInsnNode( - CHECKCAST, - Type.getObjectType(cnode.superName).getDescriptor - ) - ) - minsn.owner = cnode.superName - } - } - case _ => - } - case _ => - } - stack.visitInsn(insn) - insn = insn.getNext - } - } - - def convertMethod(mnode: MethodNode) { - if (mnode.name == "") - throw new IllegalArgumentException( - "Static initialisers are not permitted " + cnode.name + " as a mixin trait" - ) - - if (mnode.name == "") { - if (mnode.desc != "()V") - throw new IllegalArgumentException( - "Constructor arguments are not permitted " + cnode.name + " as a mixin trait" - ) - - val mv = staticClone(mnode, "$init$", ACC_PUBLIC) - def removeSuperConstructor() { - val insns = new InsnListSection - insns.add(new VarInsnNode(ALOAD, 0)) - insns.add( - new MethodInsnNode( - INVOKESPECIAL, - cnode.superName, - "", - "()V", - false - ) - ) - - val minsns = new InsnListSection(mv.instructions) - val found = InsnComparator.matches(minsns, insns, Set[LabelNode]()) - if (found == null) - throw new IllegalArgumentException( - "Invalid constructor insn sequence " + cnode.name + "\n" + minsns - ) - found.trim(Set[LabelNode]()).remove() - } - removeSuperConstructor() - staticTransform(mv, mnode) - return - } - - if ((mnode.access & ACC_PRIVATE) == 0) { - val mv = tnode.visitMethod( - ACC_PUBLIC | ACC_ABSTRACT, - mnode.name, - mnode.desc, - null, - Array(mnode.exceptions: _*) - ) - methods += mv.asInstanceOf[MethodNode] - } - - // convert that method! - val access = - if ((mnode.access & ACC_PRIVATE) == 0) ACC_PUBLIC else ACC_PRIVATE - val mv = staticClone(mnode, mnode.name, access) - staticTransform(mv, mnode) - } - - cnode.methods.foreach(convertMethod) - - define(inode.name, createBytes(inode, 0)) - define(tnode.name, createBytes(tnode, 0)) - - mixinMap.put( - tnode.name, - MixinInfo( - tnode.name, - cnode.superName, - Seq(), - fields.values.toSeq, - methods, - supers - ) + def registerScalaTrait(cnode: ClassNode): MixinInfo = + ScalaTraitRegistration.registerScalaTrait( + cnode, + mixinMap, + info => info.asInstanceOf[ClassInfo.ScalaClassInfo].sig, + info => info.asInstanceOf[ClassInfo.ScalaClassInfo].csym ) - } - - def listSideOnly(sig: ScalaSignature) = { - val side = "cpw.mods.fml.relauncher.Side." + FMLLaunchHandler.side.name - sig - .collect[sig.AnnotationInfo](40) - .filter { a => - a.annType.name == "cpw.mods.fml.relauncher.SideOnly" && - a.getValue[sig.EnumLiteral]("value").value.full != side - } - .map(_.owner.full) - .toSet - } - - def registerScalaTrait(cnode: ClassNode): MixinInfo = { - getMixinInfo(cnode.name) match { - case Some(info) => return info - case None => - } - - val info = getClassInfo(cnode).asInstanceOf[ClassInfo.ScalaClassInfo] - val sig = info.sig - val sideOnly = listSideOnly(sig) - - val parentTraits = getAndRegisterParentTraits(cnode) - val fieldAccessors = MMap[String, sig.MethodSymbol]() - val fields = MList[FieldMixin]() - val methods = MList[MethodNode]() - val supers = MList[String]() - - val csym = info.csym - for (sym <- sig.collect[sig.MethodSymbol](8)) { - if (sym.isParam || sym.owner != csym) {} else if ( - sideOnly(sym.full) - ) {} else if (sym.isAccessor) { - fieldAccessors.put(sym.name, sym) - } else if (sym.isMethod) { - val desc = sym.jDesc - if (sym.name.startsWith("super$")) - supers += sym.name.substring(6) + desc - else if (!sym.isPrivate && !sym.isDeferred && sym.name != "$init$") - methods += (cnode.methods.find(m => - m.name == sym.name && m.desc == desc - ) match { - case Some(m) => m - case None => - throw new IllegalArgumentException( - "Unable to add mixin trait " + cnode.name + ": " + - sym.name + desc + " found in scala signature but not in class file. Most likely an obfuscation issue." - ) - }) - } else { - fields += FieldMixin( - sym.name.trim, - sym.jDesc, - if (fieldAccessors(sym.name.trim).isPrivate) ACC_PRIVATE - else ACC_PUBLIC - ) - } - } - - val mixin = - MixinInfo(cnode.name, csym.jParent, parentTraits, fields, methods, supers) - mixinMap.put(cnode.name, mixin) - mixin - } } diff --git a/src/main/scala/codechicken/multipart/asm/ASMMixinFactory.java b/src/main/scala/codechicken/multipart/asm/ASMMixinFactory.java new file mode 100644 index 0000000..a1a7103 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ASMMixinFactory.java @@ -0,0 +1,149 @@ +package codechicken.multipart.asm; + +import java.lang.reflect.Constructor; +import java.util.BitSet; +import java.util.Objects; + +import org.objectweb.asm.tree.ClassNode; + +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import scala.Option; +import scala.collection.Seq; +import scala.collection.Seq$; +import scala.collection.mutable.ArrayBuffer; +import scala.collection.mutable.Builder; +import scala.collection.mutable.HashMap; +import scala.collection.mutable.Map; +import scala.reflect.ClassTag$; +import scala.runtime.BoxesRunTime; + +public class ASMMixinFactory { + + private final Class baseType; + private final Seq> paramTypes; + private final Map traitMap; + private final ArrayBuffer traits; + private final Map> classMap; + private int ugenid; + + public ASMMixinFactory(Class baseType, Seq> paramTypes) { + this.baseType = baseType; + this.paramTypes = paramTypes; + traitMap = new HashMap<>(); + traits = new ArrayBuffer<>(); + classMap = new HashMap<>(); + } + + public Class baseType() { + return baseType; + } + + private String nextName() { + String name = baseType().getSimpleName() + "_cmp$$" + ugenid; + ugenid++; + return name; + } + + @SuppressWarnings("unchecked") + private Constructor compile(BitSet traitSet) throws NoSuchMethodException { + Builder> seq = Seq$.MODULE$.newBuilder(); + for (int i = traitSet.nextSetBit(0); i >= 0; i = traitSet.nextSetBit(i + 1)) { + seq.$plus$eq(traits.apply(i)); + } + + Class clazz = (Class) ASMMixinCompiler$.MODULE$ + .mixinClasses(nextName(), ASMImplicits.nodeName(baseType().getName()), seq.result()); + onCompiled(clazz, traitSet); + return clazz.getDeclaredConstructor((Class[]) paramTypes.toArray(ClassTag$.MODULE$.apply(Class.class))); + } + + // Scala's protected hooks are public in the reference bytecode. + public void onCompiled(Class clazz, BitSet traitSet) {} + + public void autoCompleteJavaTrait(ClassNode cnode) {} + + public synchronized T construct(BitSet traitSet, Seq args) { + try { + Option> cached = classMap.get(traitSet); + Constructor constructor; + if (cached.isDefined()) { + constructor = cached.get(); + } else { + constructor = compile(traitSet); + classMap.put(ASMImplicits.ExtBitSet$.MODULE$.copy$extension(traitSet), constructor); + } + return constructor.newInstance((Object[]) args.toArray(ClassTag$.MODULE$.Object())); + } catch (ReflectiveOperationException e) { + return ASMMixinFactory.throwUnchecked(e); + } + } + + public int getId(String s_trait) { + return BoxesRunTime.unboxToInt(traitMap.apply(s_trait)); + } + + public int registerTrait(Class traitClass) { + return registerTrait(ASMImplicits.nodeName(traitClass.getName())); + } + + public int registerTrait(String s_trait) { + ClassNode cnode = ASMMixinCompiler$.MODULE$.classNode(s_trait); + if (cnode == null) { + return ASMMixinFactory.throwUnchecked(new ClassNotFoundException(s_trait)); + } + + Option registered = traitMap.get(cnode.name); + if (registered.isDefined()) { + return BoxesRunTime.unboxToInt(registered.get()); + } + + ClassInfo info = ASMMixinCompiler$.MODULE$.getClassInfo(cnode); + String parentName = codechicken$multipart$asm$ASMMixinFactory$$concreteParent$1(info).name(); + if (!codechicken$multipart$asm$ASMMixinFactory$$checkParent$1( + ASMMixinCompiler$.MODULE$.getClassInfo(baseType()), + parentName)) { + throw new IllegalArgumentException( + ASMImplicits.nodeName(baseType().getName()) + " does not extend parent " + + parentName + + " of mixin trait " + + s_trait); + } + + if (info.isTrait()) { + ASMMixinCompiler$.MODULE$.registerScalaTrait(cnode); + } else { + autoCompleteJavaTrait(cnode); + ASMMixinCompiler$.MODULE$.registerJavaTrait(cnode); + } + + int id = traits.size(); + traits.$plus$eq(cnode.name); + traitMap.put(cnode.name, id); + return id; + } + + // Retain the public helpers emitted for Scala's local recursive functions. + public final ClassInfo codechicken$multipart$asm$ASMMixinFactory$$concreteParent$1(ClassInfo info) { + Option mixin = ASMMixinCompiler$.MODULE$.getMixinInfo(info.name()); + if (mixin.isDefined()) { + return ASMMixinCompiler$.MODULE$.getClassInfo(mixin.get().parent()); + } + ClassInfo parent = info.superClass().get(); + if (parent.isTrait() || ASMMixinCompiler$.MODULE$.getMixinInfo(parent.name()).isDefined()) { + return codechicken$multipart$asm$ASMMixinFactory$$concreteParent$1(parent); + } + return parent; + } + + public final boolean codechicken$multipart$asm$ASMMixinFactory$$checkParent$1(ClassInfo info, String parentName) { + if (Objects.equals(info.name(), parentName)) return true; + Option parent = info.superClass(); + return parent.isDefined() && codechicken$multipart$asm$ASMMixinFactory$$checkParent$1(parent.get(), parentName); + } + + @SuppressWarnings("unchecked") + private static R throwUnchecked(Throwable throwable) throws E { + throw (E) throwable; + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ASMMixinFactory.scala b/src/main/scala/codechicken/multipart/asm/ASMMixinFactory.scala deleted file mode 100644 index 63cb2e3..0000000 --- a/src/main/scala/codechicken/multipart/asm/ASMMixinFactory.scala +++ /dev/null @@ -1,95 +0,0 @@ -package codechicken.multipart.asm - -import java.lang.reflect.Constructor -import scala.collection.mutable -import org.objectweb.asm.tree.ClassNode -import java.util.BitSet -import scala.collection.mutable.ArrayBuffer -import ASMMixinCompiler._ -import ASMImplicits._ - -class ASMMixinFactory[T]( - val baseType: Class[T], - private val paramTypes: Class[_]* -) { - private val traitMap = mutable.Map[String, Int]() - private val traits = ArrayBuffer[String]() - private val classMap = mutable.Map[BitSet, Constructor[_ <: T]]() - - private var ugenid = 0 - - private def nextName() = { - val ret = baseType.getSimpleName + "_cmp$$" + ugenid - ugenid += 1 - ret - } - - private def compile(traitSet: BitSet) = { - val seq = Seq.newBuilder[String] - var i = -1 - while ({ i = traitSet.nextSetBit(i + 1); i >= 0 }) - seq += traits(i) - - val c = ASMMixinCompiler - .mixinClasses(nextName(), baseType.nodeName, seq.result()) - .asInstanceOf[Class[_ <: T]] - onCompiled(c, traitSet) - c.getDeclaredConstructor(paramTypes: _*) - } - - protected def onCompiled(clazz: Class[_ <: T], traitSet: BitSet) {} - protected def autoCompleteJavaTrait(cnode: ClassNode) {} - - def construct(traitSet: BitSet, args: Object*) = synchronized { - (classMap.get(traitSet) match { - case Some(c) => c - case None => - val c = compile(traitSet) - classMap.put(traitSet.copy, c) - c - }).newInstance(args: _*) - } - - def getId(s_trait: String) = traitMap(s_trait) - - def registerTrait(traitClass: Class[_]): Int = registerTrait( - traitClass.nodeName - ) - - def registerTrait(s_trait: String): Int = { - val cnode = classNode(s_trait) - if (cnode == null) - throw new ClassNotFoundException(s_trait) - - traitMap.get(cnode.name) match { - case Some(id) => return id - case None => - } - - val info = getClassInfo(cnode) - def concreteParent(info: ClassInfo): ClassInfo = info.superClass.map { - case i if i.isTrait => concreteParent(i) - case i => i - }.get - - val parentName = concreteParent(info).name - def checkParent(info: ClassInfo): Boolean = - info.name == parentName || info.superClass.exists(checkParent) - if (!checkParent(getClassInfo(baseType))) - throw new IllegalArgumentException( - baseType.nodeName + " does not extend parent " + parentName + " of mixin trait " + s_trait - ) - - if (info.isTrait) { - registerScalaTrait(cnode) - } else { - autoCompleteJavaTrait(cnode) - registerJavaTrait(cnode) - } - - val id = traits.size - traits += cnode.name - traitMap.put(cnode.name, id) - id - } -} diff --git a/src/main/scala/codechicken/multipart/asm/ByteCodeReader.java b/src/main/scala/codechicken/multipart/asm/ByteCodeReader.java new file mode 100644 index 0000000..5999564 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ByteCodeReader.java @@ -0,0 +1,71 @@ +package codechicken.multipart.asm; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import scala.runtime.BoxesRunTime; + +public class ByteCodeReader { + + private final Bytes bc; + private int pos; + + public ByteCodeReader(Bytes bc) { + this.bc = bc; + pos = bc.pos(); + } + + public Bytes bc() { + return bc; + } + + public int pos() { + return pos; + } + + public void pos_$eq(int pos) { + this.pos = pos; + } + + public boolean more() { + return pos() < bc().pos() + bc().len(); + } + + public String readString(int len) { + byte[] bytes = bc().arr(); + int start = pos(); + start = Math.min(bytes.length, Math.max(0, start)); + int length = Math.min(bytes.length - start, Math.max(0, len)); + return advance(len, new String(bytes, start, length)); + } + + public byte readByte() { + // Retain Scala's null-to-zero unboxing if an override of advance returns null. + return BoxesRunTime.unboxToByte(advance(1, BoxesRunTime.boxToByte(bc().arr()[pos()]))); + } + + public int readNat() { + int r = 0; + int b = 0; + do { + b = readByte(); + r = r << 7 | b & 0x7f; + } while ((b & 0x80) != 0); + return r; + } + + public long readLong() { + long l = 0L; + while (more()) { + l <<= 8; + l |= readByte() & 0xff; + } + return l; + } + + public A advance(int len, A r) { + if (pos() + len > bc().pos() + bc().len()) { + throw new IllegalArgumentException("Ran off the end of bytecode"); + } + pos_$eq(pos() + len); + return r; + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ByteCodecs$.java b/src/main/scala/codechicken/multipart/asm/ByteCodecs$.java new file mode 100644 index 0000000..d46a5b9 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ByteCodecs$.java @@ -0,0 +1,217 @@ +/* + * Scala API (c) 2007-2013, LAMP/EPFL http://scala-lang.org/ + */ +package codechicken.multipart.asm; + +public final class ByteCodecs$ { + + public static final ByteCodecs$ MODULE$ = new ByteCodecs$(); + + private ByteCodecs$() {} + + public byte[] avoidZero(byte[] src) { + int i = 0; + int srclen = src.length; + int count = 0; + while (i < srclen) { + if (src[i] == 0x7f) count += 1; + i += 1; + } + byte[] dst = new byte[srclen + count]; + i = 0; + int j = 0; + while (i < srclen) { + byte in = src[i]; + if (in == 0x7f) { + dst[j] = (byte) 0xc0; + dst[j + 1] = (byte) 0x80; + j += 2; + } else { + dst[j] = (byte) (in + 1); + j += 1; + } + i += 1; + } + return dst; + } + + public int regenerateZero(byte[] src) { + int i = 0; + int srclen = src.length; + int j = 0; + while (i < srclen) { + int in = src[i] & 0xff; + // A trailing 0xc0 deliberately retains the reference's unchecked failure and prior writes. + if (in == 0xc0 && (src[i + 1] & 0xff) == 0x80) { + src[j] = 0x7f; + i += 2; + } else if (in == 0) { + src[j] = 0x7f; + i += 1; + } else { + src[j] = (byte) (in - 1); + i += 1; + } + j += 1; + } + return j; + } + + public byte[] encode8to7(byte[] src) { + int srclen = src.length; + int dstlen = (srclen * 8 + 6) / 7; + byte[] dst = new byte[dstlen]; + int i = 0; + int j = 0; + while (i + 6 < srclen) { + int in = src[i] & 0xff; + dst[j] = (byte) (in & 0x7f); + int out = in >>> 7; + in = src[i + 1] & 0xff; + dst[j + 1] = (byte) (out | (in << 1) & 0x7f); + out = in >>> 6; + in = src[i + 2] & 0xff; + dst[j + 2] = (byte) (out | (in << 2) & 0x7f); + out = in >>> 5; + in = src[i + 3] & 0xff; + dst[j + 3] = (byte) (out | (in << 3) & 0x7f); + out = in >>> 4; + in = src[i + 4] & 0xff; + dst[j + 4] = (byte) (out | (in << 4) & 0x7f); + out = in >>> 3; + in = src[i + 5] & 0xff; + dst[j + 5] = (byte) (out | (in << 5) & 0x7f); + out = in >>> 2; + in = src[i + 6] & 0xff; + dst[j + 6] = (byte) (out | (in << 6) & 0x7f); + out = in >>> 1; + dst[j + 7] = (byte) out; + i += 7; + j += 8; + } + if (i < srclen) { + int in = src[i] & 0xff; + dst[j] = (byte) (in & 0x7f); + j += 1; + int out = in >>> 7; + if (i + 1 < srclen) { + in = src[i + 1] & 0xff; + dst[j] = (byte) (out | (in << 1) & 0x7f); + j += 1; + out = in >>> 6; + if (i + 2 < srclen) { + in = src[i + 2] & 0xff; + dst[j] = (byte) (out | (in << 2) & 0x7f); + j += 1; + out = in >>> 5; + if (i + 3 < srclen) { + in = src[i + 3] & 0xff; + dst[j] = (byte) (out | (in << 3) & 0x7f); + j += 1; + out = in >>> 4; + if (i + 4 < srclen) { + in = src[i + 4] & 0xff; + dst[j] = (byte) (out | (in << 4) & 0x7f); + j += 1; + out = in >>> 3; + if (i + 5 < srclen) { + in = src[i + 5] & 0xff; + dst[j] = (byte) (out | (in << 5) & 0x7f); + j += 1; + out = in >>> 2; + } + } + } + } + } + if (j < dstlen) dst[j] = (byte) out; + } + return dst; + } + + public int decode7to8(byte[] src, int srclen) { + int i = 0; + int j = 0; + int dstlen = (srclen * 7 + 7) / 8; + while (i + 7 < srclen) { + // Keep signed byte promotion, including the unsigned shifts of malformed high-bit input. + int out = src[i]; + byte in = src[i + 1]; + src[j] = (byte) (out | (in & 0x01) << 7); + out = in >>> 1; + in = src[i + 2]; + src[j + 1] = (byte) (out | (in & 0x03) << 6); + out = in >>> 2; + in = src[i + 3]; + src[j + 2] = (byte) (out | (in & 0x07) << 5); + out = in >>> 3; + in = src[i + 4]; + src[j + 3] = (byte) (out | (in & 0x0f) << 4); + out = in >>> 4; + in = src[i + 5]; + src[j + 4] = (byte) (out | (in & 0x1f) << 3); + out = in >>> 5; + in = src[i + 6]; + src[j + 5] = (byte) (out | (in & 0x3f) << 2); + out = in >>> 6; + in = src[i + 7]; + src[j + 6] = (byte) (out | in << 1); + i += 8; + j += 7; + } + if (i < srclen) { + int out = src[i]; + if (i + 1 < srclen) { + byte in = src[i + 1]; + src[j] = (byte) (out | (in & 0x01) << 7); + j += 1; + out = in >>> 1; + if (i + 2 < srclen) { + in = src[i + 2]; + src[j] = (byte) (out | (in & 0x03) << 6); + j += 1; + out = in >>> 2; + if (i + 3 < srclen) { + in = src[i + 3]; + src[j] = (byte) (out | (in & 0x07) << 5); + j += 1; + out = in >>> 3; + if (i + 4 < srclen) { + in = src[i + 4]; + src[j] = (byte) (out | (in & 0x0f) << 4); + j += 1; + out = in >>> 4; + if (i + 5 < srclen) { + in = src[i + 5]; + src[j] = (byte) (out | (in & 0x1f) << 3); + j += 1; + out = in >>> 5; + if (i + 6 < srclen) { + in = src[i + 6]; + src[j] = (byte) (out | (in & 0x3f) << 2); + j += 1; + out = in >>> 6; + } + } + } + } + } + } + if (j < dstlen) src[j] = (byte) out; + } + return dstlen; + } + + public byte[] encode(byte[] xs) { + return avoidZero(encode8to7(xs)); + } + + /** + * Destructively decodes xs and returns its decoded length, possibly including an extra zero padding byte. For + * example, encoding {1, 2, 3} gives {2, 5, 13, 1}, which decodes to {1, 2, 3, 0} with length 4. + */ + public int decode(byte[] xs) { + int len = regenerateZero(xs); + return decode7to8(xs, len); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ByteCodecs.java b/src/main/scala/codechicken/multipart/asm/ByteCodecs.java new file mode 100644 index 0000000..719c8f6 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ByteCodecs.java @@ -0,0 +1,30 @@ +package codechicken.multipart.asm; + +public final class ByteCodecs { + + private ByteCodecs() {} + + public static byte[] avoidZero(byte[] src) { + return ByteCodecs$.MODULE$.avoidZero(src); + } + + public static int regenerateZero(byte[] src) { + return ByteCodecs$.MODULE$.regenerateZero(src); + } + + public static byte[] encode8to7(byte[] src) { + return ByteCodecs$.MODULE$.encode8to7(src); + } + + public static int decode7to8(byte[] src, int srclen) { + return ByteCodecs$.MODULE$.decode7to8(src, srclen); + } + + public static byte[] encode(byte[] xs) { + return ByteCodecs$.MODULE$.encode(xs); + } + + public static int decode(byte[] xs) { + return ByteCodecs$.MODULE$.decode(xs); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ByteCodecs.scala b/src/main/scala/codechicken/multipart/asm/ByteCodecs.scala deleted file mode 100644 index b6b5ee0..0000000 --- a/src/main/scala/codechicken/multipart/asm/ByteCodecs.scala +++ /dev/null @@ -1,211 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2007-2013, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ -package codechicken.multipart.asm - -object ByteCodecs { - - def avoidZero(src: Array[Byte]): Array[Byte] = { - var i = 0 - val srclen = src.length - var count = 0 - while (i < srclen) { - if (src(i) == 0x7f) count += 1 - i += 1 - } - val dst = new Array[Byte](srclen + count) - i = 0 - var j = 0 - while (i < srclen) { - val in = src(i) - if (in == 0x7f) { - dst(j) = (0xc0).toByte - dst(j + 1) = (0x80).toByte - j += 2 - } else { - dst(j) = (in + 1).toByte - j += 1 - } - i += 1 - } - dst - } - - def regenerateZero(src: Array[Byte]): Int = { - var i = 0 - val srclen = src.length - var j = 0 - while (i < srclen) { - val in: Int = src(i) & 0xff - if (in == 0xc0 && (src(i + 1) & 0xff) == 0x80) { - src(j) = 0x7f - i += 2 - } else if (in == 0) { - src(j) = 0x7f - i += 1 - } else { - src(j) = (in - 1).toByte - i += 1 - } - j += 1 - } - j - } - - def encode8to7(src: Array[Byte]): Array[Byte] = { - val srclen = src.length - val dstlen = (srclen * 8 + 6) / 7 - val dst = new Array[Byte](dstlen) - var i = 0 - var j = 0 - while (i + 6 < srclen) { - var in: Int = src(i) & 0xff - dst(j) = (in & 0x7f).toByte - var out: Int = in >>> 7 - in = src(i + 1) & 0xff - dst(j + 1) = (out | (in << 1) & 0x7f).toByte - out = in >>> 6 - in = src(i + 2) & 0xff - dst(j + 2) = (out | (in << 2) & 0x7f).toByte - out = in >>> 5 - in = src(i + 3) & 0xff - dst(j + 3) = (out | (in << 3) & 0x7f).toByte - out = in >>> 4 - in = src(i + 4) & 0xff - dst(j + 4) = (out | (in << 4) & 0x7f).toByte - out = in >>> 3 - in = src(i + 5) & 0xff - dst(j + 5) = (out | (in << 5) & 0x7f).toByte - out = in >>> 2 - in = src(i + 6) & 0xff - dst(j + 6) = (out | (in << 6) & 0x7f).toByte - out = in >>> 1 - dst(j + 7) = out.toByte - i += 7 - j += 8 - } - if (i < srclen) { - var in: Int = src(i) & 0xff - dst(j) = (in & 0x7f).toByte; j += 1 - var out: Int = in >>> 7 - if (i + 1 < srclen) { - in = src(i + 1) & 0xff - dst(j) = (out | (in << 1) & 0x7f).toByte; j += 1 - out = in >>> 6 - if (i + 2 < srclen) { - in = src(i + 2) & 0xff - dst(j) = (out | (in << 2) & 0x7f).toByte; j += 1 - out = in >>> 5 - if (i + 3 < srclen) { - in = src(i + 3) & 0xff - dst(j) = (out | (in << 3) & 0x7f).toByte; j += 1 - out = in >>> 4 - if (i + 4 < srclen) { - in = src(i + 4) & 0xff - dst(j) = (out | (in << 4) & 0x7f).toByte; j += 1 - out = in >>> 3 - if (i + 5 < srclen) { - in = src(i + 5) & 0xff - dst(j) = (out | (in << 5) & 0x7f).toByte; j += 1 - out = in >>> 2 - } - } - } - } - } - if (j < dstlen) dst(j) = out.toByte - } - dst - } - - def decode7to8(src: Array[Byte], srclen: Int): Int = { - var i = 0 - var j = 0 - val dstlen = (srclen * 7 + 7) / 8 - while (i + 7 < srclen) { - var out: Int = src(i).toInt - var in: Byte = src(i + 1) - src(j) = (out | (in & 0x01) << 7).toByte - out = in >>> 1 - in = src(i + 2) - src(j + 1) = (out | (in & 0x03) << 6).toByte - out = in >>> 2 - in = src(i + 3) - src(j + 2) = (out | (in & 0x07) << 5).toByte - out = in >>> 3 - in = src(i + 4) - src(j + 3) = (out | (in & 0x0f) << 4).toByte - out = in >>> 4 - in = src(i + 5) - src(j + 4) = (out | (in & 0x1f) << 3).toByte - out = in >>> 5 - in = src(i + 6) - src(j + 5) = (out | (in & 0x3f) << 2).toByte - out = in >>> 6 - in = src(i + 7) - src(j + 6) = (out | in << 1).toByte - i += 8 - j += 7 - } - if (i < srclen) { - var out: Int = src(i).toInt - if (i + 1 < srclen) { - var in: Byte = src(i + 1) - src(j) = (out | (in & 0x01) << 7).toByte; j += 1 - out = in >>> 1 - if (i + 2 < srclen) { - in = src(i + 2) - src(j) = (out | (in & 0x03) << 6).toByte; j += 1 - out = in >>> 2 - if (i + 3 < srclen) { - in = src(i + 3) - src(j) = (out | (in & 0x07) << 5).toByte; j += 1 - out = in >>> 3 - if (i + 4 < srclen) { - in = src(i + 4) - src(j) = (out | (in & 0x0f) << 4).toByte; j += 1 - out = in >>> 4 - if (i + 5 < srclen) { - in = src(i + 5) - src(j) = (out | (in & 0x1f) << 3).toByte; j += 1 - out = in >>> 5 - if (i + 6 < srclen) { - in = src(i + 6) - src(j) = (out | (in & 0x3f) << 2).toByte; j += 1 - out = in >>> 6 - } - } - } - } - } - } - if (j < dstlen) src(j) = out.toByte - } - dstlen - } - - def encode(xs: Array[Byte]): Array[Byte] = avoidZero(encode8to7(xs)) - - /** Destructively decodes array xs and returns the length of the decoded - * array. - * - * Sometimes returns (length+1) of the decoded array. Example: - * - * scala> val enc = scala.reflect.generic.ByteCodecs.encode(Array(1,2,3)) - * enc: Array[Byte] = Array(2, 5, 13, 1) - * - * scala> scala.reflect.generic.ByteCodecs.decode(enc) res43: Int = 4 - * - * scala> enc res44: Array[Byte] = Array(1, 2, 3, 0) - * - * However, this does not always happen. - */ - def decode(xs: Array[Byte]): Int = { - val len = regenerateZero(xs) - decode7to8(xs, len) - } -} diff --git a/src/main/scala/codechicken/multipart/asm/ClassBytes.java b/src/main/scala/codechicken/multipart/asm/ClassBytes.java new file mode 100644 index 0000000..f49488d --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ClassBytes.java @@ -0,0 +1,85 @@ +package codechicken.multipart.asm; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.util.Set; + +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.tree.ClassNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.lib.asm.ObfMapping; +import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; +import scala.collection.JavaConversions; +import scala.collection.mutable.Map; +import scala.runtime.AbstractFunction0; +import scala.runtime.AbstractFunction1; + +/** Class-byte loading and caching behind the retained compiler singleton and Scala entry points. */ +final class ClassBytes { + + private ClassBytes() {} + + static Class define(String name, byte[] bytes) throws IllegalAccessException, InvocationTargetException { + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + compiler.internalDefine(name, bytes); + DebugPrinter$.MODULE$.defined(name, bytes); + try { + return (Class) compiler.m_defineClass().invoke(compiler.cl(), bytes, 0, bytes.length); + } catch (LinkageError link) { + // Reflective failures normally remain wrapped; retain the original direct-error guard. + if (link.getMessage().contains("duplicate")) { + throw new IllegalStateException( + "class with name: " + name + + " already loaded. Do not reference your java mixin classes before registering", + link); + } + throw link; + } + } + + static byte[] getBytes(String name) throws IOException, IllegalAccessException, InvocationTargetException { + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + final String javaName = name.replace('/', '.'); + if (javaName.equals("java.lang.Object")) return null; + String obfuscatedName = ObfMapping.obfuscated ? FMLDeobfuscatingRemapper.INSTANCE.unmap(name).replace('/', '.') + : javaName; + byte[] bytes = compiler.cl().getClassBytes(obfuscatedName); + if (bytes != null && useTransformers(compiler, javaName)) { + return (byte[]) compiler.m_runTransformers().invoke(compiler.cl(), javaName, obfuscatedName, bytes); + } + return bytes; + } + + @SuppressWarnings("unchecked") + private static boolean useTransformers(ASMMixinCompiler$ compiler, final String name) + throws IllegalAccessException { + Set exclusions = (Set) compiler.f_transformerExceptions().get(compiler.cl()); + return JavaConversions.asScalaSet(exclusions).find(new AbstractFunction1() { + + @Override + public Object apply(String prefix) { + return name.startsWith(prefix); + } + }).isEmpty(); + } + + static void internalDefine(Map cache, String name, byte[] bytes) { + String normalized = ASMImplicits.nodeName(name); + cache.put(normalized, bytes); + ASMMixinCompiler$.MODULE$.remClassInfo(normalized); + DebugPrinter$.MODULE$.dump(normalized, bytes); + } + + static ClassNode classNode(Map cache, String name) { + final String normalized = ASMImplicits.nodeName(name); + byte[] bytes = cache.getOrElseUpdate(normalized, new AbstractFunction0() { + + @Override + public byte[] apply() { + return ASMMixinCompiler$.MODULE$.getBytes(normalized); + } + }); + return bytes == null ? null : ASMHelper.createClassNode(bytes, ClassReader.EXPAND_FRAMES); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ClassInfoLookup.java b/src/main/scala/codechicken/multipart/asm/ClassInfoLookup.java new file mode 100644 index 0000000..0fb0900 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ClassInfoLookup.java @@ -0,0 +1,229 @@ +package codechicken.multipart.asm; + +import java.lang.reflect.Method; +import java.util.Objects; + +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AnnotationNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo$; +import codechicken.multipart.asm.ASMMixinCompiler.MethodInfo; +import codechicken.multipart.asm.StackAnalyser.Load; +import codechicken.multipart.asm.StackAnalyser.StackEntry; +import codechicken.multipart.asm.StackAnalyser.This; +import cpw.mods.fml.relauncher.FMLLaunchHandler; +import scala.Array$; +import scala.Function1; +import scala.Function3; +import scala.Option; +import scala.Predef; +import scala.Predef.DummyImplicit$; +import scala.collection.GenTraversableOnce; +import scala.collection.Iterable; +import scala.collection.Iterable$; +import scala.collection.IterableView; +import scala.collection.IterableView$; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.TraversableLike; +import scala.collection.TraversableOnce; +import scala.collection.immutable.IndexedSeq$; +import scala.collection.immutable.List$; +import scala.collection.immutable.Set; +import scala.collection.mutable.Buffer; +import scala.collection.mutable.Buffer$; +import scala.collection.mutable.Map; +import scala.runtime.AbstractFunction0; +import scala.runtime.AbstractFunction1; + +/** + * Metadata lookup behind the retained Scala nested models, construction callbacks and view bridge. Raw traversal + * interfaces disambiguate Scala's covariant generic methods while preserving virtual collection dispatch. + */ +@SuppressWarnings({ "unchecked", "rawtypes" }) +final class ClassInfoLookup { + + private ClassInfoLookup() {} + + static IterableView> parentMethods(IterableView parents) { + return (IterableView>) ((TraversableLike) parents) + .flatMap(new AbstractFunction1>() { + + @Override + public GenTraversableOnce apply(ClassInfo parent) { + return parent.allMethods(); + } + }, IterableView$.MODULE$.canBuildFrom()); + } + + static Iterable allMethods(ClassInfo info) { + return (Iterable) ((TraversableLike) info.methods()) + .$plus$plus(info.parentMethods(), Iterable$.MODULE$.canBuildFrom()); + } + + static Option findPublicImpl(ClassInfo info, final String name, final String desc) { + return info.allMethods().find(new AbstractFunction1() { + + @Override + public Object apply(MethodInfo method) { + return Objects.equals(method.name(), name) && Objects.equals(method.desc(), desc) + && !method.isAbstract() + && !method.isPrivate(); + } + }); + } + + static ClassInfo getClassInfo(Map cache, final String name) { + return cache.getOrElseUpdate(name, new AbstractFunction0() { + + @Override + public ClassInfo apply() { + return ClassInfo$.MODULE$.obtainInfo(name); + } + }); + } + + static Iterable reflectionInterfaces(Class type) { + return mapArray(type.getInterfaces(), new AbstractFunction1, ClassInfo>() { + + @Override + public ClassInfo apply(Class parent) { + return ASMMixinCompiler$.MODULE$.getClassInfo(parent); + } + }); + } + + static Iterable reflectionMethods(Class type, Function1 factory) { + return mapArray(type.getMethods(), factory); + } + + private static Iterable mapArray(A[] values, Function1 function) { + return (Iterable) ((TraversableLike) Predef.refArrayOps(values)) + .map(function, Array$.MODULE$.fallbackCanBuildFrom(DummyImplicit$.MODULE$.dummyImplicit())); + } + + static Seq nodeInterfaces(ClassNode node) { + return (Seq) ((TraversableLike) JavaConversions.asScalaBuffer(node.interfaces)) + .map(resolveName(), Buffer$.MODULE$.canBuildFrom()); + } + + static Iterable nodeMethods(Buffer methods, Function1 factory) { + return (Iterable) ((TraversableLike) methods).map(factory, Buffer$.MODULE$.canBuildFrom()); + } + + static Seq scalaInterfaces(Object symbol) { + return (Seq) ((TraversableLike) ((ScalaSignature.ClassSymbolRef) symbol).jInterfaces()) + .map(resolveName(), List$.MODULE$.canBuildFrom()); + } + + private static Function1 resolveName() { + return new AbstractFunction1() { + + @Override + public ClassInfo apply(String name) { + return ASMMixinCompiler$.MODULE$.getClassInfo(name); + } + }; + } + + static String[] exceptionNames(Method method) { + Class[] exceptions = method.getExceptionTypes(); + String[] names = new String[exceptions.length]; + for (int i = 0; i < names.length; i++) names[i] = ASMImplicits.nodeName(exceptions[i].getName()); + return names; + } + + static String[] exceptionNames(java.util.List exceptions) { + return exceptions.toArray(new String[0]); + } + + static ClassInfo obtainInfo(String name, Function3 scalaFactory, + Function1 nodeFactory, Function1, ClassInfo> reflectionFactory) { + if (name == null) return null; + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + if (name.endsWith("$")) { + ClassNode base = compiler.classNode(name.substring(0, name.length() - 1)); + if (base != null) { + Option info = scalaInfo(base, true, scalaFactory); + if (info.isDefined()) return info.get(); + } + } + ClassNode node = compiler.classNode(name); + if (node == null) { + Class type; + try { + type = compiler.cl().findClass(name.replace('/', '.')); + } catch (ClassNotFoundException exception) { + return ClassInfoLookup.throwUnchecked(exception); + } + return type == null ? null : reflectionFactory.apply(type); + } + Option info = scalaInfo(node, false, scalaFactory); + return info.isDefined() ? info.get() : nodeFactory.apply(node); + } + + private static Option scalaInfo(ClassNode node, boolean object, + Function3 factory) { + Option annotation = ScalaSigReader$.MODULE$.ann(node); + if (!annotation.isDefined()) return Option.empty(); + ScalaSignature signature = ScalaSigReader$.MODULE$.read(annotation.get()); + String name = node.name.replace('/', '.'); + Option symbol = object ? signature.findObject(name) + : signature.findClass(name); + if (!symbol.isDefined()) return Option.empty(); + return new scala.Some<>(factory.apply(node, signature, symbol.get())); + } + + @SuppressWarnings("unchecked") + private static R throwUnchecked(Throwable throwable) throws E { + throw (E) throwable; + } + + static Option getSuper(final MethodInsnNode call, StackAnalyser stack) { + if (Objects.equals(call.owner, stack.owner().getInternalName())) return Option.empty(); + + final String methodName = stack.m().name.replaceAll(".+\\Q$$super$\\E", ""); + if (!Objects.equals(call.name, methodName)) return Option.empty(); + + // Preserve the compiler's argument-count indexing, including its behavior for wide stack values. + StackEntry receiver = stack.peek(Type.getType(call.desc).getArgumentTypes().length); + if (!(receiver instanceof Load) || !(((Load) receiver).e() instanceof This)) return Option.empty(); + + return ASMMixinCompiler$.MODULE$.getClassInfo(stack.owner().getInternalName()).superClass() + .flatMap(new AbstractFunction1>() { + + @Override + public Option apply(ClassInfo parent) { + return parent.findPublicImpl(methodName, call.desc); + } + }); + } + + static Set listSideOnly(ScalaSignature sig) { + final String side = "cpw.mods.fml.relauncher.Side." + FMLLaunchHandler.side().name(); + TraversableLike filtered = (TraversableLike) sig.collect(40) + .filter(new AbstractFunction1() { + + @Override + public Object apply(ScalaSignature.AnnotationInfo annotation) { + return Objects.equals(annotation.annType().name(), "cpw.mods.fml.relauncher.SideOnly") + && !Objects.equals( + annotation.getValue("value").value().full(), + side); + } + }); + TraversableOnce owners = (TraversableOnce) filtered + .map(new AbstractFunction1() { + + @Override + public String apply(ScalaSignature.AnnotationInfo annotation) { + return annotation.owner().full(); + } + }, IndexedSeq$.MODULE$.canBuildFrom()); + return owners.toSet(); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/CompilerBootstrap.java b/src/main/scala/codechicken/multipart/asm/CompilerBootstrap.java new file mode 100644 index 0000000..625d374 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/CompilerBootstrap.java @@ -0,0 +1,44 @@ +package codechicken.multipart.asm; + +import java.lang.reflect.AccessibleObject; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +import net.minecraft.launchwrapper.LaunchClassLoader; + +import scala.collection.mutable.HashMap; +import scala.collection.mutable.Map; + +/** Reflection and storage initialization for the retained compiler singleton. */ +final class CompilerBootstrap { + + private CompilerBootstrap() {} + + static LaunchClassLoader loader(Class owner) { + return (LaunchClassLoader) owner.getClassLoader(); + } + + static Method defineClassMethod() throws NoSuchMethodException { + return ClassLoader.class.getDeclaredMethod("defineClass", byte[].class, int.class, int.class); + } + + static Method runTransformersMethod() throws NoSuchMethodException { + return LaunchClassLoader.class.getDeclaredMethod("runTransformers", String.class, String.class, byte[].class); + } + + static Field transformerExceptionsField() throws NoSuchFieldException { + return LaunchClassLoader.class.getDeclaredField("transformerExceptions"); + } + + static void open(AccessibleObject... members) { + for (AccessibleObject member : members) member.setAccessible(true); + } + + static Map mutableMap() { + return new HashMap<>(); + } + + static void warmupSanityChecker() { + ASMMixinCompiler$.MODULE$.getBytes("cpw/mods/fml/common/asm/FMLSanityChecker"); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/DebugPrinter$.java b/src/main/scala/codechicken/multipart/asm/DebugPrinter$.java new file mode 100644 index 0000000..7577f0c --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/DebugPrinter$.java @@ -0,0 +1,55 @@ +package codechicken.multipart.asm; + +import java.io.File; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import codechicken.lib.asm.ASMHelper; +import codechicken.lib.asm.ObfMapping; +import codechicken.multipart.handler.MultipartProxy; + +public final class DebugPrinter$ { + + public static final DebugPrinter$ MODULE$ = new DebugPrinter$(); + + private final boolean debug; + private final Logger logger; + private int permGenUsed; + private final File dir; + + private DebugPrinter$() { + debug = MultipartProxy.config().getTag("debug_asm").getBooleanValue(!ObfMapping.obfuscated); + logger = LogManager.getLogger("Multipart ASM"); + dir = new File("asm/multipart"); + if (debug) { + if (!dir.exists()) dir.mkdirs(); + for (File file : dir.listFiles()) { + file.delete(); + } + } + } + + public boolean debug() { + return debug; + } + + public Logger logger() { + return logger; + } + + public File dir() { + return dir; + } + + public void dump(String name, byte[] bytes) { + if (debug) ASMHelper.dump(bytes, new File(dir, name.replace('/', '#') + ".txt"), false, false); + } + + public void defined(String name, byte[] bytes) { + if ((permGenUsed + bytes.length) / 16000 != permGenUsed / 16000) { + logger.debug((permGenUsed + bytes.length) + " bytes of permGen has been used by ASMMixinCompiler"); + } + permGenUsed += bytes.length; + } +} diff --git a/src/main/scala/codechicken/multipart/asm/DebugPrinter.java b/src/main/scala/codechicken/multipart/asm/DebugPrinter.java new file mode 100644 index 0000000..b8431b9 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/DebugPrinter.java @@ -0,0 +1,30 @@ +package codechicken.multipart.asm; + +import java.io.File; + +import org.apache.logging.log4j.Logger; + +public final class DebugPrinter { + + private DebugPrinter() {} + + public static boolean debug() { + return DebugPrinter$.MODULE$.debug(); + } + + public static Logger logger() { + return DebugPrinter$.MODULE$.logger(); + } + + public static File dir() { + return DebugPrinter$.MODULE$.dir(); + } + + public static void dump(String name, byte[] bytes) { + DebugPrinter$.MODULE$.dump(name, bytes); + } + + public static void defined(String name, byte[] bytes) { + DebugPrinter$.MODULE$.defined(name, bytes); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/JavaTraitRegistration.java b/src/main/scala/codechicken/multipart/asm/JavaTraitRegistration.java new file mode 100644 index 0000000..932a156 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/JavaTraitRegistration.java @@ -0,0 +1,387 @@ +package codechicken.multipart.asm; + +import static org.objectweb.asm.Opcodes.*; + +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Objects; +import java.util.function.Function; + +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.AnnotationNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.FieldNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TypeInsnNode; +import org.objectweb.asm.tree.VarInsnNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.lib.asm.InsnComparator; +import codechicken.lib.asm.InsnListSection; +import codechicken.multipart.asm.ASMMixinCompiler.FieldMixin; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import cpw.mods.fml.relauncher.FMLLaunchHandler; +import cpw.mods.fml.relauncher.SideOnly; +import scala.Function1; +import scala.Option; +import scala.Tuple2; +import scala.collection.JavaConversions; +import scala.collection.TraversableLike; +import scala.collection.immutable.Map; +import scala.collection.mutable.Buffer; +import scala.collection.mutable.ListBuffer; +import scala.runtime.AbstractFunction1; + +/** Java mixin rewriting behind the retained compiler singleton and Scala metadata models. */ +@SuppressWarnings({ "unchecked", "rawtypes" }) +final class JavaTraitRegistration { + + private JavaTraitRegistration() {} + + static void register(ClassNode input, scala.collection.mutable.Map mixins) { + if ((input.access & ACC_INTERFACE) != 0) throw new IllegalArgumentException( + "Cannot register java interface " + input.name + + " as a mixin trait. Try register passThroughInterface"); + if (!input.innerClasses.isEmpty()) throw new IllegalArgumentException( + "Inner classes are not permitted for " + input.name + " as a java mixin trait. Use scala"); + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + Option parentTrait = compiler.getMixinInfo(input.superName); + Map fields = scala.collection.immutable.Map$.MODULE$.empty(); + for (FieldNode field : input.fields) { + if (!excludedOnCurrentSide(field.visibleAnnotations, field.invisibleAnnotations)) + fields = fields.$plus(new Tuple2<>(field.name, new FieldMixin(field.name, field.desc, field.access))); + } + ListBuffer supers = new ListBuffer<>(); + ListBuffer methods = new ListBuffer<>(); + java.util.Set methodSignatures = new LinkedHashSet<>(); + List sourceMethods = new ArrayList<>(); + for (MethodNode method : input.methods) { + if (!excludedOnCurrentSide(method.visibleAnnotations, method.invisibleAnnotations)) { + sourceMethods.add(method); + methodSignatures.add(method.name + method.desc); + } + } + + ClassNode implementation = new ClassNode(); + implementation.visit(V1_6, ACC_ABSTRACT | ACC_PUBLIC, input.name + "$class", null, "java/lang/Object", null); + implementation.sourceFile = input.sourceFile; + ClassNode contract = new ClassNode(); + List interfaces = new ArrayList<>(input.interfaces); + if (parentTrait.isDefined()) interfaces.add(parentTrait.get().name()); + contract.visit( + V1_6, + ACC_INTERFACE | ACC_ABSTRACT | ACC_PUBLIC, + input.name, + null, + "java/lang/Object", + new LinkedHashSet<>(interfaces).toArray(new String[0])); + + for (FieldMixin field : iterable(fields.values())) { + String name = field.accessName(input.name); + contract.visitMethod(ACC_PUBLIC | ACC_ABSTRACT, name, "()" + field.desc(), null, null); + contract.visitMethod(ACC_PUBLIC | ACC_ABSTRACT, name + "_$eq", "(" + field.desc() + ")V", null, null); + } + + Context context = new Context( + input, + implementation, + contract, + fields, + methodSignatures, + supers, + methods, + parentTrait); + Buffer selected = (Buffer) ((TraversableLike) JavaConversions + .asScalaBuffer(sourceMethods)).filterNot(fn(context::isGeneratedFieldAccessor)); + selected.foreach(fn(method -> { + context.convertMethod(method); + return scala.runtime.BoxedUnit.UNIT; + })); + // Forge may have stripped the constructor before this ClassNode reaches the compiler. + if (!methodSignatures.contains("()V")) { + MethodNode initializer = (MethodNode) implementation + .visitMethod(ACC_PUBLIC | ACC_STATIC, "$init$", "(L" + input.name + ";)V", null, null); + initializer.visitInsn(RETURN); + initializer.visitMaxs(0, 1); + } + + compiler.define(implementation.name, ASMHelper.createBytes(implementation, 0)); + compiler.define(contract.name, ASMHelper.createBytes(contract, 0)); + mixins.put( + contract.name, + new MixinInfo( + contract.name, + parentTrait.isDefined() ? parentTrait.get().parent() : input.superName, + JavaConversions.asScalaBuffer( + parentTrait.isDefined() ? java.util.Collections.singletonList(parentTrait.get()) + : java.util.Collections.emptyList()) + .toList(), + fields.values().toSeq(), + methods, + supers)); + } + + private static boolean excludedOnCurrentSide(List visible, List invisible) { + return excludedOnCurrentSide(visible) || excludedOnCurrentSide(invisible); + } + + private static boolean excludedOnCurrentSide(List annotations) { + if (annotations == null) return false; + String side = FMLLaunchHandler.side().name(); + String descriptor = Type.getDescriptor(SideOnly.class); + for (AnnotationNode annotation : annotations) { + if (!Objects.equals(annotation.desc, descriptor) || annotation.values == null) continue; + for (int i = 0; i < annotation.values.size() - 1; i += 2) { + if (!Objects.equals(annotation.values.get(i), "value")) continue; + Object value = annotation.values.get(i + 1); + if (value instanceof String[] && ((String[]) value).length > 1 + && !Objects.equals(((String[]) value)[1], side)) + return true; + } + } + return false; + } + + private static final class Context { + + final ClassNode input; + final ClassNode implementation; + final ClassNode contract; + final Map fields; + final java.util.Set methodSignatures; + final ListBuffer supers; + final ListBuffer methods; + final Option parentTrait; + + Context(ClassNode input, ClassNode implementation, ClassNode contract, Map fields, + java.util.Set methodSignatures, ListBuffer supers, ListBuffer methods, + Option parentTrait) { + this.input = input; + this.implementation = implementation; + this.contract = contract; + this.fields = fields; + this.methodSignatures = methodSignatures; + this.supers = supers; + this.methods = methods; + this.parentTrait = parentTrait; + } + + /** + * A registered parent trait is only an interface in class metadata, so the generic super lookup finds no + * implementation. Resolve the call against the parent's linearization and its base instead. + */ + boolean isParentTraitSuperCall(MethodInsnNode call, StackAnalyser stack) { + if (!parentTrait.isDefined() || !Objects.equals(call.owner, input.superName) + || !Objects.equals(call.name, stack.m().name)) + return false; + StackAnalyser.StackEntry receiver = stack.peek( + StackAnalyser.width( + JavaConversions.asScalaBuffer(java.util.Arrays.asList(Type.getArgumentTypes(call.desc))))); + if (!(receiver instanceof StackAnalyser.Load) + || !(((StackAnalyser.Load) receiver).e() instanceof StackAnalyser.This)) + return false; + for (MixinInfo trait : JavaConversions.seqAsJavaList(parentTrait.get().linearise())) { + for (MethodNode method : JavaConversions.seqAsJavaList(trait.methods())) { + if (Objects.equals(method.name, call.name) && Objects.equals(method.desc, call.desc)) return true; + } + } + return ASMMixinCompiler$.MODULE$.getClassInfo(parentTrait.get().parent()) + .findPublicImpl(call.name, call.desc).isDefined(); + } + + String fieldName(String name) { + return fields.apply(name).accessName(input.name); + } + + MethodInsnNode superInstruction(MethodInsnNode instruction) { + String bridge = input.name.replace('/', '$') + "$$super$" + instruction.name; + if (!supers.contains(instruction.name + instruction.desc)) { + contract.visitMethod(ACC_PUBLIC | ACC_ABSTRACT, bridge, instruction.desc, null, null); + supers.$plus$eq(instruction.name + instruction.desc); + } + return new MethodInsnNode(INVOKEINTERFACE, input.name, bridge, instruction.desc, true); + } + + MethodNode staticClone(MethodNode source, String name, int access) { + MethodNode result = (MethodNode) implementation.visitMethod( + access | ACC_STATIC, + name, + ASMMixinCompiler$.MODULE$.staticDesc(input.name, source.desc), + null, + (String[]) source.exceptions.toArray(new String[0])); + ASMHelper.copy(source, result); + return result; + } + + void staticTransform(MethodNode method, MethodNode base) { + StackAnalyser stack = new StackAnalyser(Type.getType(Type.getObjectType(input.name).getDescriptor()), base); + InsnList instructions = method.instructions; + AbstractInsnNode instruction = instructions.getFirst(); + while (instruction != null) { + if (instruction instanceof FieldInsnNode) { + FieldInsnNode field = (FieldInsnNode) instruction; + if (instruction.getOpcode() == GETFIELD) instruction = replace( + instructions, + instruction, + new MethodInsnNode( + INVOKEINTERFACE, + input.name, + fieldName(field.name), + "()" + field.desc, + true)); + else if (instruction.getOpcode() == PUTFIELD) instruction = replace( + instructions, + instruction, + new MethodInsnNode( + INVOKEINTERFACE, + input.name, + fieldName(field.name) + "_$eq", + "(" + field.desc + ")V", + true)); + } else if (instruction instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instruction; + if (instruction.getOpcode() == INVOKESPECIAL) { + if (ASMMixinCompiler$.MODULE$.getSuper(call, stack).isDefined() + || isParentTraitSuperCall(call, stack)) + instruction = replace(instructions, instruction, superInstruction(call)); + } else if (instruction.getOpcode() == INVOKEVIRTUAL && Objects.equals(call.owner, input.name)) { + if (methodSignatures.contains(call.name + call.desc)) instruction = replace( + instructions, + instruction, + new MethodInsnNode(INVOKEINTERFACE, call.owner, call.name, call.desc, true)); + else { + Type methodType = Type.getMethodType(call.desc); + StackAnalyser.StackEntry receiver = stack.peek( + StackAnalyser.width( + JavaConversions.asScalaBuffer( + java.util.Arrays.asList(methodType.getArgumentTypes())))); + instructions.insert( + receiver.insn(), + new TypeInsnNode(CHECKCAST, Type.getObjectType(input.superName).getDescriptor())); + call.owner = input.superName; + } + } + } + stack.visitInsn(instruction); + instruction = instruction.getNext(); + } + } + + void convertMethod(MethodNode source) { + if (Objects.equals(source.name, "")) throw new IllegalArgumentException( + "Static initialisers are not permitted " + input.name + " as a mixin trait"); + if (Objects.equals(source.name, "")) { + if (!Objects.equals(source.desc, "()V")) throw new IllegalArgumentException( + "Constructor arguments are not permitted " + input.name + " as a mixin trait"); + MethodNode result = staticClone(source, "$init$", ACC_PUBLIC); + if ((input.access & ACC_ABSTRACT) != 0) removeAbstractSuperConstructor(result, source); + else removeSuperConstructor(result); + staticTransform(result, source); + return; + } + if ((source.access & ACC_ABSTRACT) != 0) { + contract.visitMethod( + ACC_PUBLIC | ACC_ABSTRACT, + source.name, + source.desc, + null, + (String[]) source.exceptions.toArray(new String[0])); + return; + } + if ((source.access & ACC_PRIVATE) == 0) { + MethodNode exposed = (MethodNode) contract.visitMethod( + ACC_PUBLIC | ACC_ABSTRACT, + source.name, + source.desc, + null, + (String[]) source.exceptions.toArray(new String[0])); + methods.$plus$eq(exposed); + } + int access = (source.access & ACC_PRIVATE) == 0 ? ACC_PUBLIC : ACC_PRIVATE; + staticTransform(staticClone(source, source.name, access), source); + } + + void removeSuperConstructor(MethodNode constructor) { + InsnListSection expected = new InsnListSection(); + expected.add(new VarInsnNode(ALOAD, 0)); + expected.add(new MethodInsnNode(INVOKESPECIAL, input.superName, "", "()V", false)); + InsnListSection actual = new InsnListSection(constructor.instructions); + InsnListSection found = InsnComparator.matches(actual, expected, java.util.Collections.emptySet()); + if (found == null) + throw new IllegalArgumentException("Invalid constructor insn sequence " + input.name + "\n" + actual); + found.trim(java.util.Collections.emptySet()).remove(); + } + + void removeAbstractSuperConstructor(MethodNode constructor, MethodNode source) { + StackAnalyser stack = new StackAnalyser(Type.getObjectType(input.name), source); + AbstractInsnNode instruction = constructor.instructions.getFirst(); + while (instruction != null) { + if (instruction.getOpcode() == INVOKESPECIAL && instruction instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instruction; + if (Objects.equals(call.owner, input.superName) && Objects.equals(call.name, "")) { + int argumentWidth = 0; + for (Type argument : Type.getArgumentTypes(call.desc)) argumentWidth += argument.getSize(); + StackAnalyser.StackEntry receiver = stack.peek(argumentWidth); + if (receiver instanceof StackAnalyser.Load + && ((StackAnalyser.Load) receiver).e() instanceof StackAnalyser.This) { + removeRange(constructor.instructions, receiver.insn(), instruction); + return; + } + } + } + stack.visitInsn(instruction); + instruction = instruction.getNext(); + } + throw new IllegalArgumentException( + "Invalid constructor insn sequence " + input.name + + "\n" + + new InsnListSection(constructor.instructions)); + } + + boolean isGeneratedFieldAccessor(MethodNode method) { + for (FieldMixin field : iterable(fields.values())) { + String name = field.accessName(input.name); + if (Objects.equals(method.name, name) && Objects.equals(method.desc, "()" + field.desc()) + || Objects.equals(method.name, name + "_$eq") + && Objects.equals(method.desc, "(" + field.desc() + ")V")) + return true; + } + return false; + } + } + + private static AbstractInsnNode replace(InsnList instructions, AbstractInsnNode old, AbstractInsnNode replacement) { + instructions.insert(old, replacement); + instructions.remove(old); + return replacement; + } + + private static void removeRange(InsnList instructions, AbstractInsnNode first, AbstractInsnNode last) { + AbstractInsnNode after = last.getNext(); + AbstractInsnNode instruction = first; + while (instruction != after) { + AbstractInsnNode next = instruction.getNext(); + instructions.remove(instruction); + instruction = next; + } + } + + private static java.lang.Iterable iterable(scala.collection.Iterable values) { + return JavaConversions.asJavaIterable(values); + } + + private static Function1 fn(Function function) { + return new AbstractFunction1() { + + @Override + public B apply(A value) { + return function.apply(value); + } + }; + } +} diff --git a/src/main/scala/codechicken/multipart/asm/MixinClassGenerator.java b/src/main/scala/codechicken/multipart/asm/MixinClassGenerator.java new file mode 100644 index 0000000..349e78c --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/MixinClassGenerator.java @@ -0,0 +1,204 @@ +package codechicken.multipart.asm; + +import static org.objectweb.asm.Opcodes.*; + +import java.util.Objects; +import java.util.function.Function; + +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.FieldMixin; +import codechicken.multipart.asm.ASMMixinCompiler.MethodInfo; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import scala.Function1; +import scala.Option; +import scala.Option$; +import scala.Tuple2; +import scala.collection.GenTraversableOnce; +import scala.collection.Iterable; +import scala.collection.Iterable$; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.Seq$; +import scala.collection.TraversableLike; +import scala.collection.mutable.ListBuffer; +import scala.collection.mutable.Map; +import scala.collection.mutable.Set; +import scala.collection.mutable.Set$; +import scala.runtime.AbstractFunction1; + +/** Composite generation behind the retained Scala entry point and metadata models. */ +@SuppressWarnings({ "unchecked", "rawtypes" }) +final class MixinClassGenerator { + + private MixinClassGenerator() {} + + static Seq linearise(MixinInfo info) { + Object parents = ((TraversableLike) info.parentTraits()) + .flatMap(fn(MixinInfo::linearise), Seq$.MODULE$.canBuildFrom()); + return (Seq) ((scala.collection.SeqLike) parents).$colon$plus(info, Seq$.MODULE$.canBuildFrom()); + } + + static String fieldAccessName(FieldMixin field, String owner) { + if ((field.access() & ACC_PRIVATE) != 0) return owner.replace('/', '$') + "$$" + field.name(); + return field.name(); + } + + static Class mixinClasses(String name, String superClass, Seq traits, Map mixins, + Function1> parents) throws ClassNotFoundException { + ASMMixinCompiler$ compiler = ASMMixinCompiler$.MODULE$; + if (traits.isEmpty()) + return compiler.cl().findClass(compiler.getClassInfo(superClass).name().replace('/', '.')); + + long startTime = System.currentTimeMillis(); + Seq baseTraits = map(traits, mixins::apply); + Seq mixinInfos = flatMap(baseTraits, MixinInfo::linearise).distinct(); + ClassInfo baseInfo = compiler.getClassInfo(superClass); + Seq traitInfos = map(mixinInfos, i -> compiler.getClassInfo(i.name())); + ClassNode node = new ClassNode(); + node.visit( + V1_6, + ACC_PUBLIC, + name, + null, + superClass, + JavaConversions.seqAsJavaList(map(baseTraits, MixinInfo::name)).toArray(new String[0])); + + MethodInfo constructor = baseInfo.methods().find(fn(m -> Objects.equals(m.name(), ""))).get(); + MethodNode init = (MethodNode) node.visitMethod(ACC_PUBLIC, "", constructor.desc(), null, null); + compiler.writeBridge(init, constructor.desc(), INVOKESPECIAL, superClass, "", constructor.desc()); + init.instructions.remove(init.instructions.getLast()); + + ListBuffer previous = new ListBuffer<>(); + for (MixinInfo trait : JavaConversions.seqAsJavaList(mixinInfos)) { + init.visitVarInsn(ALOAD, 0); + init.visitMethodInsn(INVOKESTATIC, trait.tname(), "$init$", "(L" + trait.name() + ";)V", false); + for (FieldMixin field : JavaConversions.seqAsJavaList(trait.fields())) { + FieldNode storage = (FieldNode) node + .visitField(ACC_PRIVATE, field.accessName(trait.name()), field.desc(), null, null); + Type type = Type.getType(storage.desc); + MethodVisitor method = node.visitMethod(ACC_PUBLIC, storage.name, "()" + field.desc(), null, null); + method.visitVarInsn(ALOAD, 0); + method.visitFieldInsn(GETFIELD, name, storage.name, storage.desc); + method.visitInsn(type.getOpcode(IRETURN)); + method.visitMaxs(1, 1); + method = node.visitMethod(ACC_PUBLIC, storage.name + "_$eq", "(" + field.desc() + ")V", null, null); + method.visitVarInsn(ALOAD, 0); + method.visitVarInsn(type.getOpcode(ILOAD), 1); + method.visitFieldInsn(PUTFIELD, name, storage.name, storage.desc); + method.visitInsn(RETURN); + method.visitMaxs(StackAnalyser.width(type) + 1, StackAnalyser.width(type) + 1); + } + for (String signature : JavaConversions.seqAsJavaList(trait.supers())) { + Tuple2 split = compiler.seperateDesc(signature); + String methodName = split._1(); + String descriptor = split._2(); + MethodNode method = (MethodNode) node.visitMethod( + ACC_PUBLIC, + trait.name().replace('/', '$') + "$$super$" + methodName, + descriptor, + null, + null); + Option prior = ((Seq) previous.reverse()).find( + fn( + t -> t.methods().exists( + fn( + m -> Objects.equals(m.name, methodName) + && Objects.equals(m.desc, descriptor))))); + if (prior.isDefined()) compiler.writeStaticBridge(method, methodName, prior.get()); + else compiler.writeBridge( + method, + descriptor, + INVOKESPECIAL, + baseInfo.findPublicImpl(methodName, descriptor).get().owner().name(), + methodName, + descriptor); + } + previous.$plus$eq(trait); + } + + Set signatures = Set$.MODULE$.empty(); + for (MixinInfo trait : JavaConversions.seqAsJavaList(mixinInfos.reverse())) { + for (MethodNode method : JavaConversions.seqAsJavaList(trait.methods())) { + if (!signatures.apply(method.name + method.desc)) { + MethodNode bridge = (MethodNode) node.visitMethod( + ACC_PUBLIC, + method.name, + method.desc, + null, + (String[]) method.exceptions.toArray(new String[0])); + compiler.writeStaticBridge(bridge, method.name, trait); + signatures.$plus$eq(method.name + method.desc); + } + } + } + init.visitInsn(RETURN); + + Seq allParents = flatMap(prepend(baseInfo, traitInfos), parents::apply).distinct(); + Seq allMethods = flatMap(allParents, ClassInfo::methods); + for (String signature : JavaConversions.seqAsJavaList(signatures.toSeq())) { + Tuple2 split = compiler.seperateDesc(signature); + String methodName = split._1(); + String descriptor = split._2(); + String parameters = descriptor.substring(0, descriptor.lastIndexOf(')') + 1); + Seq matching = (Seq) allMethods + .filter(fn(m -> Objects.equals(m.name(), methodName) && m.desc().startsWith(parameters))); + for (MethodInfo method : JavaConversions.seqAsJavaList(matching)) { + if (!signatures.apply(method.name() + method.desc())) { + MethodNode bridge = (MethodNode) node.visitMethod( + ACC_PUBLIC | ACC_SYNTHETIC | ACC_BRIDGE, + method.name(), + method.desc(), + null, + method.exceptions()); + compiler.writeBridge(bridge, bridge.desc, INVOKEVIRTUAL, node.name, methodName, descriptor); + signatures.$plus$eq(method.name() + method.desc()); + } + } + } + + Class result = compiler.define(name, ASMHelper.createBytes(node, 0)); + DebugPrinter$.MODULE$.logger().debug( + "Generation [" + superClass + + " with " + + traits.mkString(", ") + + "] took " + + (System.currentTimeMillis() - startTime) + + "ms"); + return result; + } + + static Iterable allParents(ClassInfo info) { + Iterable parents = (Iterable) ((TraversableLike) Option$.MODULE$ + .option2Iterable(info.superClass())).$plus$plus(info.interfaces(), Iterable$.MODULE$.canBuildFrom()); + return prepend(info, flatMap(parents.toSeq(), MixinClassGenerator::allParents)); + } + + private static Seq map(Seq values, Function function) { + return (Seq) ((TraversableLike) values).map(fn(function), Seq$.MODULE$.canBuildFrom()); + } + + private static Seq flatMap(Seq values, Function> function) { + return (Seq) ((TraversableLike) values).flatMap(fn(function), Seq$.MODULE$.canBuildFrom()); + } + + private static Seq prepend(A value, Seq values) { + return (Seq) ((scala.collection.SeqLike) values).$plus$colon(value, Seq$.MODULE$.canBuildFrom()); + } + + private static Function1 fn(Function function) { + return new AbstractFunction1() { + + @Override + public B apply(A value) { + return function.apply(value); + } + }; + } +} diff --git a/src/main/scala/codechicken/multipart/asm/MultipartMixinFactory$.java b/src/main/scala/codechicken/multipart/asm/MultipartMixinFactory$.java new file mode 100644 index 0000000..de05a65 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/MultipartMixinFactory$.java @@ -0,0 +1,268 @@ +package codechicken.multipart.asm; + +import static org.objectweb.asm.Opcodes.ACC_INTERFACE; +import static org.objectweb.asm.Opcodes.ACC_PRIVATE; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_SUPER; +import static org.objectweb.asm.Opcodes.ACC_TRANSIENT; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.CHECKCAST; +import static org.objectweb.asm.Opcodes.F_SAME; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.IFNULL; +import static org.objectweb.asm.Opcodes.IF_ACMPNE; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INSTANCEOF; +import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.PUTFIELD; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.V1_6; + +import java.util.ArrayList; +import java.util.BitSet; +import java.util.List; + +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.lib.asm.ASMHelper; +import codechicken.lib.asm.CC_ClassWriter; +import codechicken.lib.asm.ObfMapping; +import codechicken.multipart.MultipartGenerator$; +import codechicken.multipart.TileMultipart; +import scala.Predef$; +import scala.Tuple2; +import scala.collection.Iterator; +import scala.collection.immutable.Map; +import scala.collection.immutable.Map$; +import scala.collection.mutable.ArrayBuffer; +import scala.runtime.ObjectRef; + +public final class MultipartMixinFactory$ extends ASMMixinFactory { + + public static final MultipartMixinFactory$ MODULE$ = new MultipartMixinFactory$(); + + private MultipartMixinFactory$() { + super(TileMultipart.class, Predef$.MODULE$.wrapRefArray(new Class[0])); + } + + @Override + public void autoCompleteJavaTrait(ClassNode cnode) { + List copyFields = new ArrayList<>(); + for (FieldNode field : cnode.fields) { + if ((field.access & ACC_TRANSIENT) == 0) copyFields.add(field); + } + if (copyFields.isEmpty() || ASMHelper + .findMethod(new ObfMapping(cnode.name, "copyFrom", "(Lcodechicken/multipart/TileMultipart;)V"), cnode) + != null) { + return; + } + + MethodVisitor mv = cnode + .visitMethod(ACC_PUBLIC, "copyFrom", "(Lcodechicken/multipart/TileMultipart;)V", null, null); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESPECIAL, + "codechicken/multipart/TileMultipart", + "copyFrom", + "(Lcodechicken/multipart/TileMultipart;)V"); + mv.visitVarInsn(ALOAD, 1); + mv.visitTypeInsn(INSTANCEOF, cnode.name); + Label end = new Label(); + mv.visitJumpInsn(IFEQ, end); + + for (FieldNode field : copyFields) { + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitFieldInsn(GETFIELD, cnode.name, field.name, field.desc); + mv.visitFieldInsn(PUTFIELD, cnode.name, field.name, field.desc); + } + + mv.visitLabel(end); + mv.visitInsn(RETURN); + mv.visitMaxs(2, 2); + } + + public String generatePassThroughTrait(String s_interface) { + String iname = ASMImplicits.nodeName(s_interface); + String simpleName = iname.substring(iname.lastIndexOf('/') + 1); + if (simpleName.startsWith("I")) simpleName = simpleName.substring(1); + String tname = "T" + simpleName + "$$PassThrough"; + String vname = "impl"; + String idesc = "L" + iname + ";"; + + ClassNode inode = ASMMixinCompiler$.MODULE$.classNode(s_interface); + if (inode == null) { + ASMHelper.logger.error("Unable to generate pass through trait for: " + s_interface + " class not found."); + return null; + } + if ((inode.access & ACC_INTERFACE) == 0) { + throw new IllegalArgumentException(s_interface + " is not an interface."); + } + + CC_ClassWriter cw = new CC_ClassWriter(0); + cw.visit( + V1_6, + ACC_PUBLIC | ACC_SUPER, + tname, + null, + "codechicken/multipart/TileMultipart", + new String[] { iname }); + + FieldVisitor fv = cw.visitField(ACC_PRIVATE, vname, idesc, null, null); + fv.visitEnd(); + + MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "", "()V", null, null); + mv.visitCode(); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn(INVOKESPECIAL, "codechicken/multipart/TileMultipart", "", "()V"); + mv.visitInsn(RETURN); + mv.visitMaxs(1, 1); + mv.visitEnd(); + + mv = cw.visitMethod(ACC_PUBLIC, "bindPart", "(Lcodechicken/multipart/TMultiPart;)V", null, null); + mv.visitCode(); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESPECIAL, + "codechicken/multipart/TileMultipart", + "bindPart", + "(Lcodechicken/multipart/TMultiPart;)V"); + mv.visitVarInsn(ALOAD, 1); + mv.visitTypeInsn(INSTANCEOF, iname); + Label bindEnd = new Label(); + mv.visitJumpInsn(IFEQ, bindEnd); + mv.visitLabel(new Label()); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitTypeInsn(CHECKCAST, iname); + mv.visitFieldInsn(PUTFIELD, tname, vname, idesc); + mv.visitLabel(bindEnd); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitInsn(RETURN); + mv.visitMaxs(2, 2); + mv.visitEnd(); + + mv = cw.visitMethod(ACC_PUBLIC, "partRemoved", "(Lcodechicken/multipart/TMultiPart;I)V", null, null); + mv.visitCode(); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitVarInsn(ILOAD, 2); + mv.visitMethodInsn( + INVOKESPECIAL, + "codechicken/multipart/TileMultipart", + "partRemoved", + "(Lcodechicken/multipart/TMultiPart;I)V"); + mv.visitVarInsn(ALOAD, 1); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn(GETFIELD, tname, vname, idesc); + Label removeEnd = new Label(); + mv.visitJumpInsn(IF_ACMPNE, removeEnd); + mv.visitLabel(new Label()); + mv.visitVarInsn(ALOAD, 0); + mv.visitInsn(ACONST_NULL); + mv.visitFieldInsn(PUTFIELD, tname, vname, idesc); + mv.visitLabel(removeEnd); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitInsn(RETURN); + mv.visitMaxs(3, 3); + mv.visitEnd(); + + mv = cw.visitMethod(ACC_PUBLIC, "canAddPart", "(Lcodechicken/multipart/TMultiPart;)Z", null, null); + mv.visitCode(); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn(GETFIELD, tname, vname, idesc); + Label canAdd = new Label(); + mv.visitJumpInsn(IFNULL, canAdd); + mv.visitVarInsn(ALOAD, 1); + mv.visitTypeInsn(INSTANCEOF, iname); + mv.visitJumpInsn(IFEQ, canAdd); + mv.visitLabel(new Label()); + mv.visitInsn(ICONST_0); + mv.visitInsn(IRETURN); + mv.visitLabel(canAdd); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESPECIAL, + "codechicken/multipart/TileMultipart", + "canAddPart", + "(Lcodechicken/multipart/TMultiPart;)Z"); + mv.visitInsn(IRETURN); + mv.visitMaxs(2, 2); + mv.visitEnd(); + + ObjectRef visitor = ObjectRef.create(mv); + Iterator methods = codechicken$multipart$asm$MultipartMixinFactory$$methods$1(inode).values().iterator(); + while (methods.hasNext()) { + codechicken$multipart$asm$MultipartMixinFactory$$generatePassThroughMethod$1( + (MethodNode) methods.next(), + iname, + tname, + vname, + idesc, + cw, + visitor); + } + + cw.visitEnd(); + ASMMixinCompiler$.MODULE$.internalDefine(tname, cw.toByteArray()); + registerTrait(tname); + return tname; + } + + @Override + public void onCompiled(Class clazz, BitSet traitSet) { + MultipartGenerator$.MODULE$.registerTileClass(clazz, traitSet); + } + + // Keep Scala's map representation, inherited override precedence and bytecode emission order. + @SuppressWarnings({ "rawtypes", "unchecked" }) + public final Map codechicken$multipart$asm$MultipartMixinFactory$$methods$1(ClassNode cnode) { + Map methods = Map$.MODULE$.empty(); + for (MethodNode method : cnode.methods) { + methods = methods.$plus(new Tuple2<>(method.name + method.desc, method)); + } + if (cnode.interfaces == null) return methods; + + ArrayBuffer> inherited = new ArrayBuffer<>(); + for (String name : cnode.interfaces) { + inherited.$plus$plus$eq( + MODULE$.codechicken$multipart$asm$MultipartMixinFactory$$methods$1( + ASMMixinCompiler$.MODULE$.classNode(name))); + } + return methods.$plus$plus(inherited); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + public final void codechicken$multipart$asm$MultipartMixinFactory$$generatePassThroughMethod$1(MethodNode method, + String iname, String tname, String vname, String idesc, CC_ClassWriter cw, ObjectRef mv) { + mv.elem = cw.visitMethod( + ACC_PUBLIC, + method.name, + method.desc, + method.signature, + method.exceptions.toArray(new String[0])); + ((MethodVisitor) mv.elem).visitVarInsn(ALOAD, 0); + ((MethodVisitor) mv.elem).visitFieldInsn(GETFIELD, tname, vname, idesc); + ASMMixinCompiler$.MODULE$.finishBridgeCall( + (MethodVisitor) mv.elem, + method.desc, + INVOKEINTERFACE, + iname, + method.name, + method.desc); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/MultipartMixinFactory.java b/src/main/scala/codechicken/multipart/asm/MultipartMixinFactory.java new file mode 100644 index 0000000..af98c49 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/MultipartMixinFactory.java @@ -0,0 +1,56 @@ +package codechicken.multipart.asm; + +import java.util.BitSet; + +import org.objectweb.asm.tree.ClassNode; + +import codechicken.multipart.TileMultipart; +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import scala.collection.Seq; + +public final class MultipartMixinFactory { + + private MultipartMixinFactory() {} + + public static Class baseType() { + return MultipartMixinFactory$.MODULE$.baseType(); + } + + @SuppressWarnings("rawtypes") + public static Object construct(BitSet traitSet, Seq args) { + return MultipartMixinFactory$.MODULE$.construct(traitSet, args); + } + + public static int getId(String trait) { + return MultipartMixinFactory$.MODULE$.getId(trait); + } + + public static int registerTrait(Class trait) { + return MultipartMixinFactory$.MODULE$.registerTrait(trait); + } + + public static int registerTrait(String trait) { + return MultipartMixinFactory$.MODULE$.registerTrait(trait); + } + + public static void onCompiled(Class clazz, BitSet traitSet) { + MultipartMixinFactory$.MODULE$.onCompiled(clazz, traitSet); + } + + public static void autoCompleteJavaTrait(ClassNode cnode) { + MultipartMixinFactory$.MODULE$.autoCompleteJavaTrait(cnode); + } + + public static String generatePassThroughTrait(String s_interface) { + return MultipartMixinFactory$.MODULE$.generatePassThroughTrait(s_interface); + } + + public static ClassInfo codechicken$multipart$asm$ASMMixinFactory$$concreteParent$1(ClassInfo info) { + return MultipartMixinFactory$.MODULE$.codechicken$multipart$asm$ASMMixinFactory$$concreteParent$1(info); + } + + public static boolean codechicken$multipart$asm$ASMMixinFactory$$checkParent$1(ClassInfo info, String parentName) { + return MultipartMixinFactory$.MODULE$ + .codechicken$multipart$asm$ASMMixinFactory$$checkParent$1(info, parentName); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/MultipartMixinFactory.scala b/src/main/scala/codechicken/multipart/asm/MultipartMixinFactory.scala deleted file mode 100644 index 650a0d7..0000000 --- a/src/main/scala/codechicken/multipart/asm/MultipartMixinFactory.scala +++ /dev/null @@ -1,248 +0,0 @@ -package codechicken.multipart.asm - -import ASMMixinCompiler._ -import codechicken.lib.asm.ASMHelper._ -import codechicken.lib.asm.{ObfMapping, CC_ClassWriter} -import org.objectweb.asm.{Label, FieldVisitor, MethodVisitor} -import org.objectweb.asm.Opcodes._ -import org.objectweb.asm.tree.{MethodNode, ClassNode} -import codechicken.multipart.{MultipartGenerator, TileMultipart} -import java.util.BitSet -import ASMImplicits._ - -import scala.collection.JavaConversions._ - -object MultipartMixinFactory extends ASMMixinFactory(classOf[TileMultipart]) { - override protected def autoCompleteJavaTrait(cnode: ClassNode) { - if ( - !cnode.fields.isEmpty && findMethod( - new ObfMapping( - cnode.name, - "copyFrom", - "(Lcodechicken/multipart/TileMultipart;)V" - ), - cnode - ) == null - ) { - val mv = cnode.visitMethod( - ACC_PUBLIC, - "copyFrom", - "(Lcodechicken/multipart/TileMultipart;)V", - null, - null - ) - mv.visitVarInsn(ALOAD, 0) - mv.visitVarInsn(ALOAD, 1) - mv.visitMethodInsn( - INVOKESPECIAL, - "codechicken/multipart/TileMultipart", - "copyFrom", - "(Lcodechicken/multipart/TileMultipart;)V" - ) - - mv.visitVarInsn(ALOAD, 1) - mv.visitTypeInsn(INSTANCEOF, cnode.name) - val end = new Label() - mv.visitJumpInsn(IFEQ, end) - - cnode.fields.foreach { f => - mv.visitVarInsn(ALOAD, 0) - mv.visitVarInsn(ALOAD, 1) - mv.visitFieldInsn(GETFIELD, cnode.name, f.name, f.desc) - mv.visitFieldInsn(PUTFIELD, cnode.name, f.name, f.desc) - } - - mv.visitLabel(end) - mv.visitInsn(RETURN) - mv.visitMaxs(2, 2) - } - } - - def generatePassThroughTrait(s_interface: String): String = { - val iname = nodeName(s_interface) - val tname = { - var simpleName = iname.substring(iname.lastIndexOf('/') + 1) - if (simpleName.startsWith("I")) simpleName = simpleName.substring(1) - "T" + simpleName + "$$PassThrough" - } - val vname = "impl" - val idesc = "L" + iname + ";" - - val inode = classNode(s_interface) - if (inode == null) { - logger.error( - "Unable to generate pass through trait for: " + s_interface + " class not found." - ) - return null - } - if ((inode.access & ACC_INTERFACE) == 0) - throw new IllegalArgumentException(s_interface + " is not an interface.") - - val cw = new CC_ClassWriter(0) - var mv: MethodVisitor = null - var fv: FieldVisitor = null - - cw.visit( - V1_6, - ACC_PUBLIC | ACC_SUPER, - tname, - null, - "codechicken/multipart/TileMultipart", - Array(iname) - ) - - { - fv = cw.visitField(ACC_PRIVATE, vname, idesc, null, null) - fv.visitEnd() - } - { - mv = cw.visitMethod(ACC_PUBLIC, "", "()V", null, null) - mv.visitCode() - mv.visitVarInsn(ALOAD, 0) - mv.visitMethodInsn( - INVOKESPECIAL, - "codechicken/multipart/TileMultipart", - "", - "()V" - ) - mv.visitInsn(RETURN) - mv.visitMaxs(1, 1) - mv.visitEnd() - } - { - mv = cw.visitMethod( - ACC_PUBLIC, - "bindPart", - "(Lcodechicken/multipart/TMultiPart;)V", - null, - null - ) - mv.visitCode() - mv.visitVarInsn(ALOAD, 0) - mv.visitVarInsn(ALOAD, 1) - mv.visitMethodInsn( - INVOKESPECIAL, - "codechicken/multipart/TileMultipart", - "bindPart", - "(Lcodechicken/multipart/TMultiPart;)V" - ) - mv.visitVarInsn(ALOAD, 1) - mv.visitTypeInsn(INSTANCEOF, iname) - val l2 = new Label() - mv.visitJumpInsn(IFEQ, l2) - val l3 = new Label() - mv.visitLabel(l3) - mv.visitVarInsn(ALOAD, 0) - mv.visitVarInsn(ALOAD, 1) - mv.visitTypeInsn(CHECKCAST, iname) - mv.visitFieldInsn(PUTFIELD, tname, vname, idesc) - mv.visitLabel(l2) - mv.visitFrame(F_SAME, 0, null, 0, null) - mv.visitInsn(RETURN) - mv.visitMaxs(2, 2) - mv.visitEnd() - } - { - mv = cw.visitMethod( - ACC_PUBLIC, - "partRemoved", - "(Lcodechicken/multipart/TMultiPart;I)V", - null, - null - ) - mv.visitCode() - mv.visitVarInsn(ALOAD, 0) - mv.visitVarInsn(ALOAD, 1) - mv.visitVarInsn(ILOAD, 2) - mv.visitMethodInsn( - INVOKESPECIAL, - "codechicken/multipart/TileMultipart", - "partRemoved", - "(Lcodechicken/multipart/TMultiPart;I)V" - ) - mv.visitVarInsn(ALOAD, 1) - mv.visitVarInsn(ALOAD, 0) - mv.visitFieldInsn(GETFIELD, tname, vname, idesc) - val l2 = new Label() - mv.visitJumpInsn(IF_ACMPNE, l2) - val l3 = new Label() - mv.visitLabel(l3) - mv.visitVarInsn(ALOAD, 0) - mv.visitInsn(ACONST_NULL) - mv.visitFieldInsn(PUTFIELD, tname, vname, idesc) - mv.visitLabel(l2) - mv.visitFrame(F_SAME, 0, null, 0, null) - mv.visitInsn(RETURN) - mv.visitMaxs(3, 3) - mv.visitEnd() - } - { - mv = cw.visitMethod( - ACC_PUBLIC, - "canAddPart", - "(Lcodechicken/multipart/TMultiPart;)Z", - null, - null - ) - mv.visitCode() - mv.visitVarInsn(ALOAD, 0) - mv.visitFieldInsn(GETFIELD, tname, vname, idesc) - val l1 = new Label() - mv.visitJumpInsn(IFNULL, l1) - mv.visitVarInsn(ALOAD, 1) - mv.visitTypeInsn(INSTANCEOF, iname) - mv.visitJumpInsn(IFEQ, l1) - val l2 = new Label() - mv.visitLabel(l2) - mv.visitInsn(ICONST_0) - mv.visitInsn(IRETURN) - mv.visitLabel(l1) - mv.visitFrame(F_SAME, 0, null, 0, null) - mv.visitVarInsn(ALOAD, 0) - mv.visitVarInsn(ALOAD, 1) - mv.visitMethodInsn( - INVOKESPECIAL, - "codechicken/multipart/TileMultipart", - "canAddPart", - "(Lcodechicken/multipart/TMultiPart;)Z" - ) - mv.visitInsn(IRETURN) - mv.visitMaxs(2, 2) - mv.visitEnd() - } - - def methods(cnode: ClassNode): Map[String, MethodNode] = { - val m = cnode.methods.map(m => (m.name + m.desc, m)).toMap - if (cnode.interfaces != null) - m ++ cnode.interfaces.flatMap(i => methods(classNode(i))) - else - m - } - - def generatePassThroughMethod(m: MethodNode) { - mv = cw.visitMethod( - ACC_PUBLIC, - m.name, - m.desc, - m.signature, - Array(m.exceptions: _*) - ) - mv.visitVarInsn(ALOAD, 0) - mv.visitFieldInsn(GETFIELD, tname, vname, idesc) - finishBridgeCall(mv, m.desc, INVOKEINTERFACE, iname, m.name, m.desc) - } - - methods(inode).values.foreach(generatePassThroughMethod) - - cw.visitEnd() - internalDefine(tname, cw.toByteArray) - registerTrait(tname) - return tname - } - - override protected def onCompiled( - clazz: Class[_ <: TileMultipart], - traitSet: BitSet - ) = - MultipartGenerator.registerTileClass(clazz, traitSet) -} diff --git a/src/main/scala/codechicken/multipart/asm/ScalaSigReader$.java b/src/main/scala/codechicken/multipart/asm/ScalaSigReader$.java new file mode 100644 index 0000000..6436f25 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ScalaSigReader$.java @@ -0,0 +1,52 @@ +package codechicken.multipart.asm; + +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.List; + +import org.objectweb.asm.tree.AnnotationNode; +import org.objectweb.asm.tree.ClassNode; + +import codechicken.multipart.asm.ScalaSignature.Bytes$; +import scala.Option; +import scala.Some; + +public final class ScalaSigReader$ { + + public static final ScalaSigReader$ MODULE$ = new ScalaSigReader$(); + + private ScalaSigReader$() {} + + public byte[] decode(String s) { + // The reference decodes with the platform charset, not the UTF-8 used by encode. + byte[] bytes = s.getBytes(); + int length = ByteCodecs.decode(bytes); + return Arrays.copyOf(bytes, Math.min(bytes.length, Math.max(0, length))); + } + + public String encode(byte[] b) { + byte[] bytes = ByteCodecs.encode8to7(b); + for (int i = 0; i < bytes.length; i++) { + bytes[i] = (byte) ((bytes[i] + 1) & 0x7f); + } + return new String(bytes, 0, Math.max(0, bytes.length - 1), StandardCharsets.UTF_8); + } + + public ScalaSignature read(AnnotationNode ann) { + return new ScalaSignature(Bytes$.MODULE$.apply(decode((String) ann.values.get(1)))); + } + + public Object write(ScalaSignature sig, AnnotationNode ann) { + return ann.values.set(1, encode(sig.bytes().arr())); + } + + public Option ann(ClassNode cnode) { + List annotations = cnode.visibleAnnotations; + if (annotations != null) { + for (AnnotationNode annotation : annotations) { + if (annotation.desc.equals("Lscala/reflect/ScalaSignature;")) return new Some<>(annotation); + } + } + return Option.empty(); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ScalaSigReader.java b/src/main/scala/codechicken/multipart/asm/ScalaSigReader.java new file mode 100644 index 0000000..d406733 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ScalaSigReader.java @@ -0,0 +1,31 @@ +package codechicken.multipart.asm; + +import org.objectweb.asm.tree.AnnotationNode; +import org.objectweb.asm.tree.ClassNode; + +import scala.Option; + +public final class ScalaSigReader { + + private ScalaSigReader() {} + + public static byte[] decode(String s) { + return ScalaSigReader$.MODULE$.decode(s); + } + + public static String encode(byte[] b) { + return ScalaSigReader$.MODULE$.encode(b); + } + + public static ScalaSignature read(AnnotationNode ann) { + return ScalaSigReader$.MODULE$.read(ann); + } + + public static Object write(ScalaSignature sig, AnnotationNode ann) { + return ScalaSigReader$.MODULE$.write(sig, ann); + } + + public static Option ann(ClassNode cnode) { + return ScalaSigReader$.MODULE$.ann(cnode); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ScalaSignature.scala b/src/main/scala/codechicken/multipart/asm/ScalaSignature.scala index 0e9104e..4a1f916 100644 --- a/src/main/scala/codechicken/multipart/asm/ScalaSignature.scala +++ b/src/main/scala/codechicken/multipart/asm/ScalaSignature.scala @@ -1,13 +1,5 @@ package codechicken.multipart.asm -import org.objectweb.asm.tree.ClassNode -import org.objectweb.asm.tree.AnnotationNode -import org.objectweb.asm.tree.FieldNode -import org.objectweb.asm.tree.MethodNode -import java.util.{List => JList} -import scala.collection.JavaConverters._ -import scala.collection.JavaConversions._ - import ScalaSignature._ object ScalaSignature { @@ -17,7 +9,7 @@ object ScalaSignature { case class Bytes(arr: Array[Byte], pos: Int, len: Int) { def reader = new ByteCodeReader(this) - def section = arr.drop(pos).take(len) + def section = ScalaSignatureParser.section(this) } trait Flags { @@ -42,16 +34,8 @@ object ScalaSignature { class ScalaSignature(val bytes: Bytes) { val major = bytes.arr(0).toInt val minor = bytes.arr(1).toInt - val table = { - val bcr = bytes.reader - bcr.pos = 2 - Array.tabulate(bcr.readNat) { i => - val start = bcr.pos - val tpe = bcr.readByte - val len = bcr.readNat - bcr.advance(len)(new SigEntry(i, start, Bytes(bytes.arr, bcr.pos, len))) - } - } + val table = + ScalaSignatureParser.readTable(this, bytes).asInstanceOf[Array[SigEntry]] trait SymbolRef extends Flags { def full: String @@ -65,14 +49,13 @@ class ScalaSignature(val bytes: Bytes) { def flags: Int def infoId: Int - def full = owner.full + "." + name - override def toString = getClass.getName.replaceAll(".+\\$", "") + - "(" + name + "," + owner + "," + flags.toHexString + "," + infoId + ")" + def full = ScalaSignatureParser.classSymbolFull(this) + override def toString = ScalaSignatureParser.classSymbolString(this) def isObject = false def info: ClassType = evalT(infoId) - def jParent = info.parent.jName - def jInterfaces = info.interfaces.map(_.jName) + def jParent = ScalaSignatureParser.classParentName(this) + def jInterfaces = ScalaSignatureParser.interfaceNames(this) } case class ClassSymbol( @@ -97,12 +80,14 @@ class ScalaSignature(val bytes: Bytes) { flags: Int, infoId: Int ) extends SymbolRef { - override def toString = - "MethodSymbol(" + name + "," + owner + "," + flags.toHexString + "," + infoId + ")" - def full = owner.full + "." + name + override def toString = ScalaSignatureParser.methodSymbolString(this) + def full = ScalaSignatureParser.methodSymbolFull(this) - def info: TMethodType = evalT(infoId) - def jDesc = info.jDesc + def info: TMethodType = + ScalaSignatureParser + .methodSymbolInfo(ScalaSignature.this, this) + .asInstanceOf[TMethodType] + def jDesc = ScalaSignatureParser.methodSymbolDescriptor(this) } case class ExternalSymbol(name: String) extends SymbolRef { @@ -117,9 +102,7 @@ class ScalaSignature(val bytes: Bytes) { } trait TMethodType { - def jDesc = "(" + params - .map(m => m.info.returnType.jDesc) - .mkString + ")" + returnType.jDesc + def jDesc = ScalaSignatureParser.methodDescriptor(this) def returnType: TypeRef def params: List[MethodSymbol] } @@ -140,23 +123,9 @@ class ScalaSignature(val bytes: Bytes) { def sym: SymbolRef def name = sym.full - def jName = name.replace('.', '/') match { - case "scala/AnyRef" | "scala/Any" => "java/lang/Object" - case s => s - } + def jName = ScalaSignatureParser.typeName(name) - def jDesc = name match { - case "scala.Array" => null - case "scala.Long" => "J" - case "scala.Int" => "I" - case "scala.Short" => "S" - case "scala.Byte" => "B" - case "scala.Double" => "D" - case "scala.Float" => "F" - case "scala.Boolean" => "Z" - case "scala.Unit" => "V" - case _ => "L" + jName + ";" - } + def jDesc = ScalaSignatureParser.typeDescriptor(this) } case class TypeRefType(owner: TypeRef, sym: SymbolRef, typArgs: List[TypeRef]) @@ -166,10 +135,7 @@ class ScalaSignature(val bytes: Bytes) { def returnType = this - override def jDesc = name match { - case "scala.Array" => "[" + typArgs(0).jDesc - case _ => super.jDesc - } + override def jDesc = ScalaSignatureParser.appliedTypeDescriptor(this) } case class ThisType(sym: SymbolRef) extends TypeRef @@ -217,70 +183,25 @@ class ScalaSignature(val bytes: Bytes) { def getValue[T](name: String) = values(name).asInstanceOf[T] } - def evalS(i: Int): String = { - val e = table(i) - val bc = e.bytes - val bcr = bc.reader - e.id match { - case 1 | 2 => bcr.readString(bc.len) - case 3 => NoSymbol.full - case 9 | 10 => - var s = evalS(bcr.readNat) - if (bc.pos + bc.len > bcr.pos) - s = evalS(bcr.readNat) + "." + s - s - } - } + def evalS(i: Int): String = ScalaSignatureParser.evalS(this, i) def evalT[T](i: Int) = eval(i).asInstanceOf[T] - def evalList[T](bcr: ByteCodeReader) = { - val l = List.newBuilder - while (bcr.more) - l += evalT(bcr.readNat) - l.result() - } + def evalList[T](bcr: ByteCodeReader): List[Nothing] = + ScalaSignatureParser.evalList(this, bcr).asInstanceOf[List[Nothing]] def eval(i: Int): Any = { - // only parse the ones that matter for this project val e = table(i) val bcr = e.bytes.reader - - def nat = bcr.readNat - def evalS = this.evalS(nat) - def evalT[T] = this.evalT[T](nat) + val id = e.id + def evalT[T] = this.evalT[T](bcr.readNat) def evalList[T] = this.evalList[T](bcr) - e.id match { - case 1 | 2 => this.evalS(i) - case 3 => NoSymbol - case 6 => ClassSymbol(evalS, evalT, nat, nat) - case 7 => ObjectSymbol(evalS, evalT, nat, nat) - case 8 => MethodSymbol(evalS, evalT, nat, nat) - case 9 | 10 => ExternalSymbol(this.evalS(i)) - case 11 | 12 => NoType // 12 is actually NoPrefixType (no lower bound) - case 13 => ThisType(evalT) - case 14 => SingleType(evalT, evalT) - case 16 => TypeRefType(evalT, evalT, evalList) - case 19 => ClassType(evalT, evalList) - case 20 => MethodType(evalT, evalList) - case 21 | 48 => - ParameterlessType( - evalT - ) // 48 is actually a bounded super type, but it should work fine for this project - case 25 => BooleanLiteral(bcr.readLong != 0) - case 26 => ByteLiteral(bcr.readLong.toByte) - case 27 => ShortLiteral(bcr.readLong.toShort) - case 28 => CharLiteral(bcr.readLong.toChar) - case 29 => IntLiteral(bcr.readLong.toInt) - case 30 => LongLiteral(bcr.readLong) - case 31 => - FloatLiteral(java.lang.Float.intBitsToFloat(bcr.readLong.toInt)) - case 32 => DoubleLiteral(java.lang.Double.longBitsToDouble(bcr.readLong)) - case 33 => StringLiteral(evalS) - case 34 => NullLiteral - case 35 => TypeLiteral(evalT) - case 36 => EnumLiteral(evalT) + // Java misreads the outer parameter in these Scala 2.11 generic constructors. + id match { + case 16 => TypeRefType(evalT, evalT, evalList) + case 19 => ClassType(evalT, evalList) + case 20 => MethodType(evalT, evalList) case 40 => AnnotationInfo( evalT, @@ -288,82 +209,17 @@ class ScalaSignature(val bytes: Bytes) { evalList.grouped(2).map(g => (g(0), g(1))).toMap ) case 44 => ArrayLiteral(evalList) - case _ => e + case _ => ScalaSignatureParser.eval(this, i, e, bcr, id) } } - def collect[T](id: Int) = (0 until table.length).collect { - case i if table(i).id == id => evalT(i): T - } + def collect[T](id: Int): scala.collection.immutable.IndexedSeq[T] = + ScalaSignatureParser.collect[T](this, id) - def findObject(name: String) = collect[ObjectSymbol](7).find(_.full == name) - def findClass(name: String) = - collect[ClassSymbol](6).find(c => !c.isModule && c.full == name) -} - -class ByteCodeReader(val bc: Bytes) { - var pos = bc.pos - - def more = pos < bc.pos + bc.len - - def readString(len: Int) = - advance(len)(new String(bc.arr.drop(pos).take(len))) - - def readByte = advance(1)(bc.arr(pos)) - - def readNat = { - var r = 0 - var b = 0 - do { - b = readByte - r = r << 7 | b & 0x7f - } while ((b & 0x80) != 0) - r - } - - def readLong = { - var l = 0L - while (more) { - l <<= 8 - l |= readByte & 0xff - } - l - } - - def advance[A](len: Int)(r: A) = { - if (pos + len > bc.pos + bc.len) - throw new IllegalArgumentException("Ran off the end of bytecode") - pos += len - r - } -} - -object ScalaSigReader { - def decode(s: String) = { - val bytes = s.getBytes - bytes take ByteCodecs.decode(bytes) - } - - def encode(b: Array[Byte]) = { - val bytes = ByteCodecs.encode8to7(b) - var i = 0 - while (i < bytes.length) { - bytes(i) = ((bytes(i) + 1) & 0x7f).toByte - i += 1 - } - new String(bytes.take(bytes.length - 1), "UTF-8") - } - - def read(ann: AnnotationNode): ScalaSignature = new ScalaSignature( - Bytes(decode(ann.values.get(1).asInstanceOf[String])) - ) - - def write(sig: ScalaSignature, ann: AnnotationNode) = - ann.values.set(1, encode(sig.bytes.arr)) - - def ann(cnode: ClassNode): Option[AnnotationNode] = - cnode.visibleAnnotations match { - case null => None - case a => a.find(ann => ann.desc.equals("Lscala/reflect/ScalaSignature;")) - } + def findObject(name: String): Option[ObjectSymbol] = + ScalaSignatureParser + .findObject(this, name) + .asInstanceOf[Option[ObjectSymbol]] + def findClass(name: String): Option[ClassSymbol] = + ScalaSignatureParser.findClass(this, name).asInstanceOf[Option[ClassSymbol]] } diff --git a/src/main/scala/codechicken/multipart/asm/ScalaSignatureParser.java b/src/main/scala/codechicken/multipart/asm/ScalaSignatureParser.java new file mode 100644 index 0000000..9125a7b --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ScalaSignatureParser.java @@ -0,0 +1,271 @@ +package codechicken.multipart.asm; + +import java.util.Arrays; +import java.util.Objects; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import scala.MatchError; +import scala.None$; +import scala.Option; +import scala.Some; +import scala.collection.Iterator; +import scala.collection.TraversableLike; +import scala.collection.TraversableOnce; +import scala.collection.immutable.IndexedSeq; +import scala.collection.immutable.IndexedSeq$; +import scala.collection.immutable.List; +import scala.collection.immutable.List$; +import scala.collection.mutable.Builder; +import scala.runtime.AbstractFunction1; + +/** Parser implementation behind the retained Scala case-class and path-dependent API. */ +final class ScalaSignatureParser { + + private ScalaSignatureParser() {} + + static String typeName(String name) { + String internalName = name.replace('.', '/'); + if ("scala/AnyRef".equals(internalName) || "scala/Any".equals(internalName)) return "java/lang/Object"; + return internalName; + } + + static String typeDescriptor(Object value) { + ScalaSignature.TypeRef ref = (ScalaSignature.TypeRef) value; + String name = ref.name(); + if ("scala.Array".equals(name)) return null; + if ("scala.Long".equals(name)) return "J"; + if ("scala.Int".equals(name)) return "I"; + if ("scala.Short".equals(name)) return "S"; + if ("scala.Byte".equals(name)) return "B"; + if ("scala.Double".equals(name)) return "D"; + if ("scala.Float".equals(name)) return "F"; + if ("scala.Boolean".equals(name)) return "Z"; + if ("scala.Unit".equals(name)) return "V"; + return "L" + ref.jName() + ";"; + } + + static String appliedTypeDescriptor(Object value) { + ScalaSignature.TypeRefType ref = (ScalaSignature.TypeRefType) value; + if ("scala.Array".equals(ref.name())) return "[" + ref.typArgs().apply(0).jDesc(); + return typeDescriptor(ref); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + static String methodDescriptor(Object value) { + ScalaSignature.TMethodType method = (ScalaSignature.TMethodType) value; + TraversableOnce parameters = (TraversableOnce) ((TraversableLike) method.params()) + .map(new AbstractFunction1() { + + @Override + public String apply(ScalaSignature.MethodSymbol parameter) { + return parameter.info().returnType().jDesc(); + } + }, List$.MODULE$.canBuildFrom()); + return "(" + parameters.mkString() + ")" + method.returnType().jDesc(); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + static List interfaceNames(Object value) { + ScalaSignature.ClassSymbolRef symbol = (ScalaSignature.ClassSymbolRef) value; + return (List) ((TraversableLike) symbol.info().interfaces()) + .map(new AbstractFunction1() { + + @Override + public String apply(ScalaSignature.TypeRef ref) { + return ref.jName(); + } + }, List$.MODULE$.canBuildFrom()); + } + + static String classSymbolFull(Object value) { + ScalaSignature.ClassSymbolRef symbol = (ScalaSignature.ClassSymbolRef) value; + return symbol.owner().full() + "." + symbol.name(); + } + + static String classParentName(Object value) { + ScalaSignature.ClassSymbolRef symbol = (ScalaSignature.ClassSymbolRef) value; + return symbol.info().parent().jName(); + } + + static String classSymbolString(Object value) { + ScalaSignature.ClassSymbolRef symbol = (ScalaSignature.ClassSymbolRef) value; + return symbol.getClass().getName().replaceAll(".+\\$", "") + "(" + + symbol.name() + + "," + + symbol.owner() + + "," + + Integer.toHexString(symbol.flags()) + + "," + + symbol.infoId() + + ")"; + } + + static String methodSymbolString(Object value) { + ScalaSignature.MethodSymbol symbol = (ScalaSignature.MethodSymbol) value; + return "MethodSymbol(" + symbol.name() + + "," + + symbol.owner() + + "," + + Integer.toHexString(symbol.flags()) + + "," + + symbol.infoId() + + ")"; + } + + static String methodSymbolFull(Object value) { + ScalaSignature.MethodSymbol symbol = (ScalaSignature.MethodSymbol) value; + return symbol.owner().full() + "." + symbol.name(); + } + + static String methodSymbolDescriptor(Object value) { + ScalaSignature.MethodSymbol symbol = (ScalaSignature.MethodSymbol) value; + return symbol.info().jDesc(); + } + + static Object methodSymbolInfo(ScalaSignature sig, Object value) { + ScalaSignature.MethodSymbol symbol = (ScalaSignature.MethodSymbol) value; + return sig.evalT(symbol.infoId()); + } + + static byte[] section(Bytes bytes) { + byte[] array = bytes.arr(); + int start = bytes.pos(); + start = Math.min(array.length, Math.max(0, start)); + // Snapshot before len(): an override can mutate the original array. + byte[] remaining = Arrays.copyOfRange(array, start, array.length); + return Arrays.copyOf(remaining, Math.min(remaining.length, Math.max(0, bytes.len()))); + } + + // Keep path-dependent model types out of signatures read by Scala 2.11's Java parser. + static Object readTable(ScalaSignature sig, Bytes bytes) { + ByteCodeReader reader = bytes.reader(); + reader.pos_$eq(2); + // Scala Array.tabulate produces an empty array for a negative (overflowed) count. + ScalaSignature.SigEntry[] table = new ScalaSignature.SigEntry[Math.max(0, reader.readNat())]; + for (int i = 0; i < table.length; i++) { + int start = reader.pos(); + reader.readByte(); + int length = reader.readNat(); + table[i] = reader + .advance(length, sig.new SigEntry(i, start, new Bytes(sig.bytes().arr(), reader.pos(), length))); + } + return table; + } + + static String evalS(ScalaSignature sig, int index) { + ScalaSignature.SigEntry entry = sig.table()[index]; + Bytes bytes = entry.bytes(); + ByteCodeReader reader = bytes.reader(); + byte id = entry.id(); + switch (id) { + case 1: + case 2: + return reader.readString(bytes.len()); + case 3: + return sig.NoSymbol().full(); + case 9: + case 10: + String name = sig.evalS(reader.readNat()); + if (bytes.pos() + bytes.len() > reader.pos()) { + name = sig.evalS(reader.readNat()) + "." + name; + } + return name; + default: + throw new MatchError(Byte.valueOf(id)); + } + } + + static List evalList(ScalaSignature sig, ByteCodeReader reader) { + Builder> builder = List$.MODULE$.newBuilder(); + while (reader.more()) { + builder.$plus$eq(sig.evalT(reader.readNat())); + } + return builder.result(); + } + + static Object eval(ScalaSignature sig, int index, Object entry, ByteCodeReader reader, byte id) { + // The Scala optimizer constructs case classes directly, without initializing their companions. + switch (id) { + case 1: + case 2: + return sig.evalS(index); + case 3: + return sig.NoSymbol(); + case 6: + return sig.new ClassSymbol(sig.evalS(reader.readNat()), sig.evalT(reader.readNat()), reader.readNat(), + reader.readNat()); + case 7: + return sig.new ObjectSymbol(sig.evalS(reader.readNat()), sig.evalT(reader.readNat()), reader.readNat(), + reader.readNat()); + case 8: + return sig.new MethodSymbol(sig.evalS(reader.readNat()), sig.evalT(reader.readNat()), reader.readNat(), + reader.readNat()); + case 9: + case 10: + return sig.new ExternalSymbol(sig.evalS(index)); + case 11: + case 12: // NoPrefixType is treated as NoType in the reference. + return sig.NoType(); + case 13: + return sig.new ThisType(sig.evalT(reader.readNat())); + case 14: + return sig.new SingleType(sig.evalT(reader.readNat()), sig.evalT(reader.readNat())); + case 21: + case 48: // Retain the reference's parameterless interpretation of a bounded super type. + return sig.new ParameterlessType(sig.evalT(reader.readNat())); + case 25: + return sig.new BooleanLiteral(reader.readLong() != 0); + case 26: + return sig.new ByteLiteral((byte) reader.readLong()); + case 27: + return sig.new ShortLiteral((short) reader.readLong()); + case 28: + return sig.new CharLiteral((char) reader.readLong()); + case 29: + return sig.new IntLiteral((int) reader.readLong()); + case 30: + return sig.new LongLiteral(reader.readLong()); + case 31: + return sig.new FloatLiteral(Float.intBitsToFloat((int) reader.readLong())); + case 32: + return sig.new DoubleLiteral(Double.longBitsToDouble(reader.readLong())); + case 33: + return sig.new StringLiteral(sig.evalS(reader.readNat())); + case 34: + return sig.NullLiteral(); + case 35: + return sig.new TypeLiteral(sig.evalT(reader.readNat())); + case 36: + return sig.new EnumLiteral(sig.evalT(reader.readNat())); + default: + return entry; + } + } + + static IndexedSeq collect(ScalaSignature sig, int id) { + int length = sig.table().length; + Builder> builder = IndexedSeq$.MODULE$.newBuilder(); + for (int i = 0; i < length; i++) { + if (sig.table()[i].id() == id) builder.$plus$eq(sig.evalT(i)); + } + return builder.result(); + } + + static Option findObject(ScalaSignature sig, String name) { + Iterator symbols = sig.collect(7).iterator(); + while (symbols.hasNext()) { + ScalaSignature.ObjectSymbol symbol = symbols.next(); + if (Objects.equals(symbol.full(), name)) return new Some<>(symbol); + } + return None$.MODULE$; + } + + static Option findClass(ScalaSignature sig, String name) { + Iterator symbols = sig.collect(6).iterator(); + while (symbols.hasNext()) { + ScalaSignature.ClassSymbol symbol = symbols.next(); + if (!symbol.isModule() && Objects.equals(symbol.full(), name)) return new Some<>(symbol); + } + return None$.MODULE$; + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ScalaTraitRegistration.java b/src/main/scala/codechicken/multipart/asm/ScalaTraitRegistration.java new file mode 100644 index 0000000..905d553 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ScalaTraitRegistration.java @@ -0,0 +1,130 @@ +package codechicken.multipart.asm; + +import static org.objectweb.asm.Opcodes.ACC_PRIVATE; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; + +import java.util.Objects; + +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.FieldMixin; +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import codechicken.multipart.asm.ScalaSignature.MethodSymbol; +import scala.Function1; +import scala.MatchError; +import scala.None$; +import scala.Option; +import scala.Some; +import scala.collection.JavaConversions; +import scala.collection.TraversableLike; +import scala.collection.immutable.Set; +import scala.collection.mutable.Buffer; +import scala.collection.mutable.Buffer$; +import scala.collection.mutable.ListBuffer; +import scala.collection.mutable.Map; +import scala.collection.mutable.Map$; +import scala.runtime.AbstractFunction1; +import scala.runtime.AbstractPartialFunction; +import scala.runtime.BoxedUnit; +import scala.runtime.BoxesRunTime; + +/** Registration behind the Scala bridges for the retained ClassInfo$ nested types. */ +@SuppressWarnings({ "unchecked", "rawtypes" }) +final class ScalaTraitRegistration { + + private ScalaTraitRegistration() {} + + static Buffer getAndRegisterParentTraits(ClassNode node, final Function1 isTrait, + final Function1 traitNode) { + TraversableLike parents = (TraversableLike) ((TraversableLike) JavaConversions.asScalaBuffer(node.interfaces)) + .map(new AbstractFunction1() { + + @Override + public ClassInfo apply(String name) { + return ASMMixinCompiler$.MODULE$.getClassInfo(name); + } + }, Buffer$.MODULE$.canBuildFrom()); + return (Buffer) parents.collect(new AbstractPartialFunction() { + + @Override + public boolean isDefinedAt(ClassInfo info) { + return BoxesRunTime.unboxToBoolean(isTrait.apply(info)); + } + + @Override + public B1 applyOrElse(A1 info, Function1 fallback) { + if (isDefinedAt(info)) return (B1) ASMMixinCompiler$.MODULE$.registerScalaTrait(traitNode.apply(info)); + return fallback.apply(info); + } + }, Buffer$.MODULE$.canBuildFrom()); + } + + static MixinInfo registerScalaTrait(final ClassNode node, Map mixins, + Function1 signature, Function1 classSymbol) { + // Read and write the same map reference; getMixinInfo is that map's get, and one source keeps them in step. + Option cached = mixins.get(node.name); + if (cached instanceof Some) return cached.get(); + if (cached != (Object) None$.MODULE$) throw new MatchError(cached); + + ClassInfo info = ASMMixinCompiler$.MODULE$.getClassInfo(node); + ScalaSignature sig = signature.apply(info); + final Set sideOnly = ASMMixinCompiler$.MODULE$.listSideOnly(sig); + Buffer parents = ASMMixinCompiler$.MODULE$.getAndRegisterParentTraits(node); + final Map accessors = Map$.MODULE$.empty(); + final ListBuffer fields = new ListBuffer<>(); + final ListBuffer methods = new ListBuffer<>(); + final ListBuffer supers = new ListBuffer<>(); + final ScalaSignature.ClassSymbolRef symbol = (ScalaSignature.ClassSymbolRef) classSymbol.apply(info); + sig.collect(8).foreach(new AbstractFunction1() { + + @Override + public BoxedUnit apply(final MethodSymbol method) { + if (method.isParam() || !BoxesRunTime.equals(method.owner(), symbol)) return BoxedUnit.UNIT; + if (sideOnly.apply(method.full())) return BoxedUnit.UNIT; + if (method.isAccessor()) { + accessors.put(method.name(), method); + } else if (method.isMethod()) { + final String desc = method.jDesc(); + if (method.name().startsWith("super$")) { + supers.$plus$eq(method.name().substring(6) + desc); + } else + if (!method.isPrivate() && !method.isDeferred() && !Objects.equals(method.name(), "$init$")) { + Option found = JavaConversions.asScalaBuffer(node.methods) + .find(new AbstractFunction1() { + + @Override + public Object apply(MethodNode candidate) { + return Objects.equals(candidate.name, method.name()) + && Objects.equals(candidate.desc, desc); + } + }); + if (found instanceof Some) { + methods.$plus$eq(found.get()); + } else if (found == (Object) None$.MODULE$) { + throw new IllegalArgumentException( + "Unable to add mixin trait " + node.name + + ": " + + method.name() + + desc + + " found in scala signature but not in class file. Most likely an obfuscation issue."); + } else { + throw new MatchError(found); + } + } + } else { + fields.$plus$eq( + new FieldMixin( + method.name().trim(), + method.jDesc(), + accessors.apply(method.name().trim()).isPrivate() ? ACC_PRIVATE : ACC_PUBLIC)); + } + return BoxedUnit.UNIT; + } + }); + MixinInfo mixin = new MixinInfo(node.name, symbol.jParent(), parents, fields, methods, supers); + mixins.put(node.name, mixin); + return mixin; + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ScratchBitSet$class.java b/src/main/scala/codechicken/multipart/asm/ScratchBitSet$class.java new file mode 100644 index 0000000..6110060 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ScratchBitSet$class.java @@ -0,0 +1,29 @@ +package codechicken.multipart.asm; + +import java.util.BitSet; + +/** Shared implementation retaining the original Scala trait-helper entry points. */ +public abstract class ScratchBitSet$class { + + private ScratchBitSet$class() {} + + public static BitSet getBitSet(ScratchBitSet owner) { + BitSet bitset = owner.codechicken$multipart$asm$ScratchBitSet$$bitSets().get(); + if (bitset == null) { + bitset = new BitSet(); + owner.codechicken$multipart$asm$ScratchBitSet$$bitSets().set(bitset); + } + return bitset; + } + + public static BitSet freshBitSet(ScratchBitSet owner) { + BitSet bitset = owner.getBitSet(); + bitset.clear(); + return bitset; + } + + public static void $init$(ScratchBitSet owner) { + owner.codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq( + new ThreadLocal()); + } +} diff --git a/src/main/scala/codechicken/multipart/asm/ScratchBitSet.java b/src/main/scala/codechicken/multipart/asm/ScratchBitSet.java new file mode 100644 index 0000000..908bb44 --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/ScratchBitSet.java @@ -0,0 +1,16 @@ +package codechicken.multipart.asm; + +import java.util.BitSet; + +/** Per-owner, per-thread scratch storage used by both generators. */ +public interface ScratchBitSet { + + void codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq( + ThreadLocal value); + + ThreadLocal codechicken$multipart$asm$ScratchBitSet$$bitSets(); + + BitSet getBitSet(); + + BitSet freshBitSet(); +} diff --git a/src/main/scala/codechicken/multipart/asm/ScratchBitSet.scala b/src/main/scala/codechicken/multipart/asm/ScratchBitSet.scala deleted file mode 100644 index 670ecfa..0000000 --- a/src/main/scala/codechicken/multipart/asm/ScratchBitSet.scala +++ /dev/null @@ -1,20 +0,0 @@ -package codechicken.multipart.asm -import java.util.BitSet - -trait ScratchBitSet { - private val bitSets = new ThreadLocal[BitSet] - - def getBitSet = bitSets.get match { - case null => - val bitset = new BitSet - bitSets.set(bitset) - bitset - case bitset => bitset - } - - def freshBitSet = { - val bitset = getBitSet - bitset.clear() - bitset - } -} diff --git a/src/main/scala/codechicken/multipart/asm/StackAnalyser.scala b/src/main/scala/codechicken/multipart/asm/StackAnalyser.scala index 689f67c..c7d05ca 100644 --- a/src/main/scala/codechicken/multipart/asm/StackAnalyser.scala +++ b/src/main/scala/codechicken/multipart/asm/StackAnalyser.scala @@ -2,10 +2,8 @@ package codechicken.multipart.asm import scala.collection.mutable.{Map => MMap, ListBuffer => MList} import org.objectweb.asm.tree._ -import org.objectweb.asm.Opcodes._ import org.objectweb.asm.Type import org.objectweb.asm.Type._ -import scala.collection.JavaConversions._ object StackAnalyser { def width(t: Type): Int = t.getSize @@ -31,19 +29,7 @@ object StackAnalyser { } case class Const(c: Any)(implicit insn: AbstractInsnNode) extends StackEntry { - def getType = c match { - case o: Byte => BYTE_TYPE - case o: Short => SHORT_TYPE - case o: Int => INT_TYPE - case o: Long => LONG_TYPE - case o: Float => FLOAT_TYPE - case o: Double => DOUBLE_TYPE - case o: Char => CHAR_TYPE - case o: Boolean => BOOLEAN_TYPE - case o: String => getObjectType("java/lang/String") - case null => getObjectType("java/lang/Object") - case _ => throw new IllegalArgumentException("Unknown const " + c) - } + def getType: Type = StackAnalyserLogic.constType(this) } case class Load(e: LocalEntry)(implicit insn: AbstractInsnNode) extends StackEntry { @@ -119,202 +105,33 @@ class StackAnalyser(val owner: Type, val m: MethodNode) { val locals = MList[LocalEntry]() private val catchHandlers = MMap[LabelNode, TryCatchBlockNode]() - { - if ((m.access & ACC_STATIC) == 0) - pushL(This(owner)) - - val ptypes = getArgumentTypes(m.desc) - for (i <- 0 until ptypes.length) - pushL(Param(i, ptypes(i))) - - m.tryCatchBlocks.foreach(b => catchHandlers.put(b.handler, b)) - } + // The callback preserves Scala's mangled catchHandlers accessor. + StackAnalyserLogic.initialize( + this, + owner, + m, + b => catchHandlers.put(b.handler, b) + ) def pushL(entry: LocalEntry) = setL(locals.size, entry) - def setL(i: Int, entry: LocalEntry) = { - while (i + entry.getType.getSize > locals.size) locals += null - locals(i) = entry - if (entry.getType.getSize == 2) - locals(i + 1) = entry - } + def setL(i: Int, entry: LocalEntry): Unit = + StackAnalyserLogic.setL(this, i, entry) def push(entry: StackEntry) = insert(0, entry) def _pop(i: Int = 0) = stack.remove(stack.size - i - 1) - def pop(i: Int = 0) = { - val e = _pop(i) - if (e.getType.getSize == 2) { - if (peek(i) != e) - throw new IllegalStateException( - "Wide stack entry elems don't match (" + e + "," + peek(i) - ) - _pop(i) - } - e - } + def pop(i: Int = 0): StackEntry = StackAnalyserLogic.pop(this, i) def peek(i: Int = 0) = stack(stack.size - i - 1) - def insert(i: Int, entry: StackEntry) { - if (entry.getType.getSize == 0) - return - stack.insert(stack.size - i, entry) - if (entry.getType.getSize == 2) - stack.insert(stack.size - i, entry) - } + def insert(i: Int, entry: StackEntry): Unit = + StackAnalyserLogic.insert(this, i, entry) - def popArgs(desc: String) = { - val t = getType(desc) - val args = new Array[StackEntry](t.getArgumentTypes.length) - for (i <- 0 until args.length) - args(args.length - i - 1) = pop() - args - } + def popArgs(desc: String): Array[StackEntry] = + StackAnalyserLogic.popArgs(this, desc) - def visitInsn(ainsn: AbstractInsnNode) { - implicit val thisInsn = ainsn // passes to any StackEntry we create - ainsn match { - case insn: InsnNode => - ainsn.getOpcode match { - case ACONST_NULL => push(Const(null)) - case ICONST_M1 => push(Const(-1)) - case ICONST_0 => push(Const(0)) - case ICONST_1 => push(Const(1)) - case ICONST_2 => push(Const(2)) - case ICONST_3 => push(Const(3)) - case ICONST_4 => push(Const(4)) - case ICONST_5 => push(Const(5)) - case LCONST_0 => push(Const(0L)) - case LCONST_1 => push(Const(1L)) - case FCONST_0 => push(Const(0f)) - case FCONST_1 => push(Const(1f)) - case FCONST_2 => push(Const(2f)) - case DCONST_0 => push(Const(0d)) - case DCONST_1 => push(Const(1d)) - - case i if i >= IALOAD && i <= SALOAD => - push(ArrayLoad(pop(), pop())) - case i if i >= IASTORE && i <= SASTORE => - pop(); pop(); pop() - - case POP => _pop() - case POP2 => _pop(); _pop() - case DUP => push(peek()) - case DUP_X1 => insert(2, peek()) - case DUP_X2 => insert(3, peek()) - case DUP2 => push(peek(1)); push(peek(1)) - case DUP2_X1 => insert(3, peek(1)); insert(3, peek()) - case DUP2_X2 => insert(4, peek(1)); insert(4, peek()) - case SWAP => push(pop(1)) - - case i if i >= IADD && i <= DREM => - push(BinaryOp(i, pop(), pop())) - case i if i >= INEG && i <= DNEG => - push(UnaryOp(i, pop())) - case i if i >= ISHL && i <= LXOR => - push(BinaryOp(i, pop(), pop())) - - case L2I | F2I | D2I => push(PrimitiveCast(pop(), DOUBLE_TYPE)) - case I2L | F2L | D2L => push(PrimitiveCast(pop(), LONG_TYPE)) - case I2F | L2F | D2F => push(PrimitiveCast(pop(), FLOAT_TYPE)) - case I2D | L2D | F2D => push(PrimitiveCast(pop(), DOUBLE_TYPE)) - case I2B => push(PrimitiveCast(pop(), BYTE_TYPE)) - case I2C => push(PrimitiveCast(pop(), CHAR_TYPE)) - case I2S => push(PrimitiveCast(pop(), SHORT_TYPE)) - - case i if i >= LCMP && i <= DCMPG => - push(BinaryOp(i, pop(), pop())) - - case i if i >= IRETURN && i <= ARETURN => pop() - - case ARRAYLENGTH => push(ArrayLength(pop())) - case ATHROW => pop() - case MONITORENTER | MONITOREXIT => pop() - - case _ => - - } - case iinsn: IntInsnNode => - ainsn.getOpcode match { - case BIPUSH => push(Const(iinsn.operand.toByte)) - case SIPUSH => push(Const(iinsn.operand.toShort)) - } - case ldcinsn: LdcInsnNode => - ainsn.getOpcode match { - case LDC => push(Const(ldcinsn.cst)) - } - case vinsn: VarInsnNode => - ainsn.getOpcode match { - case i if i >= ILOAD && i <= ALOAD => - push(Load(locals(vinsn.`var`))) - case i if i >= ISTORE && i <= ASTORE => - setL(vinsn.`var`, Store(pop())) - } - case incinsn: IincInsnNode => - ainsn.getOpcode match { - case IINC => - setL( - incinsn.`var`, - Store( - BinaryOp(IINC, Const(incinsn.incr), Load(locals(incinsn.`var`))) - ) - ) - } - case jinsn: JumpInsnNode => - ainsn.getOpcode match { - case i if i >= IFEQ && i <= IFLE => pop() - case i if i >= IF_ICMPEQ && i <= IF_ACMPNE => pop(); pop() - case JSR => push(ReturnAddress()) - case IFNULL | IFNONNULL => pop() - case GOTO => - } - case sinsn: TableSwitchInsnNode => pop() - case linsn: LookupSwitchInsnNode => pop() - case finsn: FieldInsnNode => - ainsn.getOpcode match { - case GETSTATIC => push(GetField(null, finsn)) - case PUTSTATIC => pop() - case GETFIELD => push(GetField(pop(), finsn)) - case PUTFIELD => pop(); pop() - } - case minsn: MethodInsnNode => - ainsn.getOpcode match { - case INVOKEVIRTUAL | INVOKESPECIAL | INVOKEINTERFACE => - push(Invoke(ainsn.getOpcode, popArgs(minsn.desc), pop(), minsn)) - case INVOKESTATIC => - push(Invoke(ainsn.getOpcode, popArgs(minsn.desc), null, minsn)) - } - case tinsn: TypeInsnNode => - ainsn.getOpcode match { - case NEW => push(New(getObjectType(tinsn.desc))) - case NEWARRAY => push(NewArray(pop(), getObjectType(tinsn.desc))) - case ANEWARRAY => - push(NewArray(pop(), getObjectType("[" + tinsn.desc))) - case CHECKCAST => push(Cast(pop(), getObjectType(tinsn.desc))) - case INSTANCEOF => push(UnaryOp(INSTANCEOF, pop())) - } - case mainsn: MultiANewArrayInsnNode => - val sizes = new Array[StackEntry](mainsn.dims) - for (i <- 0 until sizes.length) - sizes(i) = pop() - push(NewMultiArray(sizes, getType(mainsn.desc))) - /*case fnode:FrameNode => fnode.`type` match - { - case F_NEW|F_FULL => println("reset stacks/locals") - case F_APPEND => println("add local") - case F_CHOP => println("rem locals") - case F_SAME => println("reset") - case F_SAME1 => println("reset locals and all but bottom stack") - }*/ - case lnode: LabelNode => - catchHandlers.get(lnode) match { - case Some(tcblock) => - push(CaughtException(Type.getType(tcblock.`type`))) - case None => - } - case _ => - } - } + def visitInsn(ainsn: AbstractInsnNode): Unit = + StackAnalyserLogic.visitInsn(this, ainsn) } diff --git a/src/main/scala/codechicken/multipart/asm/StackAnalyserLogic.java b/src/main/scala/codechicken/multipart/asm/StackAnalyserLogic.java new file mode 100644 index 0000000..69857ab --- /dev/null +++ b/src/main/scala/codechicken/multipart/asm/StackAnalyserLogic.java @@ -0,0 +1,379 @@ +package codechicken.multipart.asm; + +import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Type.*; + +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.IincInsnNode; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.IntInsnNode; +import org.objectweb.asm.tree.JumpInsnNode; +import org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.LdcInsnNode; +import org.objectweb.asm.tree.LookupSwitchInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.MultiANewArrayInsnNode; +import org.objectweb.asm.tree.TableSwitchInsnNode; +import org.objectweb.asm.tree.TryCatchBlockNode; +import org.objectweb.asm.tree.TypeInsnNode; +import org.objectweb.asm.tree.VarInsnNode; + +import codechicken.multipart.asm.StackAnalyser.ArrayLength; +import codechicken.multipart.asm.StackAnalyser.ArrayLoad; +import codechicken.multipart.asm.StackAnalyser.BinaryOp; +import codechicken.multipart.asm.StackAnalyser.Cast; +import codechicken.multipart.asm.StackAnalyser.CaughtException; +import codechicken.multipart.asm.StackAnalyser.Const; +import codechicken.multipart.asm.StackAnalyser.GetField; +import codechicken.multipart.asm.StackAnalyser.Invoke; +import codechicken.multipart.asm.StackAnalyser.Load; +import codechicken.multipart.asm.StackAnalyser.LocalEntry; +import codechicken.multipart.asm.StackAnalyser.New; +import codechicken.multipart.asm.StackAnalyser.NewArray; +import codechicken.multipart.asm.StackAnalyser.NewMultiArray; +import codechicken.multipart.asm.StackAnalyser.Param; +import codechicken.multipart.asm.StackAnalyser.PrimitiveCast; +import codechicken.multipart.asm.StackAnalyser.ReturnAddress; +import codechicken.multipart.asm.StackAnalyser.StackEntry; +import codechicken.multipart.asm.StackAnalyser.Store; +import codechicken.multipart.asm.StackAnalyser.This; +import codechicken.multipart.asm.StackAnalyser.UnaryOp; +import scala.Function1; +import scala.MatchError; +import scala.None$; +import scala.Option; +import scala.Predef; +import scala.Some; +import scala.collection.JavaConversions; + +/** Analyser control flow behind the retained Scala model and default-argument API. */ +final class StackAnalyserLogic { + + private StackAnalyserLogic() {} + + static Type constType(Const constant) { + Object value = constant.c(); + if (value instanceof Byte) return BYTE_TYPE; + if (value instanceof Short) return SHORT_TYPE; + if (value instanceof Integer) return INT_TYPE; + if (value instanceof Long) return LONG_TYPE; + if (value instanceof Float) return FLOAT_TYPE; + if (value instanceof Double) return DOUBLE_TYPE; + if (value instanceof Character) return CHAR_TYPE; + if (value instanceof Boolean) return BOOLEAN_TYPE; + if (value instanceof String) return getObjectType("java/lang/String"); + if (value == null) return getObjectType("java/lang/Object"); + // The failure message rereads the virtual accessor after classification. + throw new IllegalArgumentException("Unknown const " + constant.c()); + } + + static void initialize(StackAnalyser a, Type owner, MethodNode method, + Function1> addHandler) { + if ((method.access & ACC_STATIC) == 0) a.pushL(new This(owner)); + Type[] parameters = getArgumentTypes(method.desc); + for (int i = 0; i < parameters.length; i++) a.pushL(new Param(i, parameters[i])); + JavaConversions.asScalaBuffer(method.tryCatchBlocks).foreach(addHandler); + } + + static void setL(StackAnalyser a, int i, LocalEntry entry) { + while (i + entry.getType().getSize() > a.locals().size()) a.locals().$plus$eq(null); + a.locals().update(i, entry); + if (entry.getType().getSize() == 2) a.locals().update(i + 1, entry); + } + + static StackEntry pop(StackAnalyser a, int i) { + StackEntry entry = a._pop(i); + if (entry.getType().getSize() == 2) { + StackEntry other = a.peek(i); + if (!(other == null ? entry == null : other.equals(entry))) { + throw new IllegalStateException("Wide stack entry elems don't match (" + entry + "," + a.peek(i)); + } + a._pop(i); + } + return entry; + } + + static void insert(StackAnalyser a, int i, StackEntry entry) { + if (entry.getType().getSize() == 0) return; + a.stack().insert(a.stack().size() - i, Predef.wrapRefArray(new StackEntry[] { entry })); + if (entry.getType().getSize() == 2) { + a.stack().insert(a.stack().size() - i, Predef.wrapRefArray(new StackEntry[] { entry })); + } + } + + static StackEntry[] popArgs(StackAnalyser a, String desc) { + StackEntry[] args = new StackEntry[getType(desc).getArgumentTypes().length]; + for (int i = 0; i < args.length; i++) args[args.length - i - 1] = pop(a); + return args; + } + + // These calls must retain virtual dispatch through Scala's default-argument getters. + private static StackEntry pop(StackAnalyser a) { + return a.pop(a.pop$default$1()); + } + + private static StackEntry peek(StackAnalyser a) { + return a.peek(a.peek$default$1()); + } + + private static void rawPop(StackAnalyser a) { + a._pop(a._pop$default$1()); + } + + static void visitInsn(StackAnalyser a, AbstractInsnNode insn) { + if (insn instanceof InsnNode) { + int op = insn.getOpcode(); + switch (op) { + case ACONST_NULL: + a.push(new Const(null, insn)); + break; + case ICONST_M1: + a.push(new Const(-1, insn)); + break; + case ICONST_0: + a.push(new Const(0, insn)); + break; + case ICONST_1: + a.push(new Const(1, insn)); + break; + case ICONST_2: + a.push(new Const(2, insn)); + break; + case ICONST_3: + a.push(new Const(3, insn)); + break; + case ICONST_4: + a.push(new Const(4, insn)); + break; + case ICONST_5: + a.push(new Const(5, insn)); + break; + case LCONST_0: + a.push(new Const(0L, insn)); + break; + case LCONST_1: + a.push(new Const(1L, insn)); + break; + case FCONST_0: + a.push(new Const(0f, insn)); + break; + case FCONST_1: + a.push(new Const(1f, insn)); + break; + case FCONST_2: + a.push(new Const(2f, insn)); + break; + case DCONST_0: + a.push(new Const(0d, insn)); + break; + case DCONST_1: + a.push(new Const(1d, insn)); + break; + case POP: + rawPop(a); + break; + case POP2: + rawPop(a); + rawPop(a); + break; + case DUP: + a.push(peek(a)); + break; + case DUP_X1: + a.insert(2, peek(a)); + break; + case DUP_X2: + a.insert(3, peek(a)); + break; + case DUP2: + a.push(a.peek(1)); + a.push(a.peek(1)); + break; + case DUP2_X1: + a.insert(3, a.peek(1)); + a.insert(3, peek(a)); + break; + case DUP2_X2: + a.insert(4, a.peek(1)); + a.insert(4, peek(a)); + break; + case SWAP: + a.push(a.pop(1)); + break; + // Preserve the reference's inferred types, including conversions to int reporting double. + case L2I: + case F2I: + case D2I: + a.push(new PrimitiveCast(pop(a), DOUBLE_TYPE, insn)); + break; + case I2L: + case F2L: + case D2L: + a.push(new PrimitiveCast(pop(a), LONG_TYPE, insn)); + break; + case I2F: + case L2F: + case D2F: + a.push(new PrimitiveCast(pop(a), FLOAT_TYPE, insn)); + break; + case I2D: + case L2D: + case F2D: + a.push(new PrimitiveCast(pop(a), DOUBLE_TYPE, insn)); + break; + case I2B: + a.push(new PrimitiveCast(pop(a), BYTE_TYPE, insn)); + break; + case I2C: + a.push(new PrimitiveCast(pop(a), CHAR_TYPE, insn)); + break; + case I2S: + a.push(new PrimitiveCast(pop(a), SHORT_TYPE, insn)); + break; + case ARRAYLENGTH: + a.push(new ArrayLength(pop(a), insn)); + break; + case ATHROW: + case MONITORENTER: + case MONITOREXIT: + pop(a); + break; + default: + if (op >= IALOAD && op <= SALOAD) { + a.push(new ArrayLoad(pop(a), pop(a), insn)); + } else if (op >= IASTORE && op <= SASTORE) { + pop(a); + pop(a); + pop(a); + } else if (op >= IADD && op <= DREM || op >= ISHL && op <= LXOR || op >= LCMP && op <= DCMPG) { + a.push(new BinaryOp(op, pop(a), pop(a), insn)); + } else if (op >= INEG && op <= DNEG) { + a.push(new UnaryOp(op, pop(a), insn)); + } else if (op >= IRETURN && op <= ARETURN) { + pop(a); + } + } + } else if (insn instanceof IntInsnNode) { + IntInsnNode intInsn = (IntInsnNode) insn; + switch (insn.getOpcode()) { + case BIPUSH: + a.push(new Const((byte) intInsn.operand, insn)); + break; + case SIPUSH: + a.push(new Const((short) intInsn.operand, insn)); + break; + default: + throw new MatchError(insn.getOpcode()); + } + } else if (insn instanceof LdcInsnNode) { + if (insn.getOpcode() != LDC) throw new MatchError(insn.getOpcode()); + a.push(new Const(((LdcInsnNode) insn).cst, insn)); + } else if (insn instanceof VarInsnNode) { + VarInsnNode varInsn = (VarInsnNode) insn; + int op = insn.getOpcode(); + if (op >= ILOAD && op <= ALOAD) { + a.push(new Load(a.locals().apply(varInsn.var), insn)); + } else if (op >= ISTORE && op <= ASTORE) { + a.setL(varInsn.var, new Store(pop(a), insn)); + } else { + throw new MatchError(op); + } + } else if (insn instanceof IincInsnNode) { + IincInsnNode incInsn = (IincInsnNode) insn; + if (insn.getOpcode() != IINC) throw new MatchError(insn.getOpcode()); + a.setL( + incInsn.var, + new Store( + new BinaryOp( + IINC, + new Const(incInsn.incr, insn), + new Load(a.locals().apply(incInsn.var), insn), + insn), + insn)); + } else if (insn instanceof JumpInsnNode) { + int op = insn.getOpcode(); + if (op >= IFEQ && op <= IFLE || op == IFNULL || op == IFNONNULL) { + pop(a); + } else if (op >= IF_ICMPEQ && op <= IF_ACMPNE) { + pop(a); + pop(a); + } else if (op == JSR) { + a.push(new ReturnAddress(insn)); + } else if (op != GOTO) { + throw new MatchError(op); + } + } else if (insn instanceof TableSwitchInsnNode || insn instanceof LookupSwitchInsnNode) { + pop(a); + } else if (insn instanceof FieldInsnNode) { + FieldInsnNode field = (FieldInsnNode) insn; + switch (insn.getOpcode()) { + case GETSTATIC: + a.push(new GetField(null, field, insn)); + break; + case PUTSTATIC: + pop(a); + break; + case GETFIELD: + a.push(new GetField(pop(a), field, insn)); + break; + case PUTFIELD: + pop(a); + pop(a); + break; + default: + throw new MatchError(insn.getOpcode()); + } + } else if (insn instanceof MethodInsnNode) { + MethodInsnNode method = (MethodInsnNode) insn; + switch (insn.getOpcode()) { + case INVOKEVIRTUAL: + case INVOKESPECIAL: + case INVOKEINTERFACE: + a.push(new Invoke(insn.getOpcode(), a.popArgs(method.desc), pop(a), method, insn)); + break; + case INVOKESTATIC: + a.push(new Invoke(insn.getOpcode(), a.popArgs(method.desc), null, method, insn)); + break; + default: + throw new MatchError(insn.getOpcode()); + } + } else if (insn instanceof TypeInsnNode) { + TypeInsnNode typeInsn = (TypeInsnNode) insn; + switch (insn.getOpcode()) { + case NEW: + a.push(new New(getObjectType(typeInsn.desc), insn)); + break; + case NEWARRAY: + a.push(new NewArray(pop(a), getObjectType(typeInsn.desc), insn)); + break; + case ANEWARRAY: + a.push(new NewArray(pop(a), getObjectType("[" + typeInsn.desc), insn)); + break; + case CHECKCAST: + a.push(new Cast(pop(a), getObjectType(typeInsn.desc), insn)); + break; + case INSTANCEOF: + a.push(new UnaryOp(INSTANCEOF, pop(a), insn)); + break; + default: + throw new MatchError(insn.getOpcode()); + } + } else if (insn instanceof MultiANewArrayInsnNode) { + MultiANewArrayInsnNode multi = (MultiANewArrayInsnNode) insn; + StackEntry[] sizes = new StackEntry[multi.dims]; + for (int i = 0; i < sizes.length; i++) sizes[i] = pop(a); + a.push(new NewMultiArray(sizes, getType(multi.desc), insn)); + } else if (insn instanceof LabelNode) { + Option handler = a.codechicken$multipart$asm$StackAnalyser$$catchHandlers() + .get((LabelNode) insn); + if (handler instanceof Some) { + a.push(new CaughtException(Type.getType(((Some) handler).x().type), insn)); + } else if (!None$.MODULE$.equals(handler)) { + throw new MatchError(handler); + } + } + } +} diff --git a/src/main/scala/codechicken/multipart/handler/CubicChunksCompat.java b/src/main/scala/codechicken/multipart/handler/CubicChunksCompat.java new file mode 100644 index 0000000..ac35a4f --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/CubicChunksCompat.java @@ -0,0 +1,24 @@ +package codechicken.multipart.handler; + +import net.minecraftforge.common.MinecraftForge; + +import com.cardinalstar.cubicchunks.api.event.CubeEvent; + +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +public final class CubicChunksCompat { + + private static final CubicChunksCompat INSTANCE = new CubicChunksCompat(); + + private CubicChunksCompat() {} + + public static void init() { + MinecraftForge.EVENT_BUS.register(INSTANCE); + } + + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void onTileEntitiesLoad(CubeEvent.DataLoad event) { + MultipartSaveLoad.loadTiles(event.world, event.cube.cubeTileEntityMap); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/CubicChunksCompat.scala b/src/main/scala/codechicken/multipart/handler/CubicChunksCompat.scala deleted file mode 100644 index a80743c..0000000 --- a/src/main/scala/codechicken/multipart/handler/CubicChunksCompat.scala +++ /dev/null @@ -1,18 +0,0 @@ -package codechicken.multipart.handler - -import com.cardinalstar.cubicchunks.api.event.CubeEvent -import cpw.mods.fml.common.eventhandler.{EventPriority, SubscribeEvent} -import net.minecraftforge.common.MinecraftForge -import scala.collection.JavaConversions._ - -object CubicChunksCompat { - def init(): Unit = MinecraftForge.EVENT_BUS.register(this) - - @SubscribeEvent(priority = EventPriority.HIGHEST) - def onTileEntitiesLoad(event: CubeEvent.DataLoad): Unit = { - val cube = event.cube - val world = event.world - - MultipartSaveLoad.loadTiles(world, cube.cubeTileEntityMap) - } -} diff --git a/src/main/scala/codechicken/multipart/handler/MCPCCompatModule$.java b/src/main/scala/codechicken/multipart/handler/MCPCCompatModule$.java new file mode 100644 index 0000000..53d4769 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MCPCCompatModule$.java @@ -0,0 +1,49 @@ +package codechicken.multipart.handler; + +import java.lang.reflect.Method; + +import net.minecraft.block.Block; +import net.minecraft.world.World; + +import scala.runtime.AbstractFunction4; + +/** Scala-object-compatible implementation for the optional MCPC placement hook. */ +public final class MCPCCompatModule$ { + + public static final MCPCCompatModule$ MODULE$ = new MCPCCompatModule$(); + + private MCPCCompatModule$() {} + + public void load() { + try { + Method canPlacePart = World.class + .getDeclaredMethod("canPlaceMultipart", Block.class, Integer.TYPE, Integer.TYPE, Integer.TYPE); + MultipartCompatiblity.canAddPart_$eq(new MCPCPlacement(canPlacePart)); + } catch (Exception e) { + MultipartProxy.logger().error("Failed to integrate MCPC placement hooks", e); + } + } + + private static final class MCPCPlacement extends AbstractFunction4 { + + private final Method canPlacePart; + + MCPCPlacement(Method canPlacePart) { + this.canPlacePart = canPlacePart; + } + + @Override + public Object apply(World world, Object x, Object y, Object z) { + try { + return ((Boolean) canPlacePart.invoke(world, MultipartProxy.block(), x, y, z)).booleanValue(); + } catch (Exception e) { + return throwUnchecked(e); + } + } + + @SuppressWarnings("unchecked") + private static R throwUnchecked(Throwable throwable) throws E { + throw (E) throwable; + } + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MCPCCompatModule.java b/src/main/scala/codechicken/multipart/handler/MCPCCompatModule.java new file mode 100644 index 0000000..064af80 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MCPCCompatModule.java @@ -0,0 +1,11 @@ +package codechicken.multipart.handler; + +/** Static facade for the optional MCPC placement hook. */ +public final class MCPCCompatModule { + + private MCPCCompatModule() {} + + public static void load() { + MCPCCompatModule$.MODULE$.load(); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartCPH$.java b/src/main/scala/codechicken/multipart/handler/MultipartCPH$.java new file mode 100644 index 0000000..7f60d05 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartCPH$.java @@ -0,0 +1,88 @@ +package codechicken.multipart.handler; + +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.network.play.INetHandlerPlayClient; +import net.minecraft.network.play.server.S40PacketDisconnect; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.World; + +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.packet.PacketCustom.IClientPacketHandler; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.TileMultipart; +import scala.MatchError; + +public final class MultipartCPH$ extends MultipartPH implements IClientPacketHandler { + + public static final MultipartCPH$ MODULE$ = new MultipartCPH$(); + + private MultipartCPH$() {} + + @Override + public void handlePacket(PacketCustom packet, Minecraft minecraft, INetHandlerPlayClient netHandler) { + try { + int type = packet.getType(); + switch (type) { + case 1: + handlePartRegistration(packet, netHandler); + return; + case 2: + handleCompressedTileDesc(packet, minecraft.theWorld); + return; + case 3: + handleCompressedTileData(packet, minecraft.theWorld); + return; + default: + throw new MatchError(type); + } + } catch (RuntimeException e) { + if (e.getMessage() != null && e.getMessage().startsWith("DC: ")) { + netHandler + .handleDisconnect(new S40PacketDisconnect(new ChatComponentText(e.getMessage().substring(4)))); + return; + } + throw e; + } + } + + public void handlePartRegistration(PacketCustom packet, INetHandlerPlayClient netHandler) { + List missing = MultiPartRegistry.readIDMap(packet); + if (!missing.isEmpty()) { + netHandler.handleDisconnect( + new S40PacketDisconnect( + new ChatComponentTranslation("multipart.missing", String.join(", ", missing)))); + } + } + + public void handleCompressedTileDesc(PacketCustom packet, World world) { + ChunkCoordIntPair chunk = new ChunkCoordIntPair(packet.readInt(), packet.readInt()); + int count = packet.readUShort(); + for (int i = 0; i < count; i++) { + TileMultipart.handleDescPacket( + world, + new BlockCoord( + packet.readByte() + (chunk.chunkXPos << 4), + packet.readInt(), + packet.readByte() + (chunk.chunkZPos << 4)), + packet); + } + } + + public void handleCompressedTileData(PacketCustom packet, World world) { + int x = packet.readInt(); + while (x != Integer.MAX_VALUE) { + BlockCoord position = new BlockCoord(x, packet.readInt(), packet.readInt()); + int part = packet.readUByte(); + while (part < 255) { + TileMultipart.handlePacket(position, world, part, packet); + part = packet.readUByte(); + } + x = packet.readInt(); + } + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartCPH.java b/src/main/scala/codechicken/multipart/handler/MultipartCPH.java new file mode 100644 index 0000000..8e66a47 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartCPH.java @@ -0,0 +1,36 @@ +package codechicken.multipart.handler; + +import net.minecraft.client.Minecraft; +import net.minecraft.network.play.INetHandlerPlayClient; +import net.minecraft.world.World; + +import codechicken.lib.packet.PacketCustom; + +public final class MultipartCPH { + + private MultipartCPH() {} + + public static MultipartMod$ channel() { + return MultipartCPH$.MODULE$.channel(); + } + + public static String registryChannel() { + return MultipartCPH$.MODULE$.registryChannel(); + } + + public static void handlePacket(PacketCustom packet, Minecraft minecraft, INetHandlerPlayClient netHandler) { + MultipartCPH$.MODULE$.handlePacket(packet, minecraft, netHandler); + } + + public static void handlePartRegistration(PacketCustom packet, INetHandlerPlayClient netHandler) { + MultipartCPH$.MODULE$.handlePartRegistration(packet, netHandler); + } + + public static void handleCompressedTileDesc(PacketCustom packet, World world) { + MultipartCPH$.MODULE$.handleCompressedTileDesc(packet, world); + } + + public static void handleCompressedTileData(PacketCustom packet, World world) { + MultipartCPH$.MODULE$.handleCompressedTileData(packet, world); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartCompatiblity$.java b/src/main/scala/codechicken/multipart/handler/MultipartCompatiblity$.java new file mode 100644 index 0000000..4e02b02 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartCompatiblity$.java @@ -0,0 +1,41 @@ +package codechicken.multipart.handler; + +import net.minecraft.world.World; + +import cpw.mods.fml.common.FMLCommonHandler; +import scala.Function4; +import scala.runtime.AbstractFunction4; + +/** Scala-object-compatible implementation for the multipart placement compatibility hook. */ +public final class MultipartCompatiblity$ { + + public static final MultipartCompatiblity$ MODULE$ = new MultipartCompatiblity$(); + + private Function4 canAddPart = new AllowPlacement(); + + private MultipartCompatiblity$() {} + + public Function4 canAddPart() { + return canAddPart; + } + + public void canAddPart_$eq(Function4 callback) { + canAddPart = callback; + } + + public void load() { + if (FMLCommonHandler.instance().getModName().contains("mcpc")) { + MCPCCompatModule.load(); + } + } + + private static final class AllowPlacement extends AbstractFunction4 { + + AllowPlacement() {} + + @Override + public Object apply(World world, Object x, Object y, Object z) { + return Boolean.TRUE; + } + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartCompatiblity.java b/src/main/scala/codechicken/multipart/handler/MultipartCompatiblity.java new file mode 100644 index 0000000..e8ac2b4 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartCompatiblity.java @@ -0,0 +1,23 @@ +package codechicken.multipart.handler; + +import net.minecraft.world.World; + +import scala.Function4; + +/** Static facade for the multipart placement compatibility hook. */ +public final class MultipartCompatiblity { + + private MultipartCompatiblity() {} + + public static Function4 canAddPart() { + return MultipartCompatiblity$.MODULE$.canAddPart(); + } + + public static void canAddPart_$eq(Function4 callback) { + MultipartCompatiblity$.MODULE$.canAddPart_$eq(callback); + } + + public static void load() { + MultipartCompatiblity$.MODULE$.load(); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartCompatiblity.scala b/src/main/scala/codechicken/multipart/handler/MultipartCompatiblity.scala deleted file mode 100644 index 1b446f7..0000000 --- a/src/main/scala/codechicken/multipart/handler/MultipartCompatiblity.scala +++ /dev/null @@ -1,47 +0,0 @@ -package codechicken.multipart.handler - -import net.minecraft.world.World -import cpw.mods.fml.common.FMLCommonHandler -import net.minecraft.block.Block - -object MultipartCompatiblity { - var canAddPart = (world: World, x: Int, y: Int, z: Int) => true - - def load() { - if (FMLCommonHandler.instance().getModName.contains("mcpc")) - MCPCCompatModule.load() - } -} - -object MCPCCompatModule { - def load() { - try { - val m_canPlacePart = classOf[World].getDeclaredMethod( - "canPlaceMultipart", - classOf[Block], - classOf[Int], - classOf[Int], - classOf[Int] - ) - MultipartCompatiblity.canAddPart = - (world: World, x: Int, y: Int, z: Int) => { - m_canPlacePart - .invoke( - world, - MultipartProxy.block, - x: Integer, - y: Integer, - z: Integer - ) - .asInstanceOf[Boolean] - .booleanValue() - } - } catch { - case e: Exception => - MultipartProxy.logger.error( - "Failed to integrate MCPC placement hooks", - e - ) - } - } -} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartEventHandler$.java b/src/main/scala/codechicken/multipart/handler/MultipartEventHandler$.java new file mode 100644 index 0000000..3605143 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartEventHandler$.java @@ -0,0 +1,96 @@ +package codechicken.multipart.handler; + +import java.util.List; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.world.ChunkPosition; +import net.minecraftforge.client.event.DrawBlockHighlightEvent; +import net.minecraftforge.event.world.ChunkDataEvent; +import net.minecraftforge.event.world.ChunkWatchEvent; +import net.minecraftforge.event.world.WorldEvent; + +import codechicken.multipart.BlockMultipart; +import codechicken.multipart.ControlKeyModifer; +import codechicken.multipart.TileCache; +import codechicken.multipart.TileMultipart; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import scala.collection.JavaConverters; + +public final class MultipartEventHandler$ { + + public static final MultipartEventHandler$ MODULE$ = new MultipartEventHandler$(); + + private MultipartEventHandler$() {} + + @SubscribeEvent + public void playerLoggedOut(cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent event) { + ControlKeyModifer.map().remove(event.player); + } + + @SubscribeEvent + public void playerCloned(net.minecraftforge.event.entity.player.PlayerEvent.Clone event) { + Boolean pressed = ControlKeyModifer.map().remove(event.original); + if (pressed != null) { + ControlKeyModifer.map().put(event.entityPlayer, pressed); + } + } + + @SubscribeEvent(priority = EventPriority.HIGHEST) + @SuppressWarnings("unchecked") + public void tileEntityLoad(ChunkDataEvent.Load event) { + MultipartSaveLoad.loadTiles( + event.getChunk().worldObj, + (Map) event.getChunk().chunkTileEntityMap); + } + + @SubscribeEvent + public void worldUnLoad(WorldEvent.Unload event) { + MultipartSPH$.MODULE$.onWorldUnload(event.world); + if (event.world.isRemote) { + TileCache.clear(); + } else { + MultipartSaveLoad.loadingWorld_$eq(null); + } + } + + @SubscribeEvent + public void chunkWatch(ChunkWatchEvent.Watch event) { + MultipartSPH$.MODULE$.onChunkWatch(event.player, event.chunk); + } + + @SubscribeEvent + public void chunkUnWatch(ChunkWatchEvent.UnWatch event) { + MultipartSPH$.MODULE$.onChunkUnWatch(event.player, event.chunk); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void drawBlockHighlight(DrawBlockHighlightEvent event) { + if (event.target != null && event.target.typeOfHit == MovingObjectType.BLOCK + && event.player.worldObj.getTileEntity( + event.target.blockX, + event.target.blockY, + event.target.blockZ) instanceof TileMultipart + && BlockMultipart + .drawHighlight(event.player.worldObj, event.player, event.target, event.partialTicks)) { + event.setCanceled(true); + } + } + + @SubscribeEvent + @SuppressWarnings("unchecked") + public void serverTick(TickEvent.ServerTickEvent event) { + if (event.phase == TickEvent.Phase.END) { + List players = MinecraftServer.getServer().getConfigurationManager().playerEntityList; + MultipartSPH$.MODULE$.onTickEnd(JavaConverters.asScalaBufferConverter(players).asScala()); + } + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.java b/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.java new file mode 100644 index 0000000..879657f --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.java @@ -0,0 +1,58 @@ +package codechicken.multipart.handler; + +import net.minecraftforge.client.event.DrawBlockHighlightEvent; +import net.minecraftforge.event.world.ChunkDataEvent; +import net.minecraftforge.event.world.ChunkWatchEvent; +import net.minecraftforge.event.world.WorldEvent; + +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public final class MultipartEventHandler { + + private MultipartEventHandler() {} + + @SubscribeEvent + public static void playerLoggedOut(cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent event) { + MultipartEventHandler$.MODULE$.playerLoggedOut(event); + } + + @SubscribeEvent + public static void playerCloned(net.minecraftforge.event.entity.player.PlayerEvent.Clone event) { + MultipartEventHandler$.MODULE$.playerCloned(event); + } + + @SubscribeEvent(priority = EventPriority.HIGHEST) + public static void tileEntityLoad(ChunkDataEvent.Load event) { + MultipartEventHandler$.MODULE$.tileEntityLoad(event); + } + + @SubscribeEvent + public static void worldUnLoad(WorldEvent.Unload event) { + MultipartEventHandler$.MODULE$.worldUnLoad(event); + } + + @SubscribeEvent + public static void chunkWatch(ChunkWatchEvent.Watch event) { + MultipartEventHandler$.MODULE$.chunkWatch(event); + } + + @SubscribeEvent + public static void chunkUnWatch(ChunkWatchEvent.UnWatch event) { + MultipartEventHandler$.MODULE$.chunkUnWatch(event); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public static void drawBlockHighlight(DrawBlockHighlightEvent event) { + MultipartEventHandler$.MODULE$.drawBlockHighlight(event); + } + + @SubscribeEvent + public static void serverTick(TickEvent.ServerTickEvent event) { + MultipartEventHandler$.MODULE$.serverTick(event); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala b/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala deleted file mode 100644 index 8807a56..0000000 --- a/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala +++ /dev/null @@ -1,82 +0,0 @@ -package codechicken.multipart.handler - -import codechicken.multipart.{BlockMultipart, TileCache, TileMultipart} -import cpw.mods.fml.common.eventhandler.{EventPriority, SubscribeEvent} -import cpw.mods.fml.common.gameevent.TickEvent -import cpw.mods.fml.relauncher.{Side, SideOnly} -import net.minecraft.entity.player.EntityPlayerMP -import net.minecraft.server.MinecraftServer -import net.minecraft.tileentity.TileEntity -import net.minecraft.util.MovingObjectPosition.MovingObjectType -import net.minecraft.world.ChunkPosition -import net.minecraftforge.client.event.DrawBlockHighlightEvent -import net.minecraftforge.event.world._ - -import java.util.List -import scala.collection.JavaConverters._ - -object MultipartEventHandler { - @SubscribeEvent(priority = EventPriority.HIGHEST) - def tileEntityLoad(event: ChunkDataEvent.Load) { - MultipartSaveLoad.loadTiles( - event.getChunk.worldObj, - event.getChunk.chunkTileEntityMap - .asInstanceOf[java.util.Map[ChunkPosition, TileEntity]] - ) - } - - @SubscribeEvent - def worldUnLoad(event: WorldEvent.Unload) { - MultipartSPH.onWorldUnload(event.world) - if (event.world.isRemote) { - TileCache.clear() - } else { - MultipartSaveLoad.loadingWorld = null - } - } - - @SubscribeEvent - def chunkWatch(event: ChunkWatchEvent.Watch) { - MultipartSPH.onChunkWatch(event.player, event.chunk) - } - - @SubscribeEvent - def chunkUnWatch(event: ChunkWatchEvent.UnWatch) { - MultipartSPH.onChunkUnWatch(event.player, event.chunk) - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - def drawBlockHighlight(event: DrawBlockHighlightEvent) { - if ( - event.target != null && event.target.typeOfHit == MovingObjectType.BLOCK && - event.player.worldObj - .getTileEntity( - event.target.blockX, - event.target.blockY, - event.target.blockZ - ) - .isInstanceOf[TileMultipart] - ) { - if ( - BlockMultipart.drawHighlight( - event.player.worldObj, - event.player, - event.target, - event.partialTicks - ) - ) - event.setCanceled(true) - } - } - - @SubscribeEvent - def serverTick(event: TickEvent.ServerTickEvent) { - if (event.phase == TickEvent.Phase.END) - MultipartSPH.onTickEnd( - MinecraftServer.getServer.getConfigurationManager.playerEntityList - .asInstanceOf[List[EntityPlayerMP]] - .asScala - ) - } -} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartMod$.java b/src/main/scala/codechicken/multipart/handler/MultipartMod$.java new file mode 100644 index 0000000..079f900 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartMod$.java @@ -0,0 +1,53 @@ +package codechicken.multipart.handler; + +import codechicken.multipart.ControlKeyModifer; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.Tags; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStoppedEvent; + +@Mod( + modid = "ForgeMultipart", + name = "Forge Multipart", + acceptedMinecraftVersions = "[1.7.10]", + version = Tags.VERSION, + modLanguage = "scala") +public final class MultipartMod$ { + + public static final MultipartMod$ MODULE$ = new MultipartMod$(); + + private MultipartMod$() {} + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + MultipartProxy$.MODULE$.preInit(event.getModConfigurationDirectory(), event.getModLog()); + } + + @Mod.EventHandler + public void init(FMLInitializationEvent event) { + MultipartProxy$.MODULE$.init(); + } + + @Mod.EventHandler + public void postInit(FMLPostInitializationEvent event) { + if (MultiPartRegistry.required()) { + MultiPartRegistry.postInit(); + MultipartProxy$.MODULE$.postInit(); + } + } + + @Mod.EventHandler + public void beforeServerStart(FMLServerAboutToStartEvent event) { + MultiPartRegistry.beforeServerStart(); + } + + @Mod.EventHandler + public void serverStopped(FMLServerStoppedEvent event) { + MultipartSaveLoad.loadingWorld_$eq(null); + ControlKeyModifer.map().clear(); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartMod.java b/src/main/scala/codechicken/multipart/handler/MultipartMod.java new file mode 100644 index 0000000..1cd9d25 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartMod.java @@ -0,0 +1,45 @@ +package codechicken.multipart.handler; + +import codechicken.multipart.Tags; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStoppedEvent; + +@Mod( + modid = "ForgeMultipart", + name = "Forge Multipart", + acceptedMinecraftVersions = "[1.7.10]", + version = Tags.VERSION, + modLanguage = "scala") +public final class MultipartMod { + + private MultipartMod() {} + + @Mod.EventHandler + public static void preInit(FMLPreInitializationEvent event) { + MultipartMod$.MODULE$.preInit(event); + } + + @Mod.EventHandler + public static void init(FMLInitializationEvent event) { + MultipartMod$.MODULE$.init(event); + } + + @Mod.EventHandler + public static void postInit(FMLPostInitializationEvent event) { + MultipartMod$.MODULE$.postInit(event); + } + + @Mod.EventHandler + public static void beforeServerStart(FMLServerAboutToStartEvent event) { + MultipartMod$.MODULE$.beforeServerStart(event); + } + + @Mod.EventHandler + public static void serverStopped(FMLServerStoppedEvent event) { + MultipartMod$.MODULE$.serverStopped(event); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartMod.scala b/src/main/scala/codechicken/multipart/handler/MultipartMod.scala deleted file mode 100644 index d4de767..0000000 --- a/src/main/scala/codechicken/multipart/handler/MultipartMod.scala +++ /dev/null @@ -1,50 +0,0 @@ -package codechicken.multipart.handler - -import cpw.mods.fml.common.Mod -import cpw.mods.fml.common.event.{ - FMLInitializationEvent, - FMLPostInitializationEvent, - FMLPreInitializationEvent, - FMLServerAboutToStartEvent, - FMLServerStoppedEvent -} -import cpw.mods.fml.common.Mod.EventHandler -import codechicken.multipart.{ControlKeyModifer, MultiPartRegistry, Tags} - -@Mod( - modid = "ForgeMultipart", - name = "Forge Multipart", - acceptedMinecraftVersions = "[1.7.10]", - version = Tags.VERSION, - modLanguage = "scala" -) -object MultipartMod { - @EventHandler - def preInit(event: FMLPreInitializationEvent) { - MultipartProxy.preInit(event.getModConfigurationDirectory, event.getModLog) - } - - @EventHandler - def init(event: FMLInitializationEvent) { - MultipartProxy.init() - } - - @EventHandler - def postInit(event: FMLPostInitializationEvent) { - if (MultiPartRegistry.required) { - MultiPartRegistry.postInit() - MultipartProxy.postInit() - } - } - - @EventHandler - def beforeServerStart(event: FMLServerAboutToStartEvent) { - MultiPartRegistry.beforeServerStart() - } - - @EventHandler - def serverStopped(event: FMLServerStoppedEvent) { - MultipartSaveLoad.loadingWorld = null; - ControlKeyModifer.map.clear(); - } -} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartPH.java b/src/main/scala/codechicken/multipart/handler/MultipartPH.java new file mode 100644 index 0000000..fe4eef2 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartPH.java @@ -0,0 +1,15 @@ +package codechicken.multipart.handler; + +public class MultipartPH { + + private final MultipartMod$ channel = MultipartMod$.MODULE$; + private final String registryChannel = "ForgeMultipart"; + + public MultipartMod$ channel() { + return channel; + } + + public String registryChannel() { + return registryChannel; + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartProxy$.java b/src/main/scala/codechicken/multipart/handler/MultipartProxy$.java new file mode 100644 index 0000000..7ae9084 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartProxy$.java @@ -0,0 +1,23 @@ +package codechicken.multipart.handler; + +import net.minecraft.world.ChunkCoordIntPair; + +import codechicken.lib.vec.BlockCoord; + +public final class MultipartProxy$ extends MultipartProxy_clientImpl { + + public static final MultipartProxy$ MODULE$ = new MultipartProxy$(); + + private MultipartProxy$() {} + + public BlockCoord indexInChunk(ChunkCoordIntPair chunk, int index) { + return new BlockCoord( + chunk.chunkXPos << 4 | index & 0xF, + index >> 8 & 0xFF, + chunk.chunkZPos << 4 | (index & 0xF0) >> 4); + } + + public int indexInChunk(BlockCoord pos) { + return pos.x & 0xF | pos.y << 8 | (pos.z & 0xF) << 4; + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartProxy.java b/src/main/scala/codechicken/multipart/handler/MultipartProxy.java new file mode 100644 index 0000000..2d4f6c7 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartProxy.java @@ -0,0 +1,69 @@ +package codechicken.multipart.handler; + +import java.io.File; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkCoordIntPair; + +import org.apache.logging.log4j.Logger; + +import codechicken.lib.config.ConfigFile; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.BlockMultipart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public final class MultipartProxy { + + private MultipartProxy() {} + + public static BlockMultipart block() { + return MultipartProxy$.MODULE$.block(); + } + + public static void block_$eq(BlockMultipart block) { + MultipartProxy$.MODULE$.block_$eq(block); + } + + public static ConfigFile config() { + return MultipartProxy$.MODULE$.config(); + } + + public static void config_$eq(ConfigFile config) { + MultipartProxy$.MODULE$.config_$eq(config); + } + + public static Logger logger() { + return MultipartProxy$.MODULE$.logger(); + } + + public static void logger_$eq(Logger logger) { + MultipartProxy$.MODULE$.logger_$eq(logger); + } + + public static void preInit(File cfgdir, Logger logger) { + MultipartProxy$.MODULE$.preInit(cfgdir, logger); + } + + public static void init() { + MultipartProxy$.MODULE$.init(); + } + + @SideOnly(Side.CLIENT) + public static void postInit() { + MultipartProxy$.MODULE$.postInit(); + } + + @SideOnly(Side.CLIENT) + public static void onTileClassBuilt(Class type) { + MultipartProxy$.MODULE$.onTileClassBuilt(type); + } + + public static BlockCoord indexInChunk(ChunkCoordIntPair chunk, int index) { + return MultipartProxy$.MODULE$.indexInChunk(chunk, index); + } + + public static int indexInChunk(BlockCoord pos) { + return MultipartProxy$.MODULE$.indexInChunk(pos); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartProxy_clientImpl.java b/src/main/scala/codechicken/multipart/handler/MultipartProxy_clientImpl.java new file mode 100644 index 0000000..34a852d --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartProxy_clientImpl.java @@ -0,0 +1,34 @@ +package codechicken.multipart.handler; + +import net.minecraft.tileentity.TileEntity; + +import codechicken.lib.packet.PacketCustom; +import codechicken.multipart.ControlKeyHandler; +import codechicken.multipart.MultipartRenderer$; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class MultipartProxy_clientImpl extends MultipartProxy_serverImpl { + + @Override + @SideOnly(Side.CLIENT) + public void postInit() { + super.postInit(); + RenderingRegistry.registerBlockHandler(MultipartRenderer$.MODULE$); + PacketCustom.assignHandler(MultipartCPH$.MODULE$.channel(), MultipartCPH$.MODULE$); + PacketCustom.assignHandler(MultipartCPH$.MODULE$.registryChannel(), MultipartCPH$.MODULE$); + + FMLCommonHandler.instance().bus().register(ControlKeyHandler.INSTANCE); + ClientRegistry.registerKeyBinding(ControlKeyHandler.INSTANCE); + } + + @Override + @SideOnly(Side.CLIENT) + public void onTileClassBuilt(Class type) { + super.onTileClassBuilt(type); + ClientRegistry.bindTileEntitySpecialRenderer(type, MultipartRenderer$.MODULE$); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartProxy_serverImpl.java b/src/main/scala/codechicken/multipart/handler/MultipartProxy_serverImpl.java new file mode 100644 index 0000000..0332ce8 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartProxy_serverImpl.java @@ -0,0 +1,108 @@ +package codechicken.multipart.handler; + +import java.io.File; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.MinecraftForge; + +import org.apache.logging.log4j.Logger; + +import codechicken.lib.config.ConfigFile; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.world.TileChunkLoadHook; +import codechicken.lib.world.WorldExtensionManager; +import codechicken.multipart.BlockMultipart; +import codechicken.multipart.MultipartGenerator; +import codechicken.multipart.TickScheduler$; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; + +public class MultipartProxy_serverImpl { + + private BlockMultipart block; + private ConfigFile config; + private Logger logger; + + public BlockMultipart block() { + return block; + } + + public void block_$eq(BlockMultipart block) { + this.block = block; + } + + public ConfigFile config() { + return config; + } + + public void config_$eq(ConfigFile config) { + this.config = config; + } + + public Logger logger() { + return logger; + } + + public void logger_$eq(Logger logger) { + this.logger = logger; + } + + public void preInit(File cfgdir, Logger logger) { + this.logger = logger; + config = new ConfigFile(new File(cfgdir, "multipart.cfg")).setComment("Multipart API config file"); + + MultipartGenerator + .registerTrait("codechicken.multipart.TSlottedPart", "codechicken.multipart.scalatraits.TSlottedTile"); + MultipartGenerator.registerTrait( + "net.minecraftforge.fluids.IFluidHandler", + "codechicken.multipart.scalatraits.TFluidHandlerTile"); + MultipartGenerator.registerTrait( + "net.minecraft.inventory.IInventory", + "codechicken.multipart.scalatraits.JInventoryTile"); + MultipartGenerator.registerTrait( + "net.minecraft.inventory.ISidedInventory", + "codechicken.multipart.scalatraits.JInventoryTile"); + MultipartGenerator.registerTrait( + "codechicken.multipart.JPartialOcclusion", + "codechicken.multipart.scalatraits.TPartialOcclusionTile"); + MultipartGenerator.registerTrait( + "codechicken.multipart.IRedstonePart", + "codechicken.multipart.scalatraits.TRedstoneTile"); + MultipartGenerator.registerTrait( + "codechicken.multipart.IRandomDisplayTick", + "codechicken.multipart.scalatraits.TRandomDisplayTickTile", + null); + MultipartGenerator.registerTrait( + "codechicken.multipart.INeighborTileChange", + null, + "codechicken.multipart.scalatraits.TTileChangeTile"); + + GameRegistry.registerBlock(new BlockMultipart().setBlockName("multipart"), null, "block"); + block = (BlockMultipart) Block.blockRegistry.getObject("ForgeMultipart:block"); + + MultipartSaveLoad.hookLoader(); + } + + public void init() {} + + public void postInit() { + FMLCommonHandler.instance().bus().register(MultipartEventHandler$.MODULE$); + MinecraftForge.EVENT_BUS.register(MultipartEventHandler$.MODULE$); + PacketCustom.assignHandler(MultipartSPH$.MODULE$.channel(), MultipartSPH$.MODULE$); + PacketCustom.assignHandshakeHandler(MultipartSPH$.MODULE$.registryChannel(), MultipartSPH$.MODULE$); + + WorldExtensionManager.registerWorldExtension(TickScheduler$.MODULE$); + TileChunkLoadHook.init(); + + MultipartCompatiblity.load(); + if (Loader.isModLoaded("cubicchunks")) { + CubicChunksCompat.init(); + } + } + + public void onTileClassBuilt(Class type) { + MultipartSaveLoad.registerTileClass(type); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartSPH$.java b/src/main/scala/codechicken/multipart/handler/MultipartSPH$.java new file mode 100644 index 0000000..f36e5d7 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartSPH$.java @@ -0,0 +1,235 @@ +package codechicken.multipart.handler; + +import java.io.ByteArrayOutputStream; +import java.util.Iterator; +import java.util.LinkedList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.network.play.INetHandlerPlayServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.packet.PacketCustom.IHandshakeHandler; +import codechicken.lib.packet.PacketCustom.IServerPacketHandler; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.ControlKeyModifer; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.PacketScheduler; +import codechicken.multipart.TileMultipart; +import scala.MatchError; +import scala.Option; +import scala.Tuple2; +import scala.collection.mutable.HashMap; +import scala.collection.mutable.HashSet; +import scala.collection.mutable.Map; +import scala.collection.mutable.Set; + +public final class MultipartSPH$ extends MultipartPH implements IServerPacketHandler, IHandshakeHandler { + + public static final MultipartSPH$ MODULE$ = new MultipartSPH$(); + + private final Map> codechicken$multipart$handler$MultipartSPH$$updateMap = new HashMap<>(); + private final HashMap> codechicken$multipart$handler$MultipartSPH$$chunkWatchers = new HashMap<>(); + private final Map> codechicken$multipart$handler$MultipartSPH$$newWatchers = new HashMap<>(); + + private MultipartSPH$() {} + + public Map> codechicken$multipart$handler$MultipartSPH$$updateMap() { + return codechicken$multipart$handler$MultipartSPH$$updateMap; + } + + public HashMap> codechicken$multipart$handler$MultipartSPH$$chunkWatchers() { + return codechicken$multipart$handler$MultipartSPH$$chunkWatchers; + } + + public Map> codechicken$multipart$handler$MultipartSPH$$newWatchers() { + return codechicken$multipart$handler$MultipartSPH$$newWatchers; + } + + @Override + public void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) { + int type = packet.getType(); + if (type == 1) { + ControlKeyModifer.map().put(sender, packet.readBoolean()); + return; + } + throw new MatchError(type); + } + + @Override + public void handshakeRecieved(NetHandlerPlayServer netHandler) { + PacketCustom packet = new PacketCustom(registryChannel(), 1); + MultiPartRegistry.writeIDMap(packet); + netHandler.sendPacket(packet.toPacket()); + } + + public void onWorldUnload(World world) { + if (!world.isRemote) { + codechicken$multipart$handler$MultipartSPH$$updateMap.remove(world); + } + } + + public MultipartSPH.MCByteStream getTileStream(World world, BlockCoord position) { + Option> worldOption = codechicken$multipart$handler$MultipartSPH$$updateMap + .get(world); + Map worldUpdates; + if (worldOption.isEmpty()) { + if (world.isRemote) { + throw new IllegalArgumentException("Cannot use MultipartSPH on a client world"); + } + worldUpdates = new HashMap<>(); + codechicken$multipart$handler$MultipartSPH$$updateMap.put(world, worldUpdates); + } else { + worldUpdates = worldOption.get(); + } + + Option streamOption = worldUpdates.get(position); + if (!streamOption.isEmpty()) { + return streamOption.get(); + } + + MultipartSPH.MCByteStream stream = new MultipartSPH.MCByteStream(new ByteArrayOutputStream()); + stream.writeCoord(position); + worldUpdates.put(position, stream); + return stream; + } + + public void onTickEnd(scala.collection.Seq players) { + PacketScheduler.sendScheduled(); + + scala.collection.Iterator playerIterator = players.iterator(); + while (playerIterator.hasNext()) { + EntityPlayerMP player = playerIterator.next(); + Object playerId = player.getEntityId(); + Option> chunkOption = codechicken$multipart$handler$MultipartSPH$$chunkWatchers + .get(playerId); + if (chunkOption.isEmpty()) { + continue; + } + + Option> updatesOption = codechicken$multipart$handler$MultipartSPH$$updateMap + .get(player.worldObj); + if (updatesOption.isEmpty() || updatesOption.get().isEmpty()) { + continue; + } + + Set chunks = chunkOption.get(); + PacketCustom packet = new PacketCustom(channel(), 3).compress(); + boolean send = false; + scala.collection.Iterator> updateIterator = updatesOption + .get().iterator(); + while (updateIterator.hasNext()) { + Tuple2 update = updateIterator.next(); + BlockCoord position = update._1(); + if (chunks.contains(new ChunkCoordIntPair(position.x >> 4, position.z >> 4))) { + send = true; + packet.writeByteArray(update._2().getBytes()); + packet.writeByte(255); + } + } + if (send) { + packet.writeInt(Integer.MAX_VALUE); + packet.sendToPlayer(player); + } + } + + scala.collection.Iterator>> worldIterator = codechicken$multipart$handler$MultipartSPH$$updateMap + .iterator(); + while (worldIterator.hasNext()) { + worldIterator.next()._2().clear(); + } + + playerIterator = players.iterator(); + while (playerIterator.hasNext()) { + EntityPlayerMP player = playerIterator.next(); + Object playerId = player.getEntityId(); + Option> chunksOption = codechicken$multipart$handler$MultipartSPH$$newWatchers + .get(playerId); + if (chunksOption.isEmpty()) { + continue; + } + + for (ChunkCoordIntPair chunkPosition : chunksOption.get()) { + Chunk chunk = player.worldObj.getChunkFromChunkCoords(chunkPosition.chunkXPos, chunkPosition.chunkZPos); + @SuppressWarnings("unchecked") + Iterator tiles = ((java.util.Map) chunk.chunkTileEntityMap).values() + .iterator(); + PacketCustom packet = getDescPacket(chunk, tiles); + if (packet != null) { + packet.sendToPlayer(player); + } + addChunkWatcher(playerId, chunkPosition); + } + } + codechicken$multipart$handler$MultipartSPH$$newWatchers.clear(); + } + + public void onChunkWatch(EntityPlayer player, ChunkCoordIntPair chunk) { + Object playerId = player.getEntityId(); + Option> option = codechicken$multipart$handler$MultipartSPH$$newWatchers + .get(playerId); + LinkedList chunks; + if (option.isEmpty()) { + chunks = new LinkedList<>(); + codechicken$multipart$handler$MultipartSPH$$newWatchers.put(playerId, chunks); + } else { + chunks = option.get(); + } + chunks.add(chunk); + } + + public void onChunkUnWatch(EntityPlayer player, ChunkCoordIntPair chunk) { + Object playerId = player.getEntityId(); + Option> pending = codechicken$multipart$handler$MultipartSPH$$newWatchers + .get(playerId); + if (!pending.isEmpty()) { + pending.get().remove(chunk); + } + + Option> active = codechicken$multipart$handler$MultipartSPH$$chunkWatchers.get(playerId); + if (!active.isEmpty()) { + Set chunks = active.get(); + chunks.remove(chunk); + if (chunks.isEmpty()) { + codechicken$multipart$handler$MultipartSPH$$chunkWatchers.remove(playerId); + } + } + } + + public PacketCustom getDescPacket(Chunk chunk, Iterator tiles) { + MultipartSPH.MCByteStream stream = new MultipartSPH.MCByteStream(new ByteArrayOutputStream()); + int count = 0; + while (tiles.hasNext()) { + TileEntity tile = tiles.next(); + if (tile instanceof TileMultipart) { + stream.writeByte(tile.xCoord & 0xF); + stream.writeInt(tile.yCoord); + stream.writeByte(tile.zCoord & 0xF); + ((TileMultipart) tile).writeDesc(stream); + count++; + } + } + if (count == 0) { + return null; + } + return new PacketCustom(channel(), 2).compress().writeInt(chunk.xPosition).writeInt(chunk.zPosition) + .writeShort(count).writeByteArray(stream.getBytes()); + } + + private void addChunkWatcher(Object playerId, ChunkCoordIntPair chunk) { + Option> option = codechicken$multipart$handler$MultipartSPH$$chunkWatchers.get(playerId); + Set chunks; + if (option.isEmpty()) { + chunks = new HashSet<>(); + codechicken$multipart$handler$MultipartSPH$$chunkWatchers.put(playerId, chunks); + } else { + chunks = option.get(); + } + chunks.add(chunk); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartSPH.java b/src/main/scala/codechicken/multipart/handler/MultipartSPH.java new file mode 100644 index 0000000..3fec82d --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartSPH.java @@ -0,0 +1,77 @@ +package codechicken.multipart.handler; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.util.Iterator; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.network.play.INetHandlerPlayServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import codechicken.lib.data.MCDataOutputWrapper; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.vec.BlockCoord; + +public final class MultipartSPH { + + private MultipartSPH() {} + + public static class MCByteStream extends MCDataOutputWrapper { + + private final ByteArrayOutputStream bout; + + public MCByteStream(ByteArrayOutputStream bout) { + super(new DataOutputStream(bout)); + this.bout = bout; + } + + public byte[] getBytes() { + return bout.toByteArray(); + } + } + + public static MultipartMod$ channel() { + return MultipartSPH$.MODULE$.channel(); + } + + public static String registryChannel() { + return MultipartSPH$.MODULE$.registryChannel(); + } + + public static void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) { + MultipartSPH$.MODULE$.handlePacket(packet, sender, netHandler); + } + + public static void handshakeRecieved(NetHandlerPlayServer netHandler) { + MultipartSPH$.MODULE$.handshakeRecieved(netHandler); + } + + public static void onWorldUnload(World world) { + MultipartSPH$.MODULE$.onWorldUnload(world); + } + + public static MCByteStream getTileStream(World world, BlockCoord position) { + return MultipartSPH$.MODULE$.getTileStream(world, position); + } + + public static void onTickEnd(scala.collection.Seq players) { + MultipartSPH$.MODULE$.onTickEnd(players); + } + + public static void onChunkWatch(EntityPlayer player, ChunkCoordIntPair chunk) { + MultipartSPH$.MODULE$.onChunkWatch(player, chunk); + } + + public static void onChunkUnWatch(EntityPlayer player, ChunkCoordIntPair chunk) { + MultipartSPH$.MODULE$.onChunkUnWatch(player, chunk); + } + + public static PacketCustom getDescPacket(Chunk chunk, Iterator tiles) { + return MultipartSPH$.MODULE$.getDescPacket(chunk, tiles); + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad$.java b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad$.java new file mode 100644 index 0000000..da6c332 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad$.java @@ -0,0 +1,124 @@ +package codechicken.multipart.handler; + +import java.lang.reflect.Field; +import java.util.Iterator; +import java.util.Map; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import codechicken.lib.asm.ObfMapping; +import codechicken.multipart.MultipartHelper; +import codechicken.multipart.MultipartHelper.IPartTileConverter; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.collection.mutable.MutableList; + +/** Scala companion singleton retained for binary compatibility with compiled Scala consumers. */ +public final class MultipartSaveLoad$ { + + public static final MultipartSaveLoad$ MODULE$ = new MultipartSaveLoad$(); + + private final MutableList> converters = new MutableList<>(); + private World loadingWorld; + private final Map, String> classToNameMap = getClassToNameMap(); + + private MultipartSaveLoad$() {} + + public MutableList> converters() { + return converters; + } + + public World loadingWorld() { + return loadingWorld; + } + + public void loadingWorld_$eq(World world) { + loadingWorld = world; + } + + public void hookLoader() { + Map> nameToClass = tileEntityMap("field_145855_i"); + nameToClass.put("savedMultipart", MultipartSaveLoad.TileNBTContainer.class); + } + + public void registerTileClass(Class tileClass) { + classToNameMap.put(tileClass, "savedMultipart"); + } + + public Map, String> getClassToNameMap() { + return tileEntityMap("field_145853_j"); + } + + @SuppressWarnings("unchecked") + private static Map tileEntityMap(String fieldName) { + try { + Field field = TileEntity.class.getDeclaredField( + new ObfMapping("net/minecraft/tileentity/TileEntity", fieldName, "Ljava/util/Map;") + .toRuntime().s_name); + field.setAccessible(true); + return (Map) field.get(null); + } catch (ReflectiveOperationException e) { + return MultipartSaveLoad$., RuntimeException>throwUnchecked(e); + } + } + + @SuppressWarnings("unchecked") + private static T throwUnchecked(Throwable throwable) throws E { + throw (E) throwable; + } + + @SuppressWarnings("unchecked") + public void loadTiles(Chunk chunk) { + loadTiles(chunk.worldObj, (Map) chunk.chunkTileEntityMap); + } + + public void loadTiles(World world, Map tiles) { + loadingWorld = world; + Iterator> iterator = tiles.entrySet().iterator(); + + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + TileEntity oldTile = entry.getValue(); + TileMultipart replacement; + + if (oldTile instanceof MultipartSaveLoad.TileNBTContainer + && "savedMultipart".equals(((MultipartSaveLoad.TileNBTContainer) oldTile).tag().getString("id"))) { + replacement = TileMultipart.createFromNBT(((MultipartSaveLoad.TileNBTContainer) oldTile).tag()); + } else { + IPartTileConverter converter = findConverter(oldTile); + if (converter == null) { + continue; + } + + Iterable parts = converter.convert(oldTile); + replacement = parts.iterator().hasNext() ? MultipartHelper.createTileFromParts(parts) : null; + } + + if (replacement == null) { + iterator.remove(); + } else { + replacement.xCoord = oldTile.xCoord; + replacement.yCoord = oldTile.yCoord; + replacement.zCoord = oldTile.zCoord; + replacement.setWorldObj(world); + replacement.validate(); + entry.setValue(replacement); + } + } + } + + private IPartTileConverter findConverter(TileEntity tile) { + scala.collection.Iterator> iterator = converters.iterator(); + while (iterator.hasNext()) { + IPartTileConverter converter = iterator.next(); + if (converter.canConvert(tile)) { + return converter; + } + } + return null; + } + +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.java b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.java new file mode 100644 index 0000000..d64f935 --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.java @@ -0,0 +1,70 @@ +package codechicken.multipart.handler; + +import java.util.Map; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import codechicken.multipart.MultipartHelper.IPartTileConverter; +import scala.collection.mutable.MutableList; + +/** Hack due to lack of TileEntityLoadEvent in Forge. */ +public final class MultipartSaveLoad { + + private MultipartSaveLoad() {} + + public static MutableList> converters() { + return MultipartSaveLoad$.MODULE$.converters(); + } + + public static World loadingWorld() { + return MultipartSaveLoad$.MODULE$.loadingWorld(); + } + + public static void loadingWorld_$eq(World world) { + MultipartSaveLoad$.MODULE$.loadingWorld_$eq(world); + } + + public static void hookLoader() { + MultipartSaveLoad$.MODULE$.hookLoader(); + } + + public static void registerTileClass(Class tileClass) { + MultipartSaveLoad$.MODULE$.registerTileClass(tileClass); + } + + public static Map, String> getClassToNameMap() { + return MultipartSaveLoad$.MODULE$.getClassToNameMap(); + } + + public static void loadTiles(Chunk chunk) { + MultipartSaveLoad$.MODULE$.loadTiles(chunk); + } + + public static void loadTiles(World world, Map tiles) { + MultipartSaveLoad$.MODULE$.loadTiles(world, tiles); + } + + /** Dummy registered tile that holds multipart NBT until its chunk finishes loading. */ + public static class TileNBTContainer extends TileEntity { + + private NBTTagCompound tag; + + public NBTTagCompound tag() { + return tag; + } + + public void tag_$eq(NBTTagCompound tag) { + this.tag = tag; + } + + @Override + public void readFromNBT(NBTTagCompound tag) { + super.readFromNBT(tag); + this.tag = tag; + } + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala deleted file mode 100644 index a0b76c6..0000000 --- a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala +++ /dev/null @@ -1,98 +0,0 @@ -package codechicken.multipart.handler - -import net.minecraft.tileentity.TileEntity -import net.minecraft.nbt.NBTTagCompound - -import java.util.Map -import net.minecraft.world.ChunkPosition -import codechicken.multipart.{MultipartHelper, TileMultipart} -import codechicken.lib.asm.ObfMapping -import net.minecraft.world.World - -import scala.collection.mutable -import codechicken.multipart.MultipartHelper.IPartTileConverter - -import scala.collection.JavaConversions._ - -/** Hack due to lack of TileEntityLoadEvent in forge - */ -object MultipartSaveLoad { - val converters = mutable.MutableList[IPartTileConverter[_]]() - var loadingWorld: World = _ - - class TileNBTContainer extends TileEntity { - var tag: NBTTagCompound = _ - - override def readFromNBT(t: NBTTagCompound) { - super.readFromNBT(t) - tag = t - } - } - - def hookLoader() { - val field = classOf[TileEntity].getDeclaredField( - new ObfMapping( - "net/minecraft/tileentity/TileEntity", - "field_145855_i", - "Ljava/util/Map;" - ).toRuntime.s_name - ) - field.setAccessible(true) - val map = field.get(null).asInstanceOf[Map[String, Class[_ <: TileEntity]]] - map.put("savedMultipart", classOf[TileNBTContainer]) - } - - private val classToNameMap = getClassToNameMap - - def registerTileClass(t: Class[_ <: TileEntity]) { - classToNameMap.put(t, "savedMultipart") - } - - def getClassToNameMap = { - val field = classOf[TileEntity].getDeclaredField( - new ObfMapping( - "net/minecraft/tileentity/TileEntity", - "field_145853_j", - "Ljava/util/Map;" - ).toRuntime.s_name - ) - field.setAccessible(true) - field.get(null).asInstanceOf[Map[Class[_ <: TileEntity], String]] - } - - def loadTiles(world: World, tiles: Map[ChunkPosition, TileEntity]) { - loadingWorld = world - val iterator = tiles.entrySet.iterator - while (iterator.hasNext) { - val e = iterator.next - var next = false - val t = e.getValue match { - case t: TileNBTContainer if t.tag.getString("id") == "savedMultipart" => - TileMultipart.createFromNBT( - e.getValue.asInstanceOf[TileNBTContainer].tag - ) - case t => - converters.find(_.canConvert(t)) match { - case Some(c) => - val parts = c.convert(t) - if (!parts.isEmpty) - MultipartHelper.createTileFromParts(parts) - else - null - case _ => - next = true - null - } - } - - if (!next) { - if (t != null) { - t.setWorldObj(world) - t.validate() - e.setValue(t) - } else - iterator.remove() - } - } - } -} diff --git a/src/main/scala/codechicken/multipart/handler/packethandlers.scala b/src/main/scala/codechicken/multipart/handler/packethandlers.scala deleted file mode 100644 index 6b0edf8..0000000 --- a/src/main/scala/codechicken/multipart/handler/packethandlers.scala +++ /dev/null @@ -1,244 +0,0 @@ -package codechicken.multipart.handler - -import codechicken.lib.packet.PacketCustom.{ - IHandshakeHandler, - IClientPacketHandler, - IServerPacketHandler -} -import codechicken.lib.packet.PacketCustom -import net.minecraft.client.Minecraft -import codechicken.multipart.MultiPartRegistry -import net.minecraft.entity.player.EntityPlayerMP -import codechicken.multipart.ControlKeyModifer -import net.minecraft.world.World -import net.minecraft.world.chunk.Chunk -import java.util.{Map => JMap} -import java.util.Iterator -import net.minecraft.tileentity.TileEntity -import codechicken.multipart.TileMultipart -import net.minecraft.entity.player.EntityPlayer -import scala.collection.mutable.{Map, Set, HashMap, MultiMap} -import codechicken.lib.vec.BlockCoord -import codechicken.lib.data.MCDataOutputWrapper -import java.io.DataOutputStream -import java.io.ByteArrayOutputStream -import net.minecraft.world.ChunkCoordIntPair -import MultipartProxy._ -import codechicken.multipart.PacketScheduler -import java.util.LinkedList -import scala.collection.JavaConversions._ -import net.minecraft.network.play.{INetHandlerPlayServer, INetHandlerPlayClient} -import net.minecraft.network.play.server.S40PacketDisconnect -import net.minecraft.util.{ChatComponentText, ChatComponentTranslation} -import net.minecraft.network.NetHandlerPlayServer - -class MultipartPH { - val channel = MultipartMod - val registryChannel = "ForgeMultipart" -} - -object MultipartCPH extends MultipartPH with IClientPacketHandler { - def handlePacket( - packet: PacketCustom, - mc: Minecraft, - netHandler: INetHandlerPlayClient - ) { - try { - packet.getType match { - case 1 => handlePartRegistration(packet, netHandler) - case 2 => handleCompressedTileDesc(packet, mc.theWorld) - case 3 => handleCompressedTileData(packet, mc.theWorld) - } - } catch { - case e: RuntimeException - if e.getMessage != null && e.getMessage.startsWith("DC: ") => - netHandler.handleDisconnect( - new S40PacketDisconnect( - new ChatComponentText(e.getMessage.substring(4)) - ) - ) - } - } - - def handlePartRegistration( - packet: PacketCustom, - netHandler: INetHandlerPlayClient - ) { - val missing = MultiPartRegistry.readIDMap(packet) - if (!missing.isEmpty) - netHandler.handleDisconnect( - new S40PacketDisconnect( - new ChatComponentTranslation( - "multipart.missing", - missing.mkString(", ") - ) - ) - ) - } - - def handleCompressedTileDesc(packet: PacketCustom, world: World) { - val cc = new ChunkCoordIntPair(packet.readInt, packet.readInt) - val num = packet.readUShort - for (i <- 0 until num) - TileMultipart.handleDescPacket( - world, - new BlockCoord( - packet.readByte + (cc.chunkXPos << 4), - packet.readInt, - packet.readByte + (cc.chunkZPos << 4) - ), - packet - ) - } - - def handleCompressedTileData(packet: PacketCustom, world: World) { - var x = packet.readInt - while (x != Int.MaxValue) { - val pos = new BlockCoord(x, packet.readInt, packet.readInt) - var i = packet.readUByte - while (i < 255) { - TileMultipart.handlePacket(pos, world, i, packet) - i = packet.readUByte - } - x = packet.readInt - } - } -} - -object MultipartSPH - extends MultipartPH - with IServerPacketHandler - with IHandshakeHandler { - class MCByteStream(bout: ByteArrayOutputStream) - extends MCDataOutputWrapper(new DataOutputStream(bout)) { - def getBytes = bout.toByteArray - } - - private val updateMap = Map[World, Map[BlockCoord, MCByteStream]]() - - /** These maps are keyed by entityID so that new player instances with the - * same entity id don't conflict world references - */ - private val chunkWatchers = new HashMap[Int, Set[ChunkCoordIntPair]] - with MultiMap[Int, ChunkCoordIntPair] - private val newWatchers = Map[Int, LinkedList[ChunkCoordIntPair]]() - - def handlePacket( - packet: PacketCustom, - sender: EntityPlayerMP, - netHandler: INetHandlerPlayServer - ) { - packet.getType match { - case 1 => ControlKeyModifer.map.put(sender, packet.readBoolean) - } - } - - def handshakeRecieved(netHandler: NetHandlerPlayServer) { - val packet = new PacketCustom(registryChannel, 1) - MultiPartRegistry.writeIDMap(packet) - netHandler.sendPacket(packet.toPacket) - } - - def onWorldUnload(world: World) { - if (!world.isRemote) - updateMap.remove(world) - } - - def getTileStream(world: World, pos: BlockCoord) = - updateMap - .getOrElseUpdate( - world, { - if (world.isRemote) - throw new IllegalArgumentException( - "Cannot use MultipartSPH on a client world" - ) - Map() - } - ) - .getOrElseUpdate( - pos, { - val s = new MCByteStream(new ByteArrayOutputStream) - s.writeCoord(pos) - s - } - ) - - def onTickEnd(players: Seq[EntityPlayerMP]) { - PacketScheduler.sendScheduled() - - for (p <- players if chunkWatchers.containsKey(p.getEntityId)) { - updateMap.get(p.worldObj) match { - case Some(m) if !m.isEmpty => - val chunks = chunkWatchers(p.getEntityId) - val packet = new PacketCustom(channel, 3).compress() - var send = false - for ( - (pos, stream) <- m - if chunks(new ChunkCoordIntPair(pos.x >> 4, pos.z >> 4)) - ) { - send = true - packet.writeByteArray(stream.getBytes) - packet.writeByte(255) // terminator - } - if (send) { - packet.writeInt(Int.MaxValue) // terminator - packet.sendToPlayer(p) - } - case _ => - } - } - updateMap.foreach(_._2.clear()) - for (p <- players if newWatchers.containsKey(p.getEntityId)) { - for (c <- newWatchers(p.getEntityId)) { - val chunk = p.worldObj.getChunkFromChunkCoords(c.chunkXPos, c.chunkZPos) - val pkt = getDescPacket( - chunk, - chunk.chunkTileEntityMap - .asInstanceOf[JMap[_, TileEntity]] - .values - .iterator - ) - if (pkt != null) pkt.sendToPlayer(p) - chunkWatchers.addBinding(p.getEntityId, c) - } - } - newWatchers.clear() - } - - def onChunkWatch(p: EntityPlayer, c: ChunkCoordIntPair) { - newWatchers.getOrElseUpdate(p.getEntityId, new LinkedList).add(c) - } - - def onChunkUnWatch(p: EntityPlayer, c: ChunkCoordIntPair) { - newWatchers.get(p.getEntityId) match { - case Some(chunks) => chunks.remove(c) - case _ => - } - chunkWatchers.removeBinding(p.getEntityId, c) - } - - def getDescPacket(chunk: Chunk, it: Iterator[TileEntity]): PacketCustom = { - val s = new MCByteStream(new ByteArrayOutputStream) - - var num = 0 - while (it.hasNext) { - val tile = it.next - if (tile.isInstanceOf[TileMultipart]) { - s.writeByte(tile.xCoord & 0xf) - s.writeInt(tile.yCoord) - s.writeByte(tile.zCoord & 0xf) - tile.asInstanceOf[TileMultipart].writeDesc(s) - num += 1 - } - } - if (num != 0) { - return new PacketCustom(channel, 2) - .compress() - .writeInt(chunk.xPosition) - .writeInt(chunk.zPosition) - .writeShort(num) - .writeByteArray(s.getBytes) - } - return null - } -} diff --git a/src/main/scala/codechicken/multipart/handler/proxies.scala b/src/main/scala/codechicken/multipart/handler/proxies.scala deleted file mode 100644 index a26451d..0000000 --- a/src/main/scala/codechicken/multipart/handler/proxies.scala +++ /dev/null @@ -1,129 +0,0 @@ -package codechicken.multipart.handler - -import codechicken.multipart._ -import cpw.mods.fml.client.registry.RenderingRegistry -import cpw.mods.fml.client.registry.ClientRegistry -import net.minecraft.tileentity.TileEntity -import codechicken.lib.config.ConfigFile -import java.io.File -import net.minecraftforge.common.MinecraftForge -import cpw.mods.fml.relauncher.SideOnly -import cpw.mods.fml.relauncher.Side -import codechicken.lib.packet.PacketCustom -import net.minecraft.world.ChunkCoordIntPair -import codechicken.lib.vec.BlockCoord -import codechicken.lib.world.{TileChunkLoadHook, WorldExtensionManager} -import cpw.mods.fml.common.{FMLCommonHandler, Loader} -import cpw.mods.fml.common.registry.GameRegistry -import net.minecraft.block.Block -import org.apache.logging.log4j.Logger - -class MultipartProxy_serverImpl { - var block: BlockMultipart = _ - var config: ConfigFile = _ - var logger: Logger = _ - - def preInit(cfgdir: File, logger: Logger) { - this.logger = logger - config = new ConfigFile(new File(cfgdir, "multipart.cfg")) - .setComment("Multipart API config file") - - GameRegistry.registerBlock( - new BlockMultipart().setBlockName("codechicken/multipart"), - null, - "block" - ) - block = Block.blockRegistry - .getObject("ForgeMultipart:block") - .asInstanceOf[BlockMultipart] - - MultipartGenerator.registerTrait( - "codechicken.multipart.TSlottedPart", - "codechicken.multipart.scalatraits.TSlottedTile" - ) - MultipartGenerator.registerTrait( - "net.minecraftforge.fluids.IFluidHandler", - "codechicken.multipart.scalatraits.TFluidHandlerTile" - ) - MultipartGenerator.registerTrait( - "net.minecraft.inventory.IInventory", - "codechicken.multipart.scalatraits.JInventoryTile" - ) - MultipartGenerator.registerTrait( - "net.minecraft.inventory.ISidedInventory", - "codechicken.multipart.scalatraits.JInventoryTile" - ) - MultipartGenerator.registerTrait( - "codechicken.multipart.JPartialOcclusion", - "codechicken.multipart.scalatraits.TPartialOcclusionTile" - ) - MultipartGenerator.registerTrait( - "codechicken.multipart.IRedstonePart", - "codechicken.multipart.scalatraits.TRedstoneTile" - ) - MultipartGenerator.registerTrait( - "codechicken.multipart.IRandomDisplayTick", - "codechicken.multipart.scalatraits.TRandomDisplayTickTile", - null - ) - MultipartGenerator.registerTrait( - "codechicken.multipart.INeighborTileChange", - null, - "codechicken.multipart.scalatraits.TTileChangeTile" - ) - - MultipartSaveLoad.hookLoader() - } - - def init() {} - - def postInit() { - FMLCommonHandler.instance().bus().register(MultipartEventHandler) - MinecraftForge.EVENT_BUS.register(MultipartEventHandler) - PacketCustom.assignHandler(MultipartSPH.channel, MultipartSPH) - PacketCustom.assignHandshakeHandler( - MultipartSPH.registryChannel, - MultipartSPH - ) - - WorldExtensionManager.registerWorldExtension(TickScheduler) - TileChunkLoadHook.init() - - MultipartCompatiblity.load() - if (Loader.isModLoaded("cubicchunks")) - CubicChunksCompat.init() - } - - def onTileClassBuilt(t: Class[_ <: TileEntity]) { - MultipartSaveLoad.registerTileClass(t) - } -} - -class MultipartProxy_clientImpl extends MultipartProxy_serverImpl { - @SideOnly(Side.CLIENT) - override def postInit() { - super.postInit() - RenderingRegistry.registerBlockHandler(MultipartRenderer) - PacketCustom.assignHandler(MultipartCPH.channel, MultipartCPH) - PacketCustom.assignHandler(MultipartCPH.registryChannel, MultipartCPH) - - FMLCommonHandler.instance().bus().register(ControlKeyHandler) - ClientRegistry.registerKeyBinding(ControlKeyHandler) - } - - @SideOnly(Side.CLIENT) - override def onTileClassBuilt(t: Class[_ <: TileEntity]) { - super.onTileClassBuilt(t) - ClientRegistry.bindTileEntitySpecialRenderer(t, MultipartRenderer) - } -} - -object MultipartProxy extends MultipartProxy_clientImpl { - def indexInChunk(cc: ChunkCoordIntPair, i: Int) = new BlockCoord( - cc.chunkXPos << 4 | i & 0xf, - (i >> 8) & 0xff, - cc.chunkZPos << 4 | (i & 0xf0) >> 4 - ) - def indexInChunk(pos: BlockCoord) = - pos.x & 0xf | pos.y << 8 | (pos.z & 0xf) << 4 -} diff --git a/src/main/scala/codechicken/multipart/minecraft/ButtonPart.java b/src/main/scala/codechicken/multipart/minecraft/ButtonPart.java index 829a20e..4206e2d 100644 --- a/src/main/scala/codechicken/multipart/minecraft/ButtonPart.java +++ b/src/main/scala/codechicken/multipart/minecraft/ButtonPart.java @@ -20,7 +20,14 @@ public class ButtonPart extends McSidedMetaPart implements IFaceRedstonePart { public static BlockButton stoneButton = (BlockButton) Blocks.stone_button; public static BlockButton woodenButton = (BlockButton) Blocks.wooden_button; + + /** Legacy mutable mapping retained for existing integrations; new code should use {@link #setOrientation}. */ public static int[] metaSideMap = new int[] { -1, 4, 5, 2, 3, -1, -1, -1 }; + + /** + * Legacy mutable inverse mapping retained for existing integrations; use {@link #metaForSide} to read and + * {@link #setOrientation} to configure it. + */ public static int[] sideMetaMap = new int[] { -1, -1, 3, 4, 1, 2 }; public static Cuboid6[] cuboidRegions = setupCuboids(); @@ -46,6 +53,49 @@ public class ButtonPart extends McSidedMetaPart implements IFaceRedstonePart { return regions; } + /** + * Sets the attachment face represented by a button's orientation metadata. + * + *

+ * Call this during common mod initialization, before button parts are loaded or placed. This updates both placement + * and metadata lookups and removes any previous inverse mappings displaced by the new pair. + * + * @param metadata the orientation bits, from 0 through 7; do not include the pressed or button-type bits + * @param attachmentFace the face occupied by the multipart button + * @throws IllegalArgumentException if the metadata or face is outside its supported range + */ + public static void setOrientation(int metadata, ForgeDirection attachmentFace) { + if (metadata < 0 || metadata > 7) { + throw new IllegalArgumentException("Button orientation metadata must be between 0 and 7: " + metadata); + } + if (attachmentFace == null || attachmentFace == ForgeDirection.UNKNOWN) { + throw new IllegalArgumentException("Button attachment face must be one of the six cardinal directions"); + } + + int side = attachmentFace.ordinal(); + int previousSide = metaSideMap[metadata]; + if (previousSide >= 0 && previousSide < sideMetaMap.length && sideMetaMap[previousSide] == metadata) { + sideMetaMap[previousSide] = -1; + } + int previousMetadata = sideMetaMap[side]; + if (previousMetadata >= 0 && previousMetadata < metaSideMap.length && metaSideMap[previousMetadata] == side) { + metaSideMap[previousMetadata] = -1; + } + metaSideMap[metadata] = side; + sideMetaMap[side] = metadata; + } + + /** + * Returns the current orientation metadata for an attachment face, or -1 if that face is unmapped. Reads the live + * mapping, including changes made by legacy integrations. Does not check support or construct a part. + * + * @param side attachment face index, from 0 through 5; for a clicked face use {@code side ^ 1} + * @throws IndexOutOfBoundsException if the index is outside the mapping + */ + public static int metaForSide(int side) { + return sideMetaMap[side]; + } + public static BlockButton getButton(int meta) { return (meta & 0x10) > 0 ? woodenButton : stoneButton; } diff --git a/src/main/scala/codechicken/multipart/minecraft/McBlockPart.java b/src/main/scala/codechicken/multipart/minecraft/McBlockPart.java index 1f77fa6..7acd34c 100644 --- a/src/main/scala/codechicken/multipart/minecraft/McBlockPart.java +++ b/src/main/scala/codechicken/multipart/minecraft/McBlockPart.java @@ -9,6 +9,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import codechicken.lib.vec.Cuboid6; import codechicken.multipart.IconHitEffects; @@ -66,6 +67,12 @@ public abstract class McBlockPart extends JCuboidPart implements JNormalOcclusio return getBlock().getIcon(0, 0); } + @Override + @SideOnly(Side.CLIENT) + public int getBrokenColour(int side, IBlockAccess world, int x, int y, int z) { + return getBlock().colorMultiplier(world, x, y, z); + } + @Override public void addHitEffects(MovingObjectPosition hit, EffectRenderer effectRenderer) { IconHitEffects.addHitEffects(this, hit, effectRenderer); diff --git a/src/main/scala/codechicken/multipart/package.scala b/src/main/scala/codechicken/multipart/package.scala deleted file mode 100644 index 646cfa0..0000000 --- a/src/main/scala/codechicken/multipart/package.scala +++ /dev/null @@ -1,7 +0,0 @@ -package codechicken - -import codechicken.multipart.handler.MultipartProxy - -package object multipart { - def logger = MultipartProxy.logger -} diff --git a/src/main/scala/codechicken/multipart/scalatraits/JInventoryTile.java b/src/main/scala/codechicken/multipart/scalatraits/JInventoryTile.java new file mode 100644 index 0000000..453e6fc --- /dev/null +++ b/src/main/scala/codechicken/multipart/scalatraits/JInventoryTile.java @@ -0,0 +1,234 @@ +package codechicken.multipart.scalatraits; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.Tuple2; + +/** Registered Java trait input that distributes inventory access among multipart inventories. */ +public class JInventoryTile extends TileMultipart implements TIInventoryTile { + + private LinkedList invList = new LinkedList<>(); + + @SuppressWarnings("unchecked") + private Tuple2[] slotMap = (Tuple2[]) new Tuple2[0]; + + @Override + public LinkedList invList() { + return invList; + } + + @Override + public void invList_$eq(LinkedList inventories) { + invList = inventories; + } + + @Override + public Tuple2[] slotMap() { + return slotMap; + } + + @Override + public void slotMap_$eq(Tuple2[] slots) { + slotMap = slots; + } + + @Override + public void codechicken$multipart$scalatraits$TIInventoryTile$$super$copyFrom(TileMultipart that) { + super.copyFrom(that); + } + + @Override + public void codechicken$multipart$scalatraits$TIInventoryTile$$super$bindPart(TMultiPart part) { + super.bindPart(part); + } + + @Override + public void codechicken$multipart$scalatraits$TIInventoryTile$$super$partRemoved(TMultiPart part, int position) { + super.partRemoved(part, position); + } + + @Override + public void codechicken$multipart$scalatraits$TIInventoryTile$$super$clearParts() { + super.clearParts(); + } + + @Override + public void copyFrom(TileMultipart that) { + codechicken$multipart$scalatraits$TIInventoryTile$$super$copyFrom(that); + if (that instanceof TIInventoryTile) { + invList = ((TIInventoryTile) that).invList(); + rebuildSlotMap(); + } + } + + @Override + public void bindPart(TMultiPart part) { + codechicken$multipart$scalatraits$TIInventoryTile$$super$bindPart(part); + if (part instanceof IInventory) { + invList.add((IInventory) part); + rebuildSlotMap(); + } + } + + @Override + public void partRemoved(TMultiPart part, int position) { + codechicken$multipart$scalatraits$TIInventoryTile$$super$partRemoved(part, position); + if (part instanceof IInventory) { + invList.remove(part); + rebuildSlotMap(); + } + } + + @Override + @SuppressWarnings("unchecked") + public void clearParts() { + codechicken$multipart$scalatraits$TIInventoryTile$$super$clearParts(); + invList.clear(); + slotMap = (Tuple2[]) new Tuple2[0]; + } + + @Override + public void refreshInventorySlots() { + rebuildSlotMap(); + } + + @Override + @SuppressWarnings("unchecked") + public void rebuildSlotMap() { + int totalSlots = 0; + for (IInventory inventory : invList) { + totalSlots += inventory.getSizeInventory(); + } + + Tuple2[] rebuilt = (Tuple2[]) new Tuple2[totalSlots]; + int index = 0; + for (IInventory inventory : invList) { + int size = inventory.getSizeInventory(); + for (int slot = 0; slot < size; slot++) { + rebuilt[index++] = new Tuple2(inventory, Integer.valueOf(slot)); + } + } + slotMap = rebuilt; + } + + @Override + public int getSizeInventory() { + return slotMap.length; + } + + @Override + public ItemStack getStackInSlot(int slot) { + Tuple2 entry = slotMap[slot]; + return entry._1().getStackInSlot(((Number) entry._2()).intValue()); + } + + @Override + public ItemStack decrStackSize(int slot, int amount) { + Tuple2 entry = slotMap[slot]; + return entry._1().decrStackSize(((Number) entry._2()).intValue(), amount); + } + + @Override + public ItemStack getStackInSlotOnClosing(int slot) { + Tuple2 entry = slotMap[slot]; + return entry._1().getStackInSlotOnClosing(((Number) entry._2()).intValue()); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + Tuple2 entry = slotMap[slot]; + entry._1().setInventorySlotContents(((Number) entry._2()).intValue(), stack); + } + + @Override + public String getInventoryName() { + return "Multipart Inventory"; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return true; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + Tuple2 entry = slotMap[slot]; + return entry._1().isItemValidForSlot(((Number) entry._2()).intValue(), stack); + } + + @Override + public int[] getAccessibleSlotsFromSide(int side) { + List accessibleSlots = new ArrayList<>(); + int base = 0; + for (IInventory inventory : invList) { + if (inventory instanceof ISidedInventory) { + int[] localSlots = ((ISidedInventory) inventory).getAccessibleSlotsFromSide(side); + for (int localSlot : localSlots) { + accessibleSlots.add(Integer.valueOf(localSlot + base)); + } + } else { + for (int localSlot = 0; localSlot < inventory.getSizeInventory(); localSlot++) { + accessibleSlots.add(Integer.valueOf(localSlot + base)); + } + } + base += inventory.getSizeInventory(); + } + + return JInventoryTileAccess.toIntArray(accessibleSlots); + } + + @Override + public boolean canInsertItem(int slot, ItemStack stack, int side) { + Tuple2 entry = slotMap[slot]; + IInventory inventory = entry._1(); + return !(inventory instanceof ISidedInventory) + || ((ISidedInventory) inventory).canInsertItem(((Number) entry._2()).intValue(), stack, side); + } + + @Override + public boolean canExtractItem(int slot, ItemStack stack, int side) { + Tuple2 entry = slotMap[slot]; + IInventory inventory = entry._1(); + return !(inventory instanceof ISidedInventory) + || ((ISidedInventory) inventory).canExtractItem(((Number) entry._2()).intValue(), stack, side); + } +} + +/** Keeps primitive-array allocation outside the generated trait transformer. */ +final class JInventoryTileAccess { + + private JInventoryTileAccess() {} + + static int[] toIntArray(List values) { + int[] result = new int[values.size()]; + for (int index = 0; index < result.length; index++) { + result[index] = values.get(index).intValue(); + } + return result; + } +} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TFluidHandlerTile.java b/src/main/scala/codechicken/multipart/scalatraits/TFluidHandlerTile.java new file mode 100644 index 0000000..7853def --- /dev/null +++ b/src/main/scala/codechicken/multipart/scalatraits/TFluidHandlerTile.java @@ -0,0 +1,165 @@ +package codechicken.multipart.scalatraits; + +import java.util.LinkedList; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Mixin implementation that distributes fluid handling among multipart tanks. */ +public class TFluidHandlerTile extends TileMultipart implements IFluidHandler { + + public LinkedList tankList = new LinkedList<>(); + + @Override + public void copyFrom(TileMultipart that) { + super.copyFrom(that); + if (that instanceof TFluidHandlerTile) { + tankList = ((TFluidHandlerTile) that).tankList; + } + } + + @Override + public void bindPart(TMultiPart part) { + super.bindPart(part); + if (part instanceof IFluidHandler) { + tankList.add((IFluidHandler) part); + } + } + + @Override + public void partRemoved(TMultiPart part, int position) { + super.partRemoved(part, position); + if (part instanceof IFluidHandler) { + tankList.remove(part); + } + } + + @Override + public void clearParts() { + super.clearParts(); + tankList.clear(); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection direction) { + int tankCount = 0; + for (IFluidHandler handler : tankList) { + tankCount += handler.getTankInfo(direction).length; + } + + FluidTankInfo[] tanks = new FluidTankInfo[tankCount]; + int index = 0; + for (IFluidHandler handler : tankList) { + for (FluidTankInfo tank : handler.getTankInfo(direction)) { + tanks[index++] = tank; + } + } + return tanks; + } + + @Override + public int fill(ForgeDirection direction, FluidStack liquid, boolean doFill) { + int filled = 0; + int initial = TFluidHandlerTileAccess.amount(liquid); + for (IFluidHandler handler : tankList) { + FluidStack remaining = TFluidHandlerTileAccess.copy(liquid, initial - filled); + filled += handler.fill(direction, remaining, doFill); + } + return filled; + } + + @Override + public boolean canFill(ForgeDirection direction, Fluid liquid) { + for (IFluidHandler handler : tankList) { + if (handler.canFill(direction, liquid)) { + return true; + } + } + return false; + } + + @Override + public boolean canDrain(ForgeDirection direction, Fluid liquid) { + for (IFluidHandler handler : tankList) { + if (handler.canDrain(direction, liquid)) { + return true; + } + } + return false; + } + + @Override + public FluidStack drain(ForgeDirection direction, int amount, boolean doDrain) { + FluidStack drained = null; + int drainedAmount = 0; + for (IFluidHandler handler : tankList) { + int remaining = amount - drainedAmount; + FluidStack result = handler.drain(direction, remaining, false); + if (result != null && TFluidHandlerTileAccess.amount(result) > 0 + && (drained == null || drained.isFluidEqual(result))) { + if (doDrain) { + handler.drain(direction, remaining, true); + } + if (drained == null) { + drained = result; + } + drainedAmount += TFluidHandlerTileAccess.amount(result); + } + } + if (drained != null) { + TFluidHandlerTileAccess.setAmount(drained, drainedAmount); + } + return drained; + } + + @Override + public FluidStack drain(ForgeDirection direction, FluidStack liquid, boolean doDrain) { + int amount = TFluidHandlerTileAccess.amount(liquid); + FluidStack drained = null; + int drainedAmount = 0; + for (IFluidHandler handler : tankList) { + FluidStack remaining = TFluidHandlerTileAccess.copy(liquid, amount - drainedAmount); + FluidStack result = handler.drain(direction, remaining, false); + if (result != null && TFluidHandlerTileAccess.amount(result) > 0 + && (drained == null || drained.isFluidEqual(result))) { + if (doDrain) { + handler.drain(direction, remaining, true); + } + if (drained == null) { + drained = result; + } + drainedAmount += TFluidHandlerTileAccess.amount(result); + } + } + if (drained != null) { + TFluidHandlerTileAccess.setAmount(drained, drainedAmount); + } + return drained; + } +} + +/** Keeps fields owned by method arguments outside the generated trait transformer. */ +final class TFluidHandlerTileAccess { + + private TFluidHandlerTileAccess() {} + + static int amount(FluidStack stack) { + return stack.amount; + } + + static void setAmount(FluidStack stack, int amount) { + stack.amount = amount; + } + + static FluidStack copy(FluidStack stack, int amount) { + FluidStack copy = stack.copy(); + copy.amount = amount; + return copy; + } +} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TFluidHandlerTile.scala b/src/main/scala/codechicken/multipart/scalatraits/TFluidHandlerTile.scala deleted file mode 100644 index ef437b9..0000000 --- a/src/main/scala/codechicken/multipart/scalatraits/TFluidHandlerTile.scala +++ /dev/null @@ -1,139 +0,0 @@ -package codechicken.multipart.scalatraits - -import net.minecraftforge.common.util.ForgeDirection -import codechicken.multipart.TMultiPart -import codechicken.multipart.TileMultipart -import net.minecraftforge.fluids.IFluidHandler -import net.minecraftforge.fluids.FluidStack -import net.minecraftforge.fluids.FluidTankInfo -import net.minecraftforge.fluids.Fluid -import java.util.LinkedList -import scala.collection.JavaConversions._ - -/** Mixin trait implementation for parts implementing IFluidHandler. Distributes - * fluid manipulation among fluid handling parts. - */ -trait TFluidHandlerTile extends TileMultipart with IFluidHandler { - var tankList = new LinkedList[IFluidHandler]() - - override def copyFrom(that: TileMultipart) { - super.copyFrom(that) - if (that.isInstanceOf[TFluidHandlerTile]) - tankList = that.asInstanceOf[TFluidHandlerTile].tankList - } - - override def bindPart(part: TMultiPart) { - super.bindPart(part) - if (part.isInstanceOf[IFluidHandler]) - tankList += part.asInstanceOf[IFluidHandler] - } - - override def partRemoved(part: TMultiPart, p: Int) { - super.partRemoved(part, p) - if (part.isInstanceOf[IFluidHandler]) - tankList -= part.asInstanceOf[IFluidHandler] - } - - override def clearParts() { - super.clearParts() - tankList.clear() - } - - override def getTankInfo(dir: ForgeDirection): Array[FluidTankInfo] = { - var tankCount: Int = 0 - tankList.foreach(t => tankCount += t.getTankInfo(dir).length) - val tanks = new Array[FluidTankInfo](tankCount) - var i = 0 - tankList.foreach(p => - p.getTankInfo(dir).foreach { t => - tanks(i) = t - i += 1 - } - ) - return tanks - } - - override def fill( - dir: ForgeDirection, - liquid: FluidStack, - doFill: Boolean - ): Int = { - var filled = 0 - val initial = liquid.amount - tankList.foreach(p => - filled += p.fill(dir, copy(liquid, initial - filled), doFill) - ) - return filled - } - - override def canFill(dir: ForgeDirection, liquid: Fluid) = - tankList.find(_.canFill(dir, liquid)).isDefined - - override def canDrain(dir: ForgeDirection, liquid: Fluid) = - tankList.find(_.canDrain(dir, liquid)).isDefined - - private def copy(liquid: FluidStack, quantity: Int): FluidStack = { - val copy = liquid.copy - copy.amount = quantity - return copy - } - - override def drain( - dir: ForgeDirection, - amount: Int, - doDrain: Boolean - ): FluidStack = { - var drained: FluidStack = null - var d_amount = 0 - tankList.foreach { p => - val drain = amount - d_amount - val ret = p.drain(dir, drain, false) - if ( - ret != null && ret.amount > 0 && (drained == null || drained - .isFluidEqual(ret)) - ) { - if (doDrain) - p.drain(dir, drain, true) - - if (drained == null) - drained = ret - - d_amount += ret.amount - } - } - if (drained != null) - drained.amount = d_amount - - return drained - } - - override def drain( - dir: ForgeDirection, - fluid: FluidStack, - doDrain: Boolean - ): FluidStack = { - val amount = fluid.amount - var drained: FluidStack = null - var d_amount = 0 - tankList.foreach { p => - val drain = copy(fluid, amount - d_amount) - val ret = p.drain(dir, drain, false) - if ( - ret != null && ret.amount > 0 && (drained == null || drained - .isFluidEqual(ret)) - ) { - if (doDrain) - p.drain(dir, drain, true) - - if (drained == null) - drained = ret - - d_amount += ret.amount - } - } - if (drained != null) - drained.amount = d_amount - - return drained - } -} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TIInventoryTile.java b/src/main/scala/codechicken/multipart/scalatraits/TIInventoryTile.java new file mode 100644 index 0000000..cac37a7 --- /dev/null +++ b/src/main/scala/codechicken/multipart/scalatraits/TIInventoryTile.java @@ -0,0 +1,87 @@ +package codechicken.multipart.scalatraits; + +import java.util.LinkedList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.Tuple2; + +/** Consumer-facing inventory contract implemented by the generated multipart tile. */ +public interface TIInventoryTile extends ISidedInventory { + + void codechicken$multipart$scalatraits$TIInventoryTile$$super$copyFrom(TileMultipart that); + + void codechicken$multipart$scalatraits$TIInventoryTile$$super$bindPart(TMultiPart part); + + void codechicken$multipart$scalatraits$TIInventoryTile$$super$partRemoved(TMultiPart part, int position); + + void codechicken$multipart$scalatraits$TIInventoryTile$$super$clearParts(); + + LinkedList invList(); + + void invList_$eq(LinkedList inventories); + + Tuple2[] slotMap(); + + void slotMap_$eq(Tuple2[] slots); + + void copyFrom(TileMultipart that); + + void bindPart(TMultiPart part); + + void partRemoved(TMultiPart part, int position); + + void clearParts(); + + void rebuildSlotMap(); + + @Override + int getSizeInventory(); + + @Override + ItemStack getStackInSlot(int slot); + + @Override + ItemStack decrStackSize(int slot, int amount); + + @Override + ItemStack getStackInSlotOnClosing(int slot); + + @Override + void setInventorySlotContents(int slot, ItemStack stack); + + @Override + String getInventoryName(); + + @Override + boolean hasCustomInventoryName(); + + @Override + int getInventoryStackLimit(); + + @Override + boolean isUseableByPlayer(EntityPlayer player); + + @Override + void openInventory(); + + @Override + void closeInventory(); + + @Override + boolean isItemValidForSlot(int slot, ItemStack stack); + + @Override + int[] getAccessibleSlotsFromSide(int side); + + @Override + boolean canInsertItem(int slot, ItemStack stack, int side); + + @Override + boolean canExtractItem(int slot, ItemStack stack, int side); +} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TIInventoryTile.scala b/src/main/scala/codechicken/multipart/scalatraits/TIInventoryTile.scala deleted file mode 100644 index 995f5e4..0000000 --- a/src/main/scala/codechicken/multipart/scalatraits/TIInventoryTile.scala +++ /dev/null @@ -1,126 +0,0 @@ -package codechicken.multipart.scalatraits - -import net.minecraft.inventory.{IInventory, ISidedInventory} -import codechicken.multipart.{TMultiPart, TileMultipart} -import java.util.LinkedList -import net.minecraft.item.ItemStack -import net.minecraft.entity.player.EntityPlayer -import scala.collection.JavaConversions._ -import scala.collection.mutable.ArrayBuffer - -trait TIInventoryTile extends TileMultipart with ISidedInventory { - var invList = new LinkedList[IInventory]() - var slotMap = Array[(IInventory, Int)]() - - override def copyFrom(that: TileMultipart) { - super.copyFrom(that) - if (that.isInstanceOf[TIInventoryTile]) { - invList = that.asInstanceOf[TIInventoryTile].invList - rebuildSlotMap() - } - } - - override def bindPart(part: TMultiPart) { - super.bindPart(part) - if (part.isInstanceOf[IInventory]) { - invList += part.asInstanceOf[IInventory] - rebuildSlotMap() - } - } - - override def partRemoved(part: TMultiPart, p: Int) { - super.partRemoved(part, p) - if (part.isInstanceOf[IInventory]) { - invList -= part.asInstanceOf[IInventory] - rebuildSlotMap() - } - } - - override def clearParts() { - super.clearParts() - invList.clear() - slotMap = Array() - } - - def rebuildSlotMap() { - slotMap = Array.ofDim(invList.map(_.getSizeInventory).sum) - var i = 0 - for (inv <- invList; s <- 0 until inv.getSizeInventory) { - slotMap(i) = (inv, s) - i += 1 - } - } - - def getSizeInventory: Int = slotMap.length - - def getStackInSlot(i: Int) = { - val (inv, slot) = slotMap(i) - inv.getStackInSlot(slot) - } - - def decrStackSize(i: Int, j: Int) = { - val (inv, slot) = slotMap(i) - inv.decrStackSize(slot, j) - } - - def getStackInSlotOnClosing(i: Int) = { - val (inv, slot) = slotMap(i) - inv.getStackInSlotOnClosing(slot) - } - - def setInventorySlotContents(i: Int, itemstack: ItemStack) = { - val (inv, slot) = slotMap(i) - inv.setInventorySlotContents(slot, itemstack) - } - - def getInventoryName = "Multipart Inventory" - - def hasCustomInventoryName = false - - def getInventoryStackLimit = 64 - - def isUseableByPlayer(entityplayer: EntityPlayer) = true - - def openInventory() {} - - def closeInventory() {} - - def isItemValidForSlot(i: Int, itemstack: ItemStack) = { - val (inv, slot) = slotMap(i) - inv.isItemValidForSlot(slot, itemstack) - } - - def getAccessibleSlotsFromSide(side: Int) = { - val buf = new ArrayBuffer[Int]() - var base = 0 - for (inv <- invList) { - inv match { - case isided: ISidedInventory => - buf ++= isided.getAccessibleSlotsFromSide(side).map(_ + base) - case _ => - } - base += inv.getSizeInventory - } - buf.toArray - } - - def canInsertItem(i: Int, itemstack: ItemStack, j: Int) = { - val (inv, slot) = slotMap(i) - inv match { - case isided: ISidedInventory => isided.canInsertItem(slot, itemstack, j) - case _ => true - } - } - - def canExtractItem(i: Int, itemstack: ItemStack, j: Int) = { - val (inv, slot) = slotMap(i) - inv match { - case isided: ISidedInventory => isided.canExtractItem(slot, itemstack, j) - case _ => true - } - } -} - -/** To handle obfuscation issues, this is registered as a java trait. - */ -class JInventoryTile extends TileMultipart with TIInventoryTile {} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TPartialOcclusionTile.java b/src/main/scala/codechicken/multipart/scalatraits/TPartialOcclusionTile.java new file mode 100644 index 0000000..5740155 --- /dev/null +++ b/src/main/scala/codechicken/multipart/scalatraits/TPartialOcclusionTile.java @@ -0,0 +1,37 @@ +package codechicken.multipart.scalatraits; + +import codechicken.multipart.JPartialOcclusion; +import codechicken.multipart.PartialOcclusionTest; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.collection.Seq; +import scala.collection.Seq$; +import scala.collection.mutable.Builder; + +/** Implementation for the partial occlusion test. */ +public class TPartialOcclusionTile extends TileMultipart { + + @Override + public boolean occlusionTest(Seq parts, TMultiPart newPart) { + if (newPart instanceof JPartialOcclusion) { + Builder> builder = Seq$.MODULE$.newBuilder(); + builder.$plus$plus$eq(parts); + builder.$plus$eq(newPart); + if (!partialOcclusionTest(builder.result())) { + return false; + } + } + return super.occlusionTest(parts, newPart); + } + + public boolean partialOcclusionTest(Seq parts) { + PartialOcclusionTest test = new PartialOcclusionTest(parts.length()); + for (int index = 0; index < parts.length(); index++) { + TMultiPart part = parts.apply(index); + if (part instanceof JPartialOcclusion) { + test.fill(index, (JPartialOcclusion) part); + } + } + return test.apply(); + } +} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TPartialOcclusionTile.scala b/src/main/scala/codechicken/multipart/scalatraits/TPartialOcclusionTile.scala deleted file mode 100644 index f5d22f1..0000000 --- a/src/main/scala/codechicken/multipart/scalatraits/TPartialOcclusionTile.scala +++ /dev/null @@ -1,36 +0,0 @@ -package codechicken.multipart.scalatraits - -import codechicken.multipart.TileMultipart -import codechicken.multipart.TMultiPart -import codechicken.multipart.JPartialOcclusion -import codechicken.multipart.PartialOcclusionTest - -/** Implementation for the partial occlusion test. - */ -class TPartialOcclusionTile extends TileMultipart { - override def occlusionTest( - parts: Seq[TMultiPart], - npart: TMultiPart - ): Boolean = { - if ( - npart.isInstanceOf[JPartialOcclusion] && !partialOcclusionTest( - parts :+ npart - ) - ) - return false - - return super.occlusionTest(parts, npart) - } - - def partialOcclusionTest(parts: Seq[TMultiPart]): Boolean = { - val test = new PartialOcclusionTest(parts.length) - var i = 0 - while (i < parts.length) { - val part = parts(i) - if (part.isInstanceOf[JPartialOcclusion]) - test.fill(i, part.asInstanceOf[JPartialOcclusion]) - i += 1 - } - return test() - } -} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TRandomDisplayTickTile.java b/src/main/scala/codechicken/multipart/scalatraits/TRandomDisplayTickTile.java new file mode 100644 index 0000000..2a4a249 --- /dev/null +++ b/src/main/scala/codechicken/multipart/scalatraits/TRandomDisplayTickTile.java @@ -0,0 +1,34 @@ +package codechicken.multipart.scalatraits; + +import java.util.Random; + +import codechicken.multipart.IRandomDisplayTick; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import codechicken.multipart.TileMultipartClient; +import scala.collection.Iterator; + +/** Client mixin that dispatches random display ticks only to interested parts. */ +public class TRandomDisplayTickTile extends TileMultipartClient { + + @Override + public void randomDisplayTick(Random random) { + TRandomDisplayTickTileAccess.randomDisplayTick(this, random); + } +} + +/** Keeps inherited part-list access outside the generated trait transformer. */ +final class TRandomDisplayTickTileAccess { + + private TRandomDisplayTickTileAccess() {} + + static void randomDisplayTick(Object tile, Random random) { + Iterator parts = ((TileMultipart) tile).partList().iterator(); + while (parts.hasNext()) { + TMultiPart part = parts.next(); + if (part instanceof IRandomDisplayTick) { + ((IRandomDisplayTick) part).randomDisplayTick(random); + } + } + } +} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TRandomDisplayTickTile.scala b/src/main/scala/codechicken/multipart/scalatraits/TRandomDisplayTickTile.scala deleted file mode 100644 index eca0050..0000000 --- a/src/main/scala/codechicken/multipart/scalatraits/TRandomDisplayTickTile.scala +++ /dev/null @@ -1,14 +0,0 @@ -package codechicken.multipart.scalatraits - -import codechicken.multipart.TileMultipartClient -import codechicken.multipart.IRandomDisplayTick -import java.util.Random - -/** Saves processor time looping on tiles that don't need it - */ -trait TRandomDisplayTickTile extends TileMultipartClient { - override def randomDisplayTick(random: Random) { - for (p @ (_p: IRandomDisplayTick) <- partList.iterator) - p.randomDisplayTick(random) - } -} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TRedstoneTile.java b/src/main/scala/codechicken/multipart/scalatraits/TRedstoneTile.java new file mode 100644 index 0000000..4a1e6e5 --- /dev/null +++ b/src/main/scala/codechicken/multipart/scalatraits/TRedstoneTile.java @@ -0,0 +1,156 @@ +package codechicken.multipart.scalatraits; + +import codechicken.lib.vec.Rotation; +import codechicken.multipart.IRedstonePart; +import codechicken.multipart.IRedstoneTile; +import codechicken.multipart.PartMap; +import codechicken.multipart.RedstoneInteractions; +import codechicken.multipart.TEdgePart; +import codechicken.multipart.TFacePart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.collection.Iterator; +import scala.collection.Seq; + +/** + * Mixin implementation for multipart redstone queries. Direct list walks avoid measured iterator/wrapper allocations; + * the public part-list setter also accepts other Seq types, which need the iterator fallback. + * + *

+ * Raw compiler input: Forge transforms this class into a runtime interface. Consumer Java calls must use the stable + * {@link IRedstoneTile} / {@link TileMultipart} contracts, not method invocations compiled against this raw class. + */ +public class TRedstoneTile extends TileMultipart implements IRedstoneTile { + + @Override + @SuppressWarnings("unchecked") + public int strongPowerLevel(int side) { + int max = 0; + Seq current = TRedstoneTileAccess.partList(this); + if (!(current instanceof scala.collection.immutable.List)) { + Iterator iterator = current.iterator(); + while (iterator.hasNext()) { + TMultiPart part = iterator.next(); + if (part instanceof IRedstonePart) { + max = Math.max(max, ((IRedstonePart) part).strongPowerLevel(side)); + } + } + return max; + } + + scala.collection.immutable.List parts = (scala.collection.immutable.List) current; + while (!parts.isEmpty()) { + TMultiPart part = parts.head(); + parts = (scala.collection.immutable.List) parts.tail(); + if (part instanceof IRedstonePart) { + max = Math.max(max, ((IRedstonePart) part).strongPowerLevel(side)); + } + } + return max; + } + + @Override + public int openConnections(int side) { + int mask = 0x10; + for (int rotation = 0; rotation < 4; rotation++) { + int edge = PartMap.edgeBetween(side, Rotation.rotateSide(side & 6, rotation)); + if (redstoneConductionE(edge)) { + mask |= 1 << rotation; + } + } + return mask & redstoneConductionF(side); + } + + public int redstoneConductionF(int slot) { + TMultiPart part = TRedstoneTileAccess.partMap(this, slot); + return part == null ? 0x1F : ((TFacePart) part).redstoneConductionMap(); + } + + public boolean redstoneConductionE(int slot) { + TMultiPart part = TRedstoneTileAccess.partMap(this, slot); + return part == null || ((TEdgePart) part).conductsRedstone(); + } + + @Override + public int weakPowerLevel(int side) { + return weakPowerLevel(side, TRedstoneTileAccess.otherConnectionMask(this, side, true)); + } + + @Override + public boolean canConnectRedstone(int side) { + int multipartSide = RedstoneInteractions.vanillaToSide(side); + return (getConnectionMask(multipartSide) & TRedstoneTileAccess.otherConnectionMask(this, multipartSide, false)) + > 0; + } + + @Override + @SuppressWarnings("unchecked") + public int getConnectionMask(int side) { + int openMask = openConnections(side); + int result = 0; + Seq current = TRedstoneTileAccess.partList(this); + if (!(current instanceof scala.collection.immutable.List)) { + Iterator iterator = current.iterator(); + while (iterator.hasNext()) { + result |= RedstoneInteractions.connectionMask(iterator.next(), side) & openMask; + } + return result; + } + + scala.collection.immutable.List parts = (scala.collection.immutable.List) current; + while (!parts.isEmpty()) { + TMultiPart part = parts.head(); + parts = (scala.collection.immutable.List) parts.tail(); + result |= RedstoneInteractions.connectionMask(part, side) & openMask; + } + return result; + } + + @Override + @SuppressWarnings("unchecked") + public int weakPowerLevel(int side, int mask) { + int connectedMask = openConnections(side) & mask; + int max = 0; + Seq current = TRedstoneTileAccess.partList(this); + if (!(current instanceof scala.collection.immutable.List)) { + Iterator iterator = current.iterator(); + while (iterator.hasNext()) { + TMultiPart part = iterator.next(); + if ((RedstoneInteractions.connectionMask(part, side) & connectedMask) > 0) { + max = Math.max(max, ((IRedstonePart) part).weakPowerLevel(side)); + } + } + return max; + } + + scala.collection.immutable.List parts = (scala.collection.immutable.List) current; + while (!parts.isEmpty()) { + TMultiPart part = parts.head(); + parts = (scala.collection.immutable.List) parts.tail(); + if ((RedstoneInteractions.connectionMask(part, side) & connectedMask) > 0) { + max = Math.max(max, ((IRedstonePart) part).weakPowerLevel(side)); + } + } + return max; + } +} + +/** Keeps inherited Minecraft field reads outside the generated trait transformer. */ +final class TRedstoneTileAccess { + + private TRedstoneTileAccess() {} + + static Seq partList(IRedstoneTile redstone) { + return ((TileMultipart) redstone).partList(); + } + + static TMultiPart partMap(IRedstoneTile redstone, int slot) { + return ((TileMultipart) redstone).partMap(slot); + } + + static int otherConnectionMask(IRedstoneTile redstone, int side, boolean power) { + TileMultipart tile = (TileMultipart) redstone; + return RedstoneInteractions + .otherConnectionMask(tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, side, power); + } +} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TRedstoneTile.scala b/src/main/scala/codechicken/multipart/scalatraits/TRedstoneTile.scala deleted file mode 100644 index 32eff13..0000000 --- a/src/main/scala/codechicken/multipart/scalatraits/TRedstoneTile.scala +++ /dev/null @@ -1,86 +0,0 @@ -package codechicken.multipart.scalatraits - -import codechicken.multipart.TileMultipart -import codechicken.multipart.IRedstonePart -import codechicken.multipart.RedstoneInteractions._ -import codechicken.multipart.PartMap._ -import codechicken.lib.vec.Rotation._ -import codechicken.multipart.IRedstoneTile -import codechicken.multipart.TFacePart -import codechicken.multipart.TEdgePart - -/** Mixin trait implementation for IRedstonePart Provides and overrides various - * redstone functions. - */ -trait TRedstoneTile extends TileMultipart with IRedstoneTile { - - /** Returns the strong (indirect) power being emitted fr - */ - override def strongPowerLevel(side: Int): Int = { - var max = 0 - for (p @ (_p: IRedstonePart) <- partList.iterator) { - val l = p.strongPowerLevel(side) - if (l > max) max = l - } - return max - } - - def openConnections(side: Int): Int = { - var m = 0x10 - var i = 0 - while (i < 4) { - if (redstoneConductionE(edgeBetween(side, rotateSide(side & 6, i)))) - m |= 1 << i - i += 1 - } - m &= redstoneConductionF(side) - return m - } - - def redstoneConductionF(i: Int) = partMap(i) match { - case null => 0x1f - case p => p.asInstanceOf[TFacePart].redstoneConductionMap - } - - def redstoneConductionE(i: Int) = partMap(i) match { - case null => true - case p => p.asInstanceOf[TEdgePart].conductsRedstone - } - - override def weakPowerLevel(side: Int): Int = - weakPowerLevel( - side, - otherConnectionMask(getWorldObj, xCoord, yCoord, zCoord, side, true) - ) - - override def canConnectRedstone(side: Int): Boolean = { - val vside = vanillaToSide(side) - return (getConnectionMask(vside) & otherConnectionMask( - getWorldObj, - xCoord, - yCoord, - zCoord, - vside, - false - )) > 0 - } - - def getConnectionMask(side: Int): Int = { - val mask = openConnections(side) - var res = 0 - partList.foreach(p => res |= connectionMask(p, side) & mask) - return res - } - - def weakPowerLevel(side: Int, mask: Int): Int = { - val tmask = openConnections(side) & mask - var max = 0 - partList.foreach(p => - if ((connectionMask(p, side) & tmask) > 0) { - val l = p.asInstanceOf[IRedstonePart].weakPowerLevel(side) - if (l > max) max = l - } - ) - return max - } -} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TSlottedTile.java b/src/main/scala/codechicken/multipart/scalatraits/TSlottedTile.java new file mode 100644 index 0000000..f791b07 --- /dev/null +++ b/src/main/scala/codechicken/multipart/scalatraits/TSlottedTile.java @@ -0,0 +1,86 @@ +package codechicken.multipart.scalatraits; + +import java.util.Arrays; +import java.util.Objects; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TSlottedPart; +import codechicken.multipart.TileMultipart; + +/** + * Mixin implementation for slotted parts. Raw compiler input transformed into a runtime interface; consumer Java reads + * slots through {@link TileMultipart#partMap(int)}. Do not compile field accesses against this class: the runtime + * interface has accessor methods instead of fields. Existing binary accessor callers remain supported. Use + * {@link TileMultipart#refreshPartSlots(TMultiPart)} after changing a stored part's mask; partMap is read-only. + */ +public class TSlottedTile extends TileMultipart { + + public TMultiPart[] v_partMap = new TMultiPart[27]; + + @Override + public void copyFrom(TileMultipart that) { + super.copyFrom(that); + if (that instanceof TSlottedTile) { + v_partMap = ((TSlottedTile) that).v_partMap; + } + } + + @Override + public TMultiPart partMap(int slot) { + return v_partMap[slot]; + } + + @Override + public void clearParts() { + super.clearParts(); + Arrays.fill(v_partMap, null); + } + + @Override + public void partRemoved(TMultiPart part, int position) { + super.partRemoved(part, position); + if (part instanceof TSlottedPart) { + for (int index = 0; index < 27; index++) { + if (Objects.equals(partMap(index), part)) { + v_partMap[index] = null; + } + } + } + } + + @Override + public boolean canAddPart(TMultiPart part) { + if (part instanceof TSlottedPart) { + int slotMask = ((TSlottedPart) part).getSlotMask(); + for (int index = 0; index < v_partMap.length; index++) { + if ((slotMask & (1 << index)) != 0 && partMap(index) != null) { + return false; + } + } + } + return super.canAddPart(part); + } + + @Override + public void bindPart(TMultiPart part) { + super.bindPart(part); + if (part instanceof TSlottedPart) { + int slotMask = ((TSlottedPart) part).getSlotMask(); + for (int index = 0; index < 27; index++) { + if ((slotMask & (1 << index)) > 0) { + v_partMap[index] = part; + } + } + } + } + + @Override + public void refreshPartSlots(TMultiPart part) { + for (int index = 0; index < v_partMap.length; index++) { + if (Objects.equals(v_partMap[index], part)) { + v_partMap[index] = null; + } + } + bindPart(part); + } +} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TSlottedTile.scala b/src/main/scala/codechicken/multipart/scalatraits/TSlottedTile.scala deleted file mode 100644 index a6d650a..0000000 --- a/src/main/scala/codechicken/multipart/scalatraits/TSlottedTile.scala +++ /dev/null @@ -1,55 +0,0 @@ -package codechicken.multipart.scalatraits - -import codechicken.multipart.TileMultipart -import codechicken.multipart.TMultiPart -import codechicken.multipart.TSlottedPart - -/** Mixin implementation for TSlottedPart. Puts parts into a slot array for - * quick access at the cost of memory consumption - */ -trait TSlottedTile extends TileMultipart { - var v_partMap = new Array[TMultiPart](27) - - override def copyFrom(that: TileMultipart) { - super.copyFrom(that) - if (that.isInstanceOf[TSlottedTile]) - v_partMap = that.asInstanceOf[TSlottedTile].v_partMap - } - - override def partMap(slot: Int) = v_partMap(slot) - - override def clearParts() { - super.clearParts() - for (i <- 0 until v_partMap.length) - v_partMap(i) = null - } - - override def partRemoved(part: TMultiPart, p: Int) { - super.partRemoved(part, p) - if (part.isInstanceOf[TSlottedPart]) - for (i <- 0 until 27) - if (partMap(i) == part) - v_partMap(i) = null - } - - override def canAddPart(part: TMultiPart): Boolean = { - if (part.isInstanceOf[TSlottedPart]) { - val slotMask = part.asInstanceOf[TSlottedPart].getSlotMask - for (i <- 0 until v_partMap.length) - if ((slotMask & 1 << i) != 0 && partMap(i) != null) - return false - } - - return super.canAddPart(part) - } - - override def bindPart(part: TMultiPart) { - super.bindPart(part) - if (part.isInstanceOf[TSlottedPart]) { - val mask = part.asInstanceOf[TSlottedPart].getSlotMask - for (i <- 0 until 27) - if ((mask & 1 << i) > 0) - v_partMap(i) = part - } - } -} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TTileChangeTile.java b/src/main/scala/codechicken/multipart/scalatraits/TTileChangeTile.java new file mode 100644 index 0000000..458b5cd --- /dev/null +++ b/src/main/scala/codechicken/multipart/scalatraits/TTileChangeTile.java @@ -0,0 +1,114 @@ +package codechicken.multipart.scalatraits; + +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.INeighborTileChange; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.collection.Iterator; +import scala.collection.Seq; +import scala.runtime.AbstractFunction1; +import scala.runtime.BoxedUnit; + +/** Mixin implementation for INeighborTileChange, reducing unnecessary computation. */ +public class TTileChangeTile extends TileMultipart { + + public boolean weakTileChanges = false; + + @Override + public void copyFrom(TileMultipart that) { + super.copyFrom(that); + if (that instanceof TTileChangeTile) { + weakTileChanges = ((TTileChangeTile) that).weakTileChanges; + } + } + + @Override + public void bindPart(TMultiPart part) { + super.bindPart(part); + if (part instanceof INeighborTileChange) { + weakTileChanges |= ((INeighborTileChange) part).weakTileChanges(); + } + } + + @Override + public void clearParts() { + super.clearParts(); + weakTileChanges = false; + } + + @Override + public void partRemoved(TMultiPart part, int position) { + super.partRemoved(part, position); + weakTileChanges = false; + Iterator iterator = TTileChangeTileAccess.partList(this).iterator(); + while (iterator.hasNext()) { + TMultiPart p = iterator.next(); + if (p instanceof INeighborTileChange && ((INeighborTileChange) p).weakTileChanges()) { + weakTileChanges = true; + return; + } + } + } + + @Override + public void onNeighborTileChange(int tileX, int tileY, int tileZ) { + super.onNeighborTileChange(tileX, tileY, tileZ); + BlockCoord offset = TTileChangeTileAccess.offsetFrom(this, tileX, tileY, tileZ); + int diff = offset.absSum(); + int side = offset.toSide(); + + if (side < 0 || diff <= 0 || diff > 2) { + return; + } + + TTileChangeTileAccess.notifyParts(this, side, diff == 2); + } + + @Override + public boolean getWeakChanges() { + return weakTileChanges; + } +} + +/** + * Keeps inherited member access outside the generated trait transformer, which also rejects a trait carrying any inner + * class, so the operate callback lives here too. + */ +final class TTileChangeTileAccess { + + private TTileChangeTileAccess() {} + + // The parameters are Object because the trait is an interface once transformed, and javac would elide a cast + // written against its compile-time superclass. + static Seq partList(Object tile) { + return ((TileMultipart) tile).partList(); + } + + static BlockCoord offsetFrom(Object tile, int tileX, int tileY, int tileZ) { + TileMultipart multipart = (TileMultipart) tile; + return new BlockCoord(tileX, tileY, tileZ).sub(multipart.xCoord, multipart.yCoord, multipart.zCoord); + } + + static void notifyParts(Object tile, int side, boolean weak) { + ((TileMultipart) tile).operate(new NeighborTileChanged(side, weak)); + } + + private static final class NeighborTileChanged extends AbstractFunction1 { + + private final int side; + private final boolean weak; + + private NeighborTileChanged(int side, boolean weak) { + this.side = side; + this.weak = weak; + } + + @Override + public BoxedUnit apply(TMultiPart part) { + if (part instanceof INeighborTileChange) { + ((INeighborTileChange) part).onNeighborTileChanged(side, weak); + } + return BoxedUnit.UNIT; + } + } +} diff --git a/src/main/scala/codechicken/multipart/scalatraits/TTileChangeTile.scala b/src/main/scala/codechicken/multipart/scalatraits/TTileChangeTile.scala deleted file mode 100644 index b2b3ec4..0000000 --- a/src/main/scala/codechicken/multipart/scalatraits/TTileChangeTile.scala +++ /dev/null @@ -1,58 +0,0 @@ -package codechicken.multipart.scalatraits - -import codechicken.multipart.TMultiPart -import codechicken.multipart.INeighborTileChange -import codechicken.multipart.TileMultipart -import codechicken.lib.vec.BlockCoord - -/** Mixin implementation for INeighborTileChange - * - * Reduces unnecessary computation - */ -trait TTileChangeTile extends TileMultipart { - var weakTileChanges = false - - override def copyFrom(that: TileMultipart) { - super.copyFrom(that) - if (that.isInstanceOf[TTileChangeTile]) - weakTileChanges = that.asInstanceOf[TTileChangeTile].weakTileChanges - } - - override def bindPart(part: TMultiPart) { - super.bindPart(part) - if (part.isInstanceOf[INeighborTileChange]) - weakTileChanges |= part.asInstanceOf[INeighborTileChange].weakTileChanges - } - - override def clearParts() { - super.clearParts() - weakTileChanges = false - } - - override def partRemoved(part: TMultiPart, p: Int) { - super.partRemoved(part, p) - weakTileChanges = partList.exists(p => - p.isInstanceOf[INeighborTileChange] && p - .asInstanceOf[INeighborTileChange] - .weakTileChanges - ) - } - - override def onNeighborTileChange(tileX: Int, tileY: Int, tileZ: Int) { - super.onNeighborTileChange(tileX, tileY, tileZ) - val offset = new BlockCoord(tileX, tileY, tileZ).sub(xCoord, yCoord, zCoord) - val diff = offset.absSum - val side = offset.toSide - - if (side < 0 || diff <= 0 || diff > 2) - return - - val weak = diff == 2 - operate { p => - if (p.isInstanceOf[INeighborTileChange]) - p.asInstanceOf[INeighborTileChange].onNeighborTileChanged(side, weak) - } - } - - override def getWeakChanges() = weakTileChanges -} diff --git a/src/test/fixtures/README.md b/src/test/fixtures/README.md new file mode 100644 index 0000000..e31be0e --- /dev/null +++ b/src/test/fixtures/README.md @@ -0,0 +1,426 @@ +# Compatibility fixtures + +Files below this directory are frozen baselines, not a Gradle source set. They must be reviewed when they change +rather than regenerated automatically, otherwise an accidental change silently redefines the baseline. + +## `abi/` + +`gtnh-daily-678-consumers.txt` is the constant-pool scan of every mod jar in GTNH daily `2026-08-14+678`, listing +every downstream reference into `codechicken/multipart` and `codechicken/microblock`. Regenerate with +`tools/AbiScan.java` and diff against this file at every public-API phase; a member present here but absent from the +port is a linkage break in a shipping mod. See `docs/migration/COMPATIBILITY.md` for the analysis. + +`gtnh-2.9.0-rc2-consumers.txt` is the same scan over GTNH `2.9.0-RC-2` (240 jars, `ForgeMultipart-1.7.16.jar` +excluded). It is a superset of the `+678` member, inherited-type and other-type rows; only reflective strings +that GuideNH replaced with direct links dropped out. Diff new scans against this file first, and against `+678` +when a row's history matters. + +## Precompiled binary consumers + +When a port changes descriptors that the ABI inventory shows are load-bearing, freeze a consumer compiled against the +reference dev jar here as a class file and load it directly in a test. Recompiling a consumer against the port would +hide exactly the linkage failure the fixture exists to catch. + +`ReferenceScalaPartialOcclusion` was removed together with the `JPartialOcclusion$class` bridge once the inventory +showed no downstream consumer of that helper. The trait helpers that do need this treatment are listed in +`docs/migration/COMPATIBILITY.md`. + +### `ReferenceScalaCuboidPart` + +`scala/codechicken/multipart/compat/ReferenceScalaCuboidPart.scala` mixes in `TCuboidPart` without overriding anything +the trait supplies, so its compiled forwarders call all four `TCuboidPart$class` statics: `$init$`, `getSubParts`, +`getCollisionBoxes` and `drawBreaking`. Four shipping mods depend on those descriptors. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `246daff` +(SHA-256 `0ca7103905c8e2ada010bfc0362a257f19a67f7af4e9fb9dd00a7379c274f69a`). Class-file SHA-256 is +`3aba21aa01c4d689e2e1fb33b872424c7e7b5f4a8254abf2c86e9b11bb9fabe9`, stored as +`src/test/resources/compat/ReferenceScalaCuboidPart.class.b64`. + +`TCuboidPartBinaryCompatibilityTest` exercises `$init$`, `getSubParts` and `getCollisionBoxes`. The `drawBreaking` +forwarder is present in the fixture but cannot be invoked without a client render context, so its bridge descriptor is +covered by the ABI baseline rather than by execution. + +### `ReferenceScalaNormalOcclusion` + +`scala/codechicken/multipart/compat/ReferenceScalaNormalOcclusion.scala` mixes in `TNormalOcclusion` without overriding +`occlusionTest`, so the compiled class carries the generated +`codechicken$multipart$TNormalOcclusion$$super$occlusionTest` accessor and forwards `occlusionTest` to +`TNormalOcclusion$class`. Invoking it therefore covers the whole bridge round trip: forwarder, `$class`, the singleton +`NormalOcclusionTest$.MODULE$`, and the callback through the accessor. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `cd6420f` +(SHA-256 `da0a35a968905203187edc5a1f26018305cf146114426ed7b468080b40c95771`). Class-file SHA-256 is +`0ce8ddd700df8ec859325133a1a683de1aceaabd67cb4c0d1867e6cb907e5790`, stored as +`src/test/resources/compat/ReferenceScalaNormalOcclusion.class.b64`. + +### `ReferenceScalaFacePart` + +`scala/codechicken/multipart/compat/ReferenceScalaFacePart.scala` mixes in `TFacePart` without overriding either +member it supplies, so its compiled forwarders call all three `TFacePart$class` statics: `solid`, +`redstoneConductionMap` and `$init$`. OpenComputers, ProjRed and ProjectBlue depend on those descriptors. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `a1bf3c8` +(SHA-256 `1cb57d8728f06b3d283b0bca8ce9f92a58f4c2b8cc835fa4f7ee3de6338c27ec`). Class-file SHA-256 is +`a95dfa131f57e6e6efdba25e989154899d9b1f9a5cbff7a1e6b4374ec9c2b0b2`, stored as +`src/test/resources/compat/ReferenceScalaFacePart.class.b64`. + +### `ReferenceScalaIconHitEffects` + +`scala/codechicken/multipart/compat/ReferenceScalaIconHitEffects.scala` mixes in `TIconHitEffects` without overriding +anything it or `JIconHitEffects` supplies, so its compiled forwarders call all five statics across both bridges: +`TIconHitEffects$class.addHitEffects`, `.addDestroyEffects`, `.$init$`, and `JIconHitEffects$class.getBreakingIcon`, +`.$init$`. ForgeRelocationFMP, OpenComputers and ProjRed depend on all of them. + +It records the last side passed to `getBrokenIcon` so the test can prove delegation actually happened rather than only +that the class loaded. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `57130a6` +(SHA-256 `97469dae5152f5040db6106022e8176a1b84814e700c7dfca89f1364e11cf6af`). Class-file SHA-256 is +`80255098990ee61d2c96f70c7020b3bede4f2654786c0c8a3b7618d5060923c7`, stored as +`src/test/resources/compat/ReferenceScalaIconHitEffects.class.b64`. + +### `ReferenceScalaItemMultiPart` + +`scala/codechicken/multipart/compat/ReferenceScalaItemMultiPart.scala` mixes in `TItemMultiPart` without overriding +anything it supplies, so its compiled forwarders call all three `TItemMultiPart$class` statics: `getHitDepth`, +`onItemUse` and `$init$`. ProjRed depends on them. + +Its `newPart` records each attempted position and returns null, which is the short-circuit that keeps placement from +touching the world, so the fixture can be driven with null stack, player and world. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `7843f13` +(SHA-256 `c003d02407d901271f42e182b5036ed3c295c2acbf416603513d2bec5b8210d0`). Class-file SHA-256 is +`0b9d9dba78a25b0c0867fe545bc6c6400be272c418d755ef72f46dde6294c75e`, stored as +`src/test/resources/compat/ReferenceScalaItemMultiPart.class.b64`. + +### `ReferenceScalaEdgePart` + +`scala/codechicken/multipart/compat/ReferenceScalaEdgePart.scala` mixes in `TEdgePart` without overriding what it +supplies, so its compiled forwarder calls `TEdgePart$class.conductsRedstone` and its constructor calls +`TEdgePart$class.$init$`. OpenComputers links against `$init$`. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `f2f1870` +(SHA-256 `cec40ee4c94f89fadf29e3f4860c68ca7d55caf12634d950a3eb5ecfb272a01b`). Class-file SHA-256 is +`76e4d3875ae9246ed2277f0470b22f596885282386ed179a42e5f571711ae5e0`, stored as +`src/test/resources/compat/ReferenceScalaEdgePart.class.b64`. + +### `ReferenceScalaSaw` + +`scala/codechicken/multipart/compat/ReferenceScalaSaw.scala` mixes in `Saw` without overriding +`getMaxCuttingStrength`, so its compiled forwarder calls `Saw$class.getMaxCuttingStrength` and its constructor calls +`Saw$class.$init$`. ProjRed links against both. + +Its `getCuttingStrength` reports 7 only when handed a stack that actually wraps the saw itself, so the test proves the +bridge built the stack rather than only that it linked. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `0de7283` +(SHA-256 `e931927e83134f57197aba082345ea96909291469d01a4f146836418a76bb3d1`). Class-file SHA-256 is +`a03e8eb8566ae830829d59a379c67f355519bc82de24265baabd84720f068ce1`, stored as +`src/test/resources/compat/ReferenceScalaSaw.class.b64`. + +### `ReferenceScalaMicroMaterialConsumer` + +`scala/codechicken/multipart/compat/ReferenceScalaMicroMaterialConsumer.scala` reads +`MicroMaterialRegistry$.MODULE$` and calls the instance methods ProjRed links against (`getMaterial(int)`, +`materialID`, `materialName`), plus the `scala.Tuple2` array `getIdMap` that extrautilities links against. It reads +`_1` and `_2` off the raw tuples rather than going through accessors, so the array element type is exercised too. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `52ff8ff` +(SHA-256 `122d89cf0a070cfd2325bbbcf4bb4550d6130bb7da1ffba1a3b2e2efea6ec7e5`). Class-file SHA-256 is +`e66be14e6422277cc9567acf8e96a26e419abf5ec6582085c8c6e32cc60aa599`, stored as +`src/test/resources/compat/ReferenceScalaMicroMaterialConsumer.class.b64`. + +### `ReferenceScalaItemMicroPartConsumer` + +`scala/codechicken/multipart/compat/ReferenceScalaItemMicroPartConsumer.scala` reads `ItemMicroPart$.MODULE$` and +calls the four companion methods ProjRed links against: both two-argument `create` overloads, `getMaterial`, and +`getMaterialID`. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `fdfd776` +(SHA-256 `c3bb8a18ab961a24989d895ade59dc358581c82eec8ecf925256e164eae0ab03`). Class-file SHA-256 is +`967c6c2041c43896f624b60ce74c424575a303eed79c29c8fe60a6344f97dc71`, stored as +`src/test/resources/compat/ReferenceScalaItemMicroPartConsumer.class.b64`. + +### `ReferenceScalaMultipartSaveLoadConsumer` + +`scala/codechicken/multipart/compat/ReferenceScalaMultipartSaveLoadConsumer.scala` reads +`MultipartSaveLoad$.MODULE$` and calls the `loadingWorld` getter and setter that ProjRed links against. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the reference dev jar built at `471c767` +(SHA-256 `1f571035283b5ca9120bf817f00ce961ebcbae258d901fb8ee9147636f71a481`). Class-file SHA-256 is +`27543f97e0973f042c3867c1aa0ae5598324c60c895c8d9a7ea5a6cea2f5ee70`, stored as +`src/functionalTest/resources/compat/ReferenceScalaMultipartSaveLoadConsumer.class.b64`. + +### `ReferenceScalaBlockMicroMaterialConsumer` + +`scala/codechicken/multipart/compat/ReferenceScalaBlockMicroMaterialConsumer.scala` calls the +`BlockMicroMaterial$.MODULE$` key/default methods and the `MaterialRenderHelper$.MODULE$` pass accessors used by +downstream Scala code. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched classes at `1939159` +(reference dev-jar SHA-256 `3dfb365ee96603dec74e22787ba17e324792410265b85afd103b07aa57ddf8f6`). Class-file +SHA-256 is `710f925a5b4bd44e337672b6c4a3c7a0dddf0c5e31287989c4774c34cf628fa8`, stored as +`src/test/resources/compat/ReferenceScalaBlockMicroMaterialConsumer.class.b64`. + +### `ReferenceScalaMultipartGeneratorConsumer` + +`scala/codechicken/multipart/compat/ReferenceScalaMultipartGeneratorConsumer.scala` calls +`MultipartGenerator$.MODULE$.generateCompositeTile(TileEntity, scala.collection.Iterable, boolean)` and the +one-argument `registerPassThroughInterface` companion method. GuideNH and Schematica depend on the former through +reflection; shipping Scala consumers link directly to the companion registration path. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched classes at `2f4972e` +(reference dev-jar SHA-256 `69c0723afd70ab6208b97e5fab12062bfb28a941dfae12575c5d61274102ef6f`). Class-file +SHA-256 is `b0f540b063bd6fffcc2a1462d72de1f31b4c8a68caa92ac9298dfdf18a9eb24f`, stored as +`src/functionalTest/resources/compat/ReferenceScalaMultipartGeneratorConsumer.class.b64`. + +### `ReferenceScalaMicroblockTraits` + +`scala/codechicken/multipart/compat/ReferenceScalaMicroblockTraits.scala` is a concrete `Microblock` with +`CommonMicroblockClient`. Its frozen Scala forwarders exercise all three `MicroblockTraits.scala` helper classes, +initialization, virtual slot/material/class dispatch, particle callbacks and both common rendering branches. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the unchanged dev jar at `f5d449d` +(SHA-256 `8061ae3ebb260b619a283519b1752a32e38126ccff537e0fbcdb33c1a736fde3`). Source SHA-256 is +`8a8754632121c8bac8c0c61bf2facbd317462c1c4e43b82127511908ffbcbd98`; class-file SHA-256 is +`dccc96505689e4c6084e11133812b56b39ae90b274762327815a22ef9a1ce75c`, stored as +`src/test/resources/compat/ReferenceScalaMicroblockTraits.class.b64`. Do not regenerate it against the Java helper. + +### `ReferenceScalaFaceMicroblockClient` + +`scala/codechicken/multipart/compat/ReferenceScalaFaceMicroblockClient.scala` freezes a concrete face-client +implementor and its `FaceMicroblockClient$class.render` forwarder. Tests execute exact per-face rendering for all +six slots and 64 masks, negative passes, virtual transparency/slot dispatch and material caching across both draws. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the unchanged dev jar at `d89aaea` +(SHA-256 `c97d389524bab62fabe6584fcaace5b5fe2d59db3e575a60605fb083fc46856f`). Source SHA-256 is +`3848f0ba68344b103614e6aaa85dfe300a1b3c41b94cb171224b411a46ecdf3b`; class-file SHA-256 is +`96283797af5f81137e6fa354fbce5886e0de4f00655a6ab89a21de94bfadcbde`, stored as +`src/test/resources/compat/ReferenceScalaFaceMicroblockClient.class.b64`. Do not regenerate it against the port. + +### `ReferenceScalaCornerMicroblock` + +`scala/codechicken/multipart/compat/ReferenceScalaCornerMicroblock.scala` freezes a concrete corner implementor +whose forwarders call `CornerMicroblock$class`. Observable shape accessors pin virtual dispatch, byte truncation, +out-of-range input behavior and the seven-slot offset without requiring Forge initialization. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the unchanged dev jar at `cfde822` +(SHA-256 `0c01bf316fe3706155dda05f6cb56a084658e5133b7590503e69a263a3fdfb85`). Source SHA-256 is +`6c0ff48c4bc6ff5508a429d53f13b718062173cc4a117095c192aed9cf0a0311`; class-file SHA-256 is +`5a6c3cf1ce593eb189af59f6db26a04d85902972073de83a77d8f0d920642cfa`, stored as +`src/test/resources/compat/ReferenceScalaCornerMicroblock.class.b64`. Do not regenerate it against the port. + +### `ReferenceScalaEdgeMicroblock` + +`scala/codechicken/multipart/compat/ReferenceScalaEdgeMicroblock.scala` freezes a concrete edge implementor +whose forwarders call `EdgeMicroblock$class`. Observable shape accessors pin virtual dispatch, byte truncation, +out-of-range input behavior and the fifteen-slot offset; tests also exercise inherited `TEdgePart` conduction. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the unchanged dev jar at `33e0bc2` +(SHA-256 `764bff78657bc14ab918c267e836702982f7a72d64e998357709df13bce90058`). Source SHA-256 is +`6524a023b8015e6ecc75aaab9dafa09bb353e66ccdb72e7d76a3469288ba5952`; class-file SHA-256 is +`2b51d17fb89999fd0324e4ea53843596539c5885c2b2eb0a476926e18446b587`, stored as +`src/test/resources/compat/ReferenceScalaEdgeMicroblock.class.b64`. Do not regenerate it against the port. + +### `ReferenceScalaPostMicroblock` + +`scala/codechicken/multipart/compat/ReferenceScalaPostMicroblock.scala` freezes post forwarders with a real superclass +predecessor and a face candidate. Tests observe special-case ordering, the synthetic super accessor, virtual shape, +bounds and list dispatch, list mutation failures, and malformed-candidate errors. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the unchanged dev jar at `7c4c87e` +(SHA-256 `c9fcc62deebf198f3aa1de1799d3a58a31cae9fa92f1b5dd129a84b93eaab73d`). Source SHA-256 is +`d22d82ab5e53074022d305bb9537a5bae77804cdc28b0bf46f58686f47e2b62d`. Frozen class files under +`src/test/resources/compat/` have these SHA-256s; do not regenerate them against the port: + +| Class | SHA-256 | +| --- | --- | +| `ReferencePostMicroblockBase` | `a6bed1c01fd74be061edfa287b724679c4cdbcb9c550cc3a3304ebda6973c7ac` | +| `ReferenceScalaPostMicroblock` | `ceafadad14da1f749ec60af6609d1b2eb7afa0666425fff25271dee1e46a7bc2` | +| `ReferencePostFace` | `066037dc6000fbcf2404583ff4ba8a9048b140beb0e1c27700564284bc4d8c06` | + +### `ReferenceScalaPostMicroblockClient` + +`scala/codechicken/multipart/compat/ReferenceScalaPostMicroblockClient.scala` freezes the client forwarders and +lifecycle superclass predecessors. Tests observe render dispatch, material reuse, repeated virtual getters, +equality receiver/order, collection `foreach`, split/reset behavior and super-call failure ordering. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `1c7dd14` +(SHA-256 `6c80983b6ba49bf7bc6c30248b9af4bdb0954bb1091ebd0e2ab4d823b994697b`). Source SHA-256 is +`6a04c03977858ce01ebd4951d105dba8be926977d0c5892aeec469c17f89ac39`. Frozen class files under +`src/test/resources/compat/` have these SHA-256s; do not regenerate against the port: + +| Class | SHA-256 | +| --- | --- | +| `ReferencePostClientBase` | `88a996255cae7f981f4386eba5bc1d4b5308c2eef900d120b105ec5727536342` | +| `ReferenceScalaPostMicroblockClient` | `71afd739893a0cff7022c758cccff8a653a219c7937310df7b893b31f0ef82a4` | + +### `ReferenceScalaHollowMicroblock` + +`scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblock.scala` freezes hollow-cover forwarders with a +real Scala trait super chain. Tests pin repeated tile/raw-shape reads, connector slot dispatch, collision geometry, +list mutability and copying, normal/partial occlusion short-circuiting and superclass failures. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `556fd51` +(SHA-256 `8bffb00300087a3f202354a836c9f3f2cf22c4cb3b145e03c8c2ac893028c311`). Source SHA-256 is +`277b708d11e37a66f311759af50b1b1e98d84238550add0e98b43793d1f55ad5`. Frozen class files under +`src/test/resources/compat/` have these SHA-256s; do not regenerate against the port: + +| Class | SHA-256 | +| --- | --- | +| `ReferenceHollowMicroblockBase` | `a329f86030d4706ba07a478d36a2fe9fd6b4e2bcaac76bd92e128769cd91110e` | +| `ReferenceScalaHollowMicroblock` | `3df6e92864c984ad973a115c56495deee8fb8a8c4014dbd34786a2caf754c7f6` | + +### `ReferenceScalaHollowMicroblockClient` + +`scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblockClient.scala` freezes the hollow client +forwarders and a real recalculation predecessor. Tests observe initialization, mask read/super order, render +selection, callback dispatch and snapshots, rim geometry/masks, breaking pipelines and highlight commands. +A child loader redirects only rendering-service calls to record their effects; trait control flow and virtual +part calls remain intact. This tests drawing commands, not actual GPU output. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `940609b` +(SHA-256 `04838fb3e100503437092fa018872d324e1765c267d5f8dc83b9831b73e66593`). Source SHA-256 is +`0dcef588bb0ee808d5ec7fba1716b2d2fd6cc6464e7650d9d29f6400d5673149`. Frozen class files under +`src/test/resources/compat/` have these SHA-256s; do not regenerate against the port: + +| Class | SHA-256 | +| --- | --- | +| `ReferenceHollowClientBase` | `fe39f52cd776ded56adceb27ed011f3f72d405ee363dcb54877717e18de16450` | +| `ReferenceScalaHollowMicroblockClient` | `5b11e01e3995bc314ffa10d129da7277e386edfe08520370e6b3ee40bdd18c67` | + +### `ReferenceScalaTMicroOcclusion` + +`scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusion.scala` freezes a trait implementor with a real +superclass predecessor. Tests pin super/type-guard ordering, repeated slot reads, signed size overflow, material +short-circuits, own-receiver edge/corner delegation, getter failures and the two independent edge reads. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `a50ce52` +(SHA-256 `241e6315ddae2b09bb2baed7f28b545985f1cf329504288cc6de454b25c945fb`). Source SHA-256 is +`087afdc786c5ac59e70c5152f183bd0cc27e65de1672ece549870fb04f09b4ab`. Frozen class files under +`src/test/resources/compat/` have these SHA-256s; do not regenerate against the port: + +| Class | SHA-256 | +| --- | --- | +| `ReferenceMicroOcclusionBase` | `f3c7c10095fd19d6e18edcee345c4ea5e22557b07595e5274e46be36d0edcb1b` | +| `ReferenceScalaTMicroOcclusion` | `d92b9b9d938e8e85b364193807e878f7eb595c099205a4ded84fb1363e11639d` | + +### `ReferenceScalaTMicroOcclusionClient` + +`scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusionClient.scala` freezes the client trait's +lifecycle super chain and forwarders. Tests pin argument identity, super/recalc failure order, physical-bounds +copying, clipping/mask replacement and partial state publication on failure. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `f6d1568` +(SHA-256 `6949f0c4afb22b3d68ecc42272ca1f88ac1712497556cf5c32c52b2833eb7161`). Source SHA-256 is `ed90e8f184cc4239c69bb6f700283fb25ef2225a59279eb567fc85195ab0f734`. Do not regenerate these class files against the port. + +| Class | SHA-256 | +| --- | --- | +| `ReferenceMicroOcclusionClientBase` | `017938f169d532f72b0ebcba31a67988b32b9116c2a6dbd558c8da2d1ac8f0bf` | +| `ReferenceScalaTMicroOcclusionClient` | `f966dc8e807327865c5ca1736f323ed33a5885f5be1dc6f1b964fa8bd3fdb21d` | + +### `ReferenceScalaInterfaceNames` + +`scala/codechicken/multipart/compat/ReferenceScalaInterfaceNames.scala` freezes a Scala caller of +`ClassSymbolRef.jInterfaces` and subclasses that override the path-dependent `ClassType.interfaces` and +`ClassSymbol.info` members. Suppliers expose ordered reads, changing results and failures to JVM tests. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `240a788` +(SHA-256 `03b3fdc1400d6c9a5d23cfa2a17837a20b48f7b014a02f13366b0c0dcb876e06`). Source SHA-256 is +`43f0451ae9e5540748f24ff8f4333d76e0d36040bd74cdfcd08d20a95fd68df3`. Frozen class files are stored under +`src/test/resources/compat/`; do not regenerate them against the port. + +| Class | SHA-256 | +| --- | --- | +| `ReferenceScalaInterfaceNames` | `996493c5c2dbab7d71e4ecf6c5598d8bf371bd9af182f1f3ee57a8eea2c1c9e1` | +| `ReferenceScalaInterfaceNames$$anon$1` | `448774963acc6afc1641d039ec79fc82b9e825de3cee65fc44e7fc4b6a238315` | +| `ReferenceScalaInterfaceNames$$anon$2` | `ecf0adc32ca5cab232a8fcbed45acad8bda8091dd5ecdf10213e9ddfc13f8217` | + +### `ReferenceScalaAppliedTypeDescriptor` + +`scala/codechicken/multipart/compat/ReferenceScalaAppliedTypeDescriptor.scala` freezes a Scala caller and +TypeRefType subclass with a virtual name supplier. Tests use it to preserve array/fallback routing and repeated reads. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `d5bf16f` +(SHA-256 `822052863670e511283fa7941ea141cb2069233530524f232e07c4379e52f373`). Source SHA-256 is +`e09a7b21b88c3cb184819b93822f5128374b881dce45efced79922b0b6c8e9af`. Frozen class files are under +`src/test/resources/compat/`; do not regenerate them against the port. + +| Class | SHA-256 | +| --- | --- | +| `ReferenceScalaAppliedTypeDescriptor` | `40eebab873311f3fec01dd5678e1c12c3af959b7f357aa49ed9cca59e1889b99` | +| `ReferenceScalaAppliedTypeDescriptor$$anon$1` | `0ac784d966048b6daa6715ead62360624a22d6a0927aba280c6d3908de11447e` | + +### `ReferenceScalaClassSymbolFull` + +`scala/codechicken/multipart/compat/ReferenceScalaClassSymbolFull.scala` freezes a Scala caller and direct +ClassSymbolRef implementation. Tests use it to preserve the old trait helper, virtual owner/name reads and failures. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `24c7723` +(SHA-256 `40c5851ad982190b2f44cd7473d8fb3ab73e0dc3d3bfa2911de06b924532248d`). Source SHA-256 is +`3744035617fbe0a1619d20ae2a44259e9aea9ea3dfa16d19a1c9b57daef0ffee`. Frozen class files are under +`src/test/resources/compat/`; do not regenerate them against the port. + +| Class | SHA-256 | +| --- | --- | +| `ReferenceScalaClassSymbolFull` | `77498a049a18080a67b557b1751c7f8ab905b9f832ebd680db822e5447ea0799` | +| `ReferenceScalaClassSymbolFull$$anon$1` | `df9d4c907de922b6e917ea848e40f746ef446bf601dbda4b8d9f9761403b5f46` | + +### `ReferenceScalaMethodSymbolFull` + +`scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolFull.scala` freezes a Scala caller of +`MethodSymbol.full`. Tests combine it with virtual JVM accessor overrides to preserve read order and failures. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `64f5abc` +(SHA-256 `39dcdec0f93d8d475b326b70abb0c8afd8c76f45d175e0d4fd032d6d61e6dc07`). Source SHA-256 is +`7a82e44389fe45d9aaf0b3a830ba554074b2f947e634a9ae5417163e9e969b33`. The frozen class file is under +`src/test/resources/compat/`; do not regenerate it against the port. + +| Class | SHA-256 | +| --- | --- | +| `ReferenceScalaMethodSymbolFull` | `82aad2c3f67b61337d7f9daf853ccdd5e68bd30ccf82abd084195e7b66e0846d` | + +### `ReferenceScalaClassParent` + +`scala/codechicken/multipart/compat/ReferenceScalaClassParent.scala` freezes a Scala caller, ClassType subclass and +direct ClassSymbolRef implementation. Tests use them to preserve the old trait helper and info/parent lookup order. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `a670ea3` +(SHA-256 `c633ae5c5eeb98cd06fd8dbc81d138f1f241b59534708a1fbf59f4681df5eede`). Source SHA-256 is +`81be49b2c65c62df5de9e1d3d3eb785f25049889ef8dc1b8ad308a943ebdad6b`. Frozen class files are under +`src/test/resources/compat/`; do not regenerate them against the port. + +| Class | SHA-256 | +| --- | --- | +| `ReferenceScalaClassParent` | `38001778088d012f62256291ede409203138b396cbc28f208e980a29f2b9418f` | +| `ReferenceScalaClassParent$$anon$1` | `91fee2779c962b2b970383ef965b0ec5f2e8d1d44cfc026b7394804f1e56993d` | +| `ReferenceScalaClassParent$$anon$2` | `941a3dce5726e8f355159ae001007f54ad4a307e7d91887909eb84f11952802c` | + +### `ReferenceScalaMethodSymbolDescriptor` + +`scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolDescriptor.scala` freezes a Scala caller and +MethodSymbol subclass with a virtual method-type supplier. Tests preserve info/descriptor order and failure behavior. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `27863b4` +(SHA-256 `1d2dcad447e30fb8df3f73e60b9a02987c42d9f8a632ce5c4523f365c7043ff5`). Source SHA-256 is +`c584b3c91ce80c3b3e5e413bb24af160d1eb89fb0a9bb51b4570193e99b27c9b`. Frozen class files are under +`src/test/resources/compat/`; do not regenerate them against the port. + +| Class | SHA-256 | +| --- | --- | +| `ReferenceScalaMethodSymbolDescriptor` | `47731de0986ab2701a3d5acae0b0a93b24c979495c288383fcab4a925370c192` | +| `ReferenceScalaMethodSymbolDescriptor$$anon$1` | `9fbfb463190e14a9be53a27add9d460d2e8e45bedb0054059806798aa098d2e1` | + +### `ReferenceScalaMethodSymbolInfo` + +`scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolInfo.scala` freezes a Scala caller of +`MethodSymbol.info`. Tests preserve the path-dependent return descriptor, virtual info-ID evaluation and failures. + +Compiled with Scala 2.11.5 under Java 8, `-target:jvm-1.8`, against the untouched dev jar at `257d0e4` +(SHA-256 `1d671a402ec0fe06fcf44c0edbcca350372c05886ad2a7b3cb5fb8688ab95267`). Source SHA-256 is +`53c16080dcd7fe271a9c89b2c869bcb8410baad88e72641d73668aea1cbfd8b8`. The frozen class file is under +`src/test/resources/compat/`; do not regenerate it against the port. + +| Class | SHA-256 | +| --- | --- | +| `ReferenceScalaMethodSymbolInfo` | `0d89ef63187efc9f7959e292ba8e6cee1f4b68794891b913c53c3e96032c869e` | diff --git a/src/test/fixtures/abi/gtnh-2.9.0-rc2-consumers.txt b/src/test/fixtures/abi/gtnh-2.9.0-rc2-consumers.txt new file mode 100644 index 0000000..d4d8019 --- /dev/null +++ b/src/test/fixtures/abi/gtnh-2.9.0-rc2-consumers.txt @@ -0,0 +1,824 @@ +Scanned 240 jars (1 excluded as ForgeMultipart itself) + +== CONSUMERS == + 142 ProjRed-4.12.47-GTNH.jar + 38 extrautilities-1.2.12.jar + 19 OpenComputers-1.12.64-GTNH.jar + 18 ProjectBlue-1.2.11-GTNH.jar + 7 appliedenergistics2-rv3-beta-1080-GTNH.jar + 7 buildcraft-compat-7.1.22.jar + 5 ForgeRelocationFMP-0.2.0.jar + 5 gregtech-5.09.54.205.jar + 4 Galacticraft-3.4.34-GTNH.jar + 4 ThaumicTinkerer-2.12.33.jar + 4 WR-CBE-1.7.12.jar + 4 chisel-2.17.34-GTNH.jar + 3 IguanaTweaksTConstruct-2.7.12.jar + 3 WitchingGadgets-1.8.51-GTNH.jar + 3 guidenh-1.3.41.jar + 2 BloodArsenal-1.5.12.jar + 2 Botania-1.13.37-GTNH.jar + 2 Waila-1.19.34.jar + 2 matter-manipulator-0.1.61-GTNH.jar + 1 BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar + 1 BloodMagic-1.9.14.jar + 1 Natura-2.8.24.jar + 1 Schematica-1.12.6-GTNH.jar + 1 TConstruct-1.14.118-GTNH.jar + 1 ae2fc-1.5.113-gtnh.jar + 1 endercore-0.5.15.jar + 1 etfuturum-2.6.60-GTNH.jar + 1 thaumicenergistics-1.7.64-GTNH.jar + +== INHERITED TYPES (downstream extends/implements - abstract method descriptors are load-bearing) == (35) + codechicken/multipart/MultiPartRegistry$IPartFactory + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, ThaumicTinkerer-2.12.33.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/MultiPartRegistry$IPartConverter + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ThaumicTinkerer-2.12.33.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TFacePart + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/TMultiPart + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TSlottedPart + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/IRandomDisplayTick + <- ProjRed-4.12.47-GTNH.jar, ThaumicTinkerer-2.12.33.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TCuboidPart + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/microblock/BlockMicroMaterial + <- ProjRed-4.12.47-GTNH.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/ISidedHollowConnect + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/IRedstonePart + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/JCuboidPart + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/JNormalOcclusion + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TIconHitEffects + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TNormalOcclusion + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/McMetaPart + <- ThaumicTinkerer-2.12.33.jar, WitchingGadgets-1.8.51-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/IFaceRedstonePart + <- ProjRed-4.12.47-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/IMaskedRedstonePart + <- ProjRed-4.12.47-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar + codechicken/multipart/INeighborTileChange + <- ProjRed-4.12.47-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/JIconHitEffects + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/JPartialOcclusion + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/microblock/IMicroMaterialRender + <- extrautilities-1.2.12.jar + codechicken/microblock/JMicroShrinkRender + <- WR-CBE-1.7.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroHighlightRenderer + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroblockGenerator$IGeneratedMaterial + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/Saw + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/IRedstoneConnector + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/IRedstoneConnectorBlock + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/JItemMultiPart + <- WR-CBE-1.7.12.jar + codechicken/multipart/MultiPartRegistry$IPartFactory2 + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TEdgePart + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TItemMultiPart + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/ButtonPart + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/McSidedMetaPart + <- appliedenergistics2-rv3-beta-1080-GTNH.jar + codechicken/multipart/minecraft/PartMetaAccess + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/TorchPart + <- chisel-2.17.34-GTNH.jar + +== REFERENCED MEMBERS (exact descriptors that must keep linking) == (268) + codechicken/microblock/BlockMicroMaterial. (Lnet/minecraft/block/Block;I)V + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.37-GTNH.jar, Natura-2.8.24.jar, ProjRed-4.12.47-GTNH.jar, ThaumicTinkerer-2.12.33.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/microblock/MicroMaterialRegistry.registerMaterial (Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;Ljava/lang/String;)V + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.37-GTNH.jar, Natura-2.8.24.jar, ThaumicTinkerer-2.12.33.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/multipart/MultiPartRegistry.registerParts (Lcodechicken/multipart/MultiPartRegistry$IPartFactory;[Ljava/lang/String;)V + <- ProjectBlue-1.2.11-GTNH.jar, ThaumicTinkerer-2.12.33.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.addPart (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lcodechicken/multipart/TMultiPart;)Lcodechicken/multipart/TileMultipart; + <- ProjectBlue-1.2.11-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TileMultipart.jPartList ()Ljava/util/List; + <- ProjectBlue-1.2.11-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar, gregtech-5.09.54.205.jar, guidenh-1.3.41.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TileMultipart.partMap (I)Lcodechicken/multipart/TMultiPart; + <- ForgeRelocationFMP-0.2.0.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar, gregtech-5.09.54.205.jar + codechicken/multipart/TileMultipart.remPart (Lcodechicken/multipart/TMultiPart;)Lcodechicken/multipart/TileMultipart; + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/MultiPartRegistry.registerConverter (Lcodechicken/multipart/MultiPartRegistry$IPartConverter;)V + <- ThaumicTinkerer-2.12.33.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TMultiPart. ()V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TMultiPart.getType ()Ljava/lang/String; + <- ThaumicTinkerer-2.12.33.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar, gregtech-5.09.54.205.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TileMultipart.canAddPart (Lcodechicken/multipart/TMultiPart;)Z + <- OpenComputers-1.12.64-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.func_70296_d ()V + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.51-GTNH.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TileMultipart.notifyPartChange (Lcodechicken/multipart/TMultiPart;)V + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.partList ()Lscala/collection/Seq; + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/microblock/BlockMicroMaterial.createAndRegister (Lnet/minecraft/block/Block;I)V + <- Natura-2.8.24.jar, TConstruct-1.14.118-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.getMaterial (Ljava/lang/String;)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- ProjectBlue-1.2.11-GTNH.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/multipart/JNormalOcclusion.getOcclusionBoxes ()Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TCuboidPart$class.$init$ (Lcodechicken/multipart/TCuboidPart;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TCuboidPart$class.drawBreaking (Lcodechicken/multipart/TCuboidPart;Lnet/minecraft/client/renderer/RenderBlocks;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TCuboidPart$class.getCollisionBoxes (Lcodechicken/multipart/TCuboidPart;)Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TCuboidPart$class.getSubParts (Lcodechicken/multipart/TCuboidPart;)Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TileMultipart.canReplacePart (Lcodechicken/multipart/TMultiPart;Lcodechicken/multipart/TMultiPart;)Z + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/TileMultipart.field_145848_d I + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, guidenh-1.3.41.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TileMultipart.field_145849_e I + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, guidenh-1.3.41.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TileMultipart.field_145851_c I + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, guidenh-1.3.41.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TileMultipart.func_145831_w ()Lnet/minecraft/world/World; + <- ProjRed-4.12.47-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/multipart/TileMultipart.markRender ()V + <- ProjRed-4.12.47-GTNH.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/microblock/Microblock.shape ()B + <- ProjRed-4.12.47-GTNH.jar, buildcraft-compat-7.1.22.jar, guidenh-1.3.41.jar + codechicken/multipart/IRedstonePart.strongPowerLevel (I)I + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/IRedstonePart.weakPowerLevel (I)I + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/JCuboidPart. ()V + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/JIconHitEffects$class.$init$ (Lcodechicken/multipart/JIconHitEffects;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/JIconHitEffects$class.getBreakingIcon (Lcodechicken/multipart/JIconHitEffects;Ljava/lang/Object;I)Lnet/minecraft/util/IIcon; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/MultiPartRegistry$.MODULE$ Lcodechicken/multipart/MultiPartRegistry$; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/MultipartGenerator.registerPassThroughInterface (Ljava/lang/String;)V + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/NormalOcclusionTest.apply (Lcodechicken/multipart/JNormalOcclusion;Lcodechicken/multipart/TMultiPart;)Z + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TFacePart$class.$init$ (Lcodechicken/multipart/TFacePart;)V + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TIconHitEffects$class.$init$ (Lcodechicken/multipart/TIconHitEffects;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TIconHitEffects$class.addDestroyEffects (Lcodechicken/multipart/TIconHitEffects;Lnet/minecraft/client/particle/EffectRenderer;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TIconHitEffects$class.addHitEffects (Lcodechicken/multipart/TIconHitEffects;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/client/particle/EffectRenderer;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.getCollisionBoxes ()Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, WitchingGadgets-1.8.51-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TMultiPart.getDrops ()Ljava/lang/Iterable; + <- buildcraft-compat-7.1.22.jar, guidenh-1.3.41.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TMultiPart.load (Lnet/minecraft/nbt/NBTTagCompound;)V + <- OpenComputers-1.12.64-GTNH.jar, buildcraft-compat-7.1.22.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TMultiPart.occlusionTest (Lcodechicken/multipart/TMultiPart;)Z + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.save (Lnet/minecraft/nbt/NBTTagCompound;)V + <- OpenComputers-1.12.64-GTNH.jar, buildcraft-compat-7.1.22.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TNormalOcclusion$class.$init$ (Lcodechicken/multipart/TNormalOcclusion;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TNormalOcclusion$class.occlusionTest (Lcodechicken/multipart/TNormalOcclusion;Lcodechicken/multipart/TMultiPart;)Z + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TileMultipart$.MODULE$ Lcodechicken/multipart/TileMultipart$; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TileMultipart.canPlacePart (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lcodechicken/multipart/TMultiPart;)Z + <- ProjectBlue-1.2.11-GTNH.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.getOrConvertTile (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;)Lcodechicken/multipart/TileMultipart; + <- appliedenergistics2-rv3-beta-1080-GTNH.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/minecraft/McMetaPart. (I)V + <- ThaumicTinkerer-2.12.33.jar, WitchingGadgets-1.8.51-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/BlockMicroMaterial.block ()Lnet/minecraft/block/Block; + <- ProjRed-4.12.47-GTNH.jar, guidenh-1.3.41.jar + codechicken/microblock/BlockMicroMaterial.meta ()I + <- ProjRed-4.12.47-GTNH.jar, guidenh-1.3.41.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getItem ()Lnet/minecraft/item/ItemStack; + <- ProjectBlue-1.2.11-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getStrength (Lnet/minecraft/entity/player/EntityPlayer;)F + <- ProjRed-4.12.47-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.getMaterial (I)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/microblock/Microblock.getSize ()I + <- ForgeRelocationFMP-0.2.0.jar, ProjRed-4.12.47-GTNH.jar + codechicken/microblock/Microblock.shape_$eq (B)V + <- buildcraft-compat-7.1.22.jar, guidenh-1.3.41.jar + codechicken/microblock/MicroblockGenerator$.MODULE$ Lcodechicken/microblock/MicroblockGenerator$; + <- ProjRed-4.12.47-GTNH.jar, guidenh-1.3.41.jar + codechicken/microblock/Saw.getCuttingStrength (Lnet/minecraft/item/ItemStack;)I + <- IguanaTweaksTConstruct-2.7.12.jar, extrautilities-1.2.12.jar + codechicken/microblock/handler/MicroblockProxy$.MODULE$ Lcodechicken/microblock/handler/MicroblockProxy$; + <- IguanaTweaksTConstruct-2.7.12.jar, ProjRed-4.12.47-GTNH.jar + codechicken/microblock/handler/MicroblockProxy.sawDiamond ()Lnet/minecraft/item/Item; + <- ProjRed-4.12.47-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/IconHitEffects.addHitEffects (Lcodechicken/multipart/JIconHitEffects;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/client/particle/EffectRenderer;)V + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/JPartialOcclusion.getPartialOcclusionBoxes ()Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, WitchingGadgets-1.8.51-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerConverter (Lcodechicken/multipart/MultiPartRegistry$IPartConverter;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerParts (Lcodechicken/multipart/MultiPartRegistry$IPartFactory;[Ljava/lang/String;)V + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/MultiPartRegistry.loadPart (Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/multipart/TMultiPart; + <- buildcraft-compat-7.1.22.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/MultipartGenerator$.MODULE$ Lcodechicken/multipart/MultipartGenerator$; + <- ForgeRelocationFMP-0.2.0.jar, guidenh-1.3.41.jar + codechicken/multipart/MultipartGenerator.registerPassThroughInterface (Ljava/lang/String;ZZ)V + <- WitchingGadgets-1.8.51-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/MultipartHelper.createTileFromNBT (Lnet/minecraft/world/World;Lnet/minecraft/nbt/NBTTagCompound;)Lnet/minecraft/tileentity/TileEntity; + <- BloodMagic-1.9.14.jar, guidenh-1.3.41.jar + codechicken/multipart/MultipartHelper.sendDescPacket (Lnet/minecraft/world/World;Lnet/minecraft/tileentity/TileEntity;)V + <- BloodMagic-1.9.14.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/NormalOcclusionTest$.MODULE$ Lcodechicken/multipart/NormalOcclusionTest$; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/NormalOcclusionTest$.apply (Lscala/collection/Traversable;Lscala/collection/Traversable;)Z + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/PartMap.edgeBetween (II)I + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/RedstoneInteractions.getPowerTo (Lcodechicken/multipart/TMultiPart;I)I + <- ProjectBlue-1.2.11-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/TFacePart$class.redstoneConductionMap (Lcodechicken/multipart/TFacePart;)I + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TFacePart$class.solid (Lcodechicken/multipart/TFacePart;I)Z + <- OpenComputers-1.12.64-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TMultiPart.activate (Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/item/ItemStack;)Z + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.onWorldJoin ()V + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.readDesc (Lcodechicken/lib/data/MCDataInput;)V + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.tile ()Lcodechicken/multipart/TileMultipart; + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TMultiPart.world ()Lnet/minecraft/world/World; + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TMultiPart.writeDesc (Lcodechicken/lib/data/MCDataOutput;)V + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.x ()I + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TMultiPart.y ()I + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TMultiPart.z ()I + <- ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TileMultipart$.addPart (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lcodechicken/multipart/TMultiPart;)Lcodechicken/multipart/TileMultipart; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TileMultipart.dropItem (Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lcodechicken/lib/vec/Vector3;)V + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.dropItems (Ljava/lang/Iterable;)V + <- ProjectBlue-1.2.11-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.func_145838_q ()Lnet/minecraft/block/Block; + <- ForgeRelocationFMP-0.2.0.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TileMultipart.notifyNeighborChange (I)V + <- ProjRed-4.12.47-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/TileMultipart.onMoved ()V + <- ForgeRelocationFMP-0.2.0.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/minecraft/McMetaPart. ()V + <- ThaumicTinkerer-2.12.33.jar, extrautilities-1.2.12.jar + codechicken/multipart/minecraft/McMetaPart.load (Lnet/minecraft/nbt/NBTTagCompound;)V + <- ProjRed-4.12.47-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar + codechicken/multipart/minecraft/McMetaPart.meta B + <- ProjRed-4.12.47-GTNH.jar, buildcraft-compat-7.1.22.jar + codechicken/multipart/minecraft/McMetaPart.readDesc (Lcodechicken/lib/data/MCDataInput;)V + <- ProjRed-4.12.47-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar + codechicken/multipart/minecraft/McMetaPart.save (Lnet/minecraft/nbt/NBTTagCompound;)V + <- ProjRed-4.12.47-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar + codechicken/multipart/minecraft/McMetaPart.writeDesc (Lcodechicken/lib/data/MCDataOutput;)V + <- ProjRed-4.12.47-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar + codechicken/multipart/minecraft/PartMetaAccess. (Lcodechicken/multipart/minecraft/IPartMeta;)V + <- WitchingGadgets-1.8.51-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/BlockMicroMaterial$.MODULE$ Lcodechicken/microblock/BlockMicroMaterial$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/BlockMicroMaterial$.createAndRegister (Lnet/minecraft/block/Block;I)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/BlockMicroMaterial$.materialKey (Lnet/minecraft/block/Block;I)Ljava/lang/String; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/BlockMicroMaterial.createAndRegister (Lnet/minecraft/block/Block;ILjava/lang/String;)V + <- TConstruct-1.14.118-GTNH.jar + codechicken/microblock/BlockMicroMaterial.getSound ()Lnet/minecraft/block/Block$SoundType; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/BlockMicroMaterial.renderMicroFace (Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;)V + <- extrautilities-1.2.12.jar + codechicken/microblock/CommonMicroClass.getClassId ()I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/CommonMicroblock.getBounds ()Lcodechicken/lib/vec/Cuboid6; + <- extrautilities-1.2.12.jar + codechicken/microblock/CommonMicroblock.getMaterial ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/CornerMicroClass$.MODULE$ Lcodechicken/microblock/CornerMicroClass$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/CornerMicroClass$.getClassId ()I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/EdgeMicroClass$.MODULE$ Lcodechicken/microblock/EdgeMicroClass$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/EdgeMicroClass$.getClassId ()I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/FaceMicroClass$.MODULE$ Lcodechicken/microblock/FaceMicroClass$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/FaceMicroClass$.aBounds ()[Lcodechicken/lib/vec/Cuboid6; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/FaceMicroClass$.getClassId ()I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/FaceMicroClass.aBounds ()[Lcodechicken/lib/vec/Cuboid6; + <- WR-CBE-1.7.12.jar + codechicken/microblock/FacePlacementGrid.getHitSlot (Lcodechicken/lib/vec/Vector3;I)I + <- ProjectBlue-1.2.11-GTNH.jar + codechicken/microblock/FacePlacementGrid.render (Lcodechicken/lib/vec/Vector3;I)V + <- ProjectBlue-1.2.11-GTNH.jar + codechicken/microblock/HollowMicroClass$.MODULE$ Lcodechicken/microblock/HollowMicroClass$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/HollowMicroClass$.getClassId ()I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/HollowMicroblock.getHollowSize ()I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/ISidedHollowConnect.getHollowSize (I)I + <- extrautilities-1.2.12.jar + codechicken/microblock/ItemMicroPart$.MODULE$ Lcodechicken/microblock/ItemMicroPart$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/ItemMicroPart$.create (II)Lnet/minecraft/item/ItemStack; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/ItemMicroPart$.create (ILjava/lang/String;)Lnet/minecraft/item/ItemStack; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/ItemMicroPart$.getMaterial (Lnet/minecraft/item/ItemStack;)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/ItemMicroPart$.getMaterialID (Lnet/minecraft/item/ItemStack;)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/ItemMicroPart.getMaterialID (Lnet/minecraft/item/ItemStack;)I + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper$.blockColour (I)Lcodechicken/microblock/MaterialRenderHelper$; + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper$.lighting ()Lcodechicken/microblock/MaterialRenderHelper$; + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper$.render ()V + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper.start (Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/render/uv/UVTransformation;)Lcodechicken/microblock/MaterialRenderHelper$; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$.MODULE$ Lcodechicken/microblock/MicroMaterialRegistry$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.getMaterial (I)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.materialID (Ljava/lang/String;)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.materialName (I)Ljava/lang/String; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.readMaterialID (Lcodechicken/lib/data/MCDataInput;)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.registerHighlightRenderer (Lcodechicken/microblock/MicroMaterialRegistry$IMicroHighlightRenderer;)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.registerMaterial (Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;Ljava/lang/String;)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.writeMaterialID (Lcodechicken/lib/data/MCDataOutput;I)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.canRenderInPass (I)Z + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getBreakingIcon (I)Lnet/minecraft/util/IIcon; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getCutterStrength ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getLightValue ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getLocalizedName ()Ljava/lang/String; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getSound ()Lnet/minecraft/block/Block$SoundType; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.isTransparent ()Z + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.renderMicroFace (Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;)V + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.getIdMap ()[Lscala/Tuple2; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.getMaxCuttingStrength ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.materialID (Ljava/lang/String;)I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.materialName (I)Ljava/lang/String; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroOcclusion.recalcBounds (Lcodechicken/microblock/JMicroShrinkRender;Lcodechicken/lib/vec/Cuboid6;)I + <- WR-CBE-1.7.12.jar + codechicken/microblock/MicroRecipe.create (IIII)Lnet/minecraft/item/ItemStack; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroRecipe.findMaterial (Lnet/minecraft/item/ItemStack;)I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroRecipe.getCraftingResult (Lnet/minecraft/inventory/InventoryCrafting;)Lnet/minecraft/item/ItemStack; + <- extrautilities-1.2.12.jar + codechicken/microblock/Microblock.getBounds ()Lcodechicken/lib/vec/Cuboid6; + <- extrautilities-1.2.12.jar + codechicken/microblock/Microblock.getIMaterial ()Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/Microblock.getMaterial ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/Microblock.getShape ()I + <- buildcraft-compat-7.1.22.jar + codechicken/microblock/Microblock.material ()I + <- guidenh-1.3.41.jar + codechicken/microblock/Microblock.microClass ()Lcodechicken/microblock/MicroblockClass; + <- guidenh-1.3.41.jar + codechicken/microblock/MicroblockGenerator$.create (Lcodechicken/microblock/MicroblockClass;IZ)Lcodechicken/microblock/Microblock; + <- guidenh-1.3.41.jar + codechicken/microblock/MicroblockGenerator$.registerTrait (Ljava/lang/Class;)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroblockRender$.MODULE$ Lcodechicken/microblock/MicroblockRender$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroblockRender$.renderCuboid (Lcodechicken/lib/vec/Vector3;Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;ILcodechicken/lib/vec/Cuboid6;I)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroblockRender.renderCuboid (Lcodechicken/lib/vec/Vector3;Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;ILcodechicken/lib/vec/Cuboid6;I)V + <- extrautilities-1.2.12.jar + codechicken/microblock/Saw$class.$init$ (Lcodechicken/microblock/Saw;)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/Saw$class.getMaxCuttingStrength (Lcodechicken/microblock/Saw;)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/handler/MicroblockProxy$.itemMicro ()Lcodechicken/microblock/ItemMicroPart; + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/handler/MicroblockProxy$.sawDiamond ()Lnet/minecraft/item/Item; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/microblock/handler/MicroblockProxy$.sawIron ()Lnet/minecraft/item/Item; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/microblock/handler/MicroblockProxy$.sawStone ()Lnet/minecraft/item/Item; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/microblock/handler/MicroblockProxy$.useSawIcons ()Z + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/microblock/handler/MicroblockProxy.createSaw (Lcodechicken/lib/config/ConfigFile;Ljava/lang/String;I)Lnet/minecraft/item/Item; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/multipart/BlockMultipart.reduceMOP (Lnet/minecraft/util/MovingObjectPosition;)Lscala/Tuple2; + <- gregtech-5.09.54.205.jar + codechicken/multipart/IFaceRedstonePart.getFace ()I + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/IFaceRedstonePart.strongPowerLevel (I)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/IFaceRedstonePart.weakPowerLevel (I)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/INeighborTileChange.onNeighborTileChanged (IZ)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/INeighborTileChange.weakTileChanges ()Z + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/IRedstonePart.canConnectRedstone (I)Z + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/IconHitEffects.addDestroyEffects (Lcodechicken/multipart/JIconHitEffects;Lnet/minecraft/client/particle/EffectRenderer;)V + <- WR-CBE-1.7.12.jar + codechicken/multipart/IconHitEffects.addDestroyEffects (Lcodechicken/multipart/JIconHitEffects;Lnet/minecraft/client/particle/EffectRenderer;Z)V + <- extrautilities-1.2.12.jar + codechicken/multipart/JCuboidPart.bind (Lcodechicken/multipart/TileMultipart;)V + <- appliedenergistics2-rv3-beta-1080-GTNH.jar + codechicken/multipart/JCuboidPart.harvest (Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/entity/player/EntityPlayer;)V + <- extrautilities-1.2.12.jar + codechicken/multipart/JCuboidPart.load (Lnet/minecraft/nbt/NBTTagCompound;)V + <- extrautilities-1.2.12.jar + codechicken/multipart/JCuboidPart.onAdded ()V + <- WR-CBE-1.7.12.jar + codechicken/multipart/JCuboidPart.onWorldJoin ()V + <- extrautilities-1.2.12.jar + codechicken/multipart/JCuboidPart.read (Lcodechicken/lib/data/MCDataInput;)V + <- WR-CBE-1.7.12.jar + codechicken/multipart/JCuboidPart.save (Lnet/minecraft/nbt/NBTTagCompound;)V + <- extrautilities-1.2.12.jar + codechicken/multipart/JItemMultiPart. ()V + <- WR-CBE-1.7.12.jar + codechicken/multipart/JItemMultiPart.func_77658_a ()Ljava/lang/String; + <- WR-CBE-1.7.12.jar + codechicken/multipart/MultiPartRegistry$.createPart (Ljava/lang/String;Z)Lcodechicken/multipart/TMultiPart; + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerParts (Lcodechicken/multipart/MultiPartRegistry$IPartFactory2;Lscala/collection/Seq;)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerParts (Lcodechicken/multipart/MultiPartRegistry$IPartFactory2;[Ljava/lang/String;)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerParts (Lscala/Function2;Lscala/collection/Seq;)V + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/MultipartGenerator$.generateCompositeTile (Lnet/minecraft/tileentity/TileEntity;Lscala/collection/Iterable;Z)Lcodechicken/multipart/TileMultipart; + <- guidenh-1.3.41.jar + codechicken/multipart/MultipartGenerator$.registerPassThroughInterface (Ljava/lang/String;)V + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/MultipartRenderer.renderWorldBlock (Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;ILnet/minecraft/client/renderer/RenderBlocks;)Z + <- guidenh-1.3.41.jar + codechicken/multipart/NormallyOccludedPart. (Lcodechicken/lib/vec/Cuboid6;)V + <- appliedenergistics2-rv3-beta-1080-GTNH.jar + codechicken/multipart/PartMap.face (I)Lcodechicken/multipart/PartMap; + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/PartMap.i I + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/PartMap.mask I + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/PartMap.values ()[Lcodechicken/multipart/PartMap; + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/RedstoneInteractions$.MODULE$ Lcodechicken/multipart/RedstoneInteractions$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/RedstoneInteractions$.connectionMask (Lcodechicken/multipart/TMultiPart;I)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/RedstoneInteractions$.getPowerTo (Lcodechicken/multipart/TMultiPart;I)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/RedstoneInteractions$.getPowerTo (Lnet/minecraft/world/World;IIIII)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/RedstoneInteractions$.otherConnectionMask (Lnet/minecraft/world/IBlockAccess;IIIIZ)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/RedstoneInteractions.getPowerTo (Lnet/minecraft/world/World;IIIII)I + <- extrautilities-1.2.12.jar + codechicken/multipart/TCuboidPart.getCollisionBoxes ()Ljava/lang/Iterable; + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TEdgePart$class.$init$ (Lcodechicken/multipart/TEdgePart;)V + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TFacePart.getSlotMask ()I + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TFacePart.solid (I)Z + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TItemMultiPart$class.$init$ (Lcodechicken/multipart/TItemMultiPart;)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TItemMultiPart$class.getHitDepth (Lcodechicken/multipart/TItemMultiPart;Lcodechicken/lib/vec/Vector3;I)D + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TItemMultiPart$class.onItemUse (Lcodechicken/multipart/TItemMultiPart;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;IIIIFFF)Z + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.getWriteStream ()Lcodechicken/lib/data/MCDataOutput; + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.invalidateConvertedTile ()V + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TMultiPart.onAdded ()V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.onNeighborChanged ()V + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TMultiPart.onPartChanged (Lcodechicken/multipart/TMultiPart;)V + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TMultiPart.onRemoved ()V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TMultiPart.onWorldSeparate ()V + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TMultiPart.update ()V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TSlottedPart.getSlotMask ()I + <- gregtech-5.09.54.205.jar + codechicken/multipart/TileMultipart$.canPlacePart (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lcodechicken/multipart/TMultiPart;)Z + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/TileMultipart$.dropItem (Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lcodechicken/lib/vec/Vector3;)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TileMultipart$.getOrConvertTile (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;)Lcodechicken/multipart/TileMultipart; + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TileMultipart$.getTile (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;)Lcodechicken/multipart/TileMultipart; + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/TileMultipart.bindPart (Lcodechicken/multipart/TMultiPart;)V + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TileMultipart.field_145847_g I + <- guidenh-1.3.41.jar + codechicken/multipart/TileMultipart.field_145854_h Lnet/minecraft/block/Block; + <- guidenh-1.3.41.jar + codechicken/multipart/TileMultipart.func_145829_t ()V + <- matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TileMultipart.func_145834_a (Lnet/minecraft/world/World;)V + <- guidenh-1.3.41.jar + codechicken/multipart/TileMultipart.func_145837_r ()Z + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TileMultipart.internalPartChange (Lcodechicken/multipart/TMultiPart;)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TileMultipart.loadParts (Lscala/collection/Iterable;)V + <- guidenh-1.3.41.jar + codechicken/multipart/TileMultipart.multiPartChange (Ljava/util/Collection;)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TileMultipart.notifyTileChange ()V + <- guidenh-1.3.41.jar + codechicken/multipart/handler/MultipartProxy$.MODULE$ Lcodechicken/multipart/handler/MultipartProxy$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/handler/MultipartProxy$.block ()Lcodechicken/multipart/BlockMultipart; + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/handler/MultipartProxy.block ()Lcodechicken/multipart/BlockMultipart; + <- buildcraft-compat-7.1.22.jar + codechicken/multipart/handler/MultipartProxy.config ()Lcodechicken/lib/config/ConfigFile; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/multipart/handler/MultipartSaveLoad$.MODULE$ Lcodechicken/multipart/handler/MultipartSaveLoad$; + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/handler/MultipartSaveLoad$.loadingWorld ()Lnet/minecraft/world/World; + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/ButtonPart. (I)V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/ButtonPart.activate (Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/item/ItemStack;)Z + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/ButtonPart.sideMetaMap [I + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/IPartMeta.getPos ()Lcodechicken/lib/vec/BlockCoord; + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/IPartMeta.getWorld ()Lnet/minecraft/world/World; + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/McMetaPart.invalidateConvertedTile ()V + <- WitchingGadgets-1.8.51-GTNH.jar + codechicken/multipart/minecraft/McMetaPart.update ()V + <- WitchingGadgets-1.8.51-GTNH.jar + codechicken/multipart/minecraft/McSidedMetaPart. (I)V + <- appliedenergistics2-rv3-beta-1080-GTNH.jar + codechicken/multipart/minecraft/McSidedMetaPart.onNeighborChanged ()V + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/PartMetaAccess.func_147438_o (III)Lnet/minecraft/tileentity/TileEntity; + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/TorchPart. ()V + <- chisel-2.17.34-GTNH.jar + codechicken/multipart/minecraft/TorchPart. (I)V + <- chisel-2.17.34-GTNH.jar + codechicken/multipart/minecraft/TorchPart.load (Lnet/minecraft/nbt/NBTTagCompound;)V + <- chisel-2.17.34-GTNH.jar + codechicken/multipart/minecraft/TorchPart.readDesc (Lcodechicken/lib/data/MCDataInput;)V + <- chisel-2.17.34-GTNH.jar + codechicken/multipart/minecraft/TorchPart.save (Lnet/minecraft/nbt/NBTTagCompound;)V + <- chisel-2.17.34-GTNH.jar + codechicken/multipart/minecraft/TorchPart.sideMetaMap [I + <- chisel-2.17.34-GTNH.jar + codechicken/multipart/minecraft/TorchPart.writeDesc (Lcodechicken/lib/data/MCDataOutput;)V + <- chisel-2.17.34-GTNH.jar + codechicken/multipart/scalatraits/TIInventoryTile.rebuildSlotMap ()V + <- appliedenergistics2-rv3-beta-1080-GTNH.jar + codechicken/multipart/scalatraits/TRedstoneTile.openConnections (I)I + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/scalatraits/TRedstoneTile.weakPowerLevel (I)I + <- extrautilities-1.2.12.jar + codechicken/multipart/scalatraits/TSlottedTile.v_partMap ()[Lcodechicken/multipart/TMultiPart; + <- OpenComputers-1.12.64-GTNH.jar + +== OTHER REFERENCED TYPES (new/cast/instanceof/field descriptors) == (80) + codechicken/multipart/TileMultipart + <- BloodMagic-1.9.14.jar, ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar, gregtech-5.09.54.205.jar, guidenh-1.3.41.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/TMultiPart + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, ThaumicTinkerer-2.12.33.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar, gregtech-5.09.54.205.jar, guidenh-1.3.41.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/MultiPartRegistry + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, ThaumicTinkerer-2.12.33.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/microblock/MicroMaterialRegistry + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.37-GTNH.jar, Natura-2.8.24.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, ThaumicTinkerer-2.12.33.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.37-GTNH.jar, Natura-2.8.24.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar, ThaumicTinkerer-2.12.33.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.34-GTNH.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/microblock/BlockMicroMaterial + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.37-GTNH.jar, Natura-2.8.24.jar, ProjRed-4.12.47-GTNH.jar, TConstruct-1.14.118-GTNH.jar, ThaumicTinkerer-2.12.33.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/microblock/Microblock + <- ForgeRelocationFMP-0.2.0.jar, ProjRed-4.12.47-GTNH.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar, guidenh-1.3.41.jar + codechicken/multipart/JNormalOcclusion + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, WitchingGadgets-1.8.51-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/MultipartGenerator + <- WR-CBE-1.7.12.jar, WitchingGadgets-1.8.51-GTNH.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TCuboidPart$class + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/microblock/ItemSaw + <- IguanaTweaksTConstruct-2.7.12.jar, ProjectBlue-1.2.11-GTNH.jar, endercore-0.5.15.jar + codechicken/microblock/handler/MicroblockProxy + <- IguanaTweaksTConstruct-2.7.12.jar, ProjRed-4.12.47-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/JIconHitEffects$class + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/MultiPartRegistry$ + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/MultipartHelper + <- BloodMagic-1.9.14.jar, guidenh-1.3.41.jar, matter-manipulator-0.1.61-GTNH.jar + codechicken/multipart/NormalOcclusionTest + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/PartMap + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/RedstoneInteractions + <- ProjectBlue-1.2.11-GTNH.jar, WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/TFacePart$class + <- OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar, ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/TIconHitEffects$class + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TNormalOcclusion$class + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TileMultipart$ + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar, ProjRed-4.12.47-GTNH.jar + codechicken/microblock/CommonMicroblock + <- ForgeRelocationFMP-0.2.0.jar, extrautilities-1.2.12.jar + codechicken/microblock/ItemMicroPart + <- ProjRed-4.12.47-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/MicroblockGenerator$ + <- ProjRed-4.12.47-GTNH.jar, guidenh-1.3.41.jar + codechicken/microblock/Saw + <- IguanaTweaksTConstruct-2.7.12.jar, extrautilities-1.2.12.jar + codechicken/microblock/handler/MicroblockProxy$ + <- IguanaTweaksTConstruct-2.7.12.jar, ProjRed-4.12.47-GTNH.jar + codechicken/multipart/BlockMultipart + <- gregtech-5.09.54.205.jar, guidenh-1.3.41.jar + codechicken/multipart/IRedstonePart + <- ProjRed-4.12.47-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/IconHitEffects + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/JPartialOcclusion + <- ForgeRelocationFMP-0.2.0.jar, WitchingGadgets-1.8.51-GTNH.jar + codechicken/multipart/MultipartGenerator$ + <- ForgeRelocationFMP-0.2.0.jar, guidenh-1.3.41.jar + codechicken/multipart/NormalOcclusionTest$ + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/handler/MultipartProxy + <- IguanaTweaksTConstruct-2.7.12.jar, buildcraft-compat-7.1.22.jar + codechicken/multipart/minecraft/McMetaPart + <- ProjRed-4.12.47-GTNH.jar, buildcraft-compat-7.1.22.jar + codechicken/multipart/scalatraits/TRedstoneTile + <- ProjRed-4.12.47-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/BlockMicroMaterial$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/CommonMicroClass + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/CornerMicroClass$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/EdgeMicroClass$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/FaceMicroClass + <- WR-CBE-1.7.12.jar + codechicken/microblock/FaceMicroClass$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/FaceMicroblockClient + <- extrautilities-1.2.12.jar + codechicken/microblock/FacePlacementGrid + <- ProjectBlue-1.2.11-GTNH.jar + codechicken/microblock/HollowMicroClass$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/HollowMicroblock + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/HollowMicroblockClient + <- extrautilities-1.2.12.jar + codechicken/microblock/ISidedHollowConnect + <- extrautilities-1.2.12.jar + codechicken/microblock/ItemMicroPart$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MaterialRenderHelper + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper$ + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$IMicroHighlightRenderer + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroOcclusion + <- WR-CBE-1.7.12.jar + codechicken/microblock/MicroRecipe + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroblockGenerator + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/MicroblockRender + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroblockRender$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/microblock/Saw$class + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/IFaceRedstonePart + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/MultiPartRegistry$IPartConverter + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/MultiPartRegistry$IPartFactory + <- ProjectBlue-1.2.11-GTNH.jar + codechicken/multipart/MultipartRenderer + <- guidenh-1.3.41.jar + codechicken/multipart/NormallyOccludedPart + <- appliedenergistics2-rv3-beta-1080-GTNH.jar + codechicken/multipart/RedstoneInteractions$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TCuboidPart + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TEdgePart$class + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TFacePart + <- OpenComputers-1.12.64-GTNH.jar + codechicken/multipart/TItemMultiPart$class + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/TSlottedPart + <- gregtech-5.09.54.205.jar + codechicken/multipart/TileMultipartClient + <- guidenh-1.3.41.jar + codechicken/multipart/handler/MultipartProxy$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/handler/MultipartSaveLoad$ + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/ButtonPart + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/IPartMeta + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/McSidedMetaPart + <- ProjRed-4.12.47-GTNH.jar + codechicken/multipart/minecraft/PartMetaAccess + <- WitchingGadgets-1.8.51-GTNH.jar + codechicken/multipart/minecraft/TorchPart + <- chisel-2.17.34-GTNH.jar + codechicken/multipart/scalatraits/TIInventoryTile + <- appliedenergistics2-rv3-beta-1080-GTNH.jar + codechicken/multipart/scalatraits/TSlottedTile + <- OpenComputers-1.12.64-GTNH.jar + +== STRING CONSTANTS (reflection / registration candidates) == (9) + codechicken.multipart.TileMultipart + <- Galacticraft-3.4.34-GTNH.jar, Schematica-1.12.6-GTNH.jar, ae2fc-1.5.113-gtnh.jar, appliedenergistics2-rv3-beta-1080-GTNH.jar, thaumicenergistics-1.7.64-GTNH.jar + codechicken.microblock.MicroMaterialRegistry + <- Galacticraft-3.4.34-GTNH.jar, Schematica-1.12.6-GTNH.jar + codechicken.microblock.BlockMicroMaterial + <- Galacticraft-3.4.34-GTNH.jar + codechicken.microblock.MicroblockClass + <- Schematica-1.12.6-GTNH.jar + codechicken.multipart.BlockMultipart + <- Waila-1.19.34.jar + codechicken.multipart.MultiPartRegistry$ + <- Schematica-1.12.6-GTNH.jar + codechicken.multipart.MultipartGenerator$ + <- Schematica-1.12.6-GTNH.jar + codechicken.multipart.TMultiPart + <- Schematica-1.12.6-GTNH.jar + codechicken.multipart.minecraft.ButtonPart + <- etfuturum-2.6.60-GTNH.jar + diff --git a/src/test/fixtures/abi/gtnh-daily-678-consumers.txt b/src/test/fixtures/abi/gtnh-daily-678-consumers.txt new file mode 100644 index 0000000..4197c62 --- /dev/null +++ b/src/test/fixtures/abi/gtnh-daily-678-consumers.txt @@ -0,0 +1,811 @@ +Scanned 240 jars (1 excluded as ForgeMultipart itself) + +== CONSUMERS == + 141 ProjRed-4.12.41-GTNH.jar + 38 extrautilities-1.2.12.jar + 19 OpenComputers-1.12.55-GTNH.jar + 18 ProjectBlue-1.2.10-GTNH.jar + 7 appliedenergistics2-rv3-beta-1032-GTNH.jar + 7 buildcraft-compat-7.1.22.jar + 5 ForgeRelocationFMP-0.2.0.jar + 4 Galacticraft-3.4.33-GTNH.jar + 4 ThaumicTinkerer-2.12.29.jar + 4 WR-CBE-1.7.12.jar + 4 chisel-2.17.32-GTNH.jar + 3 IguanaTweaksTConstruct-2.7.12.jar + 3 WitchingGadgets-1.8.49-GTNH.jar + 3 guidenh-1.3.20.jar + 2 BloodArsenal-1.5.12.jar + 2 Botania-1.13.33-GTNH.jar + 2 Waila-1.19.31.jar + 2 matter-manipulator-0.1.53-GTNH.jar + 1 BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar + 1 BloodMagic-1.9.12.jar + 1 Natura-2.8.23.jar + 1 Schematica-1.12.6-GTNH.jar + 1 TConstruct-1.14.97-GTNH.jar + 1 ae2fc-1.5.102-gtnh.jar + 1 endercore-0.5.14.jar + 1 etfuturum-2.6.52-GTNH.jar + 1 gregtech-5.09.54.88.jar + +== INHERITED TYPES (downstream extends/implements - abstract method descriptors are load-bearing) == (35) + codechicken/multipart/MultiPartRegistry$IPartFactory + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, ThaumicTinkerer-2.12.29.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/MultiPartRegistry$IPartConverter + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ThaumicTinkerer-2.12.29.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TFacePart + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/TMultiPart + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TSlottedPart + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/IRandomDisplayTick + <- ProjRed-4.12.41-GTNH.jar, ThaumicTinkerer-2.12.29.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TCuboidPart + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/microblock/BlockMicroMaterial + <- ProjRed-4.12.41-GTNH.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/ISidedHollowConnect + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/IRedstonePart + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/JCuboidPart + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/JNormalOcclusion + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TIconHitEffects + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TNormalOcclusion + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/McMetaPart + <- ThaumicTinkerer-2.12.29.jar, WitchingGadgets-1.8.49-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/IFaceRedstonePart + <- ProjRed-4.12.41-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/IMaskedRedstonePart + <- ProjRed-4.12.41-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar + codechicken/multipart/INeighborTileChange + <- ProjRed-4.12.41-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/JIconHitEffects + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/JPartialOcclusion + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/microblock/IMicroMaterialRender + <- extrautilities-1.2.12.jar + codechicken/microblock/JMicroShrinkRender + <- WR-CBE-1.7.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroHighlightRenderer + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroblockGenerator$IGeneratedMaterial + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/Saw + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/IRedstoneConnector + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/IRedstoneConnectorBlock + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/JItemMultiPart + <- WR-CBE-1.7.12.jar + codechicken/multipart/MultiPartRegistry$IPartFactory2 + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TEdgePart + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TItemMultiPart + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/ButtonPart + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/McSidedMetaPart + <- appliedenergistics2-rv3-beta-1032-GTNH.jar + codechicken/multipart/minecraft/PartMetaAccess + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/TorchPart + <- chisel-2.17.32-GTNH.jar + +== REFERENCED MEMBERS (exact descriptors that must keep linking) == (255) + codechicken/microblock/BlockMicroMaterial. (Lnet/minecraft/block/Block;I)V + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.33-GTNH.jar, Natura-2.8.23.jar, ProjRed-4.12.41-GTNH.jar, ThaumicTinkerer-2.12.29.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.registerMaterial (Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;Ljava/lang/String;)V + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.33-GTNH.jar, Natura-2.8.23.jar, ThaumicTinkerer-2.12.29.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/MultiPartRegistry.registerParts (Lcodechicken/multipart/MultiPartRegistry$IPartFactory;[Ljava/lang/String;)V + <- ProjectBlue-1.2.10-GTNH.jar, ThaumicTinkerer-2.12.29.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.addPart (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lcodechicken/multipart/TMultiPart;)Lcodechicken/multipart/TileMultipart; + <- ProjectBlue-1.2.10-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TileMultipart.jPartList ()Ljava/util/List; + <- ProjectBlue-1.2.10-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar, gregtech-5.09.54.88.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TileMultipart.remPart (Lcodechicken/multipart/TMultiPart;)Lcodechicken/multipart/TileMultipart; + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/MultiPartRegistry.registerConverter (Lcodechicken/multipart/MultiPartRegistry$IPartConverter;)V + <- ThaumicTinkerer-2.12.29.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TMultiPart. ()V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.canAddPart (Lcodechicken/multipart/TMultiPart;)Z + <- OpenComputers-1.12.55-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.func_70296_d ()V + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.49-GTNH.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TileMultipart.notifyPartChange (Lcodechicken/multipart/TMultiPart;)V + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.partList ()Lscala/collection/Seq; + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar, guidenh-1.3.20.jar + codechicken/multipart/TileMultipart.partMap (I)Lcodechicken/multipart/TMultiPart; + <- ForgeRelocationFMP-0.2.0.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/microblock/BlockMicroMaterial.createAndRegister (Lnet/minecraft/block/Block;I)V + <- Natura-2.8.23.jar, TConstruct-1.14.97-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/JNormalOcclusion.getOcclusionBoxes ()Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TCuboidPart$class.$init$ (Lcodechicken/multipart/TCuboidPart;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TCuboidPart$class.drawBreaking (Lcodechicken/multipart/TCuboidPart;Lnet/minecraft/client/renderer/RenderBlocks;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TCuboidPart$class.getCollisionBoxes (Lcodechicken/multipart/TCuboidPart;)Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TCuboidPart$class.getSubParts (Lcodechicken/multipart/TCuboidPart;)Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TMultiPart.getType ()Ljava/lang/String; + <- ThaumicTinkerer-2.12.29.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TileMultipart.canReplacePart (Lcodechicken/multipart/TMultiPart;Lcodechicken/multipart/TMultiPart;)Z + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/microblock/MicroMaterialRegistry.getMaterial (Ljava/lang/String;)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- ProjectBlue-1.2.10-GTNH.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar + codechicken/multipart/IRedstonePart.strongPowerLevel (I)I + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/IRedstonePart.weakPowerLevel (I)I + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/JCuboidPart. ()V + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/JIconHitEffects$class.$init$ (Lcodechicken/multipart/JIconHitEffects;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/JIconHitEffects$class.getBreakingIcon (Lcodechicken/multipart/JIconHitEffects;Ljava/lang/Object;I)Lnet/minecraft/util/IIcon; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/MultiPartRegistry$.MODULE$ Lcodechicken/multipart/MultiPartRegistry$; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/MultipartGenerator.registerPassThroughInterface (Ljava/lang/String;)V + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/NormalOcclusionTest.apply (Lcodechicken/multipart/JNormalOcclusion;Lcodechicken/multipart/TMultiPart;)Z + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TFacePart$class.$init$ (Lcodechicken/multipart/TFacePart;)V + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TIconHitEffects$class.$init$ (Lcodechicken/multipart/TIconHitEffects;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TIconHitEffects$class.addDestroyEffects (Lcodechicken/multipart/TIconHitEffects;Lnet/minecraft/client/particle/EffectRenderer;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TIconHitEffects$class.addHitEffects (Lcodechicken/multipart/TIconHitEffects;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/client/particle/EffectRenderer;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.getCollisionBoxes ()Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, WitchingGadgets-1.8.49-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TMultiPart.load (Lnet/minecraft/nbt/NBTTagCompound;)V + <- OpenComputers-1.12.55-GTNH.jar, buildcraft-compat-7.1.22.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TMultiPart.occlusionTest (Lcodechicken/multipart/TMultiPart;)Z + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.save (Lnet/minecraft/nbt/NBTTagCompound;)V + <- OpenComputers-1.12.55-GTNH.jar, buildcraft-compat-7.1.22.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TNormalOcclusion$class.$init$ (Lcodechicken/multipart/TNormalOcclusion;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TNormalOcclusion$class.occlusionTest (Lcodechicken/multipart/TNormalOcclusion;Lcodechicken/multipart/TMultiPart;)Z + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TileMultipart$.MODULE$ Lcodechicken/multipart/TileMultipart$; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TileMultipart.canPlacePart (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lcodechicken/multipart/TMultiPart;)Z + <- ProjectBlue-1.2.10-GTNH.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.field_145848_d I + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TileMultipart.field_145849_e I + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TileMultipart.field_145851_c I + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TileMultipart.func_145831_w ()Lnet/minecraft/world/World; + <- ProjRed-4.12.41-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.getOrConvertTile (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;)Lcodechicken/multipart/TileMultipart; + <- appliedenergistics2-rv3-beta-1032-GTNH.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.markRender ()V + <- ProjRed-4.12.41-GTNH.jar, extrautilities-1.2.12.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/minecraft/McMetaPart. (I)V + <- ThaumicTinkerer-2.12.29.jar, WitchingGadgets-1.8.49-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getItem ()Lnet/minecraft/item/ItemStack; + <- ProjectBlue-1.2.10-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getStrength (Lnet/minecraft/entity/player/EntityPlayer;)F + <- ProjRed-4.12.41-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/Microblock.getSize ()I + <- ForgeRelocationFMP-0.2.0.jar, ProjRed-4.12.41-GTNH.jar + codechicken/microblock/Microblock.shape ()B + <- ProjRed-4.12.41-GTNH.jar, buildcraft-compat-7.1.22.jar + codechicken/microblock/Saw.getCuttingStrength (Lnet/minecraft/item/ItemStack;)I + <- IguanaTweaksTConstruct-2.7.12.jar, extrautilities-1.2.12.jar + codechicken/microblock/handler/MicroblockProxy$.MODULE$ Lcodechicken/microblock/handler/MicroblockProxy$; + <- IguanaTweaksTConstruct-2.7.12.jar, ProjRed-4.12.41-GTNH.jar + codechicken/microblock/handler/MicroblockProxy.sawDiamond ()Lnet/minecraft/item/Item; + <- ProjRed-4.12.41-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/IconHitEffects.addHitEffects (Lcodechicken/multipart/JIconHitEffects;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/client/particle/EffectRenderer;)V + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/JPartialOcclusion.getPartialOcclusionBoxes ()Ljava/lang/Iterable; + <- ForgeRelocationFMP-0.2.0.jar, WitchingGadgets-1.8.49-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerConverter (Lcodechicken/multipart/MultiPartRegistry$IPartConverter;)V + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerParts (Lcodechicken/multipart/MultiPartRegistry$IPartFactory;[Ljava/lang/String;)V + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/MultiPartRegistry.loadPart (Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/multipart/TMultiPart; + <- buildcraft-compat-7.1.22.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/MultipartGenerator.registerPassThroughInterface (Ljava/lang/String;ZZ)V + <- WitchingGadgets-1.8.49-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/MultipartHelper.sendDescPacket (Lnet/minecraft/world/World;Lnet/minecraft/tileentity/TileEntity;)V + <- BloodMagic-1.9.12.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/NormalOcclusionTest$.MODULE$ Lcodechicken/multipart/NormalOcclusionTest$; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/NormalOcclusionTest$.apply (Lscala/collection/Traversable;Lscala/collection/Traversable;)Z + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/PartMap.edgeBetween (II)I + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/RedstoneInteractions.getPowerTo (Lcodechicken/multipart/TMultiPart;I)I + <- ProjectBlue-1.2.10-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/TFacePart$class.redstoneConductionMap (Lcodechicken/multipart/TFacePart;)I + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TFacePart$class.solid (Lcodechicken/multipart/TFacePart;I)Z + <- OpenComputers-1.12.55-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TMultiPart.activate (Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/item/ItemStack;)Z + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.getDrops ()Ljava/lang/Iterable; + <- buildcraft-compat-7.1.22.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TMultiPart.onWorldJoin ()V + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.readDesc (Lcodechicken/lib/data/MCDataInput;)V + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.tile ()Lcodechicken/multipart/TileMultipart; + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TMultiPart.world ()Lnet/minecraft/world/World; + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TMultiPart.writeDesc (Lcodechicken/lib/data/MCDataOutput;)V + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.x ()I + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TMultiPart.y ()I + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TMultiPart.z ()I + <- ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TileMultipart$.addPart (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lcodechicken/multipart/TMultiPart;)Lcodechicken/multipart/TileMultipart; + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TileMultipart.dropItem (Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lcodechicken/lib/vec/Vector3;)V + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.dropItems (Ljava/lang/Iterable;)V + <- ProjectBlue-1.2.10-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TileMultipart.func_145838_q ()Lnet/minecraft/block/Block; + <- ForgeRelocationFMP-0.2.0.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TileMultipart.notifyNeighborChange (I)V + <- ProjRed-4.12.41-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/TileMultipart.onMoved ()V + <- ForgeRelocationFMP-0.2.0.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/minecraft/McMetaPart. ()V + <- ThaumicTinkerer-2.12.29.jar, extrautilities-1.2.12.jar + codechicken/multipart/minecraft/McMetaPart.load (Lnet/minecraft/nbt/NBTTagCompound;)V + <- ProjRed-4.12.41-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar + codechicken/multipart/minecraft/McMetaPart.meta B + <- ProjRed-4.12.41-GTNH.jar, buildcraft-compat-7.1.22.jar + codechicken/multipart/minecraft/McMetaPart.readDesc (Lcodechicken/lib/data/MCDataInput;)V + <- ProjRed-4.12.41-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar + codechicken/multipart/minecraft/McMetaPart.save (Lnet/minecraft/nbt/NBTTagCompound;)V + <- ProjRed-4.12.41-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar + codechicken/multipart/minecraft/McMetaPart.writeDesc (Lcodechicken/lib/data/MCDataOutput;)V + <- ProjRed-4.12.41-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar + codechicken/multipart/minecraft/PartMetaAccess. (Lcodechicken/multipart/minecraft/IPartMeta;)V + <- WitchingGadgets-1.8.49-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/BlockMicroMaterial$.MODULE$ Lcodechicken/microblock/BlockMicroMaterial$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/BlockMicroMaterial$.createAndRegister (Lnet/minecraft/block/Block;I)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/BlockMicroMaterial$.materialKey (Lnet/minecraft/block/Block;I)Ljava/lang/String; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/BlockMicroMaterial.block ()Lnet/minecraft/block/Block; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/BlockMicroMaterial.createAndRegister (Lnet/minecraft/block/Block;ILjava/lang/String;)V + <- TConstruct-1.14.97-GTNH.jar + codechicken/microblock/BlockMicroMaterial.getSound ()Lnet/minecraft/block/Block$SoundType; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/BlockMicroMaterial.meta ()I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/BlockMicroMaterial.renderMicroFace (Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;)V + <- extrautilities-1.2.12.jar + codechicken/microblock/CommonMicroClass.getClassId ()I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/CommonMicroblock.getBounds ()Lcodechicken/lib/vec/Cuboid6; + <- extrautilities-1.2.12.jar + codechicken/microblock/CommonMicroblock.getMaterial ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/CornerMicroClass$.MODULE$ Lcodechicken/microblock/CornerMicroClass$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/CornerMicroClass$.getClassId ()I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/EdgeMicroClass$.MODULE$ Lcodechicken/microblock/EdgeMicroClass$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/EdgeMicroClass$.getClassId ()I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/FaceMicroClass$.MODULE$ Lcodechicken/microblock/FaceMicroClass$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/FaceMicroClass$.aBounds ()[Lcodechicken/lib/vec/Cuboid6; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/FaceMicroClass$.getClassId ()I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/FaceMicroClass.aBounds ()[Lcodechicken/lib/vec/Cuboid6; + <- WR-CBE-1.7.12.jar + codechicken/microblock/FacePlacementGrid.getHitSlot (Lcodechicken/lib/vec/Vector3;I)I + <- ProjectBlue-1.2.10-GTNH.jar + codechicken/microblock/FacePlacementGrid.render (Lcodechicken/lib/vec/Vector3;I)V + <- ProjectBlue-1.2.10-GTNH.jar + codechicken/microblock/HollowMicroClass$.MODULE$ Lcodechicken/microblock/HollowMicroClass$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/HollowMicroClass$.getClassId ()I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/HollowMicroblock.getHollowSize ()I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/ISidedHollowConnect.getHollowSize (I)I + <- extrautilities-1.2.12.jar + codechicken/microblock/ItemMicroPart$.MODULE$ Lcodechicken/microblock/ItemMicroPart$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/ItemMicroPart$.create (II)Lnet/minecraft/item/ItemStack; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/ItemMicroPart$.create (ILjava/lang/String;)Lnet/minecraft/item/ItemStack; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/ItemMicroPart$.getMaterial (Lnet/minecraft/item/ItemStack;)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/ItemMicroPart$.getMaterialID (Lnet/minecraft/item/ItemStack;)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/ItemMicroPart.getMaterialID (Lnet/minecraft/item/ItemStack;)I + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper$.blockColour (I)Lcodechicken/microblock/MaterialRenderHelper$; + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper$.lighting ()Lcodechicken/microblock/MaterialRenderHelper$; + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper$.render ()V + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper.start (Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/render/uv/UVTransformation;)Lcodechicken/microblock/MaterialRenderHelper$; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$.MODULE$ Lcodechicken/microblock/MicroMaterialRegistry$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.getMaterial (I)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.materialID (Ljava/lang/String;)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.materialName (I)Ljava/lang/String; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.readMaterialID (Lcodechicken/lib/data/MCDataInput;)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.registerHighlightRenderer (Lcodechicken/microblock/MicroMaterialRegistry$IMicroHighlightRenderer;)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.registerMaterial (Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;Ljava/lang/String;)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$.writeMaterialID (Lcodechicken/lib/data/MCDataOutput;I)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.canRenderInPass (I)Z + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getBreakingIcon (I)Lnet/minecraft/util/IIcon; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getCutterStrength ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getLightValue ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getLocalizedName ()Ljava/lang/String; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.getSound ()Lnet/minecraft/block/Block$SoundType; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.isTransparent ()Z + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial.renderMicroFace (Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;)V + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.getIdMap ()[Lscala/Tuple2; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.getMaterial (I)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.getMaxCuttingStrength ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.materialID (Ljava/lang/String;)I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry.materialName (I)Ljava/lang/String; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroOcclusion.recalcBounds (Lcodechicken/microblock/JMicroShrinkRender;Lcodechicken/lib/vec/Cuboid6;)I + <- WR-CBE-1.7.12.jar + codechicken/microblock/MicroRecipe.create (IIII)Lnet/minecraft/item/ItemStack; + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroRecipe.findMaterial (Lnet/minecraft/item/ItemStack;)I + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroRecipe.getCraftingResult (Lnet/minecraft/inventory/InventoryCrafting;)Lnet/minecraft/item/ItemStack; + <- extrautilities-1.2.12.jar + codechicken/microblock/Microblock.getBounds ()Lcodechicken/lib/vec/Cuboid6; + <- extrautilities-1.2.12.jar + codechicken/microblock/Microblock.getIMaterial ()Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/Microblock.getMaterial ()I + <- extrautilities-1.2.12.jar + codechicken/microblock/Microblock.getShape ()I + <- buildcraft-compat-7.1.22.jar + codechicken/microblock/Microblock.shape_$eq (B)V + <- buildcraft-compat-7.1.22.jar + codechicken/microblock/MicroblockGenerator$.MODULE$ Lcodechicken/microblock/MicroblockGenerator$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroblockGenerator$.registerTrait (Ljava/lang/Class;)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroblockRender$.MODULE$ Lcodechicken/microblock/MicroblockRender$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroblockRender$.renderCuboid (Lcodechicken/lib/vec/Vector3;Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;ILcodechicken/lib/vec/Cuboid6;I)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroblockRender.renderCuboid (Lcodechicken/lib/vec/Vector3;Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;ILcodechicken/lib/vec/Cuboid6;I)V + <- extrautilities-1.2.12.jar + codechicken/microblock/Saw$class.$init$ (Lcodechicken/microblock/Saw;)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/Saw$class.getMaxCuttingStrength (Lcodechicken/microblock/Saw;)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/handler/MicroblockProxy$.itemMicro ()Lcodechicken/microblock/ItemMicroPart; + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/handler/MicroblockProxy$.sawDiamond ()Lnet/minecraft/item/Item; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/microblock/handler/MicroblockProxy$.sawIron ()Lnet/minecraft/item/Item; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/microblock/handler/MicroblockProxy$.sawStone ()Lnet/minecraft/item/Item; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/microblock/handler/MicroblockProxy$.useSawIcons ()Z + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/microblock/handler/MicroblockProxy.createSaw (Lcodechicken/lib/config/ConfigFile;Ljava/lang/String;I)Lnet/minecraft/item/Item; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/multipart/IFaceRedstonePart.getFace ()I + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/IFaceRedstonePart.strongPowerLevel (I)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/IFaceRedstonePart.weakPowerLevel (I)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/INeighborTileChange.onNeighborTileChanged (IZ)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/INeighborTileChange.weakTileChanges ()Z + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/IRedstonePart.canConnectRedstone (I)Z + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/IconHitEffects.addDestroyEffects (Lcodechicken/multipart/JIconHitEffects;Lnet/minecraft/client/particle/EffectRenderer;)V + <- WR-CBE-1.7.12.jar + codechicken/multipart/IconHitEffects.addDestroyEffects (Lcodechicken/multipart/JIconHitEffects;Lnet/minecraft/client/particle/EffectRenderer;Z)V + <- extrautilities-1.2.12.jar + codechicken/multipart/JCuboidPart.harvest (Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/entity/player/EntityPlayer;)V + <- extrautilities-1.2.12.jar + codechicken/multipart/JCuboidPart.load (Lnet/minecraft/nbt/NBTTagCompound;)V + <- extrautilities-1.2.12.jar + codechicken/multipart/JCuboidPart.onAdded ()V + <- WR-CBE-1.7.12.jar + codechicken/multipart/JCuboidPart.onWorldJoin ()V + <- extrautilities-1.2.12.jar + codechicken/multipart/JCuboidPart.read (Lcodechicken/lib/data/MCDataInput;)V + <- WR-CBE-1.7.12.jar + codechicken/multipart/JCuboidPart.save (Lnet/minecraft/nbt/NBTTagCompound;)V + <- extrautilities-1.2.12.jar + codechicken/multipart/JItemMultiPart. ()V + <- WR-CBE-1.7.12.jar + codechicken/multipart/JItemMultiPart.func_77658_a ()Ljava/lang/String; + <- WR-CBE-1.7.12.jar + codechicken/multipart/MultiPartRegistry$.createPart (Ljava/lang/String;Z)Lcodechicken/multipart/TMultiPart; + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerParts (Lcodechicken/multipart/MultiPartRegistry$IPartFactory2;Lscala/collection/Seq;)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerParts (Lcodechicken/multipart/MultiPartRegistry$IPartFactory2;[Ljava/lang/String;)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/MultiPartRegistry$.registerParts (Lscala/Function2;Lscala/collection/Seq;)V + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/MultipartGenerator$.MODULE$ Lcodechicken/multipart/MultipartGenerator$; + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/MultipartGenerator$.registerPassThroughInterface (Ljava/lang/String;)V + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/MultipartHelper.createTileFromNBT (Lnet/minecraft/world/World;Lnet/minecraft/nbt/NBTTagCompound;)Lnet/minecraft/tileentity/TileEntity; + <- BloodMagic-1.9.12.jar + codechicken/multipart/NormallyOccludedPart. (Lcodechicken/lib/vec/Cuboid6;)V + <- appliedenergistics2-rv3-beta-1032-GTNH.jar + codechicken/multipart/PartMap.face (I)Lcodechicken/multipart/PartMap; + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/PartMap.i I + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/PartMap.mask I + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/PartMap.values ()[Lcodechicken/multipart/PartMap; + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/RedstoneInteractions$.MODULE$ Lcodechicken/multipart/RedstoneInteractions$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/RedstoneInteractions$.connectionMask (Lcodechicken/multipart/TMultiPart;I)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/RedstoneInteractions$.getPowerTo (Lcodechicken/multipart/TMultiPart;I)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/RedstoneInteractions$.getPowerTo (Lnet/minecraft/world/World;IIIII)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/RedstoneInteractions$.otherConnectionMask (Lnet/minecraft/world/IBlockAccess;IIIIZ)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/RedstoneInteractions.getPowerTo (Lnet/minecraft/world/World;IIIII)I + <- extrautilities-1.2.12.jar + codechicken/multipart/TCuboidPart.getCollisionBoxes ()Ljava/lang/Iterable; + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TEdgePart$class.$init$ (Lcodechicken/multipart/TEdgePart;)V + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TFacePart.getSlotMask ()I + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TFacePart.solid (I)Z + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TItemMultiPart$class.$init$ (Lcodechicken/multipart/TItemMultiPart;)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TItemMultiPart$class.getHitDepth (Lcodechicken/multipart/TItemMultiPart;Lcodechicken/lib/vec/Vector3;I)D + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TItemMultiPart$class.onItemUse (Lcodechicken/multipart/TItemMultiPart;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;IIIIFFF)Z + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.getWriteStream ()Lcodechicken/lib/data/MCDataOutput; + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.invalidateConvertedTile ()V + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TMultiPart.onAdded ()V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.onNeighborChanged ()V + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TMultiPart.onPartChanged (Lcodechicken/multipart/TMultiPart;)V + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TMultiPart.onRemoved ()V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TMultiPart.onWorldSeparate ()V + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TMultiPart.update ()V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TileMultipart$.canPlacePart (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lcodechicken/multipart/TMultiPart;)Z + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/TileMultipart$.dropItem (Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lcodechicken/lib/vec/Vector3;)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TileMultipart$.getOrConvertTile (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;)Lcodechicken/multipart/TileMultipart; + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TileMultipart$.getTile (Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;)Lcodechicken/multipart/TileMultipart; + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/TileMultipart.bindPart (Lcodechicken/multipart/TMultiPart;)V + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TileMultipart.func_145829_t ()V + <- matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TileMultipart.func_145837_r ()Z + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TileMultipart.internalPartChange (Lcodechicken/multipart/TMultiPart;)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TileMultipart.multiPartChange (Ljava/util/Collection;)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/handler/MultipartProxy$.MODULE$ Lcodechicken/multipart/handler/MultipartProxy$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/handler/MultipartProxy$.block ()Lcodechicken/multipart/BlockMultipart; + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/handler/MultipartProxy.block ()Lcodechicken/multipart/BlockMultipart; + <- buildcraft-compat-7.1.22.jar + codechicken/multipart/handler/MultipartProxy.config ()Lcodechicken/lib/config/ConfigFile; + <- IguanaTweaksTConstruct-2.7.12.jar + codechicken/multipart/handler/MultipartSaveLoad$.MODULE$ Lcodechicken/multipart/handler/MultipartSaveLoad$; + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/handler/MultipartSaveLoad$.loadingWorld ()Lnet/minecraft/world/World; + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/ButtonPart. (I)V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/ButtonPart.activate (Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/item/ItemStack;)Z + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/ButtonPart.sideMetaMap [I + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/IPartMeta.getPos ()Lcodechicken/lib/vec/BlockCoord; + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/IPartMeta.getWorld ()Lnet/minecraft/world/World; + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/McMetaPart.invalidateConvertedTile ()V + <- WitchingGadgets-1.8.49-GTNH.jar + codechicken/multipart/minecraft/McMetaPart.update ()V + <- WitchingGadgets-1.8.49-GTNH.jar + codechicken/multipart/minecraft/McSidedMetaPart. (I)V + <- appliedenergistics2-rv3-beta-1032-GTNH.jar + codechicken/multipart/minecraft/McSidedMetaPart.onNeighborChanged ()V + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/PartMetaAccess.func_147438_o (III)Lnet/minecraft/tileentity/TileEntity; + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/TorchPart. ()V + <- chisel-2.17.32-GTNH.jar + codechicken/multipart/minecraft/TorchPart. (I)V + <- chisel-2.17.32-GTNH.jar + codechicken/multipart/minecraft/TorchPart.load (Lnet/minecraft/nbt/NBTTagCompound;)V + <- chisel-2.17.32-GTNH.jar + codechicken/multipart/minecraft/TorchPart.readDesc (Lcodechicken/lib/data/MCDataInput;)V + <- chisel-2.17.32-GTNH.jar + codechicken/multipart/minecraft/TorchPart.save (Lnet/minecraft/nbt/NBTTagCompound;)V + <- chisel-2.17.32-GTNH.jar + codechicken/multipart/minecraft/TorchPart.sideMetaMap [I + <- chisel-2.17.32-GTNH.jar + codechicken/multipart/minecraft/TorchPart.writeDesc (Lcodechicken/lib/data/MCDataOutput;)V + <- chisel-2.17.32-GTNH.jar + codechicken/multipart/scalatraits/TIInventoryTile.rebuildSlotMap ()V + <- appliedenergistics2-rv3-beta-1032-GTNH.jar + codechicken/multipart/scalatraits/TRedstoneTile.openConnections (I)I + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/scalatraits/TRedstoneTile.weakPowerLevel (I)I + <- extrautilities-1.2.12.jar + codechicken/multipart/scalatraits/TSlottedTile.v_partMap ()[Lcodechicken/multipart/TMultiPart; + <- OpenComputers-1.12.55-GTNH.jar + +== OTHER REFERENCED TYPES (new/cast/instanceof/field descriptors) == (76) + codechicken/multipart/TileMultipart + <- BloodMagic-1.9.12.jar, ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar, gregtech-5.09.54.88.jar, guidenh-1.3.20.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/TMultiPart + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, ThaumicTinkerer-2.12.29.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar, gregtech-5.09.54.88.jar, guidenh-1.3.20.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/MultiPartRegistry + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, ThaumicTinkerer-2.12.29.jar, WR-CBE-1.7.12.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/microblock/MicroMaterialRegistry + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.33-GTNH.jar, Natura-2.8.23.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, ThaumicTinkerer-2.12.29.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$IMicroMaterial + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.33-GTNH.jar, Natura-2.8.23.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar, ThaumicTinkerer-2.12.29.jar, buildcraft-compat-7.1.22.jar, chisel-2.17.32-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/BlockMicroMaterial + <- BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar, BloodArsenal-1.5.12.jar, Botania-1.13.33-GTNH.jar, Natura-2.8.23.jar, ProjRed-4.12.41-GTNH.jar, TConstruct-1.14.97-GTNH.jar, ThaumicTinkerer-2.12.29.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/Microblock + <- ForgeRelocationFMP-0.2.0.jar, ProjRed-4.12.41-GTNH.jar, buildcraft-compat-7.1.22.jar, extrautilities-1.2.12.jar + codechicken/multipart/JNormalOcclusion + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, WitchingGadgets-1.8.49-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/MultipartGenerator + <- WR-CBE-1.7.12.jar, WitchingGadgets-1.8.49-GTNH.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/TCuboidPart$class + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/microblock/ItemSaw + <- IguanaTweaksTConstruct-2.7.12.jar, ProjectBlue-1.2.10-GTNH.jar, endercore-0.5.14.jar + codechicken/microblock/handler/MicroblockProxy + <- IguanaTweaksTConstruct-2.7.12.jar, ProjRed-4.12.41-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/JIconHitEffects$class + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/MultiPartRegistry$ + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/NormalOcclusionTest + <- WR-CBE-1.7.12.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, extrautilities-1.2.12.jar + codechicken/multipart/PartMap + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/RedstoneInteractions + <- ProjectBlue-1.2.10-GTNH.jar, WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/TFacePart$class + <- OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar, ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/TIconHitEffects$class + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TNormalOcclusion$class + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TileMultipart$ + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar, ProjRed-4.12.41-GTNH.jar + codechicken/microblock/CommonMicroblock + <- ForgeRelocationFMP-0.2.0.jar, extrautilities-1.2.12.jar + codechicken/microblock/ItemMicroPart + <- ProjRed-4.12.41-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/Saw + <- IguanaTweaksTConstruct-2.7.12.jar, extrautilities-1.2.12.jar + codechicken/microblock/handler/MicroblockProxy$ + <- IguanaTweaksTConstruct-2.7.12.jar, ProjRed-4.12.41-GTNH.jar + codechicken/multipart/IRedstonePart + <- ProjRed-4.12.41-GTNH.jar, WR-CBE-1.7.12.jar + codechicken/multipart/IconHitEffects + <- WR-CBE-1.7.12.jar, extrautilities-1.2.12.jar + codechicken/multipart/JPartialOcclusion + <- ForgeRelocationFMP-0.2.0.jar, WitchingGadgets-1.8.49-GTNH.jar + codechicken/multipart/MultipartHelper + <- BloodMagic-1.9.12.jar, matter-manipulator-0.1.53-GTNH.jar + codechicken/multipart/NormalOcclusionTest$ + <- ForgeRelocationFMP-0.2.0.jar, OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/handler/MultipartProxy + <- IguanaTweaksTConstruct-2.7.12.jar, buildcraft-compat-7.1.22.jar + codechicken/multipart/minecraft/McMetaPart + <- ProjRed-4.12.41-GTNH.jar, buildcraft-compat-7.1.22.jar + codechicken/multipart/scalatraits/TRedstoneTile + <- ProjRed-4.12.41-GTNH.jar, extrautilities-1.2.12.jar + codechicken/microblock/BlockMicroMaterial$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/CommonMicroClass + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/CornerMicroClass$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/EdgeMicroClass$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/FaceMicroClass + <- WR-CBE-1.7.12.jar + codechicken/microblock/FaceMicroClass$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/FaceMicroblockClient + <- extrautilities-1.2.12.jar + codechicken/microblock/FacePlacementGrid + <- ProjectBlue-1.2.10-GTNH.jar + codechicken/microblock/HollowMicroClass$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/HollowMicroblock + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/HollowMicroblockClient + <- extrautilities-1.2.12.jar + codechicken/microblock/ISidedHollowConnect + <- extrautilities-1.2.12.jar + codechicken/microblock/ItemMicroPart$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MaterialRenderHelper + <- extrautilities-1.2.12.jar + codechicken/microblock/MaterialRenderHelper$ + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroMaterialRegistry$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroMaterialRegistry$IMicroHighlightRenderer + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroOcclusion + <- WR-CBE-1.7.12.jar + codechicken/microblock/MicroRecipe + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroblockGenerator + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroblockGenerator$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/MicroblockRender + <- extrautilities-1.2.12.jar + codechicken/microblock/MicroblockRender$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/microblock/Saw$class + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/IFaceRedstonePart + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/MultiPartRegistry$IPartConverter + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/MultiPartRegistry$IPartFactory + <- ProjectBlue-1.2.10-GTNH.jar + codechicken/multipart/MultipartGenerator$ + <- ForgeRelocationFMP-0.2.0.jar + codechicken/multipart/NormallyOccludedPart + <- appliedenergistics2-rv3-beta-1032-GTNH.jar + codechicken/multipart/RedstoneInteractions$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TCuboidPart + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/TEdgePart$class + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TFacePart + <- OpenComputers-1.12.55-GTNH.jar + codechicken/multipart/TItemMultiPart$class + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/handler/MultipartProxy$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/handler/MultipartSaveLoad$ + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/ButtonPart + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/IPartMeta + <- extrautilities-1.2.12.jar + codechicken/multipart/minecraft/McSidedMetaPart + <- ProjRed-4.12.41-GTNH.jar + codechicken/multipart/minecraft/PartMetaAccess + <- WitchingGadgets-1.8.49-GTNH.jar + codechicken/multipart/minecraft/TorchPart + <- chisel-2.17.32-GTNH.jar + codechicken/multipart/scalatraits/TIInventoryTile + <- appliedenergistics2-rv3-beta-1032-GTNH.jar + codechicken/multipart/scalatraits/TSlottedTile + <- OpenComputers-1.12.55-GTNH.jar + +== STRING CONSTANTS (reflection / registration candidates) == (20) + codechicken.multipart.TileMultipart + <- Galacticraft-3.4.33-GTNH.jar, Schematica-1.12.6-GTNH.jar, ae2fc-1.5.102-gtnh.jar, appliedenergistics2-rv3-beta-1032-GTNH.jar, guidenh-1.3.20.jar + codechicken.microblock.MicroMaterialRegistry + <- Galacticraft-3.4.33-GTNH.jar, Schematica-1.12.6-GTNH.jar, guidenh-1.3.20.jar + codechicken.microblock.BlockMicroMaterial + <- Galacticraft-3.4.33-GTNH.jar, guidenh-1.3.20.jar + codechicken.microblock.MicroblockClass + <- Schematica-1.12.6-GTNH.jar, guidenh-1.3.20.jar + codechicken.multipart.BlockMultipart + <- Waila-1.19.31.jar, guidenh-1.3.20.jar + codechicken.multipart.MultipartGenerator$ + <- Schematica-1.12.6-GTNH.jar, guidenh-1.3.20.jar + codechicken.microblock.BlockMicroMaterial$ + <- guidenh-1.3.20.jar + codechicken.microblock.MicroMaterialRegistry$ + <- guidenh-1.3.20.jar + codechicken.microblock.Microblock + <- guidenh-1.3.20.jar + codechicken.microblock.MicroblockClient + <- guidenh-1.3.20.jar + codechicken.microblock.MicroblockGenerator$ + <- guidenh-1.3.20.jar + codechicken.multipart.MultiPartRegistry$ + <- Schematica-1.12.6-GTNH.jar + codechicken.multipart.MultipartGenerator + <- guidenh-1.3.20.jar + codechicken.multipart.MultipartHelper + <- guidenh-1.3.20.jar + codechicken.multipart.MultipartHelper$ + <- guidenh-1.3.20.jar + codechicken.multipart.MultipartRenderer + <- guidenh-1.3.20.jar + codechicken.multipart.MultipartRenderer$ + <- guidenh-1.3.20.jar + codechicken.multipart.TMultiPart + <- Schematica-1.12.6-GTNH.jar + codechicken.multipart.TileMultipartClient + <- guidenh-1.3.20.jar + codechicken.multipart.minecraft.ButtonPart + <- etfuturum-2.6.52-GTNH.jar + diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaAppliedTypeDescriptor.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaAppliedTypeDescriptor.scala new file mode 100644 index 0000000..98f28f9 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaAppliedTypeDescriptor.scala @@ -0,0 +1,22 @@ +package codechicken.multipart.compat + +import java.util.function.Supplier + +import codechicken.multipart.asm.ScalaSignature + +class ReferenceScalaAppliedTypeDescriptor { + def ref( + sig: ScalaSignature, + names: Supplier[String], + arguments: List[ScalaSignature#TypeRef] + ): ScalaSignature#TypeRefType = + new sig.TypeRefType( + null, + null, + arguments.asInstanceOf[List[sig.TypeRef]] + ) { + override def name = names.get() + } + + def descriptor(ref: ScalaSignature#TypeRefType): String = ref.jDesc +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaBlockMicroMaterialConsumer.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaBlockMicroMaterialConsumer.scala new file mode 100644 index 0000000..95c2e69 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaBlockMicroMaterialConsumer.scala @@ -0,0 +1,20 @@ +package codechicken.multipart.compat + +import codechicken.microblock.BlockMicroMaterial +import codechicken.microblock.MaterialRenderHelper + +/** Compiled against the reference dev jar. Calls the BlockMicroMaterial and MaterialRenderHelper companion methods + * used by downstream Scala code. + */ +class ReferenceScalaBlockMicroMaterialConsumer { + def materialKey(name: String, meta: Int): String = BlockMicroMaterial.materialKey(name, meta) + + def constructorDefault: Int = BlockMicroMaterial.$lessinit$greater$default$2 + + def registrationDefault: Int = BlockMicroMaterial.createAndRegister$default$2 + + def helperPass(value: Int): Int = { + MaterialRenderHelper.pass = value + MaterialRenderHelper.pass + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaClassParent.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaClassParent.scala new file mode 100644 index 0000000..a753673 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaClassParent.scala @@ -0,0 +1,32 @@ +package codechicken.multipart.compat + +import java.util.function.Supplier + +import codechicken.multipart.asm.ScalaSignature + +class ReferenceScalaClassParent { + def classType( + sig: ScalaSignature, + parents: List[ScalaSignature#TypeRef] + ): ScalaSignature#ClassType = new sig.ClassType(null, parents.asInstanceOf[List[sig.TypeRef]]) + + def info( + sig: ScalaSignature, + read: Supplier[ScalaSignature#TypeRef] + ): ScalaSignature#ClassType = new sig.ClassType(null, Nil) { + override def parent = read.get().asInstanceOf[sig.TypeRef] + } + + def ref( + sig: ScalaSignature, + infos: Supplier[ScalaSignature#ClassType] + ): ScalaSignature#ClassSymbolRef = new sig.ClassSymbolRef { + def name = "unused" + def owner = null + def flags = 0 + def infoId = 0 + override def info = infos.get().asInstanceOf[sig.ClassType] + } + + def parent(ref: ScalaSignature#ClassSymbolRef): String = ref.jParent +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaClassSymbolFull.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaClassSymbolFull.scala new file mode 100644 index 0000000..eeb1c1a --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaClassSymbolFull.scala @@ -0,0 +1,20 @@ +package codechicken.multipart.compat + +import java.util.function.Supplier + +import codechicken.multipart.asm.ScalaSignature + +class ReferenceScalaClassSymbolFull { + def ref( + sig: ScalaSignature, + owners: Supplier[ScalaSignature#SymbolRef], + names: Supplier[String] + ): ScalaSignature#ClassSymbolRef = new sig.ClassSymbolRef { + def name = names.get() + def owner = owners.get().asInstanceOf[sig.SymbolRef] + def flags = 0 + def infoId = 0 + } + + def full(ref: ScalaSignature#ClassSymbolRef): String = ref.full +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaCornerMicroblock.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaCornerMicroblock.scala new file mode 100644 index 0000000..99bb77f --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaCornerMicroblock.scala @@ -0,0 +1,23 @@ +package codechicken.multipart.compat + +import codechicken.microblock.{CornerMicroblock, Microblock} + +/** Frozen corner-trait forwarders with observable virtual shape access. */ +class ReferenceScalaCornerMicroblock extends Microblock(29) with CornerMicroblock { + var writes = 0 + var writtenShape: Byte = 0 + var reads = 0 + var overrideShape = false + var selectedShape = 0 + + override def shape_$eq(value: Byte) { + writes += 1 + writtenShape = value + super.shape_$eq(value) + } + + override def getShape = { + reads += 1 + if (overrideShape) selectedShape else super.getShape + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaCuboidPart.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaCuboidPart.scala new file mode 100644 index 0000000..899788a --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaCuboidPart.scala @@ -0,0 +1,13 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.Cuboid6 +import codechicken.multipart.TCuboidPart + +/** Mixes in TCuboidPart without overriding anything it supplies, so the compiled forwarders call + * TCuboidPart$class.$init$, getSubParts, getCollisionBoxes and drawBreaking directly. + */ +class ReferenceScalaCuboidPart extends TCuboidPart { + def getType = "test:reference-cuboid" + + def getBounds = new Cuboid6(0, 0, 0, 0.5, 0.5, 0.5) +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaEdgeMicroblock.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaEdgeMicroblock.scala new file mode 100644 index 0000000..da8c464 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaEdgeMicroblock.scala @@ -0,0 +1,23 @@ +package codechicken.multipart.compat + +import codechicken.microblock.{EdgeMicroblock, Microblock} + +/** Frozen edge-trait forwarders with observable virtual shape access. */ +class ReferenceScalaEdgeMicroblock extends Microblock(29) with EdgeMicroblock { + var writes = 0 + var writtenShape: Byte = 0 + var reads = 0 + var overrideShape = false + var selectedShape = 0 + + override def shape_$eq(value: Byte) { + writes += 1 + writtenShape = value + super.shape_$eq(value) + } + + override def getShape = { + reads += 1 + if (overrideShape) selectedShape else super.getShape + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaEdgePart.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaEdgePart.scala new file mode 100644 index 0000000..888d4ca --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaEdgePart.scala @@ -0,0 +1,12 @@ +package codechicken.multipart.compat + +import codechicken.multipart.{TEdgePart, TMultiPart} + +/** Mixes in TEdgePart without overriding what it supplies, so the compiled forwarder calls + * TEdgePart$class.conductsRedstone and the constructor calls TEdgePart$class.$init$. + */ +class ReferenceScalaEdgePart extends TMultiPart with TEdgePart { + def getType = "test:reference-edge" + + def getSlotMask = 1 << 15 +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaFaceMicroblockClient.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaFaceMicroblockClient.scala new file mode 100644 index 0000000..21f41ec --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaFaceMicroblockClient.scala @@ -0,0 +1,39 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.Cuboid6 +import codechicken.microblock._ +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial + +/** Frozen face-client implementor; its forwarder invokes FaceMicroblockClient$class.render. */ +class ReferenceScalaFaceMicroblockClient extends Microblock(37) with FaceMicroblockClient { + val events = new java.util.ArrayList[String]() + var selectedMaterial: IMicroMaterial = _ + var bounds = new Cuboid6(0, 0, 0, 1, 0.25, 1) + var transparent = false + var selectedSlot = 0 + var slotAdvance = 0 + + def microClass: CommonMicroClass = null + + override def getIMaterial = { + events.add("material") + selectedMaterial + } + + override def isTransparent = { + events.add("transparent") + transparent + } + + def getBounds = { + events.add("bounds") + bounds + } + + override def getSlot = { + events.add("slot:" + selectedSlot) + val slot = selectedSlot + selectedSlot += slotAdvance + slot + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaFacePart.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaFacePart.scala new file mode 100644 index 0000000..f34a625 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaFacePart.scala @@ -0,0 +1,12 @@ +package codechicken.multipart.compat + +import codechicken.multipart.{TFacePart, TMultiPart} + +/** Mixes in TFacePart without overriding either supplied member, so the compiled forwarders call + * TFacePart$class.solid, TFacePart$class.redstoneConductionMap and TFacePart$class.$init$. + */ +class ReferenceScalaFacePart extends TMultiPart with TFacePart { + def getType = "test:reference-face" + + def getSlotMask = 0x3f +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblock.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblock.scala new file mode 100644 index 0000000..941fd3f --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblock.scala @@ -0,0 +1,56 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.Cuboid6 +import codechicken.microblock.{HollowMicroblock, Microblock} +import codechicken.multipart.{TMultiPart, TileMultipart} + +abstract class ReferenceHollowMicroblockBase extends Microblock(0) { + var events: java.util.List[String] = new java.util.ArrayList[String]() + var superResult = true + var superFailure = false + override def occlusionTest(part: TMultiPart): Boolean = { + events.add("super") + if (superFailure) throw new IllegalStateException("super failure") + superResult + } +} + +/** Frozen forwarders retain the real Scala trait super chain and observable virtual getters. */ +class ReferenceScalaHollowMicroblock extends ReferenceHollowMicroblockBase with HollowMicroblock { + var firstTile: TileMultipart = null + var secondTile: TileMultipart = null + var tileReads = 0 + var firstShape: Byte = 48 + var secondShape: Byte = 48 + var shapeReads = 0 + var slot = 0 + var overrideSize = false + var hollowSize = 8 + var overrideCollision = false + var collision: java.util.List[Cuboid6] = null + var normal: java.lang.Iterable[Cuboid6] = java.util.Collections.singletonList(Cuboid6.full) + + override def tile = { + events.add("tile") + tileReads += 1 + if (tileReads == 1) firstTile else secondTile + } + override def shape = { + events.add("shape") + shapeReads += 1 + if (shapeReads == 1) firstShape else secondShape + } + override def getSlot = { events.add("slot"); slot } + override def getHollowSize = { + events.add("size") + if (overrideSize) hollowSize else super.getHollowSize + } + override def getCollisionBoxes: java.util.List[Cuboid6] = { + events.add("collision") + if (overrideCollision) collision else super.getCollisionBoxes + } + override def getOcclusionBoxes: java.lang.Iterable[Cuboid6] = { + events.add("normal:self") + normal + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblockClient.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblockClient.scala new file mode 100644 index 0000000..09948e0 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaHollowMicroblockClient.scala @@ -0,0 +1,53 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.{Cuboid6, Vector3} +import codechicken.microblock.{CommonMicroblockClient, HollowMicroblockClient, Microblock} +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial + +abstract class ReferenceHollowClientBase extends Microblock(41) with CommonMicroblockClient { + var events: java.util.List[String] = new java.util.ArrayList[String]() + var failSuper = false + var superMask = 0x12345665 + renderMask = 0x123401 + override def recalcBounds() { + events.add("super") + renderMask = superMask + if (failSuper) throw new IllegalStateException("super") + } +} + +/** Frozen client forwarders expose the original trait linearization and render callback dispatch. */ +class ReferenceScalaHollowMicroblockClient extends ReferenceHollowClientBase with HollowMicroblockClient { + var bounds = new Cuboid6(0.1, 0.2, 0.3, 0.9, 0.8, 0.7) + var selectedMaterial: IMicroMaterial = null + var transparent = false + var slot = 0 + var slotAdvance = 0 + var hollowSize = 8 + var changeMaskOnSize = false + var rawShape: Byte = 48 + var shapeAdvance = 0 + var runHollow = false + var afterHollow: Runnable = null + var draws: java.util.List[Array[Object]] = new java.util.ArrayList[Array[Object]]() + override def getBounds = { events.add("bounds"); bounds } + override def getIMaterial = { events.add("material"); selectedMaterial } + override def isTransparent = { events.add("transparent"); transparent } + override def getSlot = { events.add("slot"); val result = slot; slot += slotAdvance; result } + override def getHollowSize = { + events.add("size") + if (changeMaskOnSize) renderMask = 0xdeadbeef + hollowSize + } + override def shape = { events.add("shape"); val result = rawShape; rawShape = (rawShape + shapeAdvance).toByte; result } + override def x = { events.add("x"); 2 } + override def y = { events.add("y"); -3 } + override def z = { events.add("z"); 4 } + override def renderHollow(pos: Vector3, pass: Int, c: Cuboid6, mask: Int, face: Boolean, + f: (Vector3, IMicroMaterial, Int, Cuboid6, Int) => Unit) { + events.add("hollow") + draws.add(Array[Object](pos, Int.box(pass), c, Int.box(mask), Boolean.box(face), f)) + if (afterHollow != null) afterHollow.run() + if (runHollow) super.renderHollow(pos, pass, c, mask, face, f) + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaIconHitEffects.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaIconHitEffects.scala new file mode 100644 index 0000000..8c75bff --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaIconHitEffects.scala @@ -0,0 +1,22 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.Cuboid6 +import codechicken.multipart.{TIconHitEffects, TMultiPart} +import net.minecraft.util.IIcon + +/** Mixes in TIconHitEffects without overriding anything it or JIconHitEffects supplies, so the compiled forwarders + * call TIconHitEffects$class.addHitEffects, TIconHitEffects$class.addDestroyEffects, TIconHitEffects$class.$init$, + * JIconHitEffects$class.getBreakingIcon and JIconHitEffects$class.$init$. + */ +class ReferenceScalaIconHitEffects extends TMultiPart with TIconHitEffects { + var lastSide = -1 + + def getType = "test:reference-icon-hit" + + def getBounds = new Cuboid6(0, 0, 0, 1, 1, 1) + + def getBrokenIcon(side: Int): IIcon = { + lastSide = side + null + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaInterfaceNames.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaInterfaceNames.scala new file mode 100644 index 0000000..6de7103 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaInterfaceNames.scala @@ -0,0 +1,23 @@ +package codechicken.multipart.compat + +import java.util.function.Supplier + +import codechicken.multipart.asm.ScalaSignature + +class ReferenceScalaInterfaceNames { + def info( + sig: ScalaSignature, + read: Supplier[List[ScalaSignature#TypeRef]] + ): ScalaSignature#ClassType = new sig.ClassType(null, Nil) { + override def interfaces = read.get().asInstanceOf[List[sig.TypeRef]] + } + + def symbol( + sig: ScalaSignature, + read: Supplier[ScalaSignature#ClassType] + ): ScalaSignature#ClassSymbolRef = new sig.ClassSymbol("unused", null, 0, -1) { + override def info = read.get().asInstanceOf[sig.ClassType] + } + + def names(ref: ScalaSignature#ClassSymbolRef): List[String] = ref.jInterfaces +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaItemMicroPartConsumer.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaItemMicroPartConsumer.scala new file mode 100644 index 0000000..10c9923 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaItemMicroPartConsumer.scala @@ -0,0 +1,20 @@ +package codechicken.multipart.compat + +import codechicken.microblock.ItemMicroPart +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial +import net.minecraft.item.ItemStack + +/** Compiled against the reference dev jar. Exercises the ItemMicroPart companion methods used by ProjRed. */ +class ReferenceScalaItemMicroPartConsumer { + def createById(damage: Int, material: Int): ItemStack = + ItemMicroPart.create(damage, material) + + def createByName(damage: Int, material: String): ItemStack = + ItemMicroPart.create(damage, material) + + def material(stack: ItemStack): IMicroMaterial = + ItemMicroPart.getMaterial(stack) + + def materialId(stack: ItemStack): Int = + ItemMicroPart.getMaterialID(stack) +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaItemMultiPart.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaItemMultiPart.scala new file mode 100644 index 0000000..20376fc --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaItemMultiPart.scala @@ -0,0 +1,29 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.{BlockCoord, Vector3} +import codechicken.multipart.{TItemMultiPart, TMultiPart} +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.item.{Item, ItemStack} +import net.minecraft.world.World + +/** Mixes in TItemMultiPart without overriding anything it supplies, so the compiled forwarders call + * TItemMultiPart$class.getHitDepth, TItemMultiPart$class.onItemUse and TItemMultiPart$class.$init$. + * + * newPart records each attempted position and returns null, which is the short-circuit that keeps placement from + * touching the world. + */ +class ReferenceScalaItemMultiPart extends Item with TItemMultiPart { + var attempts = "" + + def newPart( + item: ItemStack, + player: EntityPlayer, + world: World, + pos: BlockCoord, + side: Int, + vhit: Vector3 + ): TMultiPart = { + attempts += s"${pos.x},${pos.y},${pos.z};" + null + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolDescriptor.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolDescriptor.scala new file mode 100644 index 0000000..93b0c1c --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolDescriptor.scala @@ -0,0 +1,16 @@ +package codechicken.multipart.compat + +import java.util.function.Supplier + +import codechicken.multipart.asm.ScalaSignature + +class ReferenceScalaMethodSymbolDescriptor { + def ref( + sig: ScalaSignature, + infos: Supplier[ScalaSignature#TMethodType] + ): ScalaSignature#MethodSymbol = new sig.MethodSymbol(null, null, 0, 0) { + override def info = infos.get().asInstanceOf[sig.TMethodType] + } + + def descriptor(ref: ScalaSignature#MethodSymbol): String = ref.jDesc +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolFull.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolFull.scala new file mode 100644 index 0000000..9bf364e --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolFull.scala @@ -0,0 +1,7 @@ +package codechicken.multipart.compat + +import codechicken.multipart.asm.ScalaSignature + +class ReferenceScalaMethodSymbolFull { + def full(ref: ScalaSignature#MethodSymbol): String = ref.full +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolInfo.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolInfo.scala new file mode 100644 index 0000000..d818a0a --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMethodSymbolInfo.scala @@ -0,0 +1,7 @@ +package codechicken.multipart.compat + +import codechicken.multipart.asm.ScalaSignature + +class ReferenceScalaMethodSymbolInfo { + def info(ref: ScalaSignature#MethodSymbol): ScalaSignature#TMethodType = ref.info +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMicroMaterialConsumer.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMicroMaterialConsumer.scala new file mode 100644 index 0000000..344e25f --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMicroMaterialConsumer.scala @@ -0,0 +1,21 @@ +package codechicken.multipart.compat + +import codechicken.microblock.MicroMaterialRegistry +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial + +/** Compiled against the reference dev jar. Reads MicroMaterialRegistry$.MODULE$ and calls the instance methods ProjRed + * links against, plus the Tuple2-array getIdMap that extrautilities links against. + */ +class ReferenceScalaMicroMaterialConsumer { + def materialAt(id: Int): IMicroMaterial = MicroMaterialRegistry.getMaterial(id) + + def idOf(name: String): Int = MicroMaterialRegistry.materialID(name) + + def nameOf(id: Int): String = MicroMaterialRegistry.materialName(id) + + /** Exercises the raw scala.Tuple2 array descriptor rather than the accessors. */ + def idMapEntry(id: Int): String = { + val entry = MicroMaterialRegistry.getIdMap.apply(id) + entry._1 + "=" + (entry._2 eq materialAt(id)) + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMicroblockTraits.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMicroblockTraits.scala new file mode 100644 index 0000000..a98202c --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMicroblockTraits.scala @@ -0,0 +1,37 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.{Cuboid6, Vector3} +import codechicken.microblock._ +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial + +/** Frozen concrete consumer of the three traits and their generated helper bridges. */ +class ReferenceScalaMicroblockTraits extends Microblock(23) with CommonMicroblockClient { + val events = new java.util.ArrayList[String]() + var selectedMaterial: IMicroMaterial = _ + var selectedClass: CommonMicroClass = _ + var bounds = new Cuboid6(0, 0, 0, 1, 0.5, 1) + var overrideSlot = false + var selectedSlot = 0 + var commonRender = false + var renderedPosition: Vector3 = _ + + override def getIMaterial = { + events.add("material") + selectedMaterial + } + + def microClass = selectedClass + + def getBounds = { + events.add("bounds") + bounds + } + + override def getSlot = if (overrideSlot) selectedSlot else super.getSlot + + override def render(pos: Vector3, pass: Int) { + events.add("render:" + pass) + renderedPosition = pos + if (commonRender) super.render(pos, pass) + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMultipartGeneratorConsumer.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMultipartGeneratorConsumer.scala new file mode 100644 index 0000000..828aaf8 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMultipartGeneratorConsumer.scala @@ -0,0 +1,12 @@ +package codechicken.multipart.compat + +import codechicken.multipart.{MultipartGenerator, TMultiPart, TileMultipart} +import net.minecraft.tileentity.TileEntity + +/** Frozen against Scala: companion-only generation and singleton pass-through registration. */ +class ReferenceScalaMultipartGeneratorConsumer { + def create(tile: TileEntity, parts: Iterable[TMultiPart], client: Boolean): TileMultipart = + MultipartGenerator.generateCompositeTile(tile, parts, client) + + def register(name: String): Unit = MultipartGenerator.registerPassThroughInterface(name) +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMultipartSaveLoadConsumer.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMultipartSaveLoadConsumer.scala new file mode 100644 index 0000000..7cc72e9 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaMultipartSaveLoadConsumer.scala @@ -0,0 +1,15 @@ +package codechicken.multipart.compat + +import codechicken.multipart.handler.MultipartSaveLoad +import net.minecraft.world.World + +/** Compiled against the reference dev jar. Reads MultipartSaveLoad$.MODULE$ and calls the loadingWorld getter/setter + * that ProjectRed links against. + */ +class ReferenceScalaMultipartSaveLoadConsumer { + def loadingWorld: World = MultipartSaveLoad.loadingWorld + + def loadingWorld_=(world: World) { + MultipartSaveLoad.loadingWorld = world + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaNormalOcclusion.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaNormalOcclusion.scala new file mode 100644 index 0000000..b9c6db4 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaNormalOcclusion.scala @@ -0,0 +1,15 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.Cuboid6 +import codechicken.multipart.{TMultiPart, TNormalOcclusion} + +/** Mixes in TNormalOcclusion without overriding occlusionTest, so the compiled class carries the generated + * codechicken$multipart$TNormalOcclusion$$super$occlusionTest accessor and forwards occlusionTest to + * TNormalOcclusion$class. + */ +class ReferenceScalaNormalOcclusion extends TMultiPart with TNormalOcclusion { + def getType = "test:reference-normal-occlusion" + + def getOcclusionBoxes: java.lang.Iterable[Cuboid6] = + java.util.Collections.singletonList(new Cuboid6(0, 0, 0, 0.5, 1, 1)) +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaPostMicroblock.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaPostMicroblock.scala new file mode 100644 index 0000000..9acc25c --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaPostMicroblock.scala @@ -0,0 +1,55 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.Cuboid6 +import codechicken.microblock.{CommonMicroblock, CommonMicroClass, Microblock, PostMicroblock} +import codechicken.multipart.TMultiPart + +/** A real superclass predecessor for the frozen PostMicroblock super accessor. */ +abstract class ReferencePostMicroblockBase extends Microblock(31) { + var events: java.util.List[String] = new java.util.ArrayList[String]() + var label = "self" + var superResult = true + var superFailure = false + + override def occlusionTest(part: TMultiPart): Boolean = { + events.add("super:" + label) + if (superFailure) throw new IllegalStateException("super failure") + superResult + } +} + +/** Frozen trait forwarders with observable virtual calls and an actual super chain. */ +class ReferenceScalaPostMicroblock extends ReferencePostMicroblockBase with PostMicroblock { + var selectedShape = 0 + var selectedBounds: Cuboid6 = Cuboid6.full.copy + var replacementBoxes: java.util.List[Cuboid6] = null + + override def getShape = { + events.add("shape:" + label) + selectedShape + } + + override def getBounds = { + events.add("bounds:" + label) + selectedBounds + } + + override def getType = { + events.add("type:" + label) + "mcr_face" + } + + override def getOcclusionBoxes: java.util.List[Cuboid6] = { + events.add("boxes:" + label) + if (replacementBoxes == null) super.getOcclusionBoxes else replacementBoxes + } +} + +class ReferencePostFace extends Microblock(0) with CommonMicroblock { + var events: java.util.List[String] = new java.util.ArrayList[String]() + var slot = 0 + def microClass: CommonMicroClass = null + override def getType = { events.add("type:face"); "mcr_face" } + override def getSlot = { events.add("slot:face"); slot } + def getBounds = { events.add("bounds:face"); Cuboid6.full } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaPostMicroblockClient.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaPostMicroblockClient.scala new file mode 100644 index 0000000..6b652f6 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaPostMicroblockClient.scala @@ -0,0 +1,67 @@ +package codechicken.multipart.compat + +import codechicken.lib.data.MCDataInput +import codechicken.lib.vec.Cuboid6 +import codechicken.microblock.{Microblock, PostMicroblock, PostMicroblockClient} +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial +import codechicken.multipart.TMultiPart + +abstract class ReferencePostClientBase extends Microblock(41) { + var events: java.util.List[String] = new java.util.ArrayList[String]() + var failSuper = false + var seenPacket: MCDataInput = null + override def onAdded() { events.add("superAdded"); if (failSuper) throw new IllegalStateException("super") } + override def read(packet: MCDataInput) { + events.add("superRead") + if (failSuper) throw new IllegalStateException("super") + seenPacket = packet + } + override def onPartChanged(part: TMultiPart) { events.add("superChanged") } +} + +/** Frozen client forwarders with observable virtual dispatch, equality and lifecycle predecessors. */ +class ReferenceScalaPostMicroblockClient extends ReferencePostClientBase with PostMicroblockClient { + var label = "self" + var selectedMaterial: IMicroMaterial = null + var bounds = new Cuboid6(0.375, 0, 0.375, 0.625, 1, 0.625) + var selectedSize = 2 + var sizeAdvance = 0 + var selectedShape = 0 + var shapeAdvance = 0 + var transparent = false + var flipTransparency = false + var runRecalc = true + var runShrinks = true + var forceEquality = false + var equalityResult = false + + override def getIMaterial = { events.add("material"); selectedMaterial } + override def getBounds = { events.add("bounds:" + label); bounds } + override def getSize = { + events.add("size:" + label) + val result = selectedSize + selectedSize += sizeAdvance + result + } + override def getShape = { + events.add("shape:" + label) + val result = selectedShape + selectedShape += shapeAdvance + result + } + override def isTransparent = { + events.add("transparent:" + label) + val result = transparent + if (flipTransparency) transparent = !transparent + result + } + override def tile = { events.add("tile:" + label); super.tile } + override def recalcBounds() { events.add("recalc"); if (runRecalc) super.recalcBounds() } + override def shrinkFace(side: Int) { events.add("face:" + side); if (runShrinks) super.shrinkFace(side) } + override def shrinkPost(post: PostMicroblock) { events.add("post"); if (runShrinks) super.shrinkPost(post) } + override def equals(other: Any): Boolean = { + events.add("equals:" + label) + if (forceEquality) equalityResult else super.equals(other) + } + override def hashCode = System.identityHashCode(this) +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaSaw.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaSaw.scala new file mode 100644 index 0000000..fef23ee --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaSaw.scala @@ -0,0 +1,15 @@ +package codechicken.multipart.compat + +import codechicken.microblock.Saw +import net.minecraft.item.{Item, ItemStack} + +/** Mixes in Saw without overriding getMaxCuttingStrength, so the compiled forwarder calls + * Saw$class.getMaxCuttingStrength and the constructor calls Saw$class.$init$. + * + * getCuttingStrength reports whether the stack it was handed actually wraps this item, so the test can prove the + * bridge built the stack rather than only that it linked. + */ +class ReferenceScalaSaw extends Item with Saw { + def getCuttingStrength(item: ItemStack): Int = + if (item != null && (item.getItem eq this)) 7 else -1 +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusion.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusion.scala new file mode 100644 index 0000000..514b289 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusion.scala @@ -0,0 +1,45 @@ +package codechicken.multipart.compat + +import codechicken.lib.vec.Cuboid6 +import codechicken.microblock.TMicroOcclusion +import codechicken.multipart.TMultiPart + +abstract class ReferenceMicroOcclusionBase extends TMultiPart { + var events: java.util.List[String] = new java.util.ArrayList[String]() + var label = "self" + var superResult = true + var superFailure = false + override def occlusionTest(other: TMultiPart): Boolean = { + events.add("super:" + label) + if (superFailure) throw new IllegalStateException("super") + superResult + } +} + +/** Frozen Scala trait forwarders with a real superclass and observable virtual calls. */ +class ReferenceScalaTMicroOcclusion extends ReferenceMicroOcclusionBase with TMicroOcclusion { + var slot = 0 + var slotAdvance = 0 + var size = 5 + var material = 0 + var failOn = "" + var useActualEdge = true + var edgeResult = true + var seenEdge: TMicroOcclusion = null + var seenCorner: TMicroOcclusion = null + def getType = "test:micro_occlusion" + def getBounds: Cuboid6 = throw new AssertionError("bounds must not be read") + private def record(name: String) { + events.add(name + ":" + label) + if (failOn == name) throw new IllegalStateException(name) + } + def getSlot = { record("slot"); val result = slot; slot += slotAdvance; result } + def getSize = { record("size"); size } + def getMaterial = { record("material"); material } + override def edgeCornerOcclusionTest(edge: TMicroOcclusion, corner: TMicroOcclusion): Boolean = { + record("edge") + seenEdge = edge + seenCorner = corner + if (useActualEdge) super.edgeCornerOcclusionTest(edge, corner) else edgeResult + } +} diff --git a/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusionClient.scala b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusionClient.scala new file mode 100644 index 0000000..4680dc4 --- /dev/null +++ b/src/test/fixtures/scala/codechicken/multipart/compat/ReferenceScalaTMicroOcclusionClient.scala @@ -0,0 +1,49 @@ +package codechicken.multipart.compat + +import codechicken.lib.data.MCDataInput +import codechicken.lib.vec.Cuboid6 +import codechicken.microblock.TMicroOcclusionClient +import codechicken.multipart.TMultiPart + +abstract class ReferenceMicroOcclusionClientBase extends TMultiPart { + var events: java.util.List[String] = new java.util.ArrayList[String]() + var failure: RuntimeException = null + var seenPacket: MCDataInput = null + var seenPart: TMultiPart = null + var afterSuper: Runnable = null + private def predecessor(name: String) { + events.add(name) + if (failure != null) throw failure + if (afterSuper != null) afterSuper.run() + } + override def onAdded() { predecessor("superAdded") } + override def onPartChanged(part: TMultiPart) { + seenPart = part + predecessor("superChanged") + } + override def read(packet: MCDataInput) { + seenPacket = packet + predecessor("superRead") + } +} + +/** Frozen Scala lifecycle predecessors and trait forwarders. */ +class ReferenceScalaTMicroOcclusionClient extends ReferenceMicroOcclusionClientBase with TMicroOcclusionClient { + var bounds: Cuboid6 = new Cuboid6(0, 0, 0, 0.25, 1, 1) + var slot = 4 + var size = 2 + var transparent = false + var runRecalc = true + var recalcFailure: RuntimeException = null + override def getType = "test:micro_occlusion_client" + override def getBounds = { events.add("bounds"); bounds } + override def getSlot = slot + override def getSize = size + override def getMaterial = 0 + override def isTransparent = transparent + override def recalcBounds() { + events.add("recalc") + if (recalcFailure != null) throw recalcFailure + if (runRecalc) super.recalcBounds() + } +} diff --git a/src/test/java/codechicken/microblock/AngelicaCompatCharacterizationTest.java b/src/test/java/codechicken/microblock/AngelicaCompatCharacterizationTest.java new file mode 100644 index 0000000..50493af --- /dev/null +++ b/src/test/java/codechicken/microblock/AngelicaCompatCharacterizationTest.java @@ -0,0 +1,138 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TryCatchBlockNode; +import org.objectweb.asm.tree.TypeInsnNode; + +class AngelicaCompatCharacterizationTest { + + private static final Set PUBLIC_METHODS = new TreeSet<>( + Arrays.asList( + "resetShaderMaterialOverride()Ljava/lang/Object;", + "setShaderMaterialOverride(Lnet/minecraft/block/Block;I)Ljava/lang/Object;")); + + @Test + void keepsPublicObjectReturningSurface() { + assertTrue(Modifier.isPublic(AngelicaCompat.class.getModifiers())); + assertFalse(Modifier.isFinal(AngelicaCompat.class.getModifiers())); + assertEquals(Object.class, AngelicaCompat.class.getSuperclass()); + assertEquals(0, AngelicaCompat.class.getInterfaces().length); + assertEquals(0, AngelicaCompat.class.getDeclaredFields().length); + + Constructor[] constructors = AngelicaCompat.class.getDeclaredConstructors(); + assertEquals(1, constructors.length); + assertTrue(Modifier.isPublic(constructors[0].getModifiers())); + assertEquals(0, constructors[0].getParameterTypes().length); + + Set methods = new TreeSet<>(); + for (Method method : AngelicaCompat.class.getDeclaredMethods()) { + assertTrue(Modifier.isPublic(method.getModifiers())); + assertFalse(Modifier.isStatic(method.getModifiers())); + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + assertEquals(PUBLIC_METHODS, methods); + } + + @Test + void keepsCapturingGuardAndClassCastFallback() throws IOException { + ClassNode type = new ClassNode(); + new ClassReader(AngelicaCompat.class.getName()).accept(type, 0); + + assertHook( + method(type, "setShaderMaterialOverride", "(Lnet/minecraft/block/Block;I)Ljava/lang/Object;"), + "setShaderMaterialOverride", + "(Lnet/minecraft/block/Block;I)V"); + assertHook( + method(type, "resetShaderMaterialOverride", "()Ljava/lang/Object;"), + "resetShaderMaterialOverride", + "()V"); + } + + private static MethodNode method(ClassNode type, String name, String descriptor) { + for (MethodNode method : type.methods) { + if (name.equals(method.name) && descriptor.equals(method.desc)) { + return method; + } + } + throw new AssertionError("Missing method " + name + descriptor); + } + + private static void assertHook(MethodNode method, String hookName, String hookDescriptor) { + assertEquals(1, method.tryCatchBlocks.size()); + TryCatchBlockNode fallback = method.tryCatchBlocks.get(0); + assertEquals("java/lang/ClassCastException", fallback.type); + + assertTrue( + hasField( + method, + Opcodes.GETSTATIC, + "net/minecraft/client/renderer/Tessellator", + "instance", + "Lnet/minecraft/client/renderer/Tessellator;")); + assertTrue( + hasType(method, Opcodes.INSTANCEOF, "com/gtnewhorizon/gtnhlib/client/renderer/CapturingTessellator")); + assertTrue(hasCall(method, "net/coderbot/iris/Iris", hookName, hookDescriptor)); + assertTrue(hasField(method, Opcodes.GETSTATIC, "scala/runtime/BoxedUnit", "UNIT", "Lscala/runtime/BoxedUnit;")); + assertTrue(hasField(method, Opcodes.GETSTATIC, "scala/Unit$", "MODULE$", "Lscala/Unit$;")); + } + + private static boolean hasField(MethodNode method, int opcode, String owner, String name, String descriptor) { + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof FieldInsnNode) { + FieldInsnNode field = (FieldInsnNode) instruction; + if (field.getOpcode() == opcode && owner.equals(field.owner) + && name.equals(field.name) + && descriptor.equals(field.desc)) { + return true; + } + } + } + return false; + } + + private static boolean hasType(MethodNode method, int opcode, String descriptor) { + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof TypeInsnNode) { + TypeInsnNode type = (TypeInsnNode) instruction; + if (type.getOpcode() == opcode && descriptor.equals(type.desc)) { + return true; + } + } + } + return false; + } + + private static boolean hasCall(MethodNode method, String owner, String name, String descriptor) { + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instruction; + if (call.getOpcode() == Opcodes.INVOKESTATIC && owner.equals(call.owner) + && name.equals(call.name) + && descriptor.equals(call.desc)) { + return true; + } + } + } + return false; + } +} diff --git a/src/test/java/codechicken/microblock/BlockMicroMaterialBinaryCompatibilityTest.java b/src/test/java/codechicken/microblock/BlockMicroMaterialBinaryCompatibilityTest.java new file mode 100644 index 0000000..4fdf637 --- /dev/null +++ b/src/test/java/codechicken/microblock/BlockMicroMaterialBinaryCompatibilityTest.java @@ -0,0 +1,48 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +/** Loads a Scala consumer compiled against the reference companion-singleton ABI used by downstream mods. */ +class BlockMicroMaterialBinaryCompatibilityTest { + + @Test + void referenceScalaConsumerStillLinksAgainstBothCompanions() throws Exception { + Class fixtureClass = new FixtureClassLoader(BlockMicroMaterial.class.getClassLoader()).define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + assertEquals( + "example_3", + fixtureClass.getMethod("materialKey", String.class, int.class).invoke(fixture, "example", 3)); + assertEquals(0, fixtureClass.getMethod("constructorDefault").invoke(fixture)); + assertEquals(0, fixtureClass.getMethod("registrationDefault").invoke(fixture)); + assertEquals(7, fixtureClass.getMethod("helperPass", int.class).invoke(fixture, 7)); + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + BlockMicroMaterialBinaryCompatibilityTest.class + .getResourceAsStream("/compat/ReferenceScalaBlockMicroMaterialConsumer.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/microblock/BlockMicroMaterialCharacterizationTest.java b/src/test/java/codechicken/microblock/BlockMicroMaterialCharacterizationTest.java new file mode 100644 index 0000000..3f7abff --- /dev/null +++ b/src/test/java/codechicken/microblock/BlockMicroMaterialCharacterizationTest.java @@ -0,0 +1,521 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.util.IIcon; +import net.minecraft.util.RegistrySimple; +import net.minecraft.world.IBlockAccess; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.render.BlockRenderer.BlockFace; +import codechicken.lib.render.CCRenderPipeline; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.ColourMultiplier; +import codechicken.lib.render.uv.MultiIconTransformation; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import scala.collection.JavaConversions; + +class BlockMicroMaterialCharacterizationTest { + + @Test + void publicMaterialAccessPreservesStoredBlockIdentityAndAllMetadataBits() throws Exception { + Block block = new Block(Material.rock) {}; + Field blockField = BlockMicroMaterial.class.getDeclaredField("block"); + Field metaField = BlockMicroMaterial.class.getDeclaredField("meta"); + blockField.setAccessible(true); + metaField.setAccessible(true); + for (int meta : new int[] { Integer.MIN_VALUE, -1, 0, 15, 17, Integer.MAX_VALUE }) { + BlockMicroMaterial material = new BlockMicroMaterial(block, meta); + assertSame(block, material.block()); + assertSame(blockField.get(material), material.block()); + assertEquals(meta, material.meta()); + assertEquals(metaField.getInt(material), material.meta()); + } + } + + @Test + void publicMaterialAccessDispatchesOverridesWhileLegacyFieldsKeepConstructorValues() throws Exception { + Block stored = new Block(Material.rock) {}; + Block exposed = new Block(Material.glass) {}; + List reads = new ArrayList<>(); + BlockMicroMaterial material = new BlockMicroMaterial(stored, 3) { + + @Override + public Block block() { + reads.add("block"); + return exposed; + } + + @Override + public int meta() { + reads.add("meta"); + return 23; + } + }; + assertSame(exposed, material.block()); + assertEquals(23, material.meta()); + assertEquals(Arrays.asList("block", "meta"), reads); + Field blockField = BlockMicroMaterial.class.getDeclaredField("block"); + Field metaField = BlockMicroMaterial.class.getDeclaredField("meta"); + blockField.setAccessible(true); + metaField.setAccessible(true); + assertSame(stored, blockField.get(material)); + assertEquals(3, metaField.getInt(material)); + assertEquals(Arrays.asList("block", "meta"), reads, "Raw field access bypasses the virtual API"); + } + + private static final Set THREAD_STATE_METHODS = signatures( + "builder()Lcodechicken/lib/render/CCRenderPipeline$PipelineBuilder;", + "builder_$eq(Lcodechicken/lib/render/CCRenderPipeline$PipelineBuilder;)V", + "pass()I", + "pass_$eq(I)V"); + private static final Set RENDER_HELPER_METHODS = signatures( + "blockAndMeta(Lnet/minecraft/block/Block;I)Lcodechicken/microblock/MaterialRenderHelper$;", + "blockColour(I)Lcodechicken/microblock/MaterialRenderHelper$;", + "builder()Lcodechicken/lib/render/CCRenderPipeline$PipelineBuilder;", + "builder_$eq(Lcodechicken/lib/render/CCRenderPipeline$PipelineBuilder;)V", + "lighting()Lcodechicken/microblock/MaterialRenderHelper$;", + "pass()I", + "pass_$eq(I)V", + "render()V", + "start(Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/render/uv/UVTransformation;)Lcodechicken/microblock/MaterialRenderHelper$;"); + private static final Set MATERIAL_COMPANION_METHODS = signatures( + "$lessinit$greater$default$2()I", + "createAndRegister(Lnet/minecraft/block/Block;I)V", + "createAndRegister(Lnet/minecraft/block/Block;ILjava/lang/String;)V", + "createAndRegister(Lnet/minecraft/block/Block;ILjava/lang/String;Ljava/lang/String;)V", + "createAndRegister(Lnet/minecraft/block/Block;Lscala/collection/Seq;)V", + "createAndRegister(Lnet/minecraft/block/Block;Lscala/collection/Seq;Ljava/lang/String;)V", + "createAndRegister(Lnet/minecraft/block/Block;Lscala/collection/Seq;Ljava/lang/String;Ljava/lang/String;)V", + "createAndRegister$default$2()I", + "materialKey(Lnet/minecraft/block/Block;)Ljava/lang/String;", + "materialKey(Lnet/minecraft/block/Block;I)Ljava/lang/String;", + "materialKey(Ljava/lang/String;I)Ljava/lang/String;", + "oldKey(Lnet/minecraft/block/Block;)Ljava/lang/String;"); + private static final Set MATERIAL_INSTANCE_METHODS = signatures( + "block()Lnet/minecraft/block/Block;", + "blockKey()Ljava/lang/String;", + "canRenderInPass(I)Z", + "codechicken$microblock$BlockMicroMaterial$$safeIcon$1(Lnet/minecraft/block/Block;I)Lnet/minecraft/util/IIcon;", + "explosionResistance(Lnet/minecraft/entity/Entity;)F", + "getBreakingColour(ILnet/minecraft/world/IBlockAccess;III)I", + "getBreakingIcon(I)Lnet/minecraft/util/IIcon;", + "getColour(I)I", + "getCutterStrength()I", + "getItem()Lnet/minecraft/item/ItemStack;", + "getLightValue()I", + "getLocalizedName()Ljava/lang/String;", + "getSound()Lnet/minecraft/block/Block$SoundType;", + "getStrength(Lnet/minecraft/entity/player/EntityPlayer;)F", + "icont()Lcodechicken/lib/render/uv/MultiIconTransformation;", + "icont_$eq(Lcodechicken/lib/render/uv/MultiIconTransformation;)V", + "isTransparent()Z", + "loadIcons()V", + "meta()I", + "renderMicroFace(Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;)V", + "toolClasses()Lscala/collection/Seq;"); + + @Test + void keepsTheFiveRetainedClassSurfacesAndStateShapes() throws Exception { + assertClass(ThreadState.class, Object.class, false, THREAD_STATE_METHODS); + assertField(ThreadState.class, "pass", int.class, false, false); + assertField(ThreadState.class, "builder", CCRenderPipeline.PipelineBuilder.class, false, false); + + assertClass(MaterialRenderHelper.class, Object.class, true, RENDER_HELPER_METHODS); + assertClass(MaterialRenderHelper$.class, Object.class, true, RENDER_HELPER_METHODS); + assertEquals(0, MaterialRenderHelper.class.getDeclaredFields().length); + assertField(MaterialRenderHelper$.class, "threadState", ThreadLocal.class, false, true); + assertModule(MaterialRenderHelper$.class, MaterialRenderHelper$.MODULE$); + + assertTrue(Modifier.isPublic(BlockMicroMaterial.class.getModifiers())); + assertFalse(Modifier.isFinal(BlockMicroMaterial.class.getModifiers())); + assertSame(Object.class, BlockMicroMaterial.class.getSuperclass()); + assertEquals(Arrays.asList(IMicroMaterial.class), Arrays.asList(BlockMicroMaterial.class.getInterfaces())); + Set materialMethods = new TreeSet<>(MATERIAL_COMPANION_METHODS); + materialMethods.addAll(MATERIAL_INSTANCE_METHODS); + assertEquals(materialMethods, publicDeclaredMethods(BlockMicroMaterial.class)); + assertTrue(Modifier.isPublic(BlockMicroMaterial.class.getConstructor(Block.class, int.class).getModifiers())); + assertEquals(1, BlockMicroMaterial.class.getDeclaredConstructors().length); + assertField(BlockMicroMaterial.class, "block", Block.class, false, true); + assertField(BlockMicroMaterial.class, "meta", int.class, false, true); + assertField(BlockMicroMaterial.class, "blockKey", String.class, false, true); + Field icons = assertField(BlockMicroMaterial.class, "icont", MultiIconTransformation.class, false, false); + assertSideOnly(icons.getAnnotation(SideOnly.class)); + Field stale = assertField(BlockMicroMaterial.class, "iconsStale", boolean.class, false, false); + assertSideOnly(stale.getAnnotation(SideOnly.class)); + assertTrue(Modifier.isVolatile(stale.getModifiers())); + assertEquals(5, BlockMicroMaterial.class.getDeclaredFields().length); + + assertClass(BlockMicroMaterial$.class, Object.class, true, MATERIAL_COMPANION_METHODS); + assertModule(BlockMicroMaterial$.class, BlockMicroMaterial$.MODULE$); + } + + @Test + void keepsTheExactClientOnlyBoundary() throws Exception { + for (Method method : BlockMicroMaterial.class.getDeclaredMethods()) { + SideOnly annotation = method.getAnnotation(SideOnly.class); + if (method.getName().equals("loadIcons") || method.getName().equals("getBreakingIcon") + || method.getName().equals("getBreakingColour")) { + assertSideOnly(annotation); + } else { + assertNull(annotation, method.toString()); + } + } + Method safeIcon = BlockMicroMaterial.class + .getDeclaredMethod("codechicken$microblock$BlockMicroMaterial$$safeIcon$1", Block.class, int.class); + assertTrue(Modifier.isFinal(safeIcon.getModifiers())); + } + + @Test + void keepsMaterialKeysDefaultsAndCommonBlockBehavior() { + Block block = new Block(Material.rock) {}; + BlockMicroMaterial stone = new BlockMicroMaterial(block, 17); + assertSame(block, stone.block()); + assertEquals(17, stone.meta()); + assertNull(stone.blockKey()); + assertEquals(block.getUnlocalizedName(), BlockMicroMaterial.oldKey(block)); + assertNull(BlockMicroMaterial.materialKey(block)); + assertEquals("example", BlockMicroMaterial.materialKey("example", 0)); + assertEquals("example", BlockMicroMaterial.materialKey("example", -1)); + assertEquals("example_2", BlockMicroMaterial.materialKey("example", 2)); + assertEquals(0, BlockMicroMaterial.$lessinit$greater$default$2()); + assertEquals(0, BlockMicroMaterial.createAndRegister$default$2()); + assertEquals(0, BlockMicroMaterial$.MODULE$.$lessinit$greater$default$2()); + assertEquals(0, BlockMicroMaterial$.MODULE$.createAndRegister$default$2()); + + assertEquals(!block.isOpaqueCube(), stone.isTransparent()); + assertEquals(block.getLightValue(), stone.getLightValue()); + assertEquals(block.getHarvestLevel(1), stone.getCutterStrength()); + assertSame(block.stepSound, stone.getSound()); + assertEquals(block.getExplosionResistance(null), stone.explosionResistance(null)); + assertEquals(block.canRenderInPass(1), stone.canRenderInPass(1)); + assertEquals((block.getBlockColor() << 8) | 0xFF, stone.getColour(-1)); + assertEquals(Arrays.asList("axe", "pickaxe", "shovel"), JavaConversions.seqAsJavaList(stone.toolClasses())); + + assertNull(stone.icont()); + MultiIconTransformation icons = new MultiIconTransformation((net.minecraft.util.IIcon) null); + stone.icont_$eq(icons); + assertSame(icons, stone.icont()); + } + + @Test + void keepsRenderHelperStateThreadLocalAndFacadeBacked() throws Exception { + ThreadState state = new ThreadState(); + assertEquals(0, state.pass()); + assertNull(state.builder()); + state.pass_$eq(4); + assertEquals(4, state.pass()); + + MaterialRenderHelper.pass_$eq(9); + assertEquals(9, MaterialRenderHelper.pass()); + assertEquals(9, MaterialRenderHelper$.MODULE$.pass()); + AtomicInteger otherThreadPass = new AtomicInteger(-1); + Thread thread = new Thread(() -> otherThreadPass.set(MaterialRenderHelper.pass())); + thread.start(); + thread.join(); + assertEquals(0, otherThreadPass.get()); + + MultiIconTransformation icons = new MultiIconTransformation((net.minecraft.util.IIcon) null); + assertSame(MaterialRenderHelper$.MODULE$, MaterialRenderHelper.start(new Vector3(), -1, icons)); + assertNotNull(MaterialRenderHelper.builder()); + MaterialRenderHelper.pass_$eq(0); + MaterialRenderHelper.builder_$eq(null); + } + + @Test + void baseMaterialBuildsTheInventoryRenderPipeline() throws Exception { + BlockMicroMaterial material = new BlockMicroMaterial(Blocks.stone, 0) { + + @Override + public int getColour(int pass) { + return 0x89ABCDEF; + } + }; + MultiIconTransformation icons = new MultiIconTransformation((net.minecraft.util.IIcon) null); + material.icont_$eq(icons); + CCRenderState state = CCRenderState.instance(); + state.resetInstance(); + BlockFace face = new BlockFace(); + face.side = 1; + state.model = face; + state.firstVertexIndex = 0; + state.lastVertexIndex = 0; + + material.renderMicroFace(new Vector3(), -1, Cuboid6.full); + + Field operationsField = CCRenderPipeline.class.getDeclaredField("ops"); + operationsField.setAccessible(true); + @SuppressWarnings("unchecked") + List operations = new ArrayList<>( + (List) operationsField.get(state.pipeline)); + assertTrue(operations.contains(icons)); + assertTrue(operations.stream().anyMatch(ColourMultiplier.class::isInstance)); + } + + @Test + void overriddenBlockAndMetadataDriveMaterialProperties() { + Block block = new Block(Material.rock) { + + @Override + public int getHarvestLevel(int metadata) { + return metadata; + } + + @Override + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + return 0x123456; + } + }; + block.setLightLevel(0.8f); + block.setResistance(12); + List reads = new ArrayList<>(); + BlockMicroMaterial material = new BlockMicroMaterial(null, 0) { + + @Override + public Block block() { + reads.add("block"); + return block; + } + + @Override + public int meta() { + reads.add("meta"); + return 23; + } + }; + assertTrue(reads.isEmpty(), "Construction uses the argument before subclass state is initialized"); + assertEquals(block.getLightValue(), material.getLightValue()); + assertEquals(!block.isOpaqueCube(), material.isTransparent()); + assertEquals(7, material.getCutterStrength()); + assertSame(block.stepSound, material.getSound()); + assertEquals(block.getExplosionResistance(null), material.explosionResistance(null)); + assertEquals(block.canRenderInPass(1), material.canRenderInPass(1)); + assertEquals((block.getBlockColor() << 8) | 0xFF, material.getColour(-1)); + assertEquals(0x123456FF, material.getColour(0)); + reads.clear(); + assertNotNull(material.getItem()); + assertEquals(Arrays.asList("block", "meta"), reads); + reads.clear(); + assertThrows(NullPointerException.class, () -> material.getStrength(null)); + assertEquals(Arrays.asList("block", "block", "meta"), reads); + } + + @Test + void overriddenMetadataReachesBreakingAndSafeIcons() { + IIcon icon = (IIcon) Proxy.newProxyInstance( + IIcon.class.getClassLoader(), + new Class[] { IIcon.class }, + (proxy, method, arguments) -> { throw new AssertionError(method); }); + List reads = new ArrayList<>(); + Block block = new Block(Material.rock) { + + @Override + public IIcon getIcon(int side, int metadata) { + reads.add(side); + reads.add(metadata); + return icon; + } + }; + BlockMicroMaterial material = new BlockMicroMaterial(null, 0) { + + @Override + public Block block() { + return block; + } + + @Override + public int meta() { + return 23; + } + }; + assertSame(icon, material.getBreakingIcon(2)); + assertSame(icon, material.codechicken$microblock$BlockMicroMaterial$$safeIcon$1(block, 4)); + assertEquals(Arrays.asList(2, 23, 4, 23), reads); + } + + @Test + void firstIconReadAfterStitchPicksUpIconsFinishedByLaterPostHandlers() throws Exception { + IIcon early = stubIcon(); + IIcon late = stubIcon(); + AtomicReference current = new AtomicReference<>(early); + Block block = new Block(Material.rock) { + + @Override + public IIcon getIcon(int side, int metadata) { + return current.get(); + } + }; + String key = "fmptest:late_icon_block"; + Field objects = RegistrySimple.class.getDeclaredField("registryObjects"); + objects.setAccessible(true); + @SuppressWarnings("unchecked") + Map registry = (Map) objects.get(Block.blockRegistry); + registry.put(key, block); + try { + BlockMicroMaterial material = new BlockMicroMaterial(block, 0) { + + @Override + public String blockKey() { + return key; + } + }; + material.loadIcons(); + // Another mod's TextureStitchEvent.Post handler replaces the block's icon after FMP's ran. + current.set(late); + MultiIconTransformation resolved = material.icont(); + assertSame(late, resolved.icons[0]); + assertSame(late, resolved.icons[5]); + assertSame(resolved, material.icont(), "Icons are re-resolved once per stitch, not on every read"); + + MultiIconTransformation assigned = new MultiIconTransformation(early); + material.loadIcons(); + material.icont_$eq(assigned); + assertSame(assigned, material.icont(), "Explicitly assigned icons are not overwritten"); + } finally { + registry.remove(key); + } + } + + private static IIcon stubIcon() { + return (IIcon) Proxy.newProxyInstance( + IIcon.class.getClassLoader(), + new Class[] { IIcon.class }, + (proxy, method, arguments) -> method.getName().equals("toString") ? "stubIcon" : null); + } + + @Test + void overriddenBlockKeyIsReadBeforeLoadingIcons() { + IllegalStateException failure = new IllegalStateException("block key unavailable"); + BlockMicroMaterial material = new BlockMicroMaterial(null, 0) { + + @Override + public String blockKey() { + throw failure; + } + }; + assertSame(failure, assertThrows(IllegalStateException.class, material::loadIcons)); + } + + @Test + void overriddenIconsAndBlockPropertiesReachTheRenderPipeline() throws Exception { + MultiIconTransformation icons = new MultiIconTransformation((IIcon) null); + List reads = new ArrayList<>(); + BlockMicroMaterial material = new BlockMicroMaterial(null, 0) { + + @Override + public MultiIconTransformation icont() { + reads.add("icons"); + return icons; + } + + @Override + public int getColour(int pass) { + reads.add("colour"); + return 0x89ABCDEF; + } + + @Override + public Block block() { + reads.add("block"); + return null; + } + + @Override + public int meta() { + reads.add("meta"); + return 23; + } + }; + assertTrue(reads.isEmpty()); + CCRenderState state = CCRenderState.instance(); + state.resetInstance(); + BlockFace face = new BlockFace(); + face.side = 1; + state.model = face; + state.firstVertexIndex = 0; + state.lastVertexIndex = 0; + try { + material.renderMicroFace(new Vector3(), -1, Cuboid6.full); + assertEquals(Arrays.asList("icons", "colour", "block", "meta"), reads); + Field operationsField = CCRenderPipeline.class.getDeclaredField("ops"); + operationsField.setAccessible(true); + assertTrue(((List) operationsField.get(state.pipeline)).contains(icons)); + } finally { + state.resetInstance(); + MaterialRenderHelper.pass_$eq(0); + MaterialRenderHelper.builder_$eq(null); + } + } + + private static void assertClass(Class type, Class superclass, boolean isFinal, Set methods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertEquals(isFinal, Modifier.isFinal(type.getModifiers())); + assertSame(superclass, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static Field assertField(Class owner, String name, Class type, boolean isStatic, boolean isFinal) + throws Exception { + Field field = owner.getDeclaredField(name); + assertSame(type, field.getType()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + assertEquals(isStatic, Modifier.isStatic(field.getModifiers())); + assertEquals(isFinal, Modifier.isFinal(field.getModifiers())); + return field; + } + + private static void assertModule(Class type, Object expected) throws Exception { + Field module = type.getField("MODULE$"); + assertSame(type, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(expected, module.get(null)); + } + + private static void assertSideOnly(SideOnly annotation) { + assertNotNull(annotation); + assertSame(Side.CLIENT, annotation.value()); + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } + + private static Set publicDeclaredMethods(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/microblock/ConfigContentCharacterizationTest.java b/src/test/java/codechicken/microblock/ConfigContentCharacterizationTest.java new file mode 100644 index 0000000..787b6b7 --- /dev/null +++ b/src/test/java/codechicken/microblock/ConfigContentCharacterizationTest.java @@ -0,0 +1,257 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.File; +import java.io.FileNotFoundException; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ObjectIntIdentityMap; +import net.minecraft.util.RegistryNamespaced; +import net.minecraft.util.RegistrySimple; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.objectweb.asm.Type; + +import codechicken.microblock.handler.MicroblockProxy; +import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import scala.collection.JavaConversions; +import scala.collection.Seq; + +class ConfigContentCharacterizationTest { + + private static final int TEST_ID = 3980; + private static final String TEST_NAME = "configcontent:test_block"; + private static final Block TEST_BLOCK = new Block(Material.rock) {}.setBlockName("configContentTest"); + private static final Item TEST_ITEM = new ItemBlock(TEST_BLOCK); + private static final Set METHODS = signatures( + "generateDefault(Ljava/io/File;)V", + "handleIMC(Lscala/collection/Seq;)V", + "load()V", + "loadLine(Ljava/lang/String;)V", + "loadLines(Ljava/io/File;)V", + "parse(Ljava/io/File;)V"); + + private Logger originalLogger; + + @BeforeEach + void prepareState() { + names().clear(); + originalLogger = MicroblockProxy.logger(); + MicroblockProxy.logger_$eq(LogManager.getLogger("ConfigContentCharacterizationTest")); + } + + @AfterEach + void restoreState() { + names().clear(); + MicroblockProxy.logger_$eq(originalLogger); + } + + @Test + void keepsTheFacadeCompanionAndMutableMapShape() throws Exception { + assertTrue(Modifier.isPublic(ConfigContent.class.getModifiers())); + assertTrue(Modifier.isFinal(ConfigContent.class.getModifiers())); + assertEquals(METHODS, publicDeclaredMethods(ConfigContent.class)); + assertEquals(0, ConfigContent.class.getDeclaredFields().length); + for (Method method : ConfigContent.class.getDeclaredMethods()) { + assertTrue(Modifier.isStatic(method.getModifiers()), method.toString()); + } + + assertTrue(Modifier.isPublic(ConfigContent$.class.getModifiers())); + assertTrue(Modifier.isFinal(ConfigContent$.class.getModifiers())); + Set companionMethods = new TreeSet<>(METHODS); + companionMethods.add("codechicken$microblock$ConfigContent$$nameMap()Lscala/collection/mutable/Map;"); + assertEquals(companionMethods, publicDeclaredMethods(ConfigContent$.class)); + + Field module = ConfigContent$.class.getField("MODULE$"); + assertSame(ConfigContent$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(ConfigContent$.MODULE$, module.get(null)); + + Field map = ConfigContent$.class.getDeclaredField("codechicken$microblock$ConfigContent$$nameMap"); + assertSame(scala.collection.mutable.Map.class, map.getType()); + assertTrue(Modifier.isPrivate(map.getModifiers())); + assertTrue(Modifier.isFinal(map.getModifiers())); + assertEquals(2, ConfigContent$.class.getDeclaredFields().length); + } + + @Test + void parsesDefaultListsRangesAliasesAndReplacement() { + ConfigContent.loadLine("# ignored"); + ConfigContent.loadLine("x"); + assertTrue(names().isEmpty()); + + ConfigContent.loadLine("\"stone\""); + ConfigContent.loadLine("\"tile.machine\":1,3-5"); + ConfigContent.loadLine("\"mod:block\":2"); + ConfigContent.loadLine("\"reverse\":5-3"); + ConfigContent.loadLine("\"stone\":7"); + + assertEquals(Arrays.asList(7), values("minecraft:stone")); + assertEquals(Arrays.asList(1, 3, 4, 5), values("tile.machine")); + assertEquals(Arrays.asList(2), values("mod:block")); + assertEquals(Collections.emptyList(), values("minecraft:reverse")); + } + + @Test + void rejectsTheReferenceMalformedLineShapes() { + assertMessage("Line must begin with a quote", () -> ConfigContent.loadLine("stone")); + assertMessage("Unmatched quotes", () -> ConfigContent.loadLine("\"stone")); + assertMessage("Name must be followed by a colon separator", () -> ConfigContent.loadLine("\"stone\"=1")); + assertMessage("Invalid - separated range", () -> ConfigContent.loadLine("\"stone\":1-2-3")); + assertThrows(NumberFormatException.class, () -> ConfigContent.loadLine("\"stone\":nope")); + } + + @Test + void generatesAndParsesTheExactDefaultFile(@TempDir Path directory) throws Exception { + ConfigContent.parse(directory.toFile()); + Path config = directory.resolve("microblocks.cfg"); + assertEquals( + Arrays.asList( + "#Configuration file for adding microblock materials for aesthetic blocks added by mods", + "#Each line needs to be of the form :", + "# is the unlocalised name or registry key of the block/item enclosed in quotes. NEI can help you find these", + "# may be ommitted, in which case it defaults to 0, otherwise it can be a number, a comma separated list of numbers, or a dash separated range", + "#Ex. \"dirt\" \"minecraft:planks\":3 \"iron_ore\":1,2,3,5 \"ThermalFoundation:Storage\":0-15"), + Files.readAllLines(config)); + assertTrue(names().isEmpty()); + + Files.write(config, Arrays.asList("invalid", "\"stone\":2-3")); + ConfigContent$.MODULE$.parse(directory.toFile()); + assertEquals(Arrays.asList(2, 3), values("minecraft:stone")); + + File missingParent = directory.resolve("missing").resolve("microblocks.cfg").toFile(); + assertThrows(FileNotFoundException.class, () -> ConfigContent.generateDefault(missingParent)); + assertThrows(FileNotFoundException.class, () -> ConfigContent.loadLines(missingParent)); + assertDoesNotThrow(() -> ConfigContent.parse(directory.resolve("missing").toFile())); + } + + @Test + void consumesBothBlockAliasesInOrderAndLeavesUnknownNames() { + ensureTestBlockRegistered(); + ConfigContent.loadLine("\"tile.configContentTest\":1,2"); + ConfigContent.loadLine("\"" + TEST_NAME + "\":3"); + ConfigContent.loadLine("\"configcontent:missing\":4"); + + ConfigContent.load(); + + assertMaterial(TEST_NAME + "_1", 1); + assertMaterial(TEST_NAME + "_2", 2); + assertMaterial(TEST_NAME + "_3", 3); + assertEquals(Collections.singleton("configcontent:missing"), names().keySet()); + } + + @Test + void filtersAndValidatesImcBeforeRegisteringExactItemStacks() throws Exception { + ensureTestBlockRegistered(); + IMCMessage ignored = message("other", null); + IMCMessage wrongType = message("microMaterial", "not an item stack"); + IMCMessage invalidMeta = message("microMaterial", new ItemStack(TEST_ITEM, 1, 16)); + IMCMessage invalidBlock = message("microMaterial", new ItemStack(new Item(), 1, 0)); + IMCMessage valid = message("microMaterial", new ItemStack(TEST_ITEM, 1, 7)); + + ConfigContent.handleIMC( + JavaConversions.asScalaBuffer(Arrays.asList(ignored, wrongType, invalidMeta, invalidBlock, valid))); + + assertMaterial(TEST_NAME + "_7", 7); + assertNull(MicroMaterialRegistry.getMaterial(TEST_NAME + "_16")); + } + + private static void ensureTestBlockRegistered() { + Object block = Block.blockRegistry.getObjectById(TEST_ID); + if (block == null) { + addRaw(Block.blockRegistry, TEST_ID, TEST_NAME, TEST_BLOCK); + } else { + assertSame(TEST_BLOCK, block); + } + + Object item = Item.itemRegistry.getObjectById(TEST_ID); + if (item == null) { + addRaw(Item.itemRegistry, TEST_ID, TEST_NAME, TEST_ITEM); + } else { + assertSame(TEST_ITEM, item); + } + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static void addRaw(RegistryNamespaced registry, int id, String name, Object value) { + try { + Field integerMap = RegistryNamespaced.class.getDeclaredField("underlyingIntegerMap"); + integerMap.setAccessible(true); + ((ObjectIntIdentityMap) integerMap.get(registry)).func_148746_a(value, id); + + Field names = RegistrySimple.class.getDeclaredField("registryObjects"); + names.setAccessible(true); + ((Map) names.get(registry)).put(name, value); + } catch (ReflectiveOperationException exception) { + throw new AssertionError(exception); + } + } + + private static IMCMessage message(String key, Object value) throws Exception { + Constructor constructor = IMCMessage.class.getDeclaredConstructor(String.class, Object.class); + constructor.setAccessible(true); + return constructor.newInstance(key, value); + } + + private static void assertMaterial(String name, int meta) { + BlockMicroMaterial material = (BlockMicroMaterial) MicroMaterialRegistry.getMaterial(name); + assertSame(TEST_BLOCK, material.block()); + assertEquals(meta, material.meta()); + } + + private static void assertMessage(String expected, Runnable action) { + IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, action::run); + assertEquals(expected, exception.getMessage()); + } + + private static List values(String name) { + return JavaConversions.seqAsJavaList(names().get(name)); + } + + private static Map> names() { + return JavaConversions + .mutableMapAsJavaMap(ConfigContent$.MODULE$.codechicken$microblock$ConfigContent$$nameMap()); + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } +} diff --git a/src/test/java/codechicken/microblock/CornerMicroblockCharacterizationTest.java b/src/test/java/codechicken/microblock/CornerMicroblockCharacterizationTest.java new file mode 100644 index 0000000..46dddb2 --- /dev/null +++ b/src/test/java/codechicken/microblock/CornerMicroblockCharacterizationTest.java @@ -0,0 +1,164 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.vec.Cuboid6; + +class CornerMicroblockCharacterizationTest { + + private static final Set PLACEMENT_FACADE_METHODS = signatures( + "customPlacement(Lcodechicken/microblock/MicroblockPlacement;)Lcodechicken/microblock/ExecutablePlacement;", + "expand(II)Z", + "microClass()Lcodechicken/microblock/CornerMicroClass$;", + "opposite(II)I", + "placementGrid()Lcodechicken/microblock/CornerPlacementGrid$;", + "sneakOpposite(II)Z"); + private static final Set PLACEMENT_COMPANION_METHODS = signatures( + "microClass()Lcodechicken/microblock/CornerMicroClass$;", + "microClass()Lcodechicken/microblock/MicroblockClass;", + "opposite(II)I", + "placementGrid()Lcodechicken/microblock/CornerPlacementGrid$;", + "placementGrid()Lcodechicken/microblock/PlacementGrid;"); + private static final Set CLASS_FACADE_METHODS = signatures( + "aBounds()[Lcodechicken/lib/vec/Cuboid6;", + "aBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "baseTrait()Ljava/lang/Class;", + "baseTraitId()I", + "clientTrait()Ljava/lang/Class;", + "clientTraitId()I", + "create(ZI)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lcodechicken/lib/data/MCDataInput;)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/microblock/Microblock;", + "getClassId()I", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "itemSlot()I", + "placementProperties()Lcodechicken/microblock/CornerPlacement$;", + "register()V", + "register(I)V"); + private static final Set CLASS_COMPANION_METHODS = signatures( + "aBounds()[Lcodechicken/lib/vec/Cuboid6;", + "aBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "baseTrait()Ljava/lang/Class;", + "clientTrait()Ljava/lang/Class;", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "itemSlot()I", + "placementProperties()Lcodechicken/microblock/CornerPlacement$;", + "placementProperties()Lcodechicken/microblock/PlacementProperties;"); + + @Test + void keepsFacadesCompanionsAndGeneratedTraitSurface() throws Exception { + assertFacade(CornerPlacement.class, PLACEMENT_FACADE_METHODS); + assertCompanion(CornerPlacement$.class, PlacementProperties.class, PLACEMENT_COMPANION_METHODS); + assertEquals(1, CornerPlacement$.class.getDeclaredFields().length); + + assertFacade(CornerMicroClass.class, CLASS_FACADE_METHODS); + assertCompanion(CornerMicroClass$.class, CommonMicroClass.class, CLASS_COMPANION_METHODS); + Field bounds = CornerMicroClass$.class.getDeclaredField("aBounds"); + assertSame(Cuboid6[].class, bounds.getType()); + assertTrue(Modifier.isPrivate(bounds.getModifiers())); + assertFalse(Modifier.isFinal(bounds.getModifiers())); + assertEquals(2, CornerMicroClass$.class.getDeclaredFields().length); + + assertTrait( + CornerMicroblock.class, + new Class[] { CommonMicroblock.class }, + signatures( + "getBounds()Lcodechicken/lib/vec/Cuboid6;", + "getSlot()I", + "microClass()Lcodechicken/microblock/CornerMicroClass$;", + "setShape(II)V")); + assertHelper( + "codechicken.microblock.CornerMicroblock$class", + signatures( + "$init$(Lcodechicken/microblock/CornerMicroblock;)V", + "getBounds(Lcodechicken/microblock/CornerMicroblock;)Lcodechicken/lib/vec/Cuboid6;", + "getSlot(Lcodechicken/microblock/CornerMicroblock;)I", + "microClass(Lcodechicken/microblock/CornerMicroblock;)Lcodechicken/microblock/CornerMicroClass$;", + "setShape(Lcodechicken/microblock/CornerMicroblock;II)V")); + } + + @Test + void keepsCornerPlacementRulesAndGridIdentity() { + CornerPlacement$ placement = CornerPlacement$.MODULE$; + assertSame(CornerPlacementGrid$.MODULE$, placement.placementGrid()); + assertSame(CornerPlacementGrid$.MODULE$, CornerPlacement.placementGrid()); + assertNull(placement.customPlacement(null)); + assertNull(CornerPlacement.customPlacement(null)); + + for (int slot = 7; slot < 15; slot++) { + for (int side = 0; side < 6; side++) { + int opposite = ((slot - 7) ^ (1 << (side >> 1))) + 7; + assertEquals(opposite, placement.opposite(slot, side)); + assertEquals(opposite, CornerPlacement.opposite(slot, side)); + assertTrue(placement.sneakOpposite(slot, side)); + assertTrue(CornerPlacement.sneakOpposite(slot, side)); + assertTrue(placement.expand(slot, side)); + assertTrue(CornerPlacement.expand(slot, side)); + } + } + } + + private static void assertFacade(Class type, Set methods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals(0, type.getDeclaredFields().length); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertCompanion(Class type, Class superclass, Set methods) throws Exception { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(superclass, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + Field module = type.getField("MODULE$"); + assertSame(type, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + } + + private static void assertTrait(Class type, Class[] interfaces, Set methods) { + assertTrue(type.isInterface()); + assertArrayEquals(interfaces, type.getInterfaces()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertHelper(String name, Set methods) throws Exception { + Class type = Class.forName(name, false, CornerMicroblockCharacterizationTest.class.getClassLoader()); + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isAbstract(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } +} diff --git a/src/test/java/codechicken/microblock/CornerMicroblockTraitsCharacterizationTest.java b/src/test/java/codechicken/microblock/CornerMicroblockTraitsCharacterizationTest.java new file mode 100644 index 0000000..a99ce31 --- /dev/null +++ b/src/test/java/codechicken/microblock/CornerMicroblockTraitsCharacterizationTest.java @@ -0,0 +1,93 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +/** Executes corner-trait forwarders compiled against the untouched Scala implementation. */ +class CornerMicroblockTraitsCharacterizationTest { + + @Test + void packsSupportedCornersThroughTheVirtualShapeSetterExactlyOnce() throws Exception { + Fixture f = new Fixture(); + assertEquals(29, f.part.material()); + assertEquals(0, f.part.shape()); + int writes = 0; + for (int size = 1; size <= 7; size++) { + for (int corner = 0; corner < 8; corner++) { + f.part.setShape(size, corner + 7); + byte expected = (byte) (size * 16 + corner); + assertEquals(expected, f.part.shape()); + assertEquals(expected, f.get("writtenShape")); + assertEquals(++writes, f.get("writes")); + assertEquals(size, f.part.getSize()); + assertEquals(corner + 7, f.corner.getSlot()); + assertEquals(1 << (corner + 7), f.corner.getSlotMask()); + assertEquals(29, f.part.material()); + } + } + } + + @Test + void preservesTruncationAndOutOfRangeSlotBitsWithoutValidation() throws Exception { + Fixture f = new Fixture(); + int[][] cases = { { 1, 6, -1, -1, 22 }, { 8, 7, -128, -8, 7 }, { 16, 7, 0, 0, 7 }, { 0, 23, 16, 1, 7 }, + { -1, 14, -9, -1, 14 }, { Integer.MAX_VALUE, Integer.MIN_VALUE, -7, -1, 16 } }; + for (int[] value : cases) { + f.part.setShape(value[0], value[1]); + assertEquals((byte) value[2], f.part.shape()); + assertEquals(value[3], f.part.getSize()); + assertEquals(value[4], f.corner.getSlot()); + } + assertEquals(cases.length, f.get("writes")); + } + + @Test + void slotDecodingUsesTheVirtualGetterAndKeepsIntegerOverflow() throws Exception { + Fixture f = new Fixture(); + f.set("overrideShape", boolean.class, true); + int[][] cases = { { -8, -1 }, { 0, 7 }, { 25, 32 }, { Integer.MAX_VALUE, Integer.MIN_VALUE + 6 } }; + int reads = 0; + for (int[] value : cases) { + f.set("selectedShape", int.class, value[0]); + assertEquals(value[1], f.corner.getSlot()); + assertEquals(++reads, f.get("reads")); + assertEquals(1 << value[1], f.corner.getSlotMask()); + assertEquals(++reads, f.get("reads")); + } + assertEquals(0, f.get("writes")); + assertEquals(0, f.part.shape()); + } + + private static final class Fixture extends ClassLoader { + + final Microblock part; + final CornerMicroblock corner; + + Fixture() throws Exception { + super(Microblock.class.getClassLoader()); + InputStream input = Objects + .requireNonNull(getClass().getResourceAsStream("/compat/ReferenceScalaCornerMicroblock.class.b64")); + byte[] bytes; + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + part = (Microblock) defineClass(null, bytes, 0, bytes.length).getConstructor().newInstance(); + corner = (CornerMicroblock) part; + } + + Object get(String name) throws Exception { + return part.getClass().getMethod(name).invoke(part); + } + + void set(String name, Class type, Object value) throws Exception { + part.getClass().getMethod(name + "_$eq", type).invoke(part, value); + } + } +} diff --git a/src/test/java/codechicken/microblock/DefaultContentCharacterizationTest.java b/src/test/java/codechicken/microblock/DefaultContentCharacterizationTest.java new file mode 100644 index 0000000..fcb7eb2 --- /dev/null +++ b/src/test/java/codechicken/microblock/DefaultContentCharacterizationTest.java @@ -0,0 +1,44 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +class DefaultContentCharacterizationTest { + + @Test + void keepsTheFacadeAndCompanionSurface() throws Exception { + assertSingletonType(DefaultContent.class, true); + assertSingletonType(DefaultContent$.class, false); + + assertArrayEquals(new Class[0], DefaultContent.class.getInterfaces()); + assertArrayEquals(new Class[0], DefaultContent$.class.getInterfaces()); + assertEquals(0, DefaultContent.class.getFields().length); + + Field module = DefaultContent$.class.getField("MODULE$"); + assertSame(DefaultContent$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(DefaultContent$.MODULE$, module.get(null)); + } + + private static void assertSingletonType(Class type, boolean staticMethod) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + + Method[] methods = type.getDeclaredMethods(); + assertEquals(1, methods.length); + assertEquals("load()V", methods[0].getName() + Type.getMethodDescriptor(methods[0])); + assertTrue(Modifier.isPublic(methods[0].getModifiers())); + assertEquals(staticMethod, Modifier.isStatic(methods[0].getModifiers())); + assertEquals(0, methods[0].getDeclaredAnnotations().length); + } +} diff --git a/src/test/java/codechicken/microblock/EdgeMicroblockCharacterizationTest.java b/src/test/java/codechicken/microblock/EdgeMicroblockCharacterizationTest.java new file mode 100644 index 0000000..c34bdbb --- /dev/null +++ b/src/test/java/codechicken/microblock/EdgeMicroblockCharacterizationTest.java @@ -0,0 +1,255 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.JPartialOcclusion; +import codechicken.multipart.PartMap; +import codechicken.multipart.TEdgePart; +import codechicken.multipart.TNormalOcclusion; + +class EdgeMicroblockCharacterizationTest { + + private static final Set PLACEMENT_FACADE_METHODS = signatures( + "customPlacement(Lcodechicken/microblock/MicroblockPlacement;)Lcodechicken/microblock/ExecutablePlacement;", + "expand(II)Z", + "microClass()Lcodechicken/microblock/EdgeMicroClass$;", + "opposite(II)I", + "placementGrid()Lcodechicken/microblock/EdgePlacementGrid$;", + "sneakOpposite(II)Z"); + private static final Set PLACEMENT_COMPANION_METHODS = signatures( + "customPlacement(Lcodechicken/microblock/MicroblockPlacement;)Lcodechicken/microblock/ExecutablePlacement;", + "microClass()Lcodechicken/microblock/EdgeMicroClass$;", + "microClass()Lcodechicken/microblock/MicroblockClass;", + "opposite(II)I", + "placementGrid()Lcodechicken/microblock/EdgePlacementGrid$;", + "placementGrid()Lcodechicken/microblock/PlacementGrid;"); + private static final Set EDGE_CLASS_FACADE_METHODS = signatures( + "aBounds()[Lcodechicken/lib/vec/Cuboid6;", + "aBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "baseTrait()Ljava/lang/Class;", + "baseTraitId()I", + "clientTrait()Ljava/lang/Class;", + "clientTraitId()I", + "create(ZI)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lcodechicken/lib/data/MCDataInput;)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/microblock/Microblock;", + "getClassId()I", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "itemSlot()I", + "placementProperties()Lcodechicken/microblock/EdgePlacement$;", + "register()V", + "register(I)V"); + private static final Set EDGE_CLASS_COMPANION_METHODS = signatures( + "aBounds()[Lcodechicken/lib/vec/Cuboid6;", + "aBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "baseTrait()Ljava/lang/Class;", + "clientTrait()Ljava/lang/Class;", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "itemSlot()I", + "placementProperties()Lcodechicken/microblock/EdgePlacement$;", + "placementProperties()Lcodechicken/microblock/PlacementProperties;"); + private static final Set POST_CLASS_FACADE_METHODS = signatures( + "aBounds()[Lcodechicken/lib/vec/Cuboid6;", + "aBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "baseTrait()Ljava/lang/Class;", + "baseTraitId()I", + "clientTrait()Ljava/lang/Class;", + "clientTraitId()I", + "create(ZI)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lcodechicken/lib/data/MCDataInput;)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/microblock/Microblock;", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "register()V"); + private static final Set POST_CLASS_COMPANION_METHODS = signatures( + "aBounds()[Lcodechicken/lib/vec/Cuboid6;", + "aBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "baseTrait()Ljava/lang/Class;", + "clientTrait()Ljava/lang/Class;", + "getName()Ljava/lang/String;", + "getResistanceFactor()F"); + + @Test + void keepsAllFacadesCompanionsAndGeneratedTraitSurfaces() throws Exception { + assertFacade(EdgePlacement.class, PLACEMENT_FACADE_METHODS); + assertCompanion(EdgePlacement$.class, PlacementProperties.class, PLACEMENT_COMPANION_METHODS, false); + + assertFacade(EdgeMicroClass.class, EDGE_CLASS_FACADE_METHODS); + assertCompanion(EdgeMicroClass$.class, CommonMicroClass.class, EDGE_CLASS_COMPANION_METHODS, true); + + assertTrait( + EdgeMicroblock.class, + new Class[] { CommonMicroblock.class, TEdgePart.class }, + signatures( + "getBounds()Lcodechicken/lib/vec/Cuboid6;", + "getSlot()I", + "microClass()Lcodechicken/microblock/EdgeMicroClass$;", + "setShape(II)V")); + assertHelper( + "codechicken.microblock.EdgeMicroblock$class", + signatures( + "$init$(Lcodechicken/microblock/EdgeMicroblock;)V", + "getBounds(Lcodechicken/microblock/EdgeMicroblock;)Lcodechicken/lib/vec/Cuboid6;", + "getSlot(Lcodechicken/microblock/EdgeMicroblock;)I", + "microClass(Lcodechicken/microblock/EdgeMicroblock;)Lcodechicken/microblock/EdgeMicroClass$;", + "setShape(Lcodechicken/microblock/EdgeMicroblock;II)V")); + + assertFacade(PostMicroClass.class, POST_CLASS_FACADE_METHODS); + assertCompanion(PostMicroClass$.class, MicroblockClass.class, POST_CLASS_COMPANION_METHODS, true); + + assertTrait( + PostMicroblock.class, + new Class[] { JPartialOcclusion.class, TNormalOcclusion.class }, + signatures( + "canPlaceTorchOnTop()Z", + "codechicken$microblock$PostMicroblock$$super$occlusionTest(Lcodechicken/multipart/TMultiPart;)Z", + "getBounds()Lcodechicken/lib/vec/Cuboid6;", + "getOcclusionBoxes()Ljava/util/List;", + "getPartialOcclusionBoxes()Ljava/util/List;", + "getResistanceFactor()F", + "itemClassID()I", + "microClass()Lcodechicken/microblock/PostMicroClass$;", + "occlusionTest(Lcodechicken/multipart/TMultiPart;)Z")); + assertHelper( + "codechicken.microblock.PostMicroblock$class", + signatures( + "$init$(Lcodechicken/microblock/PostMicroblock;)V", + "canPlaceTorchOnTop(Lcodechicken/microblock/PostMicroblock;)Z", + "getBounds(Lcodechicken/microblock/PostMicroblock;)Lcodechicken/lib/vec/Cuboid6;", + "getOcclusionBoxes(Lcodechicken/microblock/PostMicroblock;)Ljava/util/List;", + "getPartialOcclusionBoxes(Lcodechicken/microblock/PostMicroblock;)Ljava/util/List;", + "getResistanceFactor(Lcodechicken/microblock/PostMicroblock;)F", + "itemClassID(Lcodechicken/microblock/PostMicroblock;)I", + "microClass(Lcodechicken/microblock/PostMicroblock;)Lcodechicken/microblock/PostMicroClass$;", + "occlusionTest(Lcodechicken/microblock/PostMicroblock;Lcodechicken/multipart/TMultiPart;)Z")); + + assertTrait( + PostMicroblockClient.class, + new Class[] { PostMicroblock.class, MicroblockClient.class }, + signatures( + "codechicken$microblock$PostMicroblockClient$$super$onAdded()V", + "codechicken$microblock$PostMicroblockClient$$super$read(Lcodechicken/lib/data/MCDataInput;)V", + "onAdded()V", + "onPartChanged(Lcodechicken/multipart/TMultiPart;)V", + "read(Lcodechicken/lib/data/MCDataInput;)V", + "recalcBounds()V", + "render(Lcodechicken/lib/vec/Vector3;I)V", + "renderBounds1()Lcodechicken/lib/vec/Cuboid6;", + "renderBounds1_$eq(Lcodechicken/lib/vec/Cuboid6;)V", + "renderBounds2()Lcodechicken/lib/vec/Cuboid6;", + "renderBounds2_$eq(Lcodechicken/lib/vec/Cuboid6;)V", + "shrinkFace(I)V", + "shrinkPost(Lcodechicken/microblock/PostMicroblock;)V", + "thisShrinks(Lcodechicken/microblock/PostMicroblock;)Z")); + assertHelper( + "codechicken.microblock.PostMicroblockClient$class", + signatures( + "$init$(Lcodechicken/microblock/PostMicroblockClient;)V", + "onAdded(Lcodechicken/microblock/PostMicroblockClient;)V", + "onPartChanged(Lcodechicken/microblock/PostMicroblockClient;Lcodechicken/multipart/TMultiPart;)V", + "read(Lcodechicken/microblock/PostMicroblockClient;Lcodechicken/lib/data/MCDataInput;)V", + "recalcBounds(Lcodechicken/microblock/PostMicroblockClient;)V", + "render(Lcodechicken/microblock/PostMicroblockClient;Lcodechicken/lib/vec/Vector3;I)V", + "shrinkFace(Lcodechicken/microblock/PostMicroblockClient;I)V", + "shrinkPost(Lcodechicken/microblock/PostMicroblockClient;Lcodechicken/microblock/PostMicroblock;)V", + "thisShrinks(Lcodechicken/microblock/PostMicroblockClient;Lcodechicken/microblock/PostMicroblock;)Z")); + } + + @Test + void keepsEdgePlacementRulesAndGridIdentity() { + EdgePlacement$ placement = EdgePlacement$.MODULE$; + assertSame(EdgePlacementGrid$.MODULE$, placement.placementGrid()); + assertSame(EdgePlacementGrid$.MODULE$, EdgePlacement.placementGrid()); + + for (int slot = -3; slot < 0; slot++) { + for (int side = 0; side < 6; side++) { + assertEquals(slot, placement.opposite(slot, side)); + assertEquals(slot, EdgePlacement.opposite(slot, side)); + } + } + for (int slot = 15; slot < 27; slot++) { + for (int side = 0; side < 6; side++) { + int edge = slot - 15; + int opposite = 15 + PartMap.packEdgeBits(edge, PartMap.unpackEdgeBits(edge) ^ (1 << (side >> 1))); + assertEquals(opposite, placement.opposite(slot, side)); + assertEquals(opposite, EdgePlacement.opposite(slot, side)); + assertTrue(placement.sneakOpposite(slot, side)); + assertTrue(EdgePlacement.sneakOpposite(slot, side)); + assertTrue(placement.expand(slot, side)); + assertTrue(EdgePlacement.expand(slot, side)); + } + } + } + + private static void assertFacade(Class type, Set methods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals(0, type.getDeclaredFields().length); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertCompanion(Class type, Class superclass, Set methods, boolean hasBounds) + throws Exception { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(superclass, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + Field module = type.getField("MODULE$"); + assertSame(type, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + if (hasBounds) { + Field bounds = type.getDeclaredField("aBounds"); + assertSame(Cuboid6[].class, bounds.getType()); + assertTrue(Modifier.isPrivate(bounds.getModifiers())); + assertFalse(Modifier.isFinal(bounds.getModifiers())); + } + assertEquals(hasBounds ? 2 : 1, type.getDeclaredFields().length); + } + + private static void assertTrait(Class type, Class[] interfaces, Set methods) { + assertTrue(type.isInterface()); + assertArrayEquals(interfaces, type.getInterfaces()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertHelper(String name, Set methods) throws Exception { + Class type = Class.forName(name, false, EdgeMicroblockCharacterizationTest.class.getClassLoader()); + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isAbstract(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } +} diff --git a/src/test/java/codechicken/microblock/EdgeMicroblockTraitsCharacterizationTest.java b/src/test/java/codechicken/microblock/EdgeMicroblockTraitsCharacterizationTest.java new file mode 100644 index 0000000..dc92f16 --- /dev/null +++ b/src/test/java/codechicken/microblock/EdgeMicroblockTraitsCharacterizationTest.java @@ -0,0 +1,94 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +/** Executes edge-trait forwarders compiled against the untouched Scala implementation. */ +class EdgeMicroblockTraitsCharacterizationTest { + + @Test + void packsSupportedEdgesThroughTheVirtualShapeSetterExactlyOnce() throws Exception { + Fixture f = new Fixture(); + assertEquals(29, f.part.material()); + assertEquals(0, f.part.shape()); + int writes = 0; + for (int size = 1; size <= 7; size++) { + for (int edge = 0; edge < 12; edge++) { + f.part.setShape(size, edge + 15); + byte expected = (byte) (size * 16 + edge); + assertEquals(expected, f.part.shape()); + assertEquals(expected, f.get("writtenShape")); + assertEquals(++writes, f.get("writes")); + assertEquals(size, f.part.getSize()); + assertEquals(edge + 15, f.edge.getSlot()); + assertEquals(1 << (edge + 15), f.edge.getSlotMask()); + assertFalse(f.edge.conductsRedstone()); + assertEquals(29, f.part.material()); + } + } + } + + @Test + void preservesTruncationAndOutOfRangeSlotBitsWithoutValidation() throws Exception { + Fixture f = new Fixture(); + int[][] cases = { { 1, 14, -1, -1, 30 }, { 8, 15, -128, -8, 15 }, { 16, 15, 0, 0, 15 }, { 0, 31, 16, 1, 15 }, + { -1, 26, -5, -1, 26 }, { Integer.MAX_VALUE, Integer.MIN_VALUE, -15, -1, 16 } }; + for (int[] value : cases) { + f.part.setShape(value[0], value[1]); + assertEquals((byte) value[2], f.part.shape()); + assertEquals(value[3], f.part.getSize()); + assertEquals(value[4], f.edge.getSlot()); + } + assertEquals(cases.length, f.get("writes")); + } + + @Test + void slotDecodingUsesTheVirtualGetterAndKeepsIntegerOverflow() throws Exception { + Fixture f = new Fixture(); + f.set("overrideShape", boolean.class, true); + int[][] cases = { { -16, -1 }, { 0, 15 }, { 17, 32 }, { Integer.MAX_VALUE, Integer.MIN_VALUE + 14 } }; + int reads = 0; + for (int[] value : cases) { + f.set("selectedShape", int.class, value[0]); + assertEquals(value[1], f.edge.getSlot()); + assertEquals(++reads, f.get("reads")); + assertEquals(1 << value[1], f.edge.getSlotMask()); + assertEquals(++reads, f.get("reads")); + } + assertEquals(0, f.get("writes")); + assertEquals(0, f.part.shape()); + } + + private static final class Fixture extends ClassLoader { + + final Microblock part; + final EdgeMicroblock edge; + + Fixture() throws Exception { + super(Microblock.class.getClassLoader()); + InputStream input = Objects + .requireNonNull(getClass().getResourceAsStream("/compat/ReferenceScalaEdgeMicroblock.class.b64")); + byte[] bytes; + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + part = (Microblock) defineClass(null, bytes, 0, bytes.length).getConstructor().newInstance(); + edge = (EdgeMicroblock) part; + } + + Object get(String name) throws Exception { + return part.getClass().getMethod(name).invoke(part); + } + + void set(String name, Class type, Object value) throws Exception { + part.getClass().getMethod(name + "_$eq", type).invoke(part, value); + } + } +} diff --git a/src/test/java/codechicken/microblock/FaceMicroblockCharacterizationTest.java b/src/test/java/codechicken/microblock/FaceMicroblockCharacterizationTest.java new file mode 100644 index 0000000..d6f5f96 --- /dev/null +++ b/src/test/java/codechicken/microblock/FaceMicroblockCharacterizationTest.java @@ -0,0 +1,179 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.TFacePart; + +class FaceMicroblockCharacterizationTest { + + private static final Set PLACEMENT_FACADE_METHODS = signatures( + "customPlacement(Lcodechicken/microblock/MicroblockPlacement;)Lcodechicken/microblock/ExecutablePlacement;", + "expand(II)Z", + "microClass()Lcodechicken/microblock/FaceMicroClass$;", + "opposite(II)I", + "placementGrid()Lcodechicken/microblock/FacePlacementGrid$;", + "sneakOpposite(II)Z"); + private static final Set PLACEMENT_COMPANION_METHODS = signatures( + "expand(II)Z", + "microClass()Lcodechicken/microblock/FaceMicroClass$;", + "microClass()Lcodechicken/microblock/MicroblockClass;", + "opposite(II)I", + "placementGrid()Lcodechicken/microblock/FacePlacementGrid$;", + "placementGrid()Lcodechicken/microblock/PlacementGrid;", + "sneakOpposite(II)Z"); + private static final Set CLASS_FACADE_METHODS = signatures( + "aBounds()[Lcodechicken/lib/vec/Cuboid6;", + "aBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "baseTrait()Ljava/lang/Class;", + "baseTraitId()I", + "clientTrait()Ljava/lang/Class;", + "clientTraitId()I", + "create(ZI)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lcodechicken/lib/data/MCDataInput;)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/microblock/Microblock;", + "getClassId()I", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "itemSlot()I", + "placementProperties()Lcodechicken/microblock/FacePlacement$;", + "register()V", + "register(I)V"); + private static final Set CLASS_COMPANION_METHODS = signatures( + "aBounds()[Lcodechicken/lib/vec/Cuboid6;", + "aBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "baseTrait()Ljava/lang/Class;", + "clientTrait()Ljava/lang/Class;", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "itemSlot()I", + "placementProperties()Lcodechicken/microblock/FacePlacement$;", + "placementProperties()Lcodechicken/microblock/PlacementProperties;"); + + @Test + void keepsFacadesCompanionsAndGeneratedTraitSurfaces() throws Exception { + assertFacade(FacePlacement.class, true, PLACEMENT_FACADE_METHODS); + assertCompanion(FacePlacement$.class, PlacementProperties.class, PLACEMENT_COMPANION_METHODS); + assertEquals(1, FacePlacement$.class.getDeclaredFields().length); + + assertFacade(FaceMicroClass.class, false, CLASS_FACADE_METHODS); + Constructor constructor = FaceMicroClass.class.getDeclaredConstructor(); + assertTrue(Modifier.isPublic(constructor.getModifiers())); + assertEquals(1, FaceMicroClass.class.getDeclaredConstructors().length); + assertCompanion(FaceMicroClass$.class, CommonMicroClass.class, CLASS_COMPANION_METHODS); + Field bounds = FaceMicroClass$.class.getDeclaredField("aBounds"); + assertSame(Cuboid6[].class, bounds.getType()); + assertTrue(Modifier.isPrivate(bounds.getModifiers())); + assertFalse(Modifier.isFinal(bounds.getModifiers())); + assertEquals(2, FaceMicroClass$.class.getDeclaredFields().length); + + assertTrait( + FaceMicroblock.class, + new Class[] { CommonMicroblock.class, TFacePart.class }, + signatures( + "getBounds()Lcodechicken/lib/vec/Cuboid6;", + "microClass()Lcodechicken/microblock/FaceMicroClass$;", + "solid(I)Z")); + assertHelper( + "codechicken.microblock.FaceMicroblock$class", + signatures( + "$init$(Lcodechicken/microblock/FaceMicroblock;)V", + "getBounds(Lcodechicken/microblock/FaceMicroblock;)Lcodechicken/lib/vec/Cuboid6;", + "microClass(Lcodechicken/microblock/FaceMicroblock;)Lcodechicken/microblock/FaceMicroClass$;", + "solid(Lcodechicken/microblock/FaceMicroblock;I)Z")); + + assertTrait( + FaceMicroblockClient.class, + new Class[] { CommonMicroblockClient.class }, + signatures("render(Lcodechicken/lib/vec/Vector3;I)V")); + assertHelper( + "codechicken.microblock.FaceMicroblockClient$class", + signatures( + "$init$(Lcodechicken/microblock/FaceMicroblockClient;)V", + "render(Lcodechicken/microblock/FaceMicroblockClient;Lcodechicken/lib/vec/Vector3;I)V")); + } + + @Test + void keepsFacePlacementRulesAndGridIdentity() { + FacePlacement$ placement = FacePlacement$.MODULE$; + assertSame(FacePlacementGrid$.MODULE$, placement.placementGrid()); + assertSame(FacePlacementGrid$.MODULE$, FacePlacement.placementGrid()); + assertNull(placement.customPlacement(null)); + assertNull(FacePlacement.customPlacement(null)); + + for (int slot = 0; slot < 6; slot++) { + for (int side = 0; side < 6; side++) { + boolean sneaking = slot == (side ^ 1); + assertEquals(slot ^ 1, placement.opposite(slot, side)); + assertEquals(slot ^ 1, FacePlacement.opposite(slot, side)); + assertEquals(sneaking, placement.sneakOpposite(slot, side)); + assertEquals(sneaking, FacePlacement.sneakOpposite(slot, side)); + assertEquals(sneaking, placement.expand(slot, side)); + assertEquals(sneaking, FacePlacement.expand(slot, side)); + } + } + } + + private static void assertFacade(Class type, boolean isFinal, Set methods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertEquals(isFinal, Modifier.isFinal(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals(0, type.getDeclaredFields().length); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertCompanion(Class type, Class superclass, Set methods) throws Exception { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(superclass, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + Field module = type.getField("MODULE$"); + assertSame(type, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + } + + private static void assertTrait(Class type, Class[] interfaces, Set methods) { + assertTrue(type.isInterface()); + assertArrayEquals(interfaces, type.getInterfaces()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertHelper(String name, Set methods) throws Exception { + Class type = Class.forName(name, false, FaceMicroblockCharacterizationTest.class.getClassLoader()); + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isAbstract(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } +} diff --git a/src/test/java/codechicken/microblock/FaceMicroblockTraitsCharacterizationTest.java b/src/test/java/codechicken/microblock/FaceMicroblockTraitsCharacterizationTest.java new file mode 100644 index 0000000..0c761a6 --- /dev/null +++ b/src/test/java/codechicken/microblock/FaceMicroblockTraitsCharacterizationTest.java @@ -0,0 +1,190 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.reflect.Proxy; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; + +/** Runs a frozen Scala face-client forwarder against the original or extracted helper. */ +class FaceMicroblockTraitsCharacterizationTest { + + @Test + void negativePassUsesPhysicalBoundsAndIgnoresTransparencyAndMasks() throws Exception { + Fixture f = new Fixture(); + assertEquals(37, f.part.material()); + assertNull(f.client.renderBounds()); + assertEquals(0, f.client.renderMask()); + f.client.renderMask_$eq(63); + for (int pass : new int[] { -1, -7 }) { + f.clear(); + f.client.render(f.position, pass); + assertDraw(f, 0, 6, f.bounds, pass, 0); + assertEquals(6, f.faces.size()); + assertEquals(Arrays.asList("material", "bounds"), f.events); + } + } + + @Test + void transparentPassRendersExactlyTheUnmaskedShrunkFaces() throws Exception { + Fixture f = new Fixture(); + f.set("transparent", boolean.class, true); + f.client.renderBounds_$eq(f.shrunk); + for (int mask = 0; mask < 64; mask++) { + f.clear(); + f.client.renderMask_$eq(mask); + f.client.render(f.position, 2); + int count = 6 - Integer.bitCount(mask); + assertDraw(f, 0, count, f.shrunk, 2, mask); + assertEquals(count, f.faces.size()); + assertEquals(Arrays.asList("transparent", "material"), f.events); + } + } + + @Test + void opaquePassRendersShrunkSidesThenTheOuterFaceForEveryMaskAndSlot() throws Exception { + Fixture f = new Fixture(); + f.client.renderBounds_$eq(f.shrunk); + for (int slot = 0; slot < 6; slot++) { + f.set("selectedSlot", int.class, slot); + for (int mask = 0; mask < 64; mask++) { + f.clear(); + f.client.renderMask_$eq(mask); + f.client.render(f.position, 0); + int innerMask = mask | 1 << slot; + int count = 6 - Integer.bitCount(innerMask); + assertDraw(f, 0, count, f.shrunk, 0, innerMask); + assertDraw(f, count, 1, Cuboid6.full, 0, ~(1 << slot)); + assertEquals(count + 1, f.faces.size()); + assertEquals(Arrays.asList("transparent", "material", "slot:" + slot, "slot:" + slot), f.events); + } + } + } + + @Test + void opaquePassCachesMaterialButEvaluatesTheSlotAgainAfterTheFirstDraw() throws Exception { + Fixture f = new Fixture(); + f.client.renderBounds_$eq(f.shrunk); + f.set("selectedSlot", int.class, 2); + f.set("slotAdvance", int.class, 1); + IMicroMaterial material = f.material; + f.afterFace = () -> { + try { + f.set("selectedMaterial", IMicroMaterial.class, null); + } catch (Exception e) { + throw new AssertionError(e); + } + }; + f.client.render(f.position, 1); + assertDraw(f, 0, 5, f.shrunk, 1, 1 << 2); + assertDraw(f, 5, 1, Cuboid6.full, 1, ~(1 << 3)); + assertEquals(6, f.faces.size()); + for (Face face : f.faces) assertSame(material, face.material); + assertEquals(Arrays.asList("transparent", "material", "slot:2", "slot:3"), f.events); + } + + @Test + void missingMaterialFailsOnlyWhenAnUnmaskedFaceIsEmitted() throws Exception { + Fixture f = new Fixture(); + f.set("selectedMaterial", IMicroMaterial.class, null); + f.set("transparent", boolean.class, true); + f.client.renderBounds_$eq(f.shrunk); + f.client.renderMask_$eq(63); + assertDoesNotThrow(() -> f.client.render(f.position, 0)); + assertTrue(f.faces.isEmpty()); + f.client.renderMask_$eq(0); + assertThrows(NullPointerException.class, () -> f.client.render(f.position, 0)); + f.set("transparent", boolean.class, false); + f.client.renderMask_$eq(63); + f.clear(); + assertThrows(NullPointerException.class, () -> f.client.render(f.position, 0)); + assertEquals(Arrays.asList("transparent", "material", "slot:0", "slot:0"), f.events); + } + + private static void assertDraw(Fixture f, int offset, int count, Cuboid6 bounds, int pass, int mask) { + int index = offset; + for (int side = 0; side < 6; side++) { + if ((mask & 1 << side) != 0) continue; + Face face = f.faces.get(index++); + assertEquals(side, face.side); + assertSame(bounds, face.bounds); + assertSame(f.position, face.position); + assertEquals(pass, face.pass); + } + assertEquals(offset + count, index); + } + + private static final class Face { + + final Object material; + final Vector3 position; + final Cuboid6 bounds; + final int pass; + final int side; + + Face(Object material, Object[] args) { + this.material = material; + position = (Vector3) args[0]; + pass = (Integer) args[1]; + bounds = (Cuboid6) args[2]; + side = MicroblockRender.face().get().side; + } + } + + private static final class Fixture extends ClassLoader { + + final Microblock part; + final FaceMicroblockClient client; + final List events; + final List faces = new ArrayList<>(); + final Vector3 position = new Vector3(2, 3, 4); + final Cuboid6 shrunk = new Cuboid6(0.1, 0.05, 0.2, 0.8, 0.2, 0.9); + final Cuboid6 bounds; + final IMicroMaterial material; + Runnable afterFace; + + @SuppressWarnings("unchecked") + Fixture() throws Exception { + super(Microblock.class.getClassLoader()); + InputStream input = Objects.requireNonNull( + getClass().getResourceAsStream("/compat/ReferenceScalaFaceMicroblockClient.class.b64")); + byte[] bytes; + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + part = (Microblock) defineClass(null, bytes, 0, bytes.length).getConstructor().newInstance(); + client = (FaceMicroblockClient) part; + events = (List) part.getClass().getMethod("events").invoke(part); + bounds = (Cuboid6) part.getClass().getMethod("bounds").invoke(part); + material = (IMicroMaterial) Proxy + .newProxyInstance(getParent(), new Class[] { IMicroMaterial.class }, (proxy, method, args) -> { + assertEquals("renderMicroFace", method.getName()); + faces.add(new Face(proxy, args)); + if (afterFace != null) afterFace.run(); + return null; + }); + set("selectedMaterial", IMicroMaterial.class, material); + } + + void set(String name, Class type, Object value) throws Exception { + part.getClass().getMethod(name + "_$eq", type).invoke(part, value); + } + + void clear() { + events.clear(); + faces.clear(); + } + } +} diff --git a/src/test/java/codechicken/microblock/GrassMicroMaterialCharacterizationTest.java b/src/test/java/codechicken/microblock/GrassMicroMaterialCharacterizationTest.java new file mode 100644 index 0000000..105cf01 --- /dev/null +++ b/src/test/java/codechicken/microblock/GrassMicroMaterialCharacterizationTest.java @@ -0,0 +1,234 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.render.BlockRenderer.BlockFace; +import codechicken.lib.render.CCRenderPipeline; +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.ColourMultiplier; +import codechicken.lib.render.uv.IconTransformation; +import codechicken.lib.render.uv.MultiIconTransformation; +import codechicken.lib.render.uv.UVTransformation; +import codechicken.lib.render.uv.UVTransformationList; +import codechicken.lib.render.uv.UVTranslation; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +class GrassMicroMaterialCharacterizationTest { + + private static final Set GRASS_METHODS = new TreeSet<>( + Arrays.asList( + "getBreakingColour(ILnet/minecraft/world/IBlockAccess;III)I", + "loadIcons()V", + "renderMicroFace(Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;)V", + "sideIconT()Lcodechicken/lib/render/uv/IconTransformation;", + "sideIconT_$eq(Lcodechicken/lib/render/uv/IconTransformation;)V")); + private static final Set TOP_METHODS = new TreeSet<>( + Arrays.asList( + "$lessinit$greater$default$2()I", + "renderMicroFace(Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;)V")); + + @Test + void keepsTheTwoClassSurfacesAndTopDefaultCompanion() throws Exception { + assertEquals(BlockMicroMaterial.class, GrassMicroMaterial.class.getSuperclass()); + assertEquals(BlockMicroMaterial.class, TopMicroMaterial.class.getSuperclass()); + assertFalse(Modifier.isFinal(GrassMicroMaterial.class.getModifiers())); + assertFalse(Modifier.isFinal(TopMicroMaterial.class.getModifiers())); + assertNull(GrassMicroMaterial.class.getAnnotation(SideOnly.class)); + assertNull(TopMicroMaterial.class.getAnnotation(SideOnly.class)); + assertEquals(GRASS_METHODS, publicDeclaredMethodSignatures(GrassMicroMaterial.class)); + assertEquals(TOP_METHODS, publicDeclaredMethodSignatures(TopMicroMaterial.class)); + + Constructor grassConstructor = GrassMicroMaterial.class.getConstructor(); + Constructor topConstructor = TopMicroMaterial.class.getConstructor(Block.class, int.class); + assertTrue(Modifier.isPublic(grassConstructor.getModifiers())); + assertTrue(Modifier.isPublic(topConstructor.getModifiers())); + assertEquals(1, GrassMicroMaterial.class.getDeclaredConstructors().length); + assertEquals(1, TopMicroMaterial.class.getDeclaredConstructors().length); + + Field sideIcon = GrassMicroMaterial.class.getDeclaredField("sideIconT"); + assertEquals(IconTransformation.class, sideIcon.getType()); + assertTrue(Modifier.isPrivate(sideIcon.getModifiers())); + assertEquals(1, GrassMicroMaterial.class.getDeclaredFields().length); + assertEquals(0, TopMicroMaterial.class.getDeclaredFields().length); + + assertTrue(Modifier.isPublic(TopMicroMaterial$.class.getModifiers())); + assertTrue(Modifier.isFinal(TopMicroMaterial$.class.getModifiers())); + assertEquals(1, publicDeclaredMethodSignatures(TopMicroMaterial$.class).size()); + assertTrue(publicDeclaredMethodSignatures(TopMicroMaterial$.class).contains("$lessinit$greater$default$2()I")); + Field module = TopMicroMaterial$.class.getField("MODULE$"); + assertSame(TopMicroMaterial$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(TopMicroMaterial$.MODULE$, module.get(null)); + assertEquals(0, TopMicroMaterial.$lessinit$greater$default$2()); + assertEquals(0, TopMicroMaterial$.MODULE$.$lessinit$greater$default$2()); + } + + @Test + void keepsConstructionAndGrassOverlayState() { + GrassMicroMaterial grass = new GrassMicroMaterial(); + assertSame(Blocks.grass, grass.block()); + assertEquals(0, grass.meta()); + assertNull(grass.sideIconT()); + + IconTransformation overlay = new IconTransformation(null); + grass.sideIconT_$eq(overlay); + assertSame(overlay, grass.sideIconT()); + + TopMicroMaterial top = new TopMicroMaterial(Blocks.mycelium, 7); + assertSame(Blocks.mycelium, top.block()); + assertEquals(7, top.meta()); + } + + @Test + void keepsRenderingMethodsAndOverlayAccessorsOnTheCommonSide() { + for (Class type : Arrays.asList(GrassMicroMaterial.class, TopMicroMaterial.class)) { + for (Method method : type.getDeclaredMethods()) { + if (method.getName().equals("getBreakingColour")) { + assertEquals(Side.CLIENT, method.getAnnotation(SideOnly.class).value()); + } else { + assertNull(method.getAnnotation(SideOnly.class), method.toString()); + } + } + } + assertNull(GrassMicroMaterial.class.getDeclaredFields()[0].getAnnotation(SideOnly.class)); + } + + @Test + void grassRoutesBottomTopAndSideFacesThroughTheSamePipelineInputs() throws Exception { + GrassMicroMaterial grass = new GrassMicroMaterial() { + + @Override + public int getColour(int pass) { + return 0xFFFFFFFF; + } + }; + MultiIconTransformation base = new MultiIconTransformation((net.minecraft.util.IIcon) null); + IconTransformation overlay = new IconTransformation(null); + grass.icont_$eq(base); + grass.sideIconT_$eq(overlay); + Cuboid6 bounds = new Cuboid6(0, 0, 0, 1, 0.625, 1); + + List bottom = renderOperations(grass, 0, bounds); + assertSame(base, uvOperation(bottom)); + assertFalse(hasColourMultiplier(bottom)); + + List top = renderOperations(grass, 1, bounds); + assertSame(base, uvOperation(top)); + assertTrue(hasColourMultiplier(top)); + + List side = renderOperations(grass, 2, bounds); + assertTransformationList(uvOperation(side), -0.375, overlay); + assertTrue(hasColourMultiplier(side)); + } + + @Test + void topMaterialUsesTheBaseUvOnHorizontalFacesAndHeightAdjustedUvOnSides() throws Exception { + TopMicroMaterial top = new TopMicroMaterial(Blocks.mycelium, 0) { + + @Override + public int getColour(int pass) { + return 0xFFFFFFFF; + } + }; + MultiIconTransformation icons = new MultiIconTransformation((net.minecraft.util.IIcon) null); + top.icont_$eq(icons); + Cuboid6 bounds = new Cuboid6(0, 0, 0, 1, 0.375, 1); + + List horizontal = renderOperations(top, 1, bounds); + assertSame(icons, uvOperation(horizontal)); + assertTrue(hasColourMultiplier(horizontal)); + + List side = renderOperations(top, 4, bounds); + assertTransformationList(uvOperation(side), -0.625, icons); + assertTrue(hasColourMultiplier(side)); + } + + private static List renderOperations(BlockMicroMaterial material, int side, + Cuboid6 bounds) throws Exception { + CCRenderState state = CCRenderState.instance(); + state.resetInstance(); + BlockFace face = new BlockFace(); + face.side = side; + state.model = face; + state.firstVertexIndex = 0; + state.lastVertexIndex = 0; + + material.renderMicroFace(new Vector3(), -1, bounds); + + Field operations = CCRenderPipeline.class.getDeclaredField("ops"); + operations.setAccessible(true); + @SuppressWarnings("unchecked") + List result = new ArrayList<>( + (List) operations.get(state.pipeline)); + return result; + } + + private static UVTransformation uvOperation(List operations) { + List transformations = new ArrayList<>(); + for (CCRenderState.IVertexOperation operation : operations) { + if (operation instanceof UVTransformation) { + transformations.add((UVTransformation) operation); + } + } + assertEquals(1, transformations.size()); + return transformations.get(0); + } + + private static boolean hasColourMultiplier(List operations) { + for (CCRenderState.IVertexOperation operation : operations) { + if (operation instanceof ColourMultiplier) { + return true; + } + } + return false; + } + + private static void assertTransformationList(UVTransformation transformation, double expectedDv, Object tail) + throws Exception { + assertTrue(transformation instanceof UVTransformationList); + Field transformations = UVTransformationList.class.getDeclaredField("transformations"); + transformations.setAccessible(true); + @SuppressWarnings("unchecked") + List parts = (List) transformations.get(transformation); + assertEquals(2, parts.size()); + assertTrue(parts.get(0) instanceof UVTranslation); + UVTranslation translation = (UVTranslation) parts.get(0); + assertEquals(0, translation.du); + assertEquals(expectedDv, translation.dv); + assertSame(tail, parts.get(1)); + } + + private static Set publicDeclaredMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/microblock/HollowMicroblockCharacterizationTest.java b/src/test/java/codechicken/microblock/HollowMicroblockCharacterizationTest.java new file mode 100644 index 0000000..55cf79a --- /dev/null +++ b/src/test/java/codechicken/microblock/HollowMicroblockCharacterizationTest.java @@ -0,0 +1,225 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.TFacePart; +import codechicken.multipart.TNormalOcclusion; + +class HollowMicroblockCharacterizationTest { + + private static final Set PLACEMENT_FACADE_METHODS = signatures( + "customPlacement(Lcodechicken/microblock/MicroblockPlacement;)Lcodechicken/microblock/ExecutablePlacement;", + "expand(II)Z", + "microClass()Lcodechicken/microblock/HollowMicroClass$;", + "opposite(II)I", + "placementGrid()Lcodechicken/microblock/HollowPlacement$HollowPlacementGrid$;", + "sneakOpposite(II)Z"); + private static final Set PLACEMENT_COMPANION_METHODS = signatures( + "expand(II)Z", + "microClass()Lcodechicken/microblock/HollowMicroClass$;", + "microClass()Lcodechicken/microblock/MicroblockClass;", + "opposite(II)I", + "placementGrid()Lcodechicken/microblock/HollowPlacement$HollowPlacementGrid$;", + "placementGrid()Lcodechicken/microblock/PlacementGrid;", + "sneakOpposite(II)Z"); + private static final Set CLASS_FACADE_METHODS = signatures( + "baseTrait()Ljava/lang/Class;", + "baseTraitId()I", + "clientTrait()Ljava/lang/Class;", + "clientTraitId()I", + "create(ZI)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lcodechicken/lib/data/MCDataInput;)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/microblock/Microblock;", + "getClassId()I", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "itemSlot()I", + "occBounds()[Lcodechicken/lib/vec/Cuboid6;", + "occBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "pBoxes()[Lscala/collection/Seq;", + "pBoxes_$eq([Lscala/collection/Seq;)V", + "placementProperties()Lcodechicken/microblock/HollowPlacement$;", + "register()V", + "register(I)V"); + private static final Set CLASS_COMPANION_METHODS = signatures( + "baseTrait()Ljava/lang/Class;", + "clientTrait()Ljava/lang/Class;", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "itemSlot()I", + "occBounds()[Lcodechicken/lib/vec/Cuboid6;", + "occBounds_$eq([Lcodechicken/lib/vec/Cuboid6;)V", + "pBoxes()[Lscala/collection/Seq;", + "pBoxes_$eq([Lscala/collection/Seq;)V", + "placementProperties()Lcodechicken/microblock/HollowPlacement$;", + "placementProperties()Lcodechicken/microblock/PlacementProperties;"); + + @Test + void keepsFacadesNestedGridCompanionAndGeneratedTraitSurfaces() throws Exception { + assertFacade(HollowPlacement.class, PLACEMENT_FACADE_METHODS); + assertCompanion(HollowPlacement$.class, PlacementProperties.class, PLACEMENT_COMPANION_METHODS, 1); + + Class grid = HollowPlacement.HollowPlacementGrid$.class; + assertTrue(Modifier.isPublic(grid.getModifiers())); + assertFalse(Modifier.isFinal(grid.getModifiers())); + assertSame(FaceEdgeGrid.class, grid.getSuperclass()); + assertEquals(0, publicDeclaredMethods(grid).size()); + Field gridModule = grid.getField("MODULE$"); + assertSame(grid, gridModule.getType()); + assertTrue(Modifier.isStatic(gridModule.getModifiers())); + assertTrue(Modifier.isFinal(gridModule.getModifiers())); + assertEquals(1, grid.getDeclaredFields().length); + Constructor constructor = grid.getConstructor(); + assertTrue(Modifier.isPublic(constructor.getModifiers())); + + assertFacade(HollowMicroClass.class, CLASS_FACADE_METHODS); + assertCompanion(HollowMicroClass$.class, CommonMicroClass.class, CLASS_COMPANION_METHODS, 3); + assertMutablePrivateArray(HollowMicroClass$.class.getDeclaredField("pBoxes"), scala.collection.Seq[].class); + assertMutablePrivateArray(HollowMicroClass$.class.getDeclaredField("occBounds"), Cuboid6[].class); + + assertTrait( + HollowMicroblock.class, + new Class[] { CommonMicroblock.class, TFacePart.class, TNormalOcclusion.class }, + signatures( + "allowCompleteOcclusion()Z", + "codechicken$microblock$HollowMicroblock$$super$occlusionTest(Lcodechicken/multipart/TMultiPart;)Z", + "getBounds()Lcodechicken/lib/vec/Cuboid6;", + "getCollisionBoxes()Ljava/util/List;", + "getHollowSize()I", + "getOcclusionBoxes()Ljava/lang/Iterable;", + "getPartialOcclusionBoxes()Ljava/util/List;", + "getSubParts()Ljava/util/List;", + "microClass()Lcodechicken/microblock/HollowMicroClass$;", + "occlusionTest(Lcodechicken/multipart/TMultiPart;)Z", + "redstoneConductionMap()I", + "solid(I)Z")); + assertHelper( + "codechicken.microblock.HollowMicroblock$class", + signatures( + "$init$(Lcodechicken/microblock/HollowMicroblock;)V", + "allowCompleteOcclusion(Lcodechicken/microblock/HollowMicroblock;)Z", + "getBounds(Lcodechicken/microblock/HollowMicroblock;)Lcodechicken/lib/vec/Cuboid6;", + "getCollisionBoxes(Lcodechicken/microblock/HollowMicroblock;)Ljava/util/List;", + "getHollowSize(Lcodechicken/microblock/HollowMicroblock;)I", + "getOcclusionBoxes(Lcodechicken/microblock/HollowMicroblock;)Ljava/lang/Iterable;", + "getPartialOcclusionBoxes(Lcodechicken/microblock/HollowMicroblock;)Ljava/util/List;", + "getSubParts(Lcodechicken/microblock/HollowMicroblock;)Ljava/util/List;", + "microClass(Lcodechicken/microblock/HollowMicroblock;)Lcodechicken/microblock/HollowMicroClass$;", + "occlusionTest(Lcodechicken/microblock/HollowMicroblock;Lcodechicken/multipart/TMultiPart;)Z", + "redstoneConductionMap(Lcodechicken/microblock/HollowMicroblock;)I", + "solid(Lcodechicken/microblock/HollowMicroblock;I)Z")); + + assertTrait( + HollowMicroblockClient.class, + new Class[] { HollowMicroblock.class, CommonMicroblockClient.class }, + signatures( + "codechicken$microblock$HollowMicroblockClient$$super$recalcBounds()V", + "drawBreaking(Lnet/minecraft/client/renderer/RenderBlocks;)V", + "drawHighlight(Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/entity/player/EntityPlayer;F)Z", + "recalcBounds()V", + "render(Lcodechicken/lib/vec/Vector3;I)V", + "renderHollow(Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;IZLscala/Function5;)V")); + assertHelper( + "codechicken.microblock.HollowMicroblockClient$class", + signatures( + "$init$(Lcodechicken/microblock/HollowMicroblockClient;)V", + "drawBreaking(Lcodechicken/microblock/HollowMicroblockClient;Lnet/minecraft/client/renderer/RenderBlocks;)V", + "drawHighlight(Lcodechicken/microblock/HollowMicroblockClient;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/entity/player/EntityPlayer;F)Z", + "recalcBounds(Lcodechicken/microblock/HollowMicroblockClient;)V", + "render(Lcodechicken/microblock/HollowMicroblockClient;Lcodechicken/lib/vec/Vector3;I)V", + "renderHollow(Lcodechicken/microblock/HollowMicroblockClient;Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;IZLscala/Function5;)V")); + } + + @Test + void keepsPlacementRulesAndNestedGridIdentity() { + HollowPlacement$ placement = HollowPlacement$.MODULE$; + assertSame(HollowPlacement.HollowPlacementGrid$.MODULE$, placement.placementGrid()); + assertSame(HollowPlacement.HollowPlacementGrid$.MODULE$, HollowPlacement.placementGrid()); + assertNull(placement.customPlacement(null)); + assertNull(HollowPlacement.customPlacement(null)); + + for (int slot = -3; slot < 27; slot++) { + for (int side = 0; side < 6; side++) { + assertEquals(slot ^ 1, placement.opposite(slot, side)); + assertEquals(slot ^ 1, HollowPlacement.opposite(slot, side)); + boolean opposite = slot == (side ^ 1); + assertEquals(opposite, placement.sneakOpposite(slot, side)); + assertEquals(opposite, HollowPlacement.sneakOpposite(slot, side)); + assertEquals(opposite, placement.expand(slot, side)); + assertEquals(opposite, HollowPlacement.expand(slot, side)); + } + } + } + + private static void assertFacade(Class type, Set methods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals(0, type.getDeclaredFields().length); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertCompanion(Class type, Class superclass, Set methods, int fieldCount) + throws Exception { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(superclass, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + Field module = type.getField("MODULE$"); + assertSame(type, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertEquals(fieldCount, type.getDeclaredFields().length); + } + + private static void assertMutablePrivateArray(Field field, Class type) { + assertSame(type, field.getType()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + assertFalse(Modifier.isFinal(field.getModifiers())); + } + + private static void assertTrait(Class type, Class[] interfaces, Set methods) { + assertTrue(type.isInterface()); + assertArrayEquals(interfaces, type.getInterfaces()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertHelper(String name, Set methods) throws Exception { + Class type = Class.forName(name, false, HollowMicroblockCharacterizationTest.class.getClassLoader()); + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isAbstract(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } +} diff --git a/src/test/java/codechicken/microblock/HollowMicroblockClientCharacterizationTest.java b/src/test/java/codechicken/microblock/HollowMicroblockClientCharacterizationTest.java new file mode 100644 index 0000000..0e67ae8 --- /dev/null +++ b/src/test/java/codechicken/microblock/HollowMicroblockClientCharacterizationTest.java @@ -0,0 +1,538 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.io.InputStream; +import java.lang.reflect.Proxy; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import java.util.Scanner; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.entity.Entity; +import net.minecraft.util.IIcon; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; + +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.CCRenderState.IVertexOperation; +import codechicken.lib.render.uv.IconTransformation; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Transformation; +import codechicken.lib.vec.Translation; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import scala.Function5; +import scala.MatchError; +import scala.runtime.AbstractFunction5; +import scala.runtime.BoxedUnit; + +/** Executes original frozen forwarders, replacing only GPU-facing services with a call recorder. */ +public class HollowMicroblockClientCharacterizationTest { + + @Test + void initializationOrsTheDefaultOpeningAndRecalculationPreservesSuperLowBits() throws Exception { + Fixture f = new Fixture(); + assertEquals(0x123c01, f.client.renderMask()); + for (int size : new int[] { -1, 0, 8, 11, Integer.MAX_VALUE }) { + f.set("hollowSize", int.class, size); + f.set("changeMaskOnSize", boolean.class, true); + f.events.clear(); + f.client.recalcBounds(); + assertEquals(0x65 | size << 8, f.client.renderMask()); + assertEquals(Arrays.asList("super", "size"), f.events); + } + f.set("failSuper", boolean.class, true); + f.events.clear(); + assertEquals("super", assertThrows(IllegalStateException.class, f.client::recalcBounds).getMessage()); + assertEquals(Collections.singletonList("super"), f.events); + assertEquals(0x12345665, f.client.renderMask()); + } + + @Test + void renderChoosesPhysicalTransparentAndOpaqueCallsWithLiveSlotDispatch() throws Exception { + Fixture f = new Fixture(); + Cuboid6 render = new Cuboid6(0, 0, 0, 0.5, 0.5, 0.5); + f.client.renderBounds_$eq(render); + f.client.renderMask_$eq(0x851); + for (int pass : new int[] { -1, -2, 0, 1 }) { + for (boolean transparent : new boolean[] { false, true }) { + f.set("transparent", boolean.class, transparent); + f.set("slot", int.class, 2); + f.set("slotAdvance", int.class, 1); + f.clear(); + f.client.render(f.pos, pass); + assertEquals(pass == -1 || transparent ? 1 : 2, f.draws.size()); + f.assertDraw( + 0, + pass, + pass == -1 ? f.bounds : render, + pass == -1 ? 0 : transparent ? 0x851 : 0x855, + false); + if (pass == -1) assertEquals(Arrays.asList("bounds", "hollow"), f.events); + else if (transparent) assertEquals(Arrays.asList("transparent", "hollow"), f.events); + else { + f.assertDraw(1, pass, Cuboid6.full, ~(1 << 3), true); + assertEquals(Arrays.asList("transparent", "slot", "hollow", "slot", "hollow"), f.events); + assertNotSame(f.draws.get(0)[5], f.draws.get(1)[5]); + } + } + } + } + + @Test + void renderCallbacksInvokeMaterialDrawingAndFirstFailurePreventsTheSecondCall() throws Exception { + Fixture f = new Fixture(); + List sides = new ArrayList<>(); + IMicroMaterial material = (IMicroMaterial) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { IMicroMaterial.class }, + (proxy, method, args) -> { + assertEquals("renderMicroFace", method.getName()); + assertSame(f.pos, args[0]); + assertEquals(7, args[1]); + assertSame(f.bounds, args[2]); + sides.add(MicroblockRender.face().get().side); + return null; + }); + for (int pass : new int[] { -1, 0 }) { + for (boolean transparent : new boolean[] { false, true }) { + f.set("transparent", boolean.class, transparent); + f.clear(); + f.client.render(f.pos, pass); + for (Object[] draw : f.draws) { + sides.clear(); + callback(draw).apply(f.pos, material, 7, f.bounds, 0x15); + assertEquals(Arrays.asList(1, 3, 5), sides); + } + } + } + f.set("transparent", boolean.class, false); + f.set("afterHollow", Runnable.class, (Runnable) () -> { throw new IllegalStateException("draw"); }); + f.clear(); + assertEquals("draw", assertThrows(IllegalStateException.class, () -> f.client.render(f.pos, 0)).getMessage()); + assertEquals(1, f.draws.size()); + } + + @Test + void rimCallbacksKeepAllSixOrderedBoundsAndFaceMasksOnEveryAxis() throws Exception { + Fixture f = new Fixture(); + f.set("runHollow", boolean.class, true); + f.client.renderMask_$eq(8 << 8); + // Literal reference geometry at opening size 8, independent of callback implementation. + double[][][] geometry = { + { { .25, .2, .75, .75, .8, .7 }, { .25, .2, .3, .75, .8, .25 }, { .75, .2, .25, .9, .8, .75 }, + { .1, .2, .25, .25, .8, .75 }, { .1, .2, .75, .9, .8, .7 }, { .1, .2, .3, .9, .8, .25 } }, + { { .75, .25, .3, .9, .75, .7 }, { .1, .25, .3, .25, .75, .7 }, { .25, .75, .3, .75, .8, .7 }, + { .25, .2, .3, .75, .25, .7 }, { .75, .2, .3, .9, .8, .7 }, { .1, .2, .3, .25, .8, .7 } }, + { { .1, .75, .25, .9, .8, .75 }, { .1, .2, .25, .9, .25, .75 }, { .1, .25, .75, .9, .75, .7 }, + { .1, .25, .3, .9, .75, .25 }, { .1, .75, .3, .9, .8, .7 }, { .1, .2, .3, .9, .25, .7 } } }; + int[][] masks0 = { { 59, 55, 12, 12, 4, 8 }, { 47, 31, 48, 48, 16, 32 }, { 62, 61, 3, 3, 1, 2 } }; + int[][] masks63 = { { 59, 55, 47, 31, 63, 63 }, { 47, 31, 62, 61, 63, 63 }, { 62, 61, 59, 55, 63, 63 } }; + int[] faceMask = { 60, 51, 15 }; + for (int side = 0; side < 6; side++) { + f.set("slot", int.class, side); + for (boolean face : new boolean[] { false, true }) { + for (int mask : new int[] { 0, 63, -1 }) { + List boxes = new ArrayList<>(); + List masks = new ArrayList<>(); + f.clear(); + f.client.renderHollow(f.pos, 7, f.bounds, mask, face, collect((pos, mat, pass, box, bits) -> { + assertSame(f.pos, pos); + assertNull(mat); + assertEquals(7, pass); + boxes.add(box); + masks.add(bits); + })); + assertEquals(Arrays.asList("hollow", "material", "slot"), f.events); + assertEquals(6, boxes.size()); + for (int i = 0; i < 6; i++) { + assertArrayEquals(geometry[side / 2][i], coords(boxes.get(i)), 0); + assertEquals( + (mask == 0 ? masks0 : masks63)[side / 2][i] | (face ? faceMask[side / 2] : 0), + masks.get(i)); + for (int j = 0; j < i; j++) assertNotSame(boxes.get(i), boxes.get(j)); + } + } + } + } + } + + @Test + void rimRenderingSnapshotsMaterialMaskAndCoordinatesBeforeCallbacksAndPreservesFailures() throws Exception { + Fixture f = new Fixture(); + f.set("runHollow", boolean.class, true); + List boxes = new ArrayList<>(); + for (int size : new int[] { -8, 0, 11, 32 }) { + f.client.renderMask_$eq(size << 8 | 0x55); + boxes.clear(); + f.client.renderHollow(f.pos, 0, Cuboid6.full, 0, false, collect((pos, mat, pass, box, mask) -> { + boxes.add(box); + f.client.renderMask_$eq(0); + f.setUnchecked("slot", int.class, 5); + })); + assertEquals(0.5 - size / 32D, boxes.get(0).min.x); + assertEquals(0.5 + size / 32D, boxes.get(0).max.x); + f.set("slot", int.class, 0); + } + IMicroMaterial material = (IMicroMaterial) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { IMicroMaterial.class }, + (proxy, method, args) -> { throw new AssertionError("material invoked"); }); + f.set("selectedMaterial", IMicroMaterial.class, material); + f.client.renderMask_$eq(8 << 8); + Cuboid6 mutable = f.bounds.copy(); + boxes.clear(); + f.client.renderHollow(f.pos, 0, mutable, 0, false, collect((pos, mat, pass, box, mask) -> { + assertSame(material, mat); + boxes.add(box); + mutable.max.x = 99; + f.setUnchecked("selectedMaterial", IMicroMaterial.class, null); + })); + assertEquals(.9, boxes.get(5).max.x); + f.clear(); + assertThrows(NullPointerException.class, () -> f.client.renderHollow(null, 0, null, 0, false, null)); + assertEquals(Arrays.asList("hollow", "material"), f.events); + for (int side : new int[] { -1, 6, 32 }) { + f.set("slot", int.class, side); + assertThrows(MatchError.class, () -> f.client.renderHollow(null, 0, f.bounds, 0, false, null)); + } + f.set("slot", int.class, 0); + int[] calls = { 0 }; + assertThrows( + IllegalStateException.class, + () -> f.client.renderHollow(null, 0, f.bounds, 0, false, collect((pos, mat, pass, box, mask) -> { + calls[0]++; + throw new IllegalStateException("callback"); + }))); + assertEquals(1, calls[0]); + } + + @Test + void highlightEmitsOrderedStateChangesTransformAndExpandedOutlines() throws Exception { + Fixture f = new Fixture(); + f.set("rawShape", byte.class, (byte) 32); + f.set("shapeAdvance", int.class, 1); + assertTrue(f.part.drawHighlight(null, null, 0.625F)); + assertEquals( + Arrays.asList( + "size", + "shape", + "enable:3042", + "blend:770:771", + "disable:3553", + "color:0.0:0.0:0.0:0.4", + "line:2.0", + "depth:false", + "push", + "world:0.625", + "x", + "y", + "z", + "translate:2.0:-3.0:4.0", + "shape", + "rotation", + "outline", + "outline", + "pop", + "depth:true", + "enable:3553", + "disable:3042"), + f.events); + assertArrayEquals( + new double[] { -.001, -.001, -.001, 1.001, .251, 1.001 }, + coords(RenderRecorder.outlines.get(0)), + 1e-12); + assertArrayEquals( + new double[] { .251, .001, .251, .749, .249, .749 }, + coords(RenderRecorder.outlines.get(1)), + 1e-12); + Vector3 expected = new Vector3(.2, .3, .4).apply(Rotation.sideRotations[1].at(Vector3.center)); + Vector3 actual = new Vector3(.2, .3, .4).apply(RenderRecorder.rotation); + assertEquals(expected, actual); + } + + @Test + void highlightFailuresStopAtTheOriginalPointWithoutInventingCleanup() throws Exception { + Fixture f = new Fixture(); + f.set("rawShape", byte.class, (byte) 38); + assertThrows(ArrayIndexOutOfBoundsException.class, () -> f.part.drawHighlight(null, null, 0)); + assertEquals("shape", f.events.get(f.events.size() - 1)); + assertFalse(f.events.contains("pop")); + assertTrue(RenderRecorder.outlines.isEmpty()); + f.clear(); + f.set("rawShape", byte.class, (byte) 32); + RenderRecorder.failOutline = true; + assertThrows(IllegalStateException.class, () -> f.part.drawHighlight(null, null, 0)); + assertEquals("outline", f.events.get(f.events.size() - 1)); + assertFalse(f.events.contains("pop")); + } + + @Test + void breakingBuildsTranslationAndIconPipelineAndDispatchesItsCuboidCallback() throws Exception { + Fixture f = new Fixture(); + RenderBlocks render = new RenderBlocks(); + IIcon icon = (IIcon) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { IIcon.class }, + (proxy, method, args) -> { throw new AssertionError("icon sampled"); }); + render.overrideBlockTexture = icon; + f.part.drawBreaking(render); + assertEquals(Arrays.asList("state", "reset", "x", "y", "z", "pipeline", "bounds", "hollow"), f.events); + assertEquals(2, RenderRecorder.pipeline.length); + Vector3 translated = new Vector3().apply((Translation) RenderRecorder.pipeline[0]); + assertEquals(new Vector3(2, -3, 4), translated); + assertSame(icon, ((IconTransformation) RenderRecorder.pipeline[1]).icon); + Object[] draw = f.draws.get(0); + assertNull(draw[0]); + assertEquals(0, draw[1]); + assertSame(f.bounds, draw[2]); + assertEquals(0, draw[3]); + assertEquals(false, draw[4]); + callback(draw).apply(null, null, 0, f.bounds, 37); + assertSame(f.bounds, RenderRecorder.breakBox); + assertEquals(37, RenderRecorder.breakMask); + f.clear(); + assertThrows(NullPointerException.class, () -> f.part.drawBreaking(null)); + assertEquals(Arrays.asList("state", "reset", "x", "y", "z"), f.events); + } + + private interface Draw { + + void accept(Vector3 pos, IMicroMaterial material, int pass, Cuboid6 box, int mask); + } + + private static Function5 collect(Draw draw) { + return new AbstractFunction5() { + + @Override + public BoxedUnit apply(Vector3 pos, IMicroMaterial material, Object pass, Cuboid6 box, Object mask) { + draw.accept(pos, material, (Integer) pass, box, (Integer) mask); + return BoxedUnit.UNIT; + } + }; + } + + @SuppressWarnings("unchecked") + private static Function5 callback(Object[] draw) { + return (Function5) draw[5]; + } + + private static double[] coords(Cuboid6 c) { + return new double[] { c.min.x, c.min.y, c.min.z, c.max.x, c.max.y, c.max.z }; + } + + private static final class Fixture extends ClassLoader { + + final List events = new ArrayList<>(); + final List draws; + final Microblock part; + final HollowMicroblockClient client; + final Cuboid6 bounds; + final Vector3 pos = new Vector3(2, 3, 4); + + @SuppressWarnings("unchecked") + Fixture() throws Exception { + super(Microblock.class.getClassLoader()); + for (String name : new String[] { "ReferenceHollowClientBase", "ReferenceScalaHollowMicroblockClient" }) { + byte[] bytes; + try (Scanner scanner = new Scanner( + getResourceAsStream("compat/" + name + ".class.b64"), + StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + part = (Microblock) loadClass("codechicken.multipart.compat.ReferenceScalaHollowMicroblockClient") + .getConstructor().newInstance(); + client = (HollowMicroblockClient) part; + bounds = (Cuboid6) part.getClass().getMethod("bounds").invoke(part); + draws = (List) part.getClass().getMethod("draws").invoke(part); + set("events", List.class, events); + RenderRecorder.events = events; + RenderRecorder.outlines.clear(); + RenderRecorder.failOutline = false; + } + + void set(String name, Class type, Object value) throws Exception { + part.getClass().getMethod(name + "_$eq", type).invoke(part, value); + } + + void setUnchecked(String name, Class type, Object value) { + try { + set(name, type, value); + } catch (Exception ex) { + throw new AssertionError(ex); + } + } + + void clear() { + events.clear(); + draws.clear(); + RenderRecorder.outlines.clear(); + } + + void assertDraw(int index, int pass, Cuboid6 c, int mask, boolean face) { + Object[] draw = draws.get(index); + assertSame(pos, draw[0]); + assertEquals(pass, draw[1]); + assertSame(c, draw[2]); + assertEquals(mask, draw[3]); + assertEquals(face, draw[4]); + } + + @Override + protected synchronized Class loadClass(String name, boolean resolve) throws ClassNotFoundException { + if (!name.startsWith("codechicken.microblock.HollowMicroblockClient$") + && !name.startsWith("codechicken.microblock.HollowMicroblockClientLogic")) + return super.loadClass(name, resolve); + Class loaded = findLoadedClass(name); + if (loaded == null) { + try (InputStream input = getResourceAsStream(name.replace('.', '/') + ".class")) { + if (input == null) throw new ClassNotFoundException(name); + ClassReader reader = new ClassReader(input); + ClassWriter writer = new ClassWriter(0); + reader.accept(new ClassVisitor(ASM5, writer) { + + @Override + public MethodVisitor visitMethod(int access, String method, String desc, String sig, + String[] exceptions) { + return new MethodVisitor(ASM5, super.visitMethod(access, method, desc, sig, exceptions)) { + + @Override + public void visitMethodInsn(int opcode, String owner, String method, String descriptor, + boolean itf) { + String target = Type.getInternalName(RenderRecorder.class); + if (owner.equals("org/lwjgl/opengl/GL11") + || owner.equals("codechicken/lib/render/RenderUtils") + || owner.equals("codechicken/lib/render/BlockRenderer")) { + super.visitMethodInsn(opcode, target, method, descriptor, false); + return; + } + if (owner.equals("codechicken/lib/vec/Transformation") + && method.equals("glApply")) { + super.visitMethodInsn( + INVOKESTATIC, + target, + "glApply", + "(Lcodechicken/lib/vec/Transformation;)V", + false); + return; + } + if (owner.equals("codechicken/lib/render/CCRenderState")) { + if (opcode == INVOKEVIRTUAL) + descriptor = "(Lcodechicken/lib/render/CCRenderState;" + + descriptor.substring(1); + super.visitMethodInsn(INVOKESTATIC, target, method, descriptor, false); + return; + } + super.visitMethodInsn(opcode, owner, method, descriptor, itf); + } + }; + } + }, 0); + byte[] bytes = writer.toByteArray(); + loaded = defineClass(name, bytes, 0, bytes.length); + } catch (java.io.IOException ex) { + throw new ClassNotFoundException(name, ex); + } + } + if (resolve) resolveClass(loaded); + return loaded; + } + } + + public static final class RenderRecorder { + + static List events; + static final List outlines = new ArrayList<>(); + static Transformation rotation; + static boolean failOutline; + static IVertexOperation[] pipeline; + static Cuboid6 breakBox; + static int breakMask; + + public static void glEnable(int value) { + events.add("enable:" + value); + } + + public static void glDisable(int value) { + events.add("disable:" + value); + } + + public static void glBlendFunc(int a, int b) { + events.add("blend:" + a + ":" + b); + } + + public static void glColor4f(float a, float b, float c, float d) { + events.add("color:" + a + ":" + b + ":" + c + ":" + d); + } + + public static void glLineWidth(float value) { + events.add("line:" + value); + } + + public static void glDepthMask(boolean value) { + events.add("depth:" + value); + } + + public static void glPushMatrix() { + events.add("push"); + } + + public static void glPopMatrix() { + events.add("pop"); + } + + public static void glTranslated(double x, double y, double z) { + events.add("translate:" + x + ":" + y + ":" + z); + } + + public static void translateToWorldCoords(Entity player, float frame) { + assertNull(player); + events.add("world:" + frame); + } + + public static void glApply(Transformation value) { + events.add("rotation"); + rotation = value; + } + + public static void drawCuboidOutline(Cuboid6 box) { + events.add("outline"); + outlines.add(box); + if (failOutline) throw new IllegalStateException("outline"); + } + + public static CCRenderState instance() { + events.add("state"); + return CCRenderState.instance(); + } + + public static void resetInstance(CCRenderState state) { + events.add("reset"); + } + + public static void setPipelineInstance(CCRenderState state, IVertexOperation[] operations) { + events.add("pipeline"); + pipeline = operations; + } + + public static void renderCuboid(Cuboid6 box, int mask) { + events.add("break"); + breakBox = box; + breakMask = mask; + } + } +} diff --git a/src/test/java/codechicken/microblock/HollowMicroblockTraitsCharacterizationTest.java b/src/test/java/codechicken/microblock/HollowMicroblockTraitsCharacterizationTest.java new file mode 100644 index 0000000..2b8c600 --- /dev/null +++ b/src/test/java/codechicken/microblock/HollowMicroblockTraitsCharacterizationTest.java @@ -0,0 +1,262 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.JNormalOcclusion; +import codechicken.multipart.JPartialOcclusion; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +class HollowMicroblockTraitsCharacterizationTest { + + @Test + void centerLookupRepeatsTheVirtualTileGetterAndUsesTheVirtualSlot() throws Exception { + Fixture f = new Fixture(); + assertEquals(8, f.hollow.getHollowSize()); + assertEquals(Arrays.asList("size", "tile"), f.events); + ProbeTile unused = new ProbeTile(f.events); + ProbeTile selected = new ProbeTile(f.events); + f.set("firstTile", TileMultipart.class, unused); + f.set("secondTile", TileMultipart.class, selected); + f.set("slot", int.class, 37); + for (TMultiPart occupant : new TMultiPart[] { null, new Candidate(f.events) }) { + selected.center = occupant; + f.reset(); + assertEquals(8, f.hollow.getHollowSize()); + assertEquals(Arrays.asList("size", "tile", "tile", "map:6"), f.events); + } + Connector connector = new Connector(f.events); + selected.center = connector; + for (int size : new int[] { Integer.MIN_VALUE, -1, 0, 8, 11, 32, Integer.MAX_VALUE }) { + connector.size = size; + f.reset(); + assertEquals(size, f.hollow.getHollowSize()); + assertEquals(Arrays.asList("size", "tile", "tile", "map:6", "slot", "connector:37"), f.events); + } + f.set("secondTile", TileMultipart.class, null); + f.reset(); + assertThrows(NullPointerException.class, f.hollow::getHollowSize); + assertEquals(Arrays.asList("size", "tile", "tile"), f.events); + } + + @Test + void collisionsUseSeparateRawShapeReadsAndProduceFreshReadOnlyBoxes() throws Exception { + Fixture f = new Fixture(); + f.set("overrideSize", boolean.class, true); + f.set("firstShape", byte.class, (byte) 32); + f.set("secondShape", byte.class, (byte) 113); + List boxes = f.hollow.getCollisionBoxes(); + assertEquals(Arrays.asList("collision", "size", "shape", "shape"), f.events); + assertEquals(4, boxes.size()); + for (Cuboid6 box : boxes) { + assertEquals(0.75, box.min.y, 1e-12); + assertEquals(1, box.max.y, 1e-12); + } + assertEquals(0.1875, volume(boxes), 1e-12); + assertThrows(UnsupportedOperationException.class, () -> boxes.add(Cuboid6.full)); + assertThrows(UnsupportedOperationException.class, () -> boxes.set(0, Cuboid6.full)); + assertThrows(UnsupportedOperationException.class, () -> boxes.remove(0)); + f.reset(); + List again = f.hollow.getCollisionBoxes(); + assertNotSame(boxes, again); + for (int i = 0; i < 4; i++) assertNotSame(boxes.get(i), again.get(i)); + boxes.get(0).min.x = 123; + assertNotEquals(123, again.get(0).min.x); + } + + @Test + void collisionGeometryDoesNotClampOpeningOrSignedThickness() throws Exception { + Fixture f = new Fixture(); + f.set("overrideSize", boolean.class, true); + f.set("firstShape", byte.class, (byte) 0x80); + f.set("secondShape", byte.class, (byte) 0); + for (int size : new int[] { -8, 0, 8, 24 }) { + f.set("hollowSize", int.class, size); + f.reset(); + List boxes = f.hollow.getCollisionBoxes(); + double end = 0.5 - size / 32D; + assertBox(new Cuboid6(0, -1, Math.min(0, end), 1, 0, Math.max(0, end)), boxes.get(0)); + } + for (int side = 6; side < 16; side++) { + f.set("secondShape", byte.class, (byte) side); + f.reset(); + assertThrows(ArrayIndexOutOfBoundsException.class, f.hollow::getCollisionBoxes); + assertEquals(Arrays.asList("collision", "size", "shape", "shape"), f.events); + } + } + + @Test + void subpartsDispatchToCollisionAndCopyOrderedBoundsIntoAMutableList() throws Exception { + Fixture f = new Fixture(); + List input = new ArrayList<>(Arrays.asList(new Cuboid6(0, 1, 2, 3, 4, 5), Cuboid6.full.copy())); + f.set("overrideCollision", boolean.class, true); + f.set("collision", List.class, input); + List result = f.hollow.getSubParts(); + assertEquals(Collections.singletonList("collision"), f.events); + assertEquals(2, result.size()); + for (int i = 0; i < 2; i++) { + assertEquals(0, result.get(i).data); + assertBox(input.get(i), result.get(i)); + assertNotSame(input.get(i), result.get(i)); + assertNotSame(input.get(i).min, result.get(i).min); + } + input.get(0).min.x = 99; + input.clear(); + assertEquals(0, result.get(0).min.x); + result.add(new IndexedCuboid6(1, Cuboid6.full)); + result.set(0, result.get(1)); + result.remove(0); + assertEquals(2, result.size()); + f.set("collision", List.class, Collections.singletonList(null)); + assertThrows(NullPointerException.class, f.hollow::getSubParts); + f.set("collision", List.class, null); + assertThrows(NullPointerException.class, f.hollow::getSubParts); + } + + @Test + void normalAndPartialOverlapShortCircuitTheRealScalaSuperChain() throws Exception { + Fixture f = new Fixture(); + Candidate candidate = new Candidate(f.events); + Cuboid6 separate = new Cuboid6(2, 2, 2, 3, 3, 3); + for (boolean partial : new boolean[] { false, true }) { + candidate.normal = Collections.singletonList(partial ? separate : Cuboid6.full); + candidate.partial = Collections.singletonList(partial ? Cuboid6.full : separate); + f.reset(); + assertFalse(f.part.occlusionTest(candidate)); + assertEquals(Arrays.asList("normal:other", "partial:other", "normal:self"), f.events); + } + candidate.normal = Collections.singletonList(separate); + candidate.partial = Collections.emptyList(); + for (boolean result : new boolean[] { false, true }) { + f.set("superResult", boolean.class, result); + f.reset(); + assertEquals(result, f.part.occlusionTest(candidate)); + assertEquals(Arrays.asList("normal:other", "partial:other", "normal:self", "super"), f.events); + } + f.set("superFailure", boolean.class, true); + assertEquals( + "super failure", + assertThrows(IllegalStateException.class, () -> f.part.occlusionTest(candidate)).getMessage()); + } + + private static double volume(List boxes) { + double volume = 0; + for (Cuboid6 c : boxes) volume += (c.max.x - c.min.x) * (c.max.y - c.min.y) * (c.max.z - c.min.z); + return volume; + } + + private static void assertBox(Cuboid6 expected, Cuboid6 actual) { + assertArrayEquals( + new double[] { expected.min.x, expected.min.y, expected.min.z, expected.max.x, expected.max.y, + expected.max.z }, + new double[] { actual.min.x, actual.min.y, actual.min.z, actual.max.x, actual.max.y, actual.max.z }, + 1e-12); + } + + private static final class ProbeTile extends TileMultipart { + + final List events; + TMultiPart center; + + ProbeTile(List events) { + this.events = events; + } + + @Override + public TMultiPart partMap(int slot) { + events.add("map:" + slot); + return center; + } + } + + private static class Candidate extends TMultiPart implements JNormalOcclusion, JPartialOcclusion { + + final List events; + Iterable normal = Collections.emptyList(); + Iterable partial = Collections.emptyList(); + + Candidate(List events) { + this.events = events; + } + + @Override + public String getType() { + throw new AssertionError("unexpected type lookup"); + } + + @Override + public Iterable getOcclusionBoxes() { + events.add("normal:other"); + return normal; + } + + @Override + public Iterable getPartialOcclusionBoxes() { + events.add("partial:other"); + return partial; + } + } + + private static final class Connector extends Candidate implements ISidedHollowConnect { + + int size; + + Connector(List events) { + super(events); + } + + @Override + public int getHollowSize(int side) { + events.add("connector:" + side); + return size; + } + } + + private static final class Fixture extends ClassLoader { + + final List events = new ArrayList<>(); + final Microblock part; + final HollowMicroblock hollow; + + Fixture() throws Exception { + super(Microblock.class.getClassLoader()); + for (String name : new String[] { "ReferenceHollowMicroblockBase", "ReferenceScalaHollowMicroblock" }) { + InputStream input = Objects + .requireNonNull(getClass().getResourceAsStream("/compat/" + name + ".class.b64")); + byte[] bytes; + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + part = (Microblock) loadClass("codechicken.multipart.compat.ReferenceScalaHollowMicroblock") + .getConstructor().newInstance(); + hollow = (HollowMicroblock) part; + set("events", List.class, events); + } + + void set(String name, Class type, Object value) throws Exception { + part.getClass().getMethod(name + "_$eq", type).invoke(part, value); + } + + void reset() throws Exception { + events.clear(); + set("tileReads", int.class, 0); + set("shapeReads", int.class, 0); + } + } +} diff --git a/src/test/java/codechicken/microblock/ItemMicroPartBinaryCompatibilityTest.java b/src/test/java/codechicken/microblock/ItemMicroPartBinaryCompatibilityTest.java new file mode 100644 index 0000000..8a37402 --- /dev/null +++ b/src/test/java/codechicken/microblock/ItemMicroPartBinaryCompatibilityTest.java @@ -0,0 +1,80 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import net.minecraft.item.ItemStack; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import codechicken.microblock.handler.MicroblockProxy; + +/** Loads a Scala consumer compiled against the reference ItemMicroPart$.MODULE$ ABI used by ProjRed. */ +class ItemMicroPartBinaryCompatibilityTest { + + private static final String MATERIAL = "test:item_micro_part_binary"; + + @BeforeAll + static void registerMaterial() { + if (MicroMaterialRegistry.getMaterial(MissingMicroMaterial.key()) == null) { + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, MissingMicroMaterial.key()); + } + if (MicroMaterialRegistry.getMaterial(MATERIAL) == null) { + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, MATERIAL); + } + MicroMaterialRegistry$.MODULE$.setupIDMap(); + } + + @Test + void referenceScalaConsumerStillLinksAgainstAllFourCompanionMethods() throws Exception { + Class fixtureClass = new FixtureClassLoader(ItemMicroPart.class.getClassLoader()).define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + ItemMicroPart previous = MicroblockProxy.itemMicro(); + ItemMicroPart item = new ItemMicroPart(); + MicroblockProxy.itemMicro_$eq(item); + try { + int id = MicroMaterialRegistry.materialID(MATERIAL); + ItemStack numbered = (ItemStack) fixtureClass.getMethod("createById", int.class, int.class) + .invoke(fixture, 0x401, id); + ItemStack named = (ItemStack) fixtureClass.getMethod("createByName", int.class, String.class) + .invoke(fixture, 0x202, MATERIAL); + + assertSame(item, numbered.getItem()); + assertEquals(MATERIAL, numbered.getTagCompound().getString("mat")); + assertEquals(MATERIAL, named.getTagCompound().getString("mat")); + assertSame( + MicroMaterialRegistry.getMaterial(MATERIAL), + fixtureClass.getMethod("material", ItemStack.class).invoke(fixture, named)); + assertEquals(id, fixtureClass.getMethod("materialId", ItemStack.class).invoke(fixture, named)); + } finally { + MicroblockProxy.itemMicro_$eq(previous); + } + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + ItemMicroPartBinaryCompatibilityTest.class + .getResourceAsStream("/compat/ReferenceScalaItemMicroPartConsumer.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/microblock/ItemMicroPartCharacterizationTest.java b/src/test/java/codechicken/microblock/ItemMicroPartCharacterizationTest.java new file mode 100644 index 0000000..6857ffb --- /dev/null +++ b/src/test/java/codechicken/microblock/ItemMicroPartCharacterizationTest.java @@ -0,0 +1,174 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.client.IItemRenderer; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.microblock.handler.MicroblockProxy; + +class ItemMicroPartCharacterizationTest { + + private static final String MATERIAL = "test:item_micro_part"; + private static final int INVALID_CLASS_DAMAGE = 255 << 8 | 1; + + private static final Set ITEM_METHODS = new TreeSet<>( + Arrays.asList( + "getItemStackDisplayName(Lnet/minecraft/item/ItemStack;)Ljava/lang/String;", + "getSubItems(Lnet/minecraft/item/Item;Lnet/minecraft/creativetab/CreativeTabs;Ljava/util/List;)V", + "onItemUse(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;IIIIFFF)Z", + "registerIcons(Lnet/minecraft/client/renderer/texture/IIconRegister;)V")); + private static final Set HELPERS = new TreeSet<>( + Arrays.asList( + "checkTagCompound(Lnet/minecraft/item/ItemStack;)V", + "create(II)Lnet/minecraft/item/ItemStack;", + "create(IILjava/lang/String;)Lnet/minecraft/item/ItemStack;", + "create(ILjava/lang/String;)Lnet/minecraft/item/ItemStack;", + "getMaterial(Lnet/minecraft/item/ItemStack;)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;", + "getMaterialID(Lnet/minecraft/item/ItemStack;)I")); + private static final Set RENDERER = new TreeSet<>( + Arrays.asList( + "handleRenderType(Lnet/minecraft/item/ItemStack;Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;)Z", + "renderHighlight(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/MovingObjectPosition;)Z", + "renderItem(Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;Lnet/minecraft/item/ItemStack;[Ljava/lang/Object;)V", + "renderItem(Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;Lnet/minecraft/item/ItemStack;Lscala/collection/Seq;)V", + "shouldUseRenderHelper(Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;Lnet/minecraft/item/ItemStack;Lnet/minecraftforge/client/IItemRenderer$ItemRendererHelper;)Z")); + + @BeforeAll + static void registerMaterial() { + if (MicroMaterialRegistry.getMaterial(MissingMicroMaterial.key()) == null) { + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, MissingMicroMaterial.key()); + } + if (MicroMaterialRegistry.getMaterial(MATERIAL) == null) { + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, MATERIAL); + } + MicroMaterialRegistry$.MODULE$.setupIDMap(); + } + + @Test + void keepsTheItemCompanionAndRendererSurfaces() throws Exception { + assertEquals(ITEM_METHODS, publicDeclaredMethods(ItemMicroPart.class, false)); + assertEquals(HELPERS, publicDeclaredMethods(ItemMicroPart.class, true)); + assertEquals(HELPERS, publicDeclaredMethods(ItemMicroPart$.class, false)); + assertEquals(RENDERER, publicDeclaredMethods(ItemMicroPartRenderer$.class, false)); + + Set facade = new TreeSet<>(RENDERER); + facade.remove( + "renderItem(Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;Lnet/minecraft/item/ItemStack;[Ljava/lang/Object;)V"); + assertEquals(facade, publicDeclaredMethods(ItemMicroPartRenderer.class, true)); + assertArrayEquals(new Class[] { IItemRenderer.class }, ItemMicroPartRenderer$.class.getInterfaces()); + + Field itemModule = ItemMicroPart$.class.getField("MODULE$"); + assertTrue(Modifier.isStatic(itemModule.getModifiers())); + assertTrue(Modifier.isFinal(itemModule.getModifiers())); + assertSame(ItemMicroPart$.MODULE$, itemModule.get(null)); + + Field rendererModule = ItemMicroPartRenderer$.class.getField("MODULE$"); + assertTrue(Modifier.isStatic(rendererModule.getModifiers())); + assertTrue(Modifier.isFinal(rendererModule.getModifiers())); + assertSame(ItemMicroPartRenderer$.MODULE$, rendererModule.get(null)); + + ItemMicroPartRenderer$.class + .getDeclaredMethod("renderItem", IItemRenderer.ItemRenderType.class, ItemStack.class, Object[].class); + } + + @Test + void constructorSetsTheStableItemIdentity() { + ItemMicroPart item = new ItemMicroPart(); + + assertEquals("item.microblock", item.getUnlocalizedName()); + assertTrue(item.getHasSubtypes()); + } + + @Test + void tagHelpersCreatePreserveAndResolveMaterialTags() { + ItemMicroPart item = new ItemMicroPart(); + ItemStack blank = new ItemStack(item, 1, INVALID_CLASS_DAMAGE); + assertFalse(blank.hasTagCompound()); + + assertNull(ItemMicroPart.getMaterial(blank)); + assertTrue(blank.hasTagCompound()); + NBTTagCompound original = blank.getTagCompound(); + ItemMicroPart.checkTagCompound(blank); + assertSame(original, blank.getTagCompound()); + assertEquals(MicroMaterialRegistry.getMissingId(), ItemMicroPart.getMaterialID(blank)); + + blank.getTagCompound().setString("mat", "test:no_such_material"); + assertSame(MissingMicroMaterial$.MODULE$, ItemMicroPart.getMaterial(blank)); + + blank.getTagCompound().setString("mat", MATERIAL); + assertSame(MicroMaterialRegistry.getMaterial(MATERIAL), ItemMicroPart.getMaterial(blank)); + assertEquals(MicroMaterialRegistry.materialID(MATERIAL), ItemMicroPart.getMaterialID(blank)); + } + + @Test + void creationOverloadsPreserveItemAmountDamageAndMaterialName() { + ItemMicroPart previous = MicroblockProxy.itemMicro(); + ItemMicroPart item = new ItemMicroPart(); + MicroblockProxy.itemMicro_$eq(item); + try { + ItemStack named = ItemMicroPart.create(3, 0x402, MATERIAL); + assertSame(item, named.getItem()); + assertEquals(3, named.stackSize); + assertEquals(0x402, named.getItemDamage()); + assertEquals(MATERIAL, named.getTagCompound().getString("mat")); + + int material = MicroMaterialRegistry.materialID(MATERIAL); + ItemStack numbered = ItemMicroPart.create(0x201, material); + assertEquals(1, numbered.stackSize); + assertEquals(0x201, numbered.getItemDamage()); + assertEquals(MATERIAL, numbered.getTagCompound().getString("mat")); + } finally { + MicroblockProxy.itemMicro_$eq(previous); + } + } + + @Test + void invalidMicroClassShortCircuitsNamesPlacementAndRendering() { + ItemMicroPart item = new ItemMicroPart(); + ItemStack stack = new ItemStack(item, 1, INVALID_CLASS_DAMAGE); + stack.setTagCompound(new NBTTagCompound()); + stack.getTagCompound().setString("mat", MATERIAL); + + assertEquals("Unnamed", item.getItemStackDisplayName(stack)); + assertFalse(item.onItemUse(stack, null, null, 0, 0, 0, 0, 0, 0, 0)); + assertTrue(ItemMicroPartRenderer.handleRenderType(stack, IItemRenderer.ItemRenderType.INVENTORY)); + assertTrue( + ItemMicroPartRenderer.shouldUseRenderHelper( + IItemRenderer.ItemRenderType.INVENTORY, + stack, + IItemRenderer.ItemRendererHelper.INVENTORY_BLOCK)); + assertFalse(ItemMicroPartRenderer.renderHighlight(null, stack, null)); + assertDoesNotThrow( + () -> ((IItemRenderer) ItemMicroPartRenderer$.MODULE$) + .renderItem(IItemRenderer.ItemRenderType.INVENTORY, stack, new Object[0])); + } + + private static Set publicDeclaredMethods(Class type, boolean staticMethods) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers()) && Modifier.isStatic(method.getModifiers()) == staticMethods) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/microblock/ItemSawCharacterizationTest.java b/src/test/java/codechicken/microblock/ItemSawCharacterizationTest.java new file mode 100644 index 0000000..bcb8eca --- /dev/null +++ b/src/test/java/codechicken/microblock/ItemSawCharacterizationTest.java @@ -0,0 +1,276 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.lib.config.ConfigFile; +import codechicken.lib.config.ConfigTag; +import codechicken.lib.render.CCModel; +import codechicken.microblock.examples.SawStrengthExample; + +class ItemSawCharacterizationTest { + + private static final Set ITEM_METHODS = signatures( + "doesContainerItemLeaveCraftingGrid(Lnet/minecraft/item/ItemStack;)Z", + "getContainerItem(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;", + "getCuttingStrength(Lnet/minecraft/item/ItemStack;)I", + "harvestLevel()I", + "hasContainerItem()Z", + "setHarvestLevel(I)V"); + private static final Set RENDERER_METHODS = signatures( + "blade()Lcodechicken/lib/render/CCModel;", + "handle()Lcodechicken/lib/render/CCModel;", + "handleRenderType(Lnet/minecraft/item/ItemStack;Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;)Z", + "holder()Lcodechicken/lib/render/CCModel;", + "models()Ljava/util/Map;", + "renderItem(Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;Lnet/minecraft/item/ItemStack;Lscala/collection/Seq;)V", + "shouldUseRenderHelper(Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;Lnet/minecraft/item/ItemStack;Lnet/minecraftforge/client/IItemRenderer$ItemRendererHelper;)Z"); + + @Test + void keepsItemAndRendererSurfaces() throws Exception { + assertTrue(Modifier.isPublic(ItemSaw.class.getModifiers())); + assertFalse(Modifier.isFinal(ItemSaw.class.getModifiers())); + assertEquals(ITEM_METHODS, publicDeclaredMethods(ItemSaw.class)); + assertEquals(Arrays.asList(Saw.class), Arrays.asList(ItemSaw.class.getInterfaces())); + + Constructor[] constructors = ItemSaw.class.getDeclaredConstructors(); + assertEquals(1, constructors.length); + assertTrue(Modifier.isPublic(constructors[0].getModifiers())); + assertEquals(Arrays.asList(ConfigTag.class, int.class), Arrays.asList(constructors[0].getParameterTypes())); + + Field harvestLevel = ItemSaw.class.getDeclaredField("harvestLevel"); + assertSame(int.class, harvestLevel.getType()); + assertTrue(Modifier.isPrivate(harvestLevel.getModifiers())); + assertFalse(Modifier.isFinal(harvestLevel.getModifiers())); + assertEquals(1, ItemSaw.class.getDeclaredFields().length); + + assertTrue(Modifier.isPublic(ItemSawRenderer.class.getModifiers())); + assertTrue(Modifier.isFinal(ItemSawRenderer.class.getModifiers())); + assertEquals(RENDERER_METHODS, publicDeclaredMethods(ItemSawRenderer.class)); + assertEquals(0, ItemSawRenderer.class.getDeclaredFields().length); + for (Method method : ItemSawRenderer.class.getDeclaredMethods()) { + assertTrue(Modifier.isStatic(method.getModifiers()), method.toString()); + } + + assertTrue(Modifier.isPublic(ItemSawRenderer$.class.getModifiers())); + assertTrue(Modifier.isFinal(ItemSawRenderer$.class.getModifiers())); + assertEquals(Arrays.asList(IItemRenderer.class), Arrays.asList(ItemSawRenderer$.class.getInterfaces())); + Set companionMethods = new TreeSet<>(RENDERER_METHODS); + companionMethods.add( + "renderItem(Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;Lnet/minecraft/item/ItemStack;[Ljava/lang/Object;)V"); + assertEquals(companionMethods, publicDeclaredMethods(ItemSawRenderer$.class)); + + assertField( + ItemSawRenderer$.class, + "MODULE$", + ItemSawRenderer$.class, + Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL); + assertField(ItemSawRenderer$.class, "models", Map.class, Modifier.PRIVATE | Modifier.FINAL); + assertField(ItemSawRenderer$.class, "handle", CCModel.class, Modifier.PRIVATE | Modifier.FINAL); + assertField(ItemSawRenderer$.class, "holder", CCModel.class, Modifier.PRIVATE | Modifier.FINAL); + assertField(ItemSawRenderer$.class, "blade", CCModel.class, Modifier.PRIVATE | Modifier.FINAL); + assertEquals(5, ItemSawRenderer$.class.getDeclaredFields().length); + } + + @Test + void configuresDefaultAndExplicitDurability(@TempDir Path directory) { + ItemSaw defaultSaw = saw(directory, "default", 3, null); + assertEquals(3, defaultSaw.harvestLevel()); + assertEquals(3, defaultSaw.getCuttingStrength(new ItemStack(defaultSaw))); + assertEquals(3, defaultSaw.getMaxCuttingStrength()); + assertEquals(1 << 11, defaultSaw.getMaxDamage()); + assertEquals(1, defaultSaw.getItemStackLimit()); + assertSame(CreativeTabs.tabTools, defaultSaw.getCreativeTab()); + assertFalse(defaultSaw.isRepairable()); + assertTrue(defaultSaw.hasContainerItem()); + + ItemSaw explicitSaw = saw(directory, "explicit", 1, 37); + assertEquals(37, explicitSaw.getMaxDamage()); + } + + @Test + void iguanaReflectionUpdatesCuttingStrengthWithoutReconfiguringDurability(@TempDir Path directory) + throws Exception { + ItemSaw saw = saw(directory, "iguana", 2, null); + int maxDamage = saw.getMaxDamage(); + + Field harvestLevel = ItemSaw.class.getDeclaredField("harvestLevel"); + harvestLevel.setAccessible(true); + Integer oldStrength = (Integer) harvestLevel.get(saw); + harvestLevel.set(saw, 5); + + assertEquals(2, oldStrength); + assertEquals(5, saw.harvestLevel()); + assertEquals(5, saw.getCuttingStrength(new ItemStack(saw))); + assertEquals(5, saw.getMaxCuttingStrength()); + assertEquals(maxDamage, saw.getMaxDamage()); + } + + @Test + void supportedSetterMatchesTheLegacyMutation(@TempDir Path directory) { + ItemSaw saw = saw(directory, "supported", 2, null); + int maxDamage = saw.getMaxDamage(); + + SawStrengthExample.updateStrength(saw, 5); + + assertEquals(5, saw.harvestLevel()); + assertEquals(5, saw.getCuttingStrength(new ItemStack(saw))); + assertEquals(5, saw.getMaxCuttingStrength()); + assertEquals(maxDamage, saw.getMaxDamage()); + } + + @Test + void damagesContainerOnlyWhenTheSawIsDamageable(@TempDir Path directory) { + ItemSaw damageableSaw = saw(directory, "damageable", 2, 20); + ItemStack input = new ItemStack(damageableSaw, 4, 7); + ItemStack container = damageableSaw.getContainerItem(input); + assertNotSame(input, container); + assertSame(damageableSaw, container.getItem()); + assertEquals(1, container.stackSize); + assertEquals(8, container.getItemDamage()); + assertFalse(damageableSaw.doesContainerItemLeaveCraftingGrid(input)); + + ItemSaw reusableSaw = saw(directory, "reusable", 2, 0); + ItemStack reusable = new ItemStack(reusableSaw, 3, 4); + assertFalse(reusableSaw.isDamageable()); + assertSame(reusable, reusableSaw.getContainerItem(reusable)); + } + + @Test + void keepsRendererSelectionAndUnsupportedTypeNoOp() throws IOException { + ClassNode type = new ClassNode(); + new ClassReader(ItemSawRenderer$.class.getName()).accept(type, 0); + + MethodNode handles = method( + type, + "handleRenderType", + "(Lnet/minecraft/item/ItemStack;Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;)Z"); + assertTrue(hasCall(handles, "codechicken/microblock/handler/MicroblockProxy", "useSawIcons", "()Z")); + assertTrue( + hasCall( + handles, + "codechicken/lib/render/TextureUtils", + "isMissing", + "(Lnet/minecraft/util/IIcon;Lnet/minecraft/util/ResourceLocation;)Z")); + + MethodNode helper = method( + type, + "shouldUseRenderHelper", + "(Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;Lnet/minecraft/item/ItemStack;Lnet/minecraftforge/client/IItemRenderer$ItemRendererHelper;)Z"); + assertEquals(1, countOpcode(helper, Opcodes.ICONST_1)); + assertEquals(1, countOpcode(helper, Opcodes.IRETURN)); + + MethodNode render = method( + type, + "renderItem", + "(Lnet/minecraftforge/client/IItemRenderer$ItemRenderType;Lnet/minecraft/item/ItemStack;Lscala/collection/Seq;)V"); + String enumOwner = "net/minecraftforge/client/IItemRenderer$ItemRenderType"; + String enumDescriptor = "L" + enumOwner + ";"; + for (String renderType : Arrays.asList("INVENTORY", "ENTITY", "EQUIPPED_FIRST_PERSON", "EQUIPPED")) { + assertTrue(hasField(render, enumOwner, renderType, enumDescriptor)); + } + assertFalse(hasField(render, enumOwner, "FIRST_PERSON_MAP", enumDescriptor)); + assertEquals(2, countOpcode(render, Opcodes.RETURN)); + } + + private static ItemSaw saw(Path directory, String name, int harvestLevel, Integer durability) { + ConfigFile config = new ConfigFile(directory.resolve(name + ".cfg").toFile()); + ConfigTag sawTag = config.getTag("saw").useBraces(); + if (durability != null) { + sawTag.getTag("durability").setIntValue(durability); + } + return new ItemSaw(sawTag, harvestLevel); + } + + private static void assertField(Class owner, String name, Class type, int modifiers) throws Exception { + Field field = owner.getDeclaredField(name); + assertSame(type, field.getType()); + assertEquals(modifiers, field.getModifiers()); + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } + + private static MethodNode method(ClassNode type, String name, String descriptor) { + for (MethodNode method : type.methods) { + if (name.equals(method.name) && descriptor.equals(method.desc)) { + return method; + } + } + throw new AssertionError("Missing method " + name + descriptor); + } + + private static boolean hasField(MethodNode method, String owner, String name, String descriptor) { + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof FieldInsnNode) { + FieldInsnNode field = (FieldInsnNode) instruction; + if (owner.equals(field.owner) && name.equals(field.name) && descriptor.equals(field.desc)) { + return true; + } + } + } + return false; + } + + private static boolean hasCall(MethodNode method, String owner, String name, String descriptor) { + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instruction; + if (owner.equals(call.owner) && name.equals(call.name) && descriptor.equals(call.desc)) { + return true; + } + } + } + return false; + } + + private static int countOpcode(MethodNode method, int opcode) { + int count = 0; + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction.getOpcode() == opcode) { + count++; + } + } + return count; + } +} diff --git a/src/test/java/codechicken/microblock/MarkerInterfaceCharacterizationTest.java b/src/test/java/codechicken/microblock/MarkerInterfaceCharacterizationTest.java new file mode 100644 index 0000000..7a5dfad --- /dev/null +++ b/src/test/java/codechicken/microblock/MarkerInterfaceCharacterizationTest.java @@ -0,0 +1,124 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; + +/** + * Both interfaces carry no implementation, so their characterization is their shape. The accessor names matter most: + * {@code IMicroMaterialRender} is satisfied by {@code TMultiPart}'s Scala-style {@code world/x/y/z}, so renaming any of + * them to a bean accessor would silently unimplement it for every part. + */ +class MarkerInterfaceCharacterizationTest { + + @Test + void sidedHollowConnectDeclaresOnlyTheSizeQuery() { + assertBareInterface(ISidedHollowConnect.class, "getHollowSize(int)int"); + } + + @Test + void microMaterialRenderKeepsScalaStyleAccessorNames() { + assertBareInterface( + IMicroMaterialRender.class, + "world()net.minecraft.world.World", + "x()int", + "y()int", + "z()int", + "getRenderBounds()codechicken.lib.vec.Cuboid6"); + } + + @Test + void markersAreImplementableFromJava() { + Cuboid6 bounds = new Cuboid6(0, 0, 0, 0.5, 0.5, 0.5); + MarkedRender render = new MarkedRender(bounds); + + assertTrue(render instanceof ISidedHollowConnect); + assertTrue(render instanceof IMicroMaterialRender); + assertEquals(8, render.getHollowSize(2)); + assertNull(render.world()); + assertEquals(1, render.x()); + assertEquals(2, render.y()); + assertEquals(3, render.z()); + assertSame(bounds, render.getRenderBounds()); + } + + private static void assertBareInterface(Class type, String... expectedMembers) { + assertTrue(type.isInterface(), type.getName() + " must stay an interface"); + assertEquals( + 0, + type.getInterfaces().length, + type.getName() + " must carry no superinterface, as the Scala trait emits none"); + + Set actual = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + assertTrue(Modifier.isAbstract(method.getModifiers()), method + " must stay abstract"); + assertTrue(Modifier.isPublic(method.getModifiers()), method + " must stay public"); + actual.add(signature(method)); + } + assertEquals(new TreeSet<>(Arrays.asList(expectedMembers)), actual); + } + + private static String signature(Method method) { + StringBuilder out = new StringBuilder(method.getName()).append('('); + Class[] parameters = method.getParameterTypes(); + for (int i = 0; i < parameters.length; i++) { + if (i > 0) { + out.append(','); + } + out.append(parameters[i].getName()); + } + return out.append(')').append(method.getReturnType().getName()).toString(); + } + + private static final class MarkedRender implements ISidedHollowConnect, IMicroMaterialRender { + + private final Cuboid6 bounds; + + MarkedRender(Cuboid6 bounds) { + this.bounds = bounds; + } + + @Override + public int getHollowSize(int side) { + return 8; + } + + @Override + public World world() { + return null; + } + + @Override + public int x() { + return 1; + } + + @Override + public int y() { + return 2; + } + + @Override + public int z() { + return 3; + } + + @Override + public Cuboid6 getRenderBounds() { + return bounds; + } + } +} diff --git a/src/test/java/codechicken/microblock/MicroMaterialRegistryBinaryCompatibilityTest.java b/src/test/java/codechicken/microblock/MicroMaterialRegistryBinaryCompatibilityTest.java new file mode 100644 index 0000000..e7336a4 --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroMaterialRegistryBinaryCompatibilityTest.java @@ -0,0 +1,75 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; + +/** + * Loads a Scala class compiled against the reference dev jar. It reads MicroMaterialRegistry$.MODULE$ and calls the + * instance methods ProjRed links against, plus the scala.Tuple2 array getIdMap that extrautilities links against. + * + * Registration is global, so this registers its own uniquely named material and only asserts facts about it. + */ +class MicroMaterialRegistryBinaryCompatibilityTest { + + private static final String NAME = "test:binarycompat"; + + @BeforeAll + static void register() { + // The other test class may already have registered the placeholder; re-registering would hit the error path. + if (MicroMaterialRegistry.getMaterial(MissingMicroMaterial.key()) == null) { + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, MissingMicroMaterial.key()); + } + if (MicroMaterialRegistry.getMaterial(NAME) == null) { + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, NAME); + } + MicroMaterialRegistry$.MODULE$.setupIDMap(); + } + + @Test + void referenceScalaConsumerStillLinksAgainstTheSingletonAndIdMap() throws Exception { + Class fixtureClass = new FixtureClassLoader(MicroMaterialRegistry.class.getClassLoader()) + .define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + int id = (Integer) fixtureClass.getMethod("idOf", String.class).invoke(fixture, NAME); + assertEquals(NAME, fixtureClass.getMethod("nameOf", int.class).invoke(fixture, id)); + + Object material = fixtureClass.getMethod("materialAt", int.class).invoke(fixture, id); + assertSame(MicroMaterialRegistry.getMaterial(id), material); + assertSame(MicroMaterialRegistry.getMaterial(id), (IMicroMaterial) material); + + // Reads the raw scala.Tuple2 array rather than the accessors. + assertEquals(NAME + "=true", fixtureClass.getMethod("idMapEntry", int.class).invoke(fixture, id)); + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + MicroMaterialRegistryBinaryCompatibilityTest.class + .getResourceAsStream("/compat/ReferenceScalaMicroMaterialConsumer.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/microblock/MicroMaterialRegistryCharacterizationTest.java b/src/test/java/codechicken/microblock/MicroMaterialRegistryCharacterizationTest.java new file mode 100644 index 0000000..c9da518 --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroMaterialRegistryCharacterizationTest.java @@ -0,0 +1,352 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.Collections; + +import net.minecraft.block.Block.SoundType; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.data.MCDataOutputWrapper; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroHighlightRenderer; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.examples.MaterialEnumerationExample; + +/** + * The registry is global mutable state, so everything is registered once in {@link #registerAndFreezeIdMap()} and the + * cases below restore any temporary state changes. Logger-backed error paths require MicroblockProxy.preInit and cannot + * execute headless. + */ +class MicroMaterialRegistryCharacterizationTest { + + private static final TestMaterial STONE = new TestMaterial(false, 3); + private static final TestMaterial GLASS = new TestMaterial(true, 1); + + @BeforeAll + static void registerAndFreezeIdMap() { + // Registration is global and re-registering hits the logger-backed error path, which cannot run headless. + if (MicroMaterialRegistry.getMaterial(MissingMicroMaterial.key()) == null) { + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, MissingMicroMaterial.key()); + } + MicroMaterialRegistry.registerMaterial(STONE, "test:stone"); + MicroMaterialRegistry.registerMaterial(GLASS, "test:glass"); + MicroMaterialRegistry.remapName("test:oldglass", "test:glass"); + // setupIDMap is package private in Scala, so it has no static forwarder and must go through the singleton. + MicroMaterialRegistry$.MODULE$.setupIDMap(); + } + + @Test + void idMapIsSortedByNameAndDrivesBothLookups() { + String[] names = new String[MicroMaterialRegistry.getIdMap().length]; + for (int i = 0; i < names.length; i++) { + names[i] = MicroMaterialRegistry.getIdMap()[i]._1(); + } + + String[] sorted = names.clone(); + java.util.Arrays.sort(sorted); + assertArrayEquals(sorted, names); + + for (int i = 0; i < names.length; i++) { + assertEquals(i, MicroMaterialRegistry.materialID(names[i])); + assertEquals(names[i], MicroMaterialRegistry.materialName(i)); + assertSame(MicroMaterialRegistry.getIdMap()[i]._2(), MicroMaterialRegistry.getMaterial(i)); + } + } + + @Test + void legacyIdMapIsTheSharedArrayAndNullBeforeInitialization() throws Exception { + Object original = MicroMaterialRegistry.getIdMap(); + assertSame(original, MicroMaterialRegistry.getIdMap()); + assertSame(original, MicroMaterialRegistry$.MODULE$.getIdMap()); + Field idMap = MicroMaterialRegistry.class.getDeclaredField("idMap"); + idMap.setAccessible(true); + try { + idMap.set(null, null); + assertNull(MicroMaterialRegistry.getIdMap()); + assertNull(MicroMaterialRegistry$.MODULE$.getIdMap()); + assertThrows(NullPointerException.class, () -> MicroMaterialRegistry.materialName(0)); + assertThrows(NullPointerException.class, () -> MicroMaterialRegistry.getMaterial(0)); + } finally { + idMap.set(null, original); + } + } + + @Test + void serverMapControlsOrderAndRetainsMissingSlotsAndEmptyMaps() { + Object original = MicroMaterialRegistry.getIdMap(); + try { + assertEquals( + Collections.emptyList(), + MicroMaterialRegistry.readIDMap(incomingMap("test:stone", "test:glass"))); + assertEquals(2, MicroMaterialRegistry.getIdMap().length); + assertEquals("test:stone", MicroMaterialRegistry.materialName(0)); + assertSame(STONE, MicroMaterialRegistry.getMaterial(0)); + assertEquals("test:glass", MicroMaterialRegistry.materialName(1)); + assertSame(GLASS, MicroMaterialRegistry.getMaterial(1)); + assertEquals(0, MicroMaterialRegistry.materialID("test:stone")); + assertEquals(1, MicroMaterialRegistry.materialID("test:oldglass")); + + assertEquals( + Arrays.asList("server:unavailable"), + MicroMaterialRegistry.readIDMap(incomingMap("test:stone", "server:unavailable", "test:glass"))); + assertEquals(3, MicroMaterialRegistry.getIdMap().length); + assertNull(MicroMaterialRegistry.getIdMap()[1]); + assertEquals("test:glass", MicroMaterialRegistry.materialName(2)); + assertThrows(NullPointerException.class, () -> MicroMaterialRegistry.materialName(1)); + assertThrows(NullPointerException.class, () -> MicroMaterialRegistry.getMaterial(1)); + + assertEquals(Collections.emptyList(), MicroMaterialRegistry.readIDMap(incomingMap())); + assertEquals(0, MicroMaterialRegistry.getIdMap().length); + assertThrows(ArrayIndexOutOfBoundsException.class, () -> MicroMaterialRegistry.materialName(0)); + assertThrows(ArrayIndexOutOfBoundsException.class, () -> MicroMaterialRegistry.getMaterial(-1)); + } finally { + MicroMaterialRegistry$.MODULE$.setupIDMap(); + } + assertEquals(java.lang.reflect.Array.getLength(original), MicroMaterialRegistry.getIdMap().length); + } + + @Test + void javaExampleEnumeratesTheSameMaterialsWithoutExposingTheLegacyArray() throws Exception { + String[] names = Arrays.stream(MicroMaterialRegistry.getIdMap()).map(entry -> entry._1()) + .toArray(String[]::new); + assertEquals(names.length, MicroMaterialRegistry.materialCount()); + assertEquals(Arrays.asList(names), MaterialEnumerationExample.materialNames()); + assertTrue(MicroMaterialRegistry.class.getMethod("getIdMap").isAnnotationPresent(Deprecated.class)); + assertTrue(MicroMaterialRegistry$.class.getMethod("getIdMap").isAnnotationPresent(Deprecated.class)); + } + + @Test + void javaEnumerationTracksServerOrderMissingSlotsAndEmptyMaps() { + try { + MicroMaterialRegistry.readIDMap(incomingMap("test:stone", "test:glass")); + assertEquals(2, MicroMaterialRegistry.materialCount()); + assertEquals(Arrays.asList("test:stone", "test:glass"), MaterialEnumerationExample.materialNames()); + + MicroMaterialRegistry.readIDMap(incomingMap("test:stone", "server:unavailable", "test:glass")); + assertEquals(3, MicroMaterialRegistry.materialCount()); + assertThrows(NullPointerException.class, MaterialEnumerationExample::materialNames); + + MicroMaterialRegistry.readIDMap(incomingMap()); + assertEquals(0, MicroMaterialRegistry.materialCount()); + assertEquals(Collections.emptyList(), MaterialEnumerationExample.materialNames()); + } finally { + MicroMaterialRegistry$.MODULE$.setupIDMap(); + } + } + + @Test + void materialCountRejectsAnUninitializedMapInsteadOfReportingAnEmptyRegistry() throws Exception { + Field idMap = MicroMaterialRegistry.class.getDeclaredField("idMap"); + idMap.setAccessible(true); + Object original = idMap.get(null); + try { + idMap.set(null, null); + assertThrows(IllegalStateException.class, MicroMaterialRegistry::materialCount); + } finally { + idMap.set(null, original); + } + } + + @Test + void getMaterialByNameResolvesRemapsAndReturnsNullWhenUnknown() { + assertSame(GLASS, MicroMaterialRegistry.getMaterial("test:glass")); + assertSame(GLASS, MicroMaterialRegistry.getMaterial("test:oldglass")); + assertNull(MicroMaterialRegistry.getMaterial("test:nosuchmaterial")); + } + + @Test + void materialIdResolvesRemappedNames() { + assertEquals(MicroMaterialRegistry.materialID("test:glass"), MicroMaterialRegistry.materialID("test:oldglass")); + } + + @Test + void missingIdPointsAtTheMissingMaterialRatherThanZero() { + assertEquals( + MicroMaterialRegistry.materialID(MissingMicroMaterial.key()), + MicroMaterialRegistry.getMissingId()); + assertSame( + MissingMicroMaterial$.MODULE$, + MicroMaterialRegistry.getMaterial(MicroMaterialRegistry.getMissingId())); + } + + @Test + void materialIdsRoundTripThroughTheIdWriter() throws Exception { + for (int id = 0; id < MicroMaterialRegistry.getIdMap().length; id++) { + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + MCDataOutput output = new MCDataOutputWrapper(new DataOutputStream(bytes)); + MicroMaterialRegistry.writeMaterialID(output, id); + + byte[] encoded = bytes.toByteArray(); + assertEquals(1, encoded.length, "A small id map must still use the byte carrier"); + assertEquals(id, MicroMaterialRegistry.readMaterialID(input(encoded))); + } + } + + @Test + void highlightRendererShortCircuitsTheDefaultRenderer() { + RecordingRenderer accepting = new RecordingRenderer(true); + MicroMaterialRegistry.registerHighlightRenderer(accepting); + + // A renderer that claims the highlight stops the default client renderer being reached at all. + assertTrue(MicroMaterialRegistry.renderHighlight(null, null, null, 2, 0)); + assertEquals(1, accepting.calls); + } + + /** + * MissingMicroMaterial overrides only isTransparent and loadIcons, so it inherits canRenderInPass and isSolid from + * the trait. A Java class cannot inherit them today, so this is the only way to observe the supplied values. + */ + @Test + void materialInterfaceSuppliesRenderPassAndSolidity() { + IMicroMaterial missing = MissingMicroMaterial$.MODULE$; + + assertTrue(missing.canRenderInPass(0)); + assertFalse(missing.canRenderInPass(1)); + assertFalse(missing.canRenderInPass(-1)); + + assertFalse(missing.isTransparent()); + assertTrue(missing.isSolid()); + } + + private static MCDataInput input(byte[] bytes) { + DataInputStream data = new DataInputStream(new ByteArrayInputStream(bytes)); + return (MCDataInput) Proxy.newProxyInstance( + MCDataInput.class.getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, arguments) -> { + switch (method.getName()) { + case "readUByte": + return (short) data.readUnsignedByte(); + case "readUShort": + return data.readUnsignedShort(); + case "readInt": + return data.readInt(); + default: + throw new AssertionError("Unexpected read method: " + method.getName()); + } + }); + } + + private static PacketCustom incomingMap(String... names) { + PacketCustom packet = new PacketCustom("test", 1).writeInt(names.length); + for (String name : names) { + packet.writeString(name); + } + return new PacketCustom(packet.getByteBuf().copy()); + } + + private static final class RecordingRenderer implements IMicroHighlightRenderer { + + private final boolean handled; + private int calls; + + private RecordingRenderer(boolean handled) { + this.handled = handled; + } + + @Override + public boolean renderHighlight(EntityPlayer player, MovingObjectPosition hit, CommonMicroClass mcrClass, + int size, int material) { + calls++; + return handled; + } + } + + /** Mirrors the forwarders Scala emits, so this file compiles against the trait and against the Java interface. */ + private static final class TestMaterial implements IMicroMaterial { + + private final boolean transparent; + private final int cutterStrength; + + private TestMaterial(boolean transparent, int cutterStrength) { + this.transparent = transparent; + this.cutterStrength = cutterStrength; + } + + @Override + public IIcon getBreakingIcon(int side) { + return null; + } + + @Override + public void loadIcons() {} + + @Override + public void renderMicroFace(Vector3 pos, int pass, Cuboid6 bounds) {} + + @Override + public boolean canRenderInPass(int pass) { + return pass == 0; + } + + @Override + public boolean isTransparent() { + return transparent; + } + + @Override + public int getLightValue() { + return 0; + } + + @Override + public float getStrength(EntityPlayer player) { + return 1f; + } + + @Override + public String getLocalizedName() { + return "Test Material"; + } + + @Override + public ItemStack getItem() { + return null; + } + + @Override + public int getCutterStrength() { + return cutterStrength; + } + + @Override + public SoundType getSound() { + return null; + } + + @Override + public boolean isSolid() { + return !isTransparent(); + } + + @Override + public float explosionResistance(Entity entity) { + return 1f; + } + } +} diff --git a/src/test/java/codechicken/microblock/MicroOcclusionCharacterizationTest.java b/src/test/java/codechicken/microblock/MicroOcclusionCharacterizationTest.java new file mode 100644 index 0000000..e1f25d7 --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroOcclusionCharacterizationTest.java @@ -0,0 +1,451 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.security.MessageDigest; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.MatchError; + +class MicroOcclusionCharacterizationTest { + + private static final int[] VALID_SLOTS = { 0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26 }; + private static final Set OCCLUSION_METHODS = signatures( + "recalcBounds(Lcodechicken/microblock/JMicroShrinkRender;Lcodechicken/lib/vec/Cuboid6;)I", + "shapePriority(I)I", + "shrink(Lcodechicken/lib/vec/Cuboid6;Lcodechicken/lib/vec/Cuboid6;I)V", + "shrink(Lcodechicken/microblock/JMicroShrinkRender;Lcodechicken/lib/vec/Cuboid6;I)I", + "shrinkFrom(Lcodechicken/microblock/JMicroShrinkRender;Lcodechicken/microblock/JMicroShrinkRender;Lcodechicken/lib/vec/Cuboid6;)I", + "shrinkSide(II)I", + "shrinkTest(Lcodechicken/microblock/JMicroShrinkRender;Lcodechicken/microblock/JMicroShrinkRender;)Z"); + + @Test + void keepsFacadeCompanionAndGeneratedTraitHelperSurfaces() throws Exception { + assertTrue(Modifier.isFinal(MicroOcclusion.class.getModifiers())); + assertEquals(0, MicroOcclusion.class.getDeclaredFields().length); + assertEquals(OCCLUSION_METHODS, publicDeclaredMethods(MicroOcclusion.class)); + for (Method method : MicroOcclusion.class.getDeclaredMethods()) { + assertTrue(Modifier.isStatic(method.getModifiers()), method.toString()); + } + + assertTrue(Modifier.isFinal(MicroOcclusion$.class.getModifiers())); + assertEquals(OCCLUSION_METHODS, publicDeclaredMethods(MicroOcclusion$.class)); + Field module = MicroOcclusion$.class.getField("MODULE$"); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertEquals(1, MicroOcclusion$.class.getDeclaredFields().length); + + assertTrait( + JMicroShrinkRender.class, + new Class[0], + signatures( + "getBounds()Lcodechicken/lib/vec/Cuboid6;", + "getPriorityClass()I", + "getSize()I", + "getSlot()I", + "isTransparent()Z")); + assertThrows( + ClassNotFoundException.class, + () -> Class.forName("codechicken.microblock.JMicroShrinkRender$class")); + + assertTrait( + TMicroOcclusion.class, + new Class[0], + signatures( + "codechicken$microblock$TMicroOcclusion$$super$occlusionTest(Lcodechicken/multipart/TMultiPart;)Z", + "edgeCornerOcclusionTest(Lcodechicken/microblock/TMicroOcclusion;Lcodechicken/microblock/TMicroOcclusion;)Z", + "getBounds()Lcodechicken/lib/vec/Cuboid6;", + "getMaterial()I", + "getSize()I", + "getSlot()I", + "occlusionTest(Lcodechicken/multipart/TMultiPart;)Z")); + assertHelper( + "codechicken.microblock.TMicroOcclusion$class", + signatures( + "$init$(Lcodechicken/microblock/TMicroOcclusion;)V", + "edgeCornerOcclusionTest(Lcodechicken/microblock/TMicroOcclusion;Lcodechicken/microblock/TMicroOcclusion;Lcodechicken/microblock/TMicroOcclusion;)Z", + "occlusionTest(Lcodechicken/microblock/TMicroOcclusion;Lcodechicken/multipart/TMultiPart;)Z")); + + assertTrait( + TMicroOcclusionClient.class, + new Class[] { TMicroOcclusion.class, JMicroShrinkRender.class }, + signatures( + "codechicken$microblock$TMicroOcclusionClient$$super$onAdded()V", + "codechicken$microblock$TMicroOcclusionClient$$super$onPartChanged(Lcodechicken/multipart/TMultiPart;)V", + "codechicken$microblock$TMicroOcclusionClient$$super$read(Lcodechicken/lib/data/MCDataInput;)V", + "getPriorityClass()I", + "onAdded()V", + "onPartChanged(Lcodechicken/multipart/TMultiPart;)V", + "read(Lcodechicken/lib/data/MCDataInput;)V", + "recalcBounds()V", + "renderBounds()Lcodechicken/lib/vec/Cuboid6;", + "renderBounds_$eq(Lcodechicken/lib/vec/Cuboid6;)V", + "renderMask()I", + "renderMask_$eq(I)V")); + assertHelper( + "codechicken.microblock.TMicroOcclusionClient$class", + signatures( + "$init$(Lcodechicken/microblock/TMicroOcclusionClient;)V", + "getPriorityClass(Lcodechicken/microblock/TMicroOcclusionClient;)I", + "onAdded(Lcodechicken/microblock/TMicroOcclusionClient;)V", + "onPartChanged(Lcodechicken/microblock/TMicroOcclusionClient;Lcodechicken/multipart/TMultiPart;)V", + "read(Lcodechicken/microblock/TMicroOcclusionClient;Lcodechicken/lib/data/MCDataInput;)V", + "recalcBounds(Lcodechicken/microblock/TMicroOcclusionClient;)V")); + + assertTrue( + TMicroOcclusion.class.getDeclaredMethod( + "codechicken$microblock$TMicroOcclusion$$super$occlusionTest", + TMultiPart.class).isSynthetic()); + assertTrue( + TMicroOcclusionClient.class + .getDeclaredMethod("codechicken$microblock$TMicroOcclusionClient$$super$onAdded") + .isSynthetic()); + assertTrue( + TMicroOcclusionClient.class.getDeclaredMethod( + "codechicken$microblock$TMicroOcclusionClient$$super$onPartChanged", + TMultiPart.class).isSynthetic()); + } + + @Test + void freezesAllValidSlotPriorityAndShrinkDecisions() throws Exception { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + for (int slot : VALID_SLOTS) { + int priority = MicroOcclusion.shapePriority(slot); + assertEquals(priority, MicroOcclusion$.MODULE$.shapePriority(slot)); + update(digest, priority); + } + for (int first : VALID_SLOTS) { + for (int second : VALID_SLOTS) { + int side = MicroOcclusion.shrinkSide(first, second); + assertEquals(side, MicroOcclusion$.MODULE$.shrinkSide(first, second)); + update(digest, side); + } + } + + int[] priorities = { -1, 0, 1 }; + int[] sizes = { 1, 4, 7 }; + for (int firstSlot : VALID_SLOTS) { + for (int secondSlot : VALID_SLOTS) { + for (int firstPriority : priorities) { + for (int secondPriority : priorities) { + for (int firstSize : sizes) { + for (int secondSize : sizes) { + for (boolean firstTransparent : new boolean[] { false, true }) { + for (boolean secondTransparent : new boolean[] { false, true }) { + TestPart first = new TestPart( + firstSlot, + firstSize, + firstPriority, + firstTransparent, + Cuboid6.full); + TestPart second = new TestPart( + secondSlot, + secondSize, + secondPriority, + secondTransparent, + Cuboid6.full); + boolean shrinks = MicroOcclusion.shrinkTest(first, second); + assertEquals(shrinks, MicroOcclusion$.MODULE$.shrinkTest(first, second)); + digest.update((byte) (shrinks ? 1 : 0)); + } + } + } + } + } + } + } + } + + assertEquals("89add86e47ae62da740d85b76193fbd10e791edcdf53fb3c48737349b2483abe", hex(digest.digest())); + } + + @Test + void shrinksEachAxisWithoutExpandingExistingBounds() { + Cuboid6 obstacle = new Cuboid6(0.2, 0.3, 0.4, 0.8, 0.7, 0.6); + Cuboid6[] expected = { Cuboid6.full.copy(), new Cuboid6(0, 0.7, 0, 1, 1, 1), new Cuboid6(0, 0, 0, 1, 0.3, 1), + new Cuboid6(0, 0, 0.6, 1, 1, 1), new Cuboid6(0, 0, 0, 1, 1, 0.4), new Cuboid6(0.8, 0, 0, 1, 1, 1), + new Cuboid6(0, 0, 0, 0.2, 1, 1) }; + for (int side = -1; side < 6; side++) { + Cuboid6 actual = Cuboid6.full.copy(); + MicroOcclusion.shrink(actual, obstacle, side); + assertCuboid(expected[side + 1], actual); + } + + Cuboid6 alreadyInside = new Cuboid6(0.9, 0.8, 0.7, 0.1, 0.2, 0.3); + Cuboid6 original = alreadyInside.copy(); + for (int side = 0; side < 6; side++) { + MicroOcclusion.shrink(alreadyInside, obstacle, side); + } + assertCuboid(original, alreadyInside); + } + + @Test + void rejectsUnknownShrinkSidesWithScalaMatchError() { + Cuboid6 obstacle = Cuboid6.full.copy(); + assertThrows(MatchError.class, () -> MicroOcclusion.shrink(Cuboid6.full.copy(), obstacle, 6)); + assertThrows(MatchError.class, () -> MicroOcclusion$.MODULE$.shrink(Cuboid6.full.copy(), obstacle, 6)); + } + + @Test + void keepsShrinkMaskAndSlotTraversalRules() { + TestPart shrinking = new TestPart(15, 4, 0, false, Cuboid6.full); + TestPart face = new TestPart(0, 4, 1, false, new Cuboid6(0, 0, 0, 1, 0.25, 1)); + Cuboid6 bounds = Cuboid6.full.copy(); + assertEquals(0, MicroOcclusion.shrinkFrom(shrinking, face, bounds)); + assertEquals(0.25, bounds.min.y); + + TestPart yielding = new TestPart(15, 4, 1, false, Cuboid6.full); + TestPart opaqueFace = new TestPart(0, 4, 0, false, Cuboid6.full); + assertEquals(1, MicroOcclusion.shrinkFrom(yielding, opaqueFace, Cuboid6.full.copy())); + opaqueFace.transparent = true; + assertEquals(0, MicroOcclusion.shrinkFrom(yielding, opaqueFace, Cuboid6.full.copy())); + opaqueFace.transparent = false; + assertEquals(0, MicroOcclusion.shrinkFrom(yielding, opaqueFace, new Cuboid6(0, 0.1, 0, 1, 1, 1))); + + RecordingTile tile = new RecordingTile(); + shrinking.bind(tile); + tile.parts[0] = face; + bounds = Cuboid6.full.copy(); + assertEquals(0, MicroOcclusion.shrink(shrinking, bounds, 6)); + assertEquals(0.25, bounds.min.y); + + tile.parts[0] = null; + assertTraversal(shrinking, tile, 0, 5, 5); + assertTraversal(shrinking, tile, 7, 14, 14); + assertTraversal(shrinking, tile, 15, 26, 26); + } + + @Test + void freezesCompleteMicroblockOcclusionDecisions() throws Exception { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + TestOcclusionPart first = new TestOcclusionPart(); + TestOcclusionPart second = new TestOcclusionPart(); + for (int firstSlot : VALID_SLOTS) { + for (int secondSlot : VALID_SLOTS) { + for (int firstSize = 1; firstSize < 8; firstSize++) { + for (int secondSize = 1; secondSize < 8; secondSize++) { + for (int secondMaterial = 0; secondMaterial < 2; secondMaterial++) { + first.set(firstSlot, firstSize, 0); + second.set(secondSlot, secondSize, secondMaterial); + digest.update((byte) (first.occlusionTest(second) ? 1 : 0)); + } + } + } + } + } + for (int edge = 15; edge < 27; edge++) { + for (int corner = 7; corner < 15; corner++) { + first.set(edge, 4, 0); + second.set(corner, 4, 1); + digest.update((byte) (first.edgeCornerOcclusionTest(first, second) ? 1 : 0)); + } + } + + assertEquals("089ef2772b6f50b07b8c09a1733bc0e2a6e2006c134095b19f797b0b37ceb55b", hex(digest.digest())); + assertTrue(first.occlusionTest(new BarePart())); + first.superResult = false; + assertFalse(first.occlusionTest(second)); + } + + private static void assertTraversal(TestPart part, RecordingTile tile, int slot, int lastSlot, int calls) { + part.slot = slot; + tile.visited.clear(); + assertEquals(0, MicroOcclusion.recalcBounds(part, Cuboid6.full.copy())); + assertEquals(calls, tile.visited.size()); + assertEquals(lastSlot, tile.visited.get(tile.visited.size() - 1)); + assertFalse(tile.visited.contains(slot)); + } + + private static void assertTrait(Class type, Class[] interfaces, Set methods) { + assertTrue(type.isInterface()); + assertArrayEquals(interfaces, type.getInterfaces()); + assertEquals(0, type.getDeclaredFields().length); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertHelper(String name, Set methods) throws Exception { + Class type = Class.forName(name, false, MicroOcclusionCharacterizationTest.class.getClassLoader()); + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isAbstract(type.getModifiers())); + assertEquals(0, type.getDeclaredFields().length); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } + + private static void update(MessageDigest digest, int value) { + digest.update((byte) (value >>> 24)); + digest.update((byte) (value >>> 16)); + digest.update((byte) (value >>> 8)); + digest.update((byte) value); + } + + private static String hex(byte[] bytes) { + StringBuilder result = new StringBuilder(bytes.length * 2); + for (byte value : bytes) { + result.append(Character.forDigit(value >>> 4 & 0xF, 16)); + result.append(Character.forDigit(value & 0xF, 16)); + } + return result.toString(); + } + + private static void assertCuboid(Cuboid6 expected, Cuboid6 actual) { + assertEquals(expected.min.x, actual.min.x); + assertEquals(expected.min.y, actual.min.y); + assertEquals(expected.min.z, actual.min.z); + assertEquals(expected.max.x, actual.max.x); + assertEquals(expected.max.y, actual.max.y); + assertEquals(expected.max.z, actual.max.z); + } + + private static class TestPart extends TMultiPart implements JMicroShrinkRender { + + private int slot; + private final int size; + private final int priority; + private boolean transparent; + private final Cuboid6 bounds; + + private TestPart(int slot, int size, int priority, boolean transparent, Cuboid6 bounds) { + this.slot = slot; + this.size = size; + this.priority = priority; + this.transparent = transparent; + this.bounds = bounds; + } + + @Override + public String getType() { + return "test_shrink"; + } + + @Override + public int getPriorityClass() { + return priority; + } + + @Override + public int getSlot() { + return slot; + } + + @Override + public int getSize() { + return size; + } + + @Override + public boolean isTransparent() { + return transparent; + } + + @Override + public Cuboid6 getBounds() { + return bounds; + } + } + + private static final class TestOcclusionPart extends TMultiPart implements TMicroOcclusion { + + private int slot; + private int size; + private int material; + private boolean superResult = true; + + private void set(int slot, int size, int material) { + this.slot = slot; + this.size = size; + this.material = material; + superResult = true; + } + + @Override + public String getType() { + return "test_occlusion"; + } + + @Override + public int getSlot() { + return slot; + } + + @Override + public int getSize() { + return size; + } + + @Override + public int getMaterial() { + return material; + } + + @Override + public Cuboid6 getBounds() { + return Cuboid6.full; + } + + @Override + public boolean occlusionTest(TMultiPart part) { + return TMicroOcclusion$class.occlusionTest(this, part); + } + + @Override + public boolean edgeCornerOcclusionTest(TMicroOcclusion edge, TMicroOcclusion corner) { + return TMicroOcclusion$class.edgeCornerOcclusionTest(this, edge, corner); + } + + public boolean codechicken$microblock$TMicroOcclusion$$super$occlusionTest(TMultiPart part) { + return superResult; + } + } + + private static final class BarePart extends TMultiPart { + + @Override + public String getType() { + return "bare"; + } + } + + private static final class RecordingTile extends TileMultipart { + + private final TMultiPart[] parts = new TMultiPart[27]; + private final List visited = new ArrayList<>(); + + @Override + public TMultiPart partMap(int slot) { + visited.add(slot); + return parts[slot]; + } + } +} diff --git a/src/test/java/codechicken/microblock/MicroRecipeBinaryCompatibilityTest.java b/src/test/java/codechicken/microblock/MicroRecipeBinaryCompatibilityTest.java new file mode 100644 index 0000000..fb75aa9 --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroRecipeBinaryCompatibilityTest.java @@ -0,0 +1,84 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; + +class MicroRecipeBinaryCompatibilityTest { + + @Test + void staticFacadeAndCompanionKeepTheirCompletePublishedShape() throws Exception { + Set expected = new TreeSet<>( + Arrays.asList( + "canCut(codechicken.microblock.Saw,net.minecraft.item.ItemStack,int)boolean", + "create(int,int,int,int)net.minecraft.item.ItemStack", + "findMaterial(net.minecraft.item.ItemStack)int", + "getCraftingResult(net.minecraft.inventory.InventoryCrafting)net.minecraft.item.ItemStack", + "getGluingResult(net.minecraft.inventory.InventoryCrafting)net.minecraft.item.ItemStack", + "getHollowFillResult(net.minecraft.inventory.InventoryCrafting)net.minecraft.item.ItemStack", + "getHollowResult(net.minecraft.inventory.InventoryCrafting)net.minecraft.item.ItemStack", + "getRecipeOutput()net.minecraft.item.ItemStack", + "getRecipeSize()int", + "getSaw(net.minecraft.inventory.InventoryCrafting)scala.Tuple3", + "getSplittingResult(net.minecraft.inventory.InventoryCrafting)net.minecraft.item.ItemStack", + "getThinningResult(net.minecraft.inventory.InventoryCrafting)net.minecraft.item.ItemStack", + "matches(net.minecraft.inventory.InventoryCrafting,net.minecraft.world.World)boolean", + "microClass(net.minecraft.item.ItemStack)int", + "microMaterial(net.minecraft.item.ItemStack)int", + "microSize(net.minecraft.item.ItemStack)int", + "splitMap()scala.collection.immutable.Map")); + + assertEquals(expected, publicSignatures(MicroRecipe.class, true)); + assertEquals(expected, publicSignatures(MicroRecipe$.class, false)); + assertTrue(Modifier.isFinal(MicroRecipe.class.getModifiers())); + assertTrue(Modifier.isFinal(MicroRecipe$.class.getModifiers())); + + Field module = MicroRecipe$.class.getField("MODULE$"); + assertSame(MicroRecipe$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(MicroRecipe$.MODULE$, module.get(null)); + } + + @Test + void splittingMapKeepsScalaTypeValuesAndFacadeIdentity() { + assertSame(MicroRecipe$.MODULE$.splitMap(), MicroRecipe.splitMap()); + assertEquals(3, ((Number) MicroRecipe.splitMap().apply(0)).intValue()); + assertEquals(3, ((Number) MicroRecipe.splitMap().apply(1)).intValue()); + assertEquals(2, ((Number) MicroRecipe.splitMap().apply(3)).intValue()); + assertEquals(3, MicroRecipe.splitMap().size()); + } + + private static Set publicSignatures(Class type, boolean requireStatic) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (!Modifier.isPublic(method.getModifiers())) { + continue; + } + assertEquals(requireStatic, Modifier.isStatic(method.getModifiers()), method.toString()); + signatures.add(signature(method)); + } + return signatures; + } + + private static String signature(Method method) { + StringBuilder out = new StringBuilder(method.getName()).append('('); + Class[] parameters = method.getParameterTypes(); + for (int i = 0; i < parameters.length; i++) { + if (i > 0) { + out.append(','); + } + out.append(parameters[i].getName()); + } + return out.append(')').append(method.getReturnType().getName()).toString(); + } +} diff --git a/src/test/java/codechicken/microblock/MicroblockCharacterizationTest.java b/src/test/java/codechicken/microblock/MicroblockCharacterizationTest.java new file mode 100644 index 0000000..9d00e6b --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroblockCharacterizationTest.java @@ -0,0 +1,566 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.block.Block.SoundType; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.IIcon; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.data.MCDataOutputWrapper; +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.microblock.handler.MicroblockProxy; +import codechicken.multipart.JPartialOcclusion; +import codechicken.multipart.TCuboidPart; +import codechicken.multipart.TIconHitEffects; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TSlottedPart; +import codechicken.multipart.TileMultipart; + +class MicroblockCharacterizationTest { + + private static final String MATERIAL_NAME = "test:microblock_base"; + private static final Set BASE_METHODS = signatures( + "$lessinit$greater$default$1()I", + "doesTick()Z", + "drawBreaking(Lnet/minecraft/client/renderer/RenderBlocks;)V", + "explosionResistance(Lnet/minecraft/entity/Entity;)F", + "getCollisionBoxes()Ljava/lang/Iterable;", + "getDrops()Ljava/lang/Iterable;", + "getBrokenColour(ILnet/minecraft/world/IBlockAccess;III)I", + "getDrops()Ljava/util/List;", + "getIMaterial()Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;", + "getLightValue()I", + "getMaterial()I", + "getShape()I", + "getSize()I", + "getStrength(Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/entity/player/EntityPlayer;)F", + "getSubParts()Ljava/lang/Iterable;", + "getType()Ljava/lang/String;", + "isTransparent()Z", + "itemClassID()I", + "load(Lnet/minecraft/nbt/NBTTagCompound;)V", + "material()I", + "material_$eq(I)V", + "microClass()Lcodechicken/microblock/MicroblockClass;", + "pickItem(Lnet/minecraft/util/MovingObjectPosition;)Lnet/minecraft/item/ItemStack;", + "read(Lcodechicken/lib/data/MCDataInput;)V", + "readDesc(Lcodechicken/lib/data/MCDataInput;)V", + "save(Lnet/minecraft/nbt/NBTTagCompound;)V", + "sendShapeUpdate()V", + "setShape(II)V", + "shape()B", + "shape_$eq(B)V", + "writeDesc(Lcodechicken/lib/data/MCDataOutput;)V"); + private static final Set CLIENT_METHODS = signatures( + "addDestroyEffects(Lnet/minecraft/client/particle/EffectRenderer;)V", + "addHitEffects(Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/client/particle/EffectRenderer;)V", + "getBrokenIcon(I)Lnet/minecraft/util/IIcon;", + "getRenderBounds()Lcodechicken/lib/vec/Cuboid6;", + "render(Lcodechicken/lib/vec/Vector3;I)V", + "renderStatic(Lcodechicken/lib/vec/Vector3;I)Z"); + private static final Set COMMON_METHODS = signatures( + "getPartialOcclusionBoxes()Ljava/util/List;", + "getSlot()I", + "getSlotMask()I", + "itemClassID()I", + "microClass()Lcodechicken/microblock/CommonMicroClass;"); + + private static final TestMaterial MATERIAL = new TestMaterial(); + private static int materialId; + private static TestMicroClass microClass; + + @BeforeAll + static void registerMaterialAndAllocateClass() throws Exception { + if (MicroMaterialRegistry.getMaterial(MissingMicroMaterial.key()) == null) { + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, MissingMicroMaterial.key()); + } + if (MicroMaterialRegistry.getMaterial(MATERIAL_NAME) == null) { + MicroMaterialRegistry.registerMaterial(MATERIAL, MATERIAL_NAME); + } + MicroMaterialRegistry$.MODULE$.setupIDMap(); + materialId = MicroMaterialRegistry.materialID(MATERIAL_NAME); + microClass = allocateInstance(TestMicroClass.class); + } + + @Test + void keepsTheBaseCompanionAndThreeMixinSurfaces() throws Exception { + assertTrue(Modifier.isPublic(Microblock.class.getModifiers())); + assertTrue(Modifier.isAbstract(Microblock.class.getModifiers())); + assertSame(TMultiPart.class, Microblock.class.getSuperclass()); + assertArrayEquals(new Class[] { TCuboidPart.class }, Microblock.class.getInterfaces()); + assertEquals(BASE_METHODS, publicDeclaredMethods(Microblock.class)); + assertEquals(1, Microblock.class.getDeclaredConstructors().length); + assertTrue(Modifier.isPublic(Microblock.class.getDeclaredConstructor(int.class).getModifiers())); + assertField(Microblock.class, "material", int.class); + assertField(Microblock.class, "shape", byte.class); + assertEquals(2, Microblock.class.getDeclaredFields().length); + + assertTrue(Modifier.isFinal(Microblock$.class.getModifiers())); + assertEquals(signatures("$lessinit$greater$default$1()I"), publicDeclaredMethods(Microblock$.class)); + Field module = Microblock$.class.getField("MODULE$"); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(Microblock$.MODULE$, module.get(null)); + assertEquals(0, Microblock.$lessinit$greater$default$1()); + assertEquals(0, Microblock$.MODULE$.$lessinit$greater$default$1()); + + assertTrait( + MicroblockClient.class, + new Class[] { TIconHitEffects.class, IMicroMaterialRender.class }, + CLIENT_METHODS); + assertHelper( + "codechicken.microblock.MicroblockClient$class", + signatures( + "$init$(Lcodechicken/microblock/MicroblockClient;)V", + "addDestroyEffects(Lcodechicken/microblock/MicroblockClient;Lnet/minecraft/client/particle/EffectRenderer;)V", + "addHitEffects(Lcodechicken/microblock/MicroblockClient;Lnet/minecraft/util/MovingObjectPosition;Lnet/minecraft/client/particle/EffectRenderer;)V", + "getBrokenIcon(Lcodechicken/microblock/MicroblockClient;I)Lnet/minecraft/util/IIcon;", + "getRenderBounds(Lcodechicken/microblock/MicroblockClient;)Lcodechicken/lib/vec/Cuboid6;", + "renderStatic(Lcodechicken/microblock/MicroblockClient;Lcodechicken/lib/vec/Vector3;I)Z")); + + assertTrait( + CommonMicroblock.class, + new Class[] { JPartialOcclusion.class, TMicroOcclusion.class, TSlottedPart.class }, + COMMON_METHODS); + assertHelper( + "codechicken.microblock.CommonMicroblock$class", + signatures( + "$init$(Lcodechicken/microblock/CommonMicroblock;)V", + "getPartialOcclusionBoxes(Lcodechicken/microblock/CommonMicroblock;)Ljava/util/List;", + "getSlot(Lcodechicken/microblock/CommonMicroblock;)I", + "getSlotMask(Lcodechicken/microblock/CommonMicroblock;)I", + "itemClassID(Lcodechicken/microblock/CommonMicroblock;)I")); + + assertTrait( + CommonMicroblockClient.class, + new Class[] { CommonMicroblock.class, MicroblockClient.class, TMicroOcclusionClient.class }, + signatures("render(Lcodechicken/lib/vec/Vector3;I)V")); + assertHelper( + "codechicken.microblock.CommonMicroblockClient$class", + signatures( + "$init$(Lcodechicken/microblock/CommonMicroblockClient;)V", + "render(Lcodechicken/microblock/CommonMicroblockClient;Lcodechicken/lib/vec/Vector3;I)V")); + } + + @Test + void keepsStateMaterialGeometryAndItemConversions() { + TestMicroblock part = new TestMicroblock(materialId); + assertEquals(materialId, part.material()); + assertEquals(0, part.shape()); + assertFalse(part.doesTick()); + assertSame(MATERIAL, part.getIMaterial()); + assertEquals("test_microblock", part.getType()); + assertEquals(2.5f, part.getStrength(null, null)); + assertTrue(part.isTransparent()); + assertEquals(11, part.getLightValue()); + assertEquals(2f, part.explosionResistance(null)); + + part.setShape(7, 3); + assertEquals((byte) 0x73, part.shape()); + assertEquals(7, part.getSize()); + assertEquals(3, part.getShape()); + IndexedCuboid6 subPart = part.getSubParts().iterator().next(); + assertEquals(0, subPart.data); + assertNotSame(part.getBounds(), subPart); + assertSame(part.getBounds(), part.getCollisionBoxes().iterator().next()); + + ItemMicroPart previous = MicroblockProxy.itemMicro(); + ItemMicroPart item = new ItemMicroPart(); + MicroblockProxy.itemMicro_$eq(item); + try { + List drops = part.getDrops(); + assertEquals(3, drops.size()); + assertItem(drops.get(0), item, 1, 7 << 8 | 4); + assertItem(drops.get(1), item, 1, 7 << 8 | 2); + assertItem(drops.get(2), item, 1, 7 << 8 | 1); + + part.setShape(6, 1); + assertItem(part.pickItem(null), item, 1, 7 << 8 | 2); + } finally { + MicroblockProxy.itemMicro_$eq(previous); + } + + part.setShape(8, 15); + assertEquals(-8, part.getSize(), "The signed-byte size behavior is historical and observable"); + assertEquals(15, part.getShape()); + } + + @Test + void keepsDescriptionNbtAndIncrementalUpdateSemantics() { + TestMicroblock part = new TestMicroblock(materialId); + part.setShape(5, 2); + + ByteArrayOutputStream descriptionBytes = new ByteArrayOutputStream(); + part.writeDesc(output(descriptionBytes)); + assertArrayEquals(new byte[] { (byte) materialId, (byte) 0x52 }, descriptionBytes.toByteArray()); + + NBTTagCompound tag = new NBTTagCompound(); + part.save(tag); + assertEquals((byte) 0x52, tag.getByte("shape")); + assertEquals(MATERIAL_NAME, tag.getString("material")); + + TestMicroblock loaded = new TestMicroblock(MicroMaterialRegistry.getMissingId()); + loaded.load(tag); + assertEquals((byte) 0x52, loaded.shape()); + assertEquals(materialId, loaded.material()); + + RecordingTile tile = new RecordingTile(); + ByteArrayOutputStream updateBytes = new ByteArrayOutputStream(); + tile.output = output(updateBytes); + loaded.bind(tile); + loaded.sendShapeUpdate(); + assertArrayEquals(new byte[] { (byte) 0x52 }, updateBytes.toByteArray()); + + loaded.read(input((byte) 0x31)); + assertEquals((byte) 0x31, loaded.shape()); + assertEquals(1, tile.renderMarks); + assertEquals(1, tile.partChanges); + assertSame(loaded, tile.changedPart); + } + + @Test + void overriddenStateDrivesGeometryMaterialAndItems() { + AccessorMicroblock part = new AccessorMicroblock(); + assertEquals(5, part.getSize()); + assertEquals(2, part.getShape()); + assertEquals(materialId, part.getMaterial()); + assertSame(MATERIAL, part.getIMaterial()); + assertEquals(2.5f, part.getStrength(null, null)); + assertTrue(part.isTransparent()); + assertEquals(11, part.getLightValue()); + assertEquals(2f, part.explosionResistance(null)); + + part.setShape(7, 3); + assertEquals((byte) 0x73, part.shape()); + assertEquals(1, part.shapeWrites); + ItemMicroPart previous = MicroblockProxy.itemMicro(); + ItemMicroPart item = new ItemMicroPart(); + MicroblockProxy.itemMicro_$eq(item); + try { + List drops = part.getDrops(); + assertEquals(3, drops.size()); + assertItem(drops.get(0), item, 1, 7 << 8 | 4); + assertItem(drops.get(1), item, 1, 7 << 8 | 2); + assertItem(drops.get(2), item, 1, 7 << 8 | 1); + part.setShape(6, 1); + assertItem(part.pickItem(null), item, 1, 7 << 8 | 2); + } finally { + MicroblockProxy.itemMicro_$eq(previous); + } + part.setShape(8, 15); + assertEquals(-8, part.getSize()); + assertEquals(15, part.getShape()); + } + + @Test + void overriddenStateIsWrittenToDescriptionsNbtAndUpdates() { + AccessorMicroblock part = new AccessorMicroblock(); + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + part.writeDesc(output(bytes)); + assertArrayEquals(new byte[] { (byte) materialId, (byte) 0x52 }, bytes.toByteArray()); + NBTTagCompound tag = new NBTTagCompound(); + part.save(tag); + assertEquals((byte) 0x52, tag.getByte("shape")); + assertEquals(MATERIAL_NAME, tag.getString("material")); + + bytes.reset(); + RecordingTile tile = new RecordingTile(); + tile.output = output(bytes); + part.bind(tile); + part.sendShapeUpdate(); + assertArrayEquals(new byte[] { (byte) 0x52 }, bytes.toByteArray()); + } + + @Test + void overriddenSettersReceiveLoadedStateAndNetworkUpdates() { + AccessorMicroblock part = new AccessorMicroblock(); + NBTTagCompound tag = new NBTTagCompound(); + tag.setByte("shape", (byte) 0x31); + tag.setString("material", MissingMicroMaterial.key()); + part.load(tag); + assertEquals((byte) 0x31, part.shape()); + assertEquals(MicroMaterialRegistry.getMissingId(), part.material()); + assertEquals(1, part.shapeWrites); + assertEquals(1, part.materialWrites); + + part.readDesc(input((byte) 0x42)); + assertEquals((byte) 0x42, part.shape()); + assertEquals(2, part.shapeWrites); + RecordingTile tile = new RecordingTile(); + part.bind(tile); + part.read(input((byte) 0x63)); + assertEquals((byte) 0x63, part.shape()); + assertEquals(3, part.shapeWrites); + assertEquals(1, part.materialWrites); + assertEquals(1, tile.renderMarks); + assertEquals(1, tile.partChanges); + assertSame(part, tile.changedPart); + } + + private static void assertTrait(Class type, Class[] interfaces, Set methods) { + assertTrue(type.isInterface()); + assertArrayEquals(interfaces, type.getInterfaces()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertHelper(String name, Set methods) throws Exception { + Class type = Class.forName(name); + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isAbstract(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertField(Class owner, String name, Class type) throws Exception { + Field field = owner.getDeclaredField(name); + assertSame(type, field.getType()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + assertFalse(Modifier.isFinal(field.getModifiers())); + assertFalse(Modifier.isStatic(field.getModifiers())); + } + + private static void assertItem(ItemStack stack, ItemMicroPart item, int amount, int damage) { + assertSame(item, stack.getItem()); + assertEquals(amount, stack.stackSize); + assertEquals(damage, stack.getItemDamage()); + assertEquals(MATERIAL_NAME, stack.getTagCompound().getString("mat")); + } + + private static MCDataOutput output(ByteArrayOutputStream bytes) { + return new MCDataOutputWrapper(new DataOutputStream(bytes)); + } + + private static MCDataInput input(byte value) { + DataInputStream data = new DataInputStream(new ByteArrayInputStream(new byte[] { value })); + return (MCDataInput) Proxy.newProxyInstance( + MCDataInput.class.getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, arguments) -> { + if (method.getName().equals("readByte")) { + return data.readByte(); + } + throw new AssertionError("Unexpected read method: " + method.getName()); + }); + } + + private static Set signatures(String... values) { + return new TreeSet<>(Arrays.asList(values)); + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + @SuppressWarnings("unchecked") + private static T allocateInstance(Class type) throws Exception { + Class unsafe = Class.forName("sun.misc.Unsafe"); + Field field = unsafe.getDeclaredField("theUnsafe"); + field.setAccessible(true); + return (T) unsafe.getMethod("allocateInstance", Class.class).invoke(field.get(null), type); + } + + private static class TestMicroblock extends Microblock { + + private static final Cuboid6 BOUNDS = new Cuboid6(0, 0, 0, 0.5, 0.75, 1); + + private TestMicroblock(int material) { + super(material); + } + + @Override + public MicroblockClass microClass() { + return microClass; + } + + @Override + public int itemClassID() { + return 7; + } + + @Override + public Cuboid6 getBounds() { + return BOUNDS; + } + } + + private static final class AccessorMicroblock extends TestMicroblock { + + private int overriddenMaterial = materialId; + private byte overriddenShape = 0x52; + private int materialWrites; + private int shapeWrites; + + private AccessorMicroblock() { + super(MicroMaterialRegistry.getMissingId()); + } + + @Override + public int material() { + return overriddenMaterial; + } + + @Override + public void material_$eq(int value) { + materialWrites++; + overriddenMaterial = value; + } + + @Override + public byte shape() { + return overriddenShape; + } + + @Override + public void shape_$eq(byte value) { + shapeWrites++; + overriddenShape = value; + } + } + + private static final class TestMicroClass extends MicroblockClass { + + @Override + public String getName() { + return "test_microblock"; + } + + @Override + public Class baseTrait() { + return TestMicroblock.class; + } + + @Override + public Class clientTrait() { + return MicroblockClient.class; + } + + @Override + public float getResistanceFactor() { + return 0.25f; + } + } + + private static final class RecordingTile extends TileMultipart { + + private MCDataOutput output; + private int renderMarks; + private int partChanges; + private TMultiPart changedPart; + + @Override + public MCDataOutput getWriteStream(TMultiPart part) { + return output; + } + + @Override + public void markRender() { + renderMarks++; + } + + @Override + public void notifyPartChange(TMultiPart part) { + partChanges++; + changedPart = part; + } + } + + private static final class TestMaterial implements IMicroMaterial { + + @Override + public boolean isSolid() { + return !isTransparent(); + } + + @Override + public void loadIcons() {} + + @Override + public boolean canRenderInPass(int pass) { + return pass == 0; + } + + @Override + public IIcon getBreakingIcon(int side) { + return null; + } + + @Override + public void renderMicroFace(Vector3 pos, int pass, Cuboid6 bounds) {} + + @Override + public boolean isTransparent() { + return true; + } + + @Override + public int getLightValue() { + return 11; + } + + @Override + public float getStrength(EntityPlayer player) { + return 2.5f; + } + + @Override + public String getLocalizedName() { + return "Test Microblock"; + } + + @Override + public ItemStack getItem() { + return null; + } + + @Override + public int getCutterStrength() { + return 0; + } + + @Override + public SoundType getSound() { + return null; + } + + @Override + public float explosionResistance(Entity entity) { + return 8f; + } + } +} diff --git a/src/test/java/codechicken/microblock/MicroblockClassCharacterizationTest.java b/src/test/java/codechicken/microblock/MicroblockClassCharacterizationTest.java new file mode 100644 index 0000000..c4d8ef6 --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroblockClassCharacterizationTest.java @@ -0,0 +1,276 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.MultiPartRegistry.IPartFactory2; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +class MicroblockClassCharacterizationTest { + + private static final Set MICROBLOCK_CLASS_METHODS = signatures( + "baseTrait()Ljava/lang/Class;", + "baseTraitId()I", + "clientTrait()Ljava/lang/Class;", + "clientTraitId()I", + "create(ZI)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lcodechicken/lib/data/MCDataInput;)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lcodechicken/lib/data/MCDataInput;)Lcodechicken/multipart/TMultiPart;", + "createPart(Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/microblock/Microblock;", + "createPart(Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/multipart/TMultiPart;", + "createPartForClientPreview(Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/microblock/Microblock;", + "createPartForClientPreview(Ljava/lang/String;Lnet/minecraft/nbt/NBTTagCompound;)Lcodechicken/multipart/TMultiPart;", + "getName()Ljava/lang/String;", + "getResistanceFactor()F", + "register()V"); + private static final Set COMMON_CLASS_METHODS = signatures( + "classes()[Lcodechicken/microblock/CommonMicroClass;", + "getClassId()I", + "getMicroClass(I)Lcodechicken/microblock/CommonMicroClass;", + "itemSlot()I", + "placementProperties()Lcodechicken/microblock/PlacementProperties;", + "register(I)V", + "registerMicroClass(Lcodechicken/microblock/CommonMicroClass;I)V"); + private static final Set COMMON_COMPANION_METHODS = signatures( + "classes()[Lcodechicken/microblock/CommonMicroClass;", + "getMicroClass(I)Lcodechicken/microblock/CommonMicroClass;", + "registerMicroClass(Lcodechicken/microblock/CommonMicroClass;I)V"); + + @Test + void keepsClassHierarchyCallableSurfaceAndSideAnnotations() throws Exception { + assertAbstractClass( + MicroblockClass.class, + Object.class, + new Class[] { IPartFactory2.class }, + MICROBLOCK_CLASS_METHODS); + assertAbstractClass(CommonMicroClass.class, MicroblockClass.class, new Class[0], COMMON_CLASS_METHODS); + assertConstructor(MicroblockClass.class); + assertConstructor(CommonMicroClass.class); + + assertTrue(Modifier.isPublic(CommonMicroClass$.class.getModifiers())); + assertTrue(Modifier.isFinal(CommonMicroClass$.class.getModifiers())); + assertEquals(COMMON_COMPANION_METHODS, publicDeclaredMethods(CommonMicroClass$.class)); + + assertField(MicroblockClass.class, "baseTraitId", int.class, Modifier.PRIVATE | Modifier.FINAL); + Field clientTraitId = assertField(MicroblockClass.class, "clientTraitId", int.class, Modifier.PRIVATE); + assertEquals(Side.CLIENT, clientTraitId.getAnnotation(SideOnly.class).value()); + assertField(MicroblockClass.class, "bitmap$0", boolean.class, Modifier.PRIVATE | Modifier.VOLATILE); + assertEquals(3, MicroblockClass.class.getDeclaredFields().length); + assertField(CommonMicroClass.class, "classId", int.class, Modifier.PRIVATE); + assertEquals(1, CommonMicroClass.class.getDeclaredFields().length); + + SideOnly clientTrait = MicroblockClass.class.getDeclaredMethod("clientTrait").getAnnotation(SideOnly.class); + assertEquals(Side.CLIENT, clientTrait.value()); + + Field module = assertField( + CommonMicroClass$.class, + "MODULE$", + CommonMicroClass$.class, + Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL); + assertSame(CommonMicroClass$.MODULE$, module.get(null)); + assertField(CommonMicroClass$.class, "classes", CommonMicroClass[].class, Modifier.PRIVATE | Modifier.FINAL); + assertEquals(2, CommonMicroClass$.class.getDeclaredFields().length); + } + + @Test + void registersAndLooksUpCommonClassesBeforeRejectingDuplicates() throws Exception { + int id = 251; + CommonMicroClass[] classes = CommonMicroClass.classes(); + assertSame(classes, CommonMicroClass$.MODULE$.classes()); + CommonMicroClass original = classes[id]; + assertNull(original); + + RecordingCommonMicroClass first = allocateInstance(RecordingCommonMicroClass.class); + RecordingCommonMicroClass second = allocateInstance(RecordingCommonMicroClass.class); + first.name = "first"; + first.idDuringRegistration = -1; + second.name = "second"; + try { + first.register(id); + assertEquals(1, first.registrations); + assertEquals(0, first.idDuringRegistration); + assertEquals(id, first.getClassId()); + assertSame(first, CommonMicroClass.getMicroClass(id << 8 | 0xA5)); + assertSame(first, CommonMicroClass$.MODULE$.getMicroClass(id << 8 | 0x5A)); + + IllegalArgumentException duplicate = assertThrows( + IllegalArgumentException.class, + () -> CommonMicroClass.registerMicroClass(second, id)); + assertEquals( + "Microblock class id " + id + " is already taken by first when adding second", + duplicate.getMessage()); + assertSame(first, classes[id]); + } finally { + classes[id] = original; + } + } + + @Test + void keepsFactoryCallsOnTheLoadBearingGeneratorCompanion() throws IOException { + ClassNode type = new ClassNode(); + new ClassReader(MicroblockClass.class.getName()).accept(type, 0); + + assertCall( + method(type, "", "()V"), + Opcodes.INVOKEVIRTUAL, + "codechicken/microblock/MicroblockGenerator$", + "registerTrait", + "(Ljava/lang/Class;)I"); + assertCall( + method(type, "clientTraitId$lzycompute", "()I"), + Opcodes.INVOKEVIRTUAL, + "codechicken/microblock/MicroblockGenerator$", + "registerTrait", + "(Ljava/lang/Class;)I"); + assertCall( + method(type, "create", "(ZI)Lcodechicken/microblock/Microblock;"), + Opcodes.INVOKEVIRTUAL, + "codechicken/microblock/MicroblockGenerator$", + "create", + "(Lcodechicken/microblock/MicroblockClass;IZ)Lcodechicken/microblock/Microblock;"); + assertCall( + method(type, "register", "()V"), + Opcodes.INVOKESTATIC, + "codechicken/multipart/MultiPartRegistry", + "registerParts", + "(Lcodechicken/multipart/MultiPartRegistry$IPartFactory2;[Ljava/lang/String;)V"); + } + + private static void assertAbstractClass(Class type, Class superclass, Class[] interfaces, + Set methods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isAbstract(type.getModifiers())); + assertSame(superclass, type.getSuperclass()); + assertArrayEquals(interfaces, type.getInterfaces()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static void assertConstructor(Class type) throws Exception { + Constructor constructor = type.getDeclaredConstructor(); + assertTrue(Modifier.isPublic(constructor.getModifiers())); + assertEquals(1, type.getDeclaredConstructors().length); + } + + private static Field assertField(Class owner, String name, Class type, int modifiers) throws Exception { + Field field = owner.getDeclaredField(name); + assertSame(type, field.getType()); + assertEquals(modifiers, field.getModifiers()); + return field; + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } + + private static MethodNode method(ClassNode type, String name, String descriptor) { + for (MethodNode method : type.methods) { + if (name.equals(method.name) && descriptor.equals(method.desc)) { + return method; + } + } + throw new AssertionError("Missing method " + name + descriptor); + } + + private static void assertCall(MethodNode method, int opcode, String owner, String name, String descriptor) { + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instruction; + if (call.getOpcode() == opcode && owner.equals(call.owner) + && name.equals(call.name) + && descriptor.equals(call.desc)) { + return; + } + } + } + throw new AssertionError("Missing call " + owner + '.' + name + descriptor); + } + + @SuppressWarnings("unchecked") + private static T allocateInstance(Class type) throws Exception { + Class unsafe = Class.forName("sun.misc.Unsafe"); + Field field = unsafe.getDeclaredField("theUnsafe"); + field.setAccessible(true); + return (T) unsafe.getMethod("allocateInstance", Class.class).invoke(field.get(null), type); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static Class rawClass(Class type) { + return (Class) type; + } + + private static final class RecordingCommonMicroClass extends CommonMicroClass { + + private String name; + private int registrations; + private int idDuringRegistration = -1; + + @Override + public String getName() { + return name; + } + + @Override + public Class baseTrait() { + return rawClass(CornerMicroblock.class); + } + + @Override + public Class clientTrait() { + return rawClass(CommonMicroblockClient.class); + } + + @Override + public float getResistanceFactor() { + return 1; + } + + @Override + public int itemSlot() { + return 0; + } + + @Override + public PlacementProperties placementProperties() { + return null; + } + + @Override + public void register() { + registrations++; + idDuringRegistration = getClassId(); + } + } +} diff --git a/src/test/java/codechicken/microblock/MicroblockGeneratorCharacterizationTest.java b/src/test/java/codechicken/microblock/MicroblockGeneratorCharacterizationTest.java new file mode 100644 index 0000000..70a4f9e --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroblockGeneratorCharacterizationTest.java @@ -0,0 +1,224 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.BitSet; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicReference; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.asm.ASMMixinFactory; +import codechicken.multipart.asm.ScratchBitSet; + +class MicroblockGeneratorCharacterizationTest { + + private static final Set FACADE_METHODS = signatures( + "baseType()Ljava/lang/Class;", + "construct(Ljava/util/BitSet;Lscala/collection/Seq;)Ljava/lang/Object;", + "create(Lcodechicken/microblock/MicroblockClass;IZ)Lcodechicken/microblock/Microblock;", + "freshBitSet()Ljava/util/BitSet;", + "getBitSet()Ljava/util/BitSet;", + "getId(Ljava/lang/String;)I", + "registerTrait(Ljava/lang/Class;)I", + "registerTrait(Ljava/lang/String;)I"); + private static final Set COMPANION_METHODS = signatures( + "codechicken$multipart$asm$ScratchBitSet$$bitSets()Ljava/lang/ThreadLocal;", + "codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq" + + "(Ljava/lang/ThreadLocal;)V", + "create(Lcodechicken/microblock/MicroblockClass;IZ)Lcodechicken/microblock/Microblock;", + "freshBitSet()Ljava/util/BitSet;", + "getBitSet()Ljava/util/BitSet;"); + private static final Set GENERATED_MATERIAL_METHODS = signatures( + "addTraits(Ljava/util/BitSet;Lcodechicken/microblock/MicroblockClass;Z)V"); + + @Test + void keepsFacadeCompanionAndNestedMaterialTraitSurface() throws Exception { + assertTrue(Modifier.isPublic(MicroblockGenerator.class.getModifiers())); + assertTrue(Modifier.isFinal(MicroblockGenerator.class.getModifiers())); + assertSame(Object.class, MicroblockGenerator.class.getSuperclass()); + assertEquals(FACADE_METHODS, publicDeclaredMethods(MicroblockGenerator.class)); + assertEquals(0, MicroblockGenerator.class.getDeclaredFields().length); + + assertTrue(Modifier.isPublic(MicroblockGenerator$.class.getModifiers())); + assertTrue(Modifier.isFinal(MicroblockGenerator$.class.getModifiers())); + assertSame(ASMMixinFactory.class, MicroblockGenerator$.class.getSuperclass()); + assertArrayEquals(new Class[] { ScratchBitSet.class }, MicroblockGenerator$.class.getInterfaces()); + assertEquals(COMPANION_METHODS, publicDeclaredMethods(MicroblockGenerator$.class)); + + Field module = MicroblockGenerator$.class.getDeclaredField("MODULE$"); + assertEquals(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, module.getModifiers()); + assertSame(MicroblockGenerator$.class, module.getType()); + assertSame(MicroblockGenerator$.MODULE$, module.get(null)); + + Field scratch = MicroblockGenerator$.class.getDeclaredField("codechicken$multipart$asm$ScratchBitSet$$bitSets"); + assertSame(ThreadLocal.class, scratch.getType()); + assertTrue(Modifier.isPrivate(scratch.getModifiers())); + assertEquals(2, MicroblockGenerator$.class.getDeclaredFields().length); + + Constructor constructor = MicroblockGenerator$.class.getDeclaredConstructor(); + assertTrue(Modifier.isPrivate(constructor.getModifiers())); + assertEquals(1, MicroblockGenerator$.class.getDeclaredConstructors().length); + + Class generatedMaterial = MicroblockGenerator.IGeneratedMaterial.class; + assertTrue(generatedMaterial.isInterface()); + assertTrue(Modifier.isPublic(generatedMaterial.getModifiers())); + assertTrue(Modifier.isStatic(generatedMaterial.getModifiers())); + assertSame(MicroblockGenerator.class, generatedMaterial.getDeclaringClass()); + assertEquals(GENERATED_MATERIAL_METHODS, publicDeclaredMethods(generatedMaterial)); + assertEquals(0, generatedMaterial.getDeclaredFields().length); + assertArrayEquals(new Class[] { generatedMaterial }, MicroblockGenerator.class.getDeclaredClasses()); + + assertSame(Microblock.class, MicroblockGenerator.baseType()); + assertSame(Microblock.class, MicroblockGenerator$.MODULE$.baseType()); + } + + @Test + void keepsReplaceableClearedThreadLocalScratchBitSet() throws Exception { + MicroblockGenerator$ generator = MicroblockGenerator$.MODULE$; + ThreadLocal original = generator.codechicken$multipart$asm$ScratchBitSet$$bitSets(); + ThreadLocal replacement = new ThreadLocal<>(); + generator.codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq( + replacement); + try { + assertSame(replacement, generator.codechicken$multipart$asm$ScratchBitSet$$bitSets()); + BitSet first = generator.getBitSet(); + assertSame(first, MicroblockGenerator.getBitSet()); + first.set(7); + assertSame(first, MicroblockGenerator.freshBitSet()); + assertTrue(first.isEmpty()); + + AtomicReference otherFirst = new AtomicReference<>(); + AtomicReference otherFresh = new AtomicReference<>(); + Thread thread = new Thread(() -> { + BitSet bitSet = generator.getBitSet(); + bitSet.set(11); + otherFirst.set(bitSet); + otherFresh.set(generator.freshBitSet()); + }); + thread.start(); + thread.join(); + + assertSame(otherFirst.get(), otherFresh.get()); + assertTrue(otherFresh.get().isEmpty()); + assertFalse(first == otherFirst.get()); + } finally { + generator + .codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq( + original); + } + } + + @Test + void keepsLoadBearingCompanionAndGenerationCalls() throws IOException { + ClassNode facade = classNode(MicroblockGenerator.class); + assertCall( + method( + facade, + "create", + "(Lcodechicken/microblock/MicroblockClass;IZ)Lcodechicken/microblock/Microblock;"), + Opcodes.INVOKEVIRTUAL, + "codechicken/microblock/MicroblockGenerator$", + "create", + "(Lcodechicken/microblock/MicroblockClass;IZ)Lcodechicken/microblock/Microblock;"); + + ClassNode companion = classNode(MicroblockGenerator$.class); + MethodNode create = method( + companion, + "create", + "(Lcodechicken/microblock/MicroblockClass;IZ)Lcodechicken/microblock/Microblock;"); + assertCall( + create, + Opcodes.INVOKESTATIC, + "codechicken/microblock/MicroMaterialRegistry", + "getMaterial", + "(I)Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;"); + assertCall( + create, + Opcodes.INVOKEINTERFACE, + "codechicken/microblock/MicroblockGenerator$IGeneratedMaterial", + "addTraits", + "(Ljava/util/BitSet;Lcodechicken/microblock/MicroblockClass;Z)V"); + assertCall( + create, + Opcodes.INVOKEVIRTUAL, + "codechicken/microblock/MicroblockGenerator$", + "construct", + "(Ljava/util/BitSet;Lscala/collection/Seq;)Ljava/lang/Object;"); + + MethodNode constructor = method(companion, "", "()V"); + assertCall( + constructor, + Opcodes.INVOKESPECIAL, + "codechicken/multipart/asm/ASMMixinFactory", + "", + "(Ljava/lang/Class;Lscala/collection/Seq;)V"); + assertCall( + constructor, + Opcodes.INVOKESTATIC, + "codechicken/multipart/asm/ScratchBitSet$class", + "$init$", + "(Lcodechicken/multipart/asm/ScratchBitSet;)V"); + } + + private static ClassNode classNode(Class type) throws IOException { + ClassNode node = new ClassNode(); + new ClassReader(type.getName()).accept(node, 0); + return node; + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } + + private static MethodNode method(ClassNode type, String name, String descriptor) { + for (MethodNode method : type.methods) { + if (name.equals(method.name) && descriptor.equals(method.desc)) { + return method; + } + } + throw new AssertionError("Missing method " + name + descriptor); + } + + private static void assertCall(MethodNode method, int opcode, String owner, String name, String descriptor) { + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instruction; + if (call.getOpcode() == opcode && owner.equals(call.owner) + && name.equals(call.name) + && descriptor.equals(call.desc)) { + return; + } + } + } + throw new AssertionError("Missing call " + owner + '.' + name + descriptor); + } +} diff --git a/src/test/java/codechicken/microblock/MicroblockPlacementCharacterizationTest.java b/src/test/java/codechicken/microblock/MicroblockPlacementCharacterizationTest.java new file mode 100644 index 0000000..d810152 --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroblockPlacementCharacterizationTest.java @@ -0,0 +1,212 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.vec.BlockCoord; + +class MicroblockPlacementCharacterizationTest { + + private static final Set EXECUTABLE_METHODS = signatures( + "consume(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/item/ItemStack;)V", + "part()Lcodechicken/microblock/Microblock;", + "place(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/item/ItemStack;)V", + "pos()Lcodechicken/lib/vec/BlockCoord;"); + private static final Set CONCRETE_METHODS = signatures( + "consume(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/item/ItemStack;)V", + "place(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/item/ItemStack;)V"); + private static final Set PROPERTY_METHODS = signatures( + "customPlacement(Lcodechicken/microblock/MicroblockPlacement;)Lcodechicken/microblock/ExecutablePlacement;", + "expand(II)Z", + "microClass()Lcodechicken/microblock/MicroblockClass;", + "opposite(II)I", + "placementGrid()Lcodechicken/microblock/PlacementGrid;", + "sneakOpposite(II)Z"); + private static final Set PLACEMENT_METHODS = signatures( + "apply()Lcodechicken/microblock/ExecutablePlacement;", + "checkMaterial()Z", + "create(III)Lcodechicken/microblock/Microblock;", + "d()D", + "doExpand()Z", + "expand(Lcodechicken/microblock/CommonMicroblock;)Lcodechicken/microblock/ExecutablePlacement;", + "expand(Lcodechicken/microblock/Microblock;Lcodechicken/microblock/Microblock;)Lcodechicken/microblock/ExecutablePlacement;", + "externalPlacement(I)Lcodechicken/microblock/ExecutablePlacement;", + "externalPlacement(Lcodechicken/microblock/Microblock;)Lcodechicken/microblock/ExecutablePlacement;", + "getHitDepth(Lcodechicken/lib/vec/Vector3;I)D", + "gtile()Lscala/Tuple2;", + "hit()Lnet/minecraft/util/MovingObjectPosition;", + "htile()Lcodechicken/multipart/TileMultipart;", + "internal()Z", + "internalPlacement(Lcodechicken/multipart/TileMultipart;I)Lcodechicken/microblock/ExecutablePlacement;", + "internalPlacement(Lcodechicken/multipart/TileMultipart;Lcodechicken/microblock/Microblock;)Lcodechicken/microblock/ExecutablePlacement;", + "material()I", + "mcrClass()Lcodechicken/microblock/MicroblockClass;", + "oppMod()Z", + "oslot()I", + "player()Lnet/minecraft/entity/player/EntityPlayer;", + "pos()Lcodechicken/lib/vec/BlockCoord;", + "pp()Lcodechicken/microblock/PlacementProperties;", + "side()I", + "size()I", + "slot()I", + "useOppMod()Z", + "vhit()Lcodechicken/lib/vec/Vector3;", + "world()Lnet/minecraft/world/World;"); + + @Test + void keepsTheSixClassHierarchyAndCallableSurface() throws Exception { + assertClass(ExecutablePlacement.class, Object.class, true, false, EXECUTABLE_METHODS); + assertClass(AdditionPlacement.class, ExecutablePlacement.class, false, false, CONCRETE_METHODS); + assertClass(ExpandingPlacement.class, ExecutablePlacement.class, false, false, CONCRETE_METHODS); + assertClass(PlacementProperties.class, Object.class, true, false, PROPERTY_METHODS); + assertClass(MicroblockPlacement.class, Object.class, false, false, PLACEMENT_METHODS); + assertClass( + MicroblockPlacement$.class, + Object.class, + false, + true, + signatures( + "apply(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/MovingObjectPosition;IIZLcodechicken/microblock/PlacementProperties;)Lcodechicken/microblock/ExecutablePlacement;")); + + assertConstructor(ExecutablePlacement.class, BlockCoord.class, Microblock.class); + assertConstructor(AdditionPlacement.class, BlockCoord.class, Microblock.class); + assertConstructor(ExpandingPlacement.class, BlockCoord.class, Microblock.class, Microblock.class); + assertConstructor(PlacementProperties.class); + assertConstructor( + MicroblockPlacement.class, + EntityPlayer.class, + MovingObjectPosition.class, + int.class, + int.class, + boolean.class, + PlacementProperties.class); + + Field module = MicroblockPlacement$.class.getField("MODULE$"); + assertSame(MicroblockPlacement$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(MicroblockPlacement$.MODULE$, module.get(null)); + } + + @Test + void keepsTheExactStoredStateShape() throws Exception { + assertPrivateFinalField(ExecutablePlacement.class, "pos", BlockCoord.class); + assertPrivateFinalField(ExecutablePlacement.class, "part", Microblock.class); + assertEquals(0, AdditionPlacement.class.getDeclaredFields().length); + assertPrivateFinalField(ExpandingPlacement.class, "opart", Microblock.class); + + assertPrivateFinalField(MicroblockPlacement.class, "player", EntityPlayer.class); + assertPrivateFinalField(MicroblockPlacement.class, "hit", MovingObjectPosition.class); + assertPrivateFinalField(MicroblockPlacement.class, "size", int.class); + assertPrivateFinalField(MicroblockPlacement.class, "material", int.class); + assertPrivateFinalField(MicroblockPlacement.class, "checkMaterial", boolean.class); + assertPrivateFinalField(MicroblockPlacement.class, "pp", PlacementProperties.class); + assertPrivateFinalField(MicroblockPlacement.class, "world", World.class); + assertPrivateFinalField(MicroblockPlacement.class, "mcrClass", MicroblockClass.class); + assertPrivateFinalField(MicroblockPlacement.class, "pos", BlockCoord.class); + assertPrivateFinalField(MicroblockPlacement.class, "vhit", codechicken.lib.vec.Vector3.class); + assertPrivateFinalField(MicroblockPlacement.class, "gtile", scala.Tuple2.class); + assertPrivateFinalField(MicroblockPlacement.class, "htile", codechicken.multipart.TileMultipart.class); + assertPrivateFinalField(MicroblockPlacement.class, "slot", int.class); + assertPrivateFinalField(MicroblockPlacement.class, "oslot", int.class); + assertPrivateFinalField(MicroblockPlacement.class, "d", double.class); + assertPrivateFinalField(MicroblockPlacement.class, "useOppMod", boolean.class); + assertPrivateFinalField(MicroblockPlacement.class, "oppMod", boolean.class); + assertPrivateFinalField(MicroblockPlacement.class, "internal", boolean.class); + assertPrivateFinalField(MicroblockPlacement.class, "doExpand", boolean.class); + assertPrivateFinalField(MicroblockPlacement.class, "side", int.class); + } + + @Test + void keepsDefaultPropertiesAndExecutableConsumption() { + PlacementProperties properties = new PlacementProperties() { + + @Override + public int opposite(int slot, int side) { + return slot + side; + } + + @Override + public MicroblockClass microClass() { + return null; + } + + @Override + public PlacementGrid placementGrid() { + return null; + } + }; + assertTrue(properties.sneakOpposite(2, 3)); + assertTrue(properties.expand(2, 3)); + assertNull(properties.customPlacement(null)); + + BlockCoord pos = new BlockCoord(1, 2, 3); + AdditionPlacement addition = new AdditionPlacement(pos, null); + ExpandingPlacement expansion = new ExpandingPlacement(pos, null, null); + assertSame(pos, addition.pos()); + assertNull(addition.part()); + assertSame(pos, expansion.pos()); + assertNull(expansion.part()); + + ItemStack stack = new ItemStack(net.minecraft.init.Items.stick, 4); + addition.consume(null, null, stack); + expansion.consume(null, null, stack); + assertEquals(2, stack.stackSize); + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } + + private static void assertClass(Class type, Class superclass, boolean isAbstract, boolean isFinal, + Set methods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertEquals(isAbstract, Modifier.isAbstract(type.getModifiers())); + assertEquals(isFinal, Modifier.isFinal(type.getModifiers())); + assertSame(superclass, type.getSuperclass()); + assertArrayEquals(new Class[0], type.getInterfaces()); + assertEquals(methods, publicDeclaredMethods(type)); + } + + private static Set publicDeclaredMethods(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } + + private static void assertConstructor(Class type, Class... parameterTypes) throws Exception { + Constructor constructor = type.getDeclaredConstructor(parameterTypes); + assertTrue(Modifier.isPublic(constructor.getModifiers())); + assertEquals(1, type.getDeclaredConstructors().length); + } + + private static void assertPrivateFinalField(Class owner, String name, Class type) throws Exception { + Field field = owner.getDeclaredField(name); + assertSame(type, field.getType()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + assertTrue(Modifier.isFinal(field.getModifiers())); + } +} diff --git a/src/test/java/codechicken/microblock/MicroblockRenderCharacterizationTest.java b/src/test/java/codechicken/microblock/MicroblockRenderCharacterizationTest.java new file mode 100644 index 0000000..1f4390e --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroblockRenderCharacterizationTest.java @@ -0,0 +1,289 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicReference; + +import net.minecraft.block.Block.SoundType; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.lib.render.BlockRenderer.BlockFace; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; + +class MicroblockRenderCharacterizationTest { + + private static final Set METHODS = signatures( + "face()Ljava/lang/ThreadLocal;", + "renderCuboid(Lcodechicken/lib/vec/Vector3;Lcodechicken/microblock/MicroMaterialRegistry$IMicroMaterial;ILcodechicken/lib/vec/Cuboid6;I)V", + "renderHighlight(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/MovingObjectPosition;Lcodechicken/microblock/CommonMicroClass;II)V", + "renderItem(Lcodechicken/microblock/Microblock;II)V"); + + @Test + void keepsFacadeAndCompanionSurfaces() throws Exception { + assertTrue(Modifier.isPublic(MicroblockRender.class.getModifiers())); + assertTrue(Modifier.isFinal(MicroblockRender.class.getModifiers())); + assertEquals(METHODS, publicDeclaredMethods(MicroblockRender.class)); + assertEquals(0, MicroblockRender.class.getDeclaredFields().length); + for (Method method : MicroblockRender.class.getDeclaredMethods()) { + assertTrue(Modifier.isStatic(method.getModifiers()), method.toString()); + } + + assertTrue(Modifier.isPublic(MicroblockRender$.class.getModifiers())); + assertTrue(Modifier.isFinal(MicroblockRender$.class.getModifiers())); + assertEquals(METHODS, publicDeclaredMethods(MicroblockRender$.class)); + + Field module = MicroblockRender$.class.getField("MODULE$"); + assertSame(MicroblockRender$.class, module.getType()); + assertEquals(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, module.getModifiers()); + assertSame(MicroblockRender$.MODULE$, module.get(null)); + + Field face = MicroblockRender$.class.getDeclaredField("face"); + assertSame(ThreadLocal.class, face.getType()); + assertEquals(Modifier.PRIVATE | Modifier.FINAL, face.getModifiers()); + assertEquals(2, MicroblockRender$.class.getDeclaredFields().length); + } + + @Test + void keepsBlockFacesThreadLocal() throws InterruptedException { + ThreadLocal faces = MicroblockRender.face(); + assertSame(faces, MicroblockRender$.MODULE$.face()); + + BlockFace local = faces.get(); + assertSame(local, faces.get()); + + AtomicReference other = new AtomicReference<>(); + Thread thread = new Thread(() -> other.set(faces.get()), "microblock-render-characterization"); + thread.start(); + thread.join(); + assertNotSame(local, other.get()); + } + + @Test + void rendersOnlyUnmaskedCuboidFaces() { + Vector3 pos = new Vector3(2, 3, 4); + Cuboid6 bounds = new Cuboid6(0, 0, 0, 1, 1, 1); + RecordingMaterial material = new RecordingMaterial(); + + MicroblockRender.renderCuboid(pos, material, 7, bounds, 0); + assertCalls(material.calls, 6, pos, 7, bounds); + + material.calls.clear(); + MicroblockRender$.MODULE$.renderCuboid(pos, material, -1, bounds, 0b101010); + assertCalls(material.calls, 3, pos, -1, bounds); + + material.calls.clear(); + MicroblockRender.renderCuboid(pos, material, 0, bounds, 0b111111); + assertEquals(0, material.calls.size()); + } + + @Test + void keepsTransformedClientCallsAndNoPlacementExit() throws IOException { + ClassNode type = new ClassNode(); + new ClassReader(MicroblockRender$.class.getName()).accept(type, 0); + + MethodNode item = method(type, "renderItem", "(Lcodechicken/microblock/Microblock;II)V"); + assertCall(item, Opcodes.INVOKEVIRTUAL, "codechicken/microblock/Microblock", "setShape", "(II)V"); + assertCall( + item, + Opcodes.INVOKEINTERFACE, + "codechicken/microblock/MicroblockClient", + "getBounds", + "()Lcodechicken/lib/vec/Cuboid6;"); + assertCall( + item, + Opcodes.INVOKEINTERFACE, + "codechicken/microblock/MicroblockClient", + "render", + "(Lcodechicken/lib/vec/Vector3;I)V"); + + MethodNode highlight = method( + type, + "renderHighlight", + "(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/MovingObjectPosition;Lcodechicken/microblock/CommonMicroClass;II)V"); + int placement = callIndex(highlight, "codechicken/microblock/MicroblockPlacement$", "apply"); + int earlyReturn = opcodeIndexAfter(highlight, Opcodes.RETURN, placement); + int firstGlCall = ownerCallIndex(highlight, "org/lwjgl/opengl/GL11", placement); + assertTrue(placement >= 0); + assertTrue(earlyReturn > placement); + assertTrue(firstGlCall > earlyReturn); + assertCall( + highlight, + Opcodes.INVOKEINTERFACE, + "codechicken/microblock/MicroblockClient", + "render", + "(Lcodechicken/lib/vec/Vector3;I)V"); + } + + private static void assertCalls(List calls, int count, Vector3 pos, int pass, Cuboid6 bounds) { + assertEquals(count, calls.size()); + for (RenderCall call : calls) { + assertSame(pos, call.pos); + assertEquals(pass, call.pass); + assertSame(bounds, call.bounds); + } + } + + private static Set publicDeclaredMethods(Class type) { + Set methods = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + methods.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return methods; + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } + + private static MethodNode method(ClassNode type, String name, String descriptor) { + for (MethodNode method : type.methods) { + if (name.equals(method.name) && descriptor.equals(method.desc)) { + return method; + } + } + throw new AssertionError("Missing method " + name + descriptor); + } + + private static void assertCall(MethodNode method, int opcode, String owner, String name, String descriptor) { + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instruction; + if (call.getOpcode() == opcode && owner.equals(call.owner) + && name.equals(call.name) + && descriptor.equals(call.desc)) { + return; + } + } + } + throw new AssertionError("Missing call " + owner + '.' + name + descriptor); + } + + private static int callIndex(MethodNode method, String owner, String name) { + AbstractInsnNode[] instructions = method.instructions.toArray(); + for (int i = 0; i < instructions.length; i++) { + if (instructions[i] instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instructions[i]; + if (owner.equals(call.owner) && name.equals(call.name)) { + return i; + } + } + } + return -1; + } + + private static int ownerCallIndex(MethodNode method, String owner, int start) { + AbstractInsnNode[] instructions = method.instructions.toArray(); + for (int i = start + 1; i < instructions.length; i++) { + if (instructions[i] instanceof MethodInsnNode && owner.equals(((MethodInsnNode) instructions[i]).owner)) { + return i; + } + } + return -1; + } + + private static int opcodeIndexAfter(MethodNode method, int opcode, int start) { + AbstractInsnNode[] instructions = method.instructions.toArray(); + for (int i = start + 1; i < instructions.length; i++) { + if (instructions[i].getOpcode() == opcode) { + return i; + } + } + return -1; + } + + private static final class RecordingMaterial implements IMicroMaterial { + + private final List calls = new ArrayList<>(); + + @Override + public IIcon getBreakingIcon(int side) { + return null; + } + + @Override + public void renderMicroFace(Vector3 pos, int pass, Cuboid6 bounds) { + calls.add(new RenderCall(pos, pass, bounds)); + } + + @Override + public boolean isTransparent() { + return false; + } + + @Override + public int getLightValue() { + return 0; + } + + @Override + public float getStrength(EntityPlayer player) { + return 0; + } + + @Override + public String getLocalizedName() { + return "recording"; + } + + @Override + public ItemStack getItem() { + return null; + } + + @Override + public int getCutterStrength() { + return 0; + } + + @Override + public SoundType getSound() { + return null; + } + + @Override + public float explosionResistance(Entity entity) { + return 0; + } + } + + private static final class RenderCall { + + private final Vector3 pos; + private final int pass; + private final Cuboid6 bounds; + + private RenderCall(Vector3 pos, int pass, Cuboid6 bounds) { + this.pos = pos; + this.pass = pass; + this.bounds = bounds; + } + } +} diff --git a/src/test/java/codechicken/microblock/MicroblockTraitsCharacterizationTest.java b/src/test/java/codechicken/microblock/MicroblockTraitsCharacterizationTest.java new file mode 100644 index 0000000..a2492d7 --- /dev/null +++ b/src/test/java/codechicken/microblock/MicroblockTraitsCharacterizationTest.java @@ -0,0 +1,293 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Proxy; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; + +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.render.EntityDigIconFX; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.multipart.TileMultipart; + +/** Exercises frozen Scala forwarders compiled before the implementation extraction. */ +class MicroblockTraitsCharacterizationTest { + + @Test + void frozenConstructorAndSlotDispatchKeepStateAndJvmShiftSemantics() throws Exception { + Fixture fixture = new Fixture(); + assertEquals(23, fixture.part.material()); + assertEquals(0, fixture.part.shape()); + assertNull(fixture.client.renderBounds()); + assertEquals(0, fixture.client.renderMask()); + for (int shape = -128; shape < 128; shape++) { + fixture.part.shape_$eq((byte) shape); + assertEquals(shape & 15, fixture.client.getSlot()); + assertEquals(1 << (shape & 15), fixture.client.getSlotMask()); + } + fixture.set("overrideSlot", boolean.class, true); + for (int slot : new int[] { -1, 0, 31, 32, 35 }) { + fixture.set("selectedSlot", int.class, slot); + assertEquals(1 << slot, fixture.client.getSlotMask()); + } + } + + @Test + void partialBoxesAreFreshImmutableListsContainingTheOriginalBounds() throws Exception { + Fixture fixture = new Fixture(); + Cuboid6 bounds = fixture.bounds(); + List first = fixture.client.getPartialOcclusionBoxes(); + List second = fixture.client.getPartialOcclusionBoxes(); + assertNotSame(first, second); + assertEquals(1, first.size()); + assertSame(bounds, first.get(0)); + assertSame(bounds, fixture.client.getRenderBounds()); + bounds.min.x = 0.125; + assertEquals(0.125, first.get(0).min.x); + assertThrows(UnsupportedOperationException.class, () -> first.set(0, Cuboid6.full)); + assertThrows(UnsupportedOperationException.class, () -> first.add(Cuboid6.full)); + assertThrows(UnsupportedOperationException.class, () -> first.remove(0)); + fixture.set("bounds", Cuboid6.class, null); + assertNull(fixture.client.getPartialOcclusionBoxes().get(0)); + assertNull(fixture.client.getRenderBounds()); + assertSame(bounds, first.get(0)); + } + + @Test + void itemClassIdUsesTheCurrentVirtualClass() throws Exception { + Fixture fixture = new Fixture(); + assertThrows(NullPointerException.class, fixture.part::itemClassID); + fixture.set("selectedClass", CommonMicroClass.class, TestClass.create(19)); + assertEquals(19, fixture.part.itemClassID()); + fixture.set("selectedClass", CommonMicroClass.class, TestClass.create(-3)); + assertEquals(-3, fixture.part.itemClassID()); + } + + @Test + void brokenIconsReadTheMaterialOnceAndForwardTheRequestedSide() throws Exception { + Fixture fixture = new Fixture(); + IIcon icon = (IIcon) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { IIcon.class }, + (proxy, method, args) -> null); + fixture.material((method, args) -> { + assertEquals("getBreakingIcon", method); + fixture.events.add("icon:" + args[0]); + return icon; + }); + for (int side : new int[] { -1, 0, 5, 9 }) { + fixture.events.clear(); + assertSame(icon, fixture.client.getBrokenIcon(side)); + assertEquals(Arrays.asList("material", "icon:" + side), fixture.events); + } + } + + @Test + void staticRenderingChecksThePassBeforeVirtualRender() throws Exception { + Fixture fixture = new Fixture(); + fixture.material((method, args) -> { + assertEquals("canRenderInPass", method); + fixture.events.add("pass:" + args[0]); + return ((Integer) args[0]) == 2; + }); + Vector3 position = new Vector3(4, 5, 6); + assertTrue(fixture.part.renderStatic(position, 2)); + assertSame(position, fixture.get("renderedPosition")); + assertEquals(Arrays.asList("material", "pass:2", "render:2"), fixture.events); + fixture.events.clear(); + assertFalse(fixture.part.renderStatic(position, 3)); + assertEquals(Arrays.asList("material", "pass:3"), fixture.events); + fixture.set("selectedMaterial", IMicroMaterial.class, null); + fixture.events.clear(); + assertThrows(NullPointerException.class, () -> fixture.part.renderStatic(position, 2)); + assertEquals(Arrays.asList("material"), fixture.events); + } + + @Test + void commonRenderingSelectsPhysicalOrShrunkBoundsAndFaceMask() throws Exception { + Fixture fixture = new Fixture(); + fixture.set("commonRender", boolean.class, true); + List faces = new ArrayList<>(); + fixture.material((method, args) -> { + assertEquals("renderMicroFace", method); + faces.add(args.clone()); + return null; + }); + Vector3 position = new Vector3(1, 2, 3); + Cuboid6 shrunk = new Cuboid6(0.1, 0.2, 0.3, 0.7, 0.8, 0.9); + fixture.client.renderBounds_$eq(shrunk); + fixture.client.renderMask_$eq(0b101010); + fixture.client.render(position, -4); + assertFaces(faces, 6, position, -4, fixture.bounds()); + assertEquals(Arrays.asList("render:-4", "material", "bounds"), fixture.events); + faces.clear(); + fixture.events.clear(); + fixture.client.render(position, 0); + assertFaces(faces, 3, position, 0, shrunk); + assertEquals(Arrays.asList("render:0", "material"), fixture.events); + faces.clear(); + fixture.client.renderMask_$eq(63); + fixture.client.render(position, 1); + assertTrue(faces.isEmpty()); + } + + @Test + void particleForwardersReachIconEffectsAndPreserveEvaluationOrder() throws Exception { + Fixture fixture = new Fixture(); + fixture.material((method, args) -> { + if (method.equals("getBreakingColour")) { + fixture.events.add("colour:" + args[0]); + return EntityDigIconFX.NO_TINT; + } + assertEquals("getBreakingIcon", method); + fixture.events.add("icon:" + args[0]); + return null; + }); + assertThrows(NullPointerException.class, () -> fixture.part.addDestroyEffects(null)); + assertEquals( + Arrays.asList( + "material", + "icon:0", + "material", + "icon:1", + "material", + "icon:2", + "material", + "icon:3", + "material", + "icon:4", + "material", + "icon:5", + "bounds"), + fixture.events); + fixture.part.bind(new TileMultipart()); + fixture.events.clear(); + MovingObjectPosition hit = new MovingObjectPosition(0, 0, 0, 3, Vec3.createVectorHelper(0, 0, 0)); + assertThrows(NullPointerException.class, () -> fixture.part.addHitEffects(hit, null)); + // The colour is resolved from the material right after the icon, for the same side. + assertEquals(Arrays.asList("bounds", "material", "icon:3", "material", "colour:3"), fixture.events); + } + + private static void assertFaces(List faces, int count, Vector3 position, int pass, Cuboid6 bounds) { + assertEquals(count, faces.size()); + for (Object[] face : faces) { + assertSame(position, face[0]); + assertEquals(pass, face[1]); + assertSame(bounds, face[2]); + } + } + + private interface MaterialCall { + + Object apply(String method, Object[] arguments); + } + + private static final class Fixture extends ClassLoader { + + final Microblock part; + final CommonMicroblockClient client; + final List events; + + @SuppressWarnings("unchecked") + Fixture() throws Exception { + super(Microblock.class.getClassLoader()); + InputStream input = Objects + .requireNonNull(getClass().getResourceAsStream("/compat/ReferenceScalaMicroblockTraits.class.b64")); + byte[] bytes; + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + part = (Microblock) defineClass(null, bytes, 0, bytes.length).getConstructor().newInstance(); + client = (CommonMicroblockClient) part; + events = (List) get("events"); + } + + Object get(String name) throws Exception { + return part.getClass().getMethod(name).invoke(part); + } + + Cuboid6 bounds() throws Exception { + return (Cuboid6) get("bounds"); + } + + void set(String name, Class type, Object value) throws Exception { + part.getClass().getMethod(name + "_$eq", type).invoke(part, value); + } + + void material(MaterialCall call) throws Exception { + set( + "selectedMaterial", + IMicroMaterial.class, + Proxy.newProxyInstance( + getParent(), + new Class[] { IMicroMaterial.class }, + (proxy, method, args) -> call.apply(method.getName(), args))); + } + } + + private static final class TestClass extends CommonMicroClass { + + private int id; + + static TestClass create(int id) throws Exception { + // MicroblockClass's constructor registers a trait and requires Forge initialization. + Class unsafe = Class.forName("sun.misc.Unsafe"); + Field field = unsafe.getDeclaredField("theUnsafe"); + field.setAccessible(true); + TestClass value = (TestClass) unsafe.getMethod("allocateInstance", Class.class) + .invoke(field.get(null), TestClass.class); + value.id = id; + return value; + } + + @Override + public int getClassId() { + return id; + } + + @Override + public int itemSlot() { + return 0; + } + + @Override + public PlacementProperties placementProperties() { + return null; + } + + @Override + public String getName() { + return "test:trait-class"; + } + + @Override + public Class baseTrait() { + return Microblock.class; + } + + @Override + public Class clientTrait() { + return MicroblockClient.class; + } + + @Override + public float getResistanceFactor() { + return 1; + } + } +} diff --git a/src/test/java/codechicken/microblock/MissingMicroMaterialCharacterizationTest.java b/src/test/java/codechicken/microblock/MissingMicroMaterialCharacterizationTest.java new file mode 100644 index 0000000..e7352c7 --- /dev/null +++ b/src/test/java/codechicken/microblock/MissingMicroMaterialCharacterizationTest.java @@ -0,0 +1,126 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +class MissingMicroMaterialCharacterizationTest { + + private static final Set PUBLIC_METHODS = new TreeSet<>( + Arrays.asList( + "explosionResistance(Lnet/minecraft/entity/Entity;)F", + "getBreakingIcon(I)Lnet/minecraft/util/IIcon;", + "getCutterStrength()I", + "getItem()Lnet/minecraft/item/ItemStack;", + "getLightValue()I", + "getLocalizedName()Ljava/lang/String;", + "getSound()Lnet/minecraft/block/Block$SoundType;", + "getStrength(Lnet/minecraft/entity/player/EntityPlayer;)F", + "isTransparent()Z", + "key()Ljava/lang/String;", + "loadIcons()V", + "renderMicroFace(Lcodechicken/lib/vec/Vector3;ILcodechicken/lib/vec/Cuboid6;)V")); + + private static final Set CLIENT_METHODS = new TreeSet<>( + Arrays.asList("getBreakingIcon", "loadIcons", "renderMicroFace")); + + @Test + void keepsTheFacadeAndCompanionSurface() throws Exception { + assertSingletonType(MissingMicroMaterial.class, true); + assertSingletonType(MissingMicroMaterial$.class, false); + + assertArrayEquals(new Class[0], MissingMicroMaterial.class.getInterfaces()); + assertArrayEquals(new Class[] { IMicroMaterial.class }, MissingMicroMaterial$.class.getInterfaces()); + assertEquals(0, MissingMicroMaterial.class.getFields().length); + + Field module = MissingMicroMaterial$.class.getField("MODULE$"); + assertSame(MissingMicroMaterial$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(MissingMicroMaterial$.MODULE$, module.get(null)); + } + + @Test + void keepsClientOnlyMethodsOnBothSingletonTypes() { + assertClientBoundaries(MissingMicroMaterial.class); + assertClientBoundaries(MissingMicroMaterial$.class); + } + + @Test + void suppliesTheInertMissingMaterialValues() { + IMicroMaterial missing = MissingMicroMaterial$.MODULE$; + + assertEquals("forgemicroblock:missing", MissingMicroMaterial.key()); + assertEquals(MissingMicroMaterial.key(), MissingMicroMaterial$.MODULE$.key()); + assertFalse(missing.isTransparent()); + assertTrue(missing.isSolid()); + assertTrue(missing.canRenderInPass(0)); + assertFalse(missing.canRenderInPass(1)); + assertEquals(0, missing.getLightValue()); + assertEquals(1f, missing.getStrength(null)); + assertEquals("Missing Material", missing.getLocalizedName()); + assertEquals(0, missing.getCutterStrength()); + assertSame(Block.soundTypeStone, missing.getSound()); + assertEquals(6f, missing.explosionResistance(null)); + + ItemStack item = missing.getItem(); + assertNotNull(item); + assertEquals(1, item.stackSize); + } + + private static void assertSingletonType(Class type, boolean staticMethods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertNull(type.getAnnotation(SideOnly.class)); + assertEquals(PUBLIC_METHODS, publicMethodSignatures(type)); + + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertEquals(staticMethods, Modifier.isStatic(method.getModifiers()), method.toString()); + } + } + } + + private static void assertClientBoundaries(Class type) { + Set annotated = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + SideOnly sideOnly = method.getAnnotation(SideOnly.class); + if (sideOnly != null) { + assertEquals(Side.CLIENT, sideOnly.value(), method.toString()); + annotated.add(method.getName()); + } + } + assertEquals(CLIENT_METHODS, annotated); + } + + private static Set publicMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/microblock/ParticleTintTest.java b/src/test/java/codechicken/microblock/ParticleTintTest.java new file mode 100644 index 0000000..aa0f501 --- /dev/null +++ b/src/test/java/codechicken/microblock/ParticleTintTest.java @@ -0,0 +1,92 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.lang.reflect.Proxy; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockOldLeaf; +import net.minecraft.block.material.Material; +import net.minecraft.world.ColorizerFoliage; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.biome.BiomeGenBase; + +import org.junit.jupiter.api.Test; + +class ParticleTintTest { + + @Test + void leafVariantsUseMaterialMetadataInsteadOfMultipartMetadata() { + IBlockAccess host = access((method, args) -> { + if (method.equals("getBlockMetadata")) return 0; + throw new AssertionError("Fixed leaf tints must not read the biome: " + method); + }); + Block leaves = new BlockOldLeaf(); + assertEquals( + ColorizerFoliage.getFoliageColorPine(), + new BlockMicroMaterial(leaves, 1).getBreakingColour(1, host, 10, 64, 20)); + assertEquals( + ColorizerFoliage.getFoliageColorBirch(), + new BlockMicroMaterial(leaves, 2).getBreakingColour(1, host, 10, 64, 20)); + } + + @Test + void tintSeesMaterialAtOriginAndRealNeighborsAndBiome() { + Block neighbor = new Block(Material.rock) {}; + IBlockAccess host = access((method, args) -> { + if (method.equals("getBiomeGenForCoords")) { + assertEquals(10, args[0]); + assertEquals(20, args[1]); + return BiomeGenBase.plains; + } + assertEquals(11, args[0]); + assertEquals(64, args[1]); + assertEquals(20, args[2]); + if (method.equals("getBlock")) return neighbor; + if (method.equals("getBlockMetadata")) return 7; + throw new AssertionError(method); + }); + Block tinted = new Block(Material.rock) { + + @Override + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + assertSame(this, world.getBlock(x, y, z)); + assertEquals(2, world.getBlockMetadata(x, y, z)); + assertSame(neighbor, world.getBlock(x + 1, y, z)); + assertEquals(7, world.getBlockMetadata(x + 1, y, z)); + assertSame(BiomeGenBase.plains, world.getBiomeGenForCoords(x, z)); + return 0x123456; + } + }; + assertEquals(0x123456, new BlockMicroMaterial(tinted, 2).getBreakingColour(1, host, 10, 64, 20)); + } + + @Test + void grassTintsOnlyItsTopFace() { + Block tinted = new Block(Material.grass) { + + @Override + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + return 0x123456; + } + }; + GrassMicroMaterial grass = new GrassMicroMaterial() { + + @Override + public Block block() { + return tinted; + } + }; + for (int side = 0; side < 6; side++) { + assertEquals(side == 1 ? 0x123456 : 0xFFFFFF, grass.getBreakingColour(side, null, 0, 0, 0)); + } + } + + private static IBlockAccess access(java.util.function.BiFunction callback) { + return (IBlockAccess) Proxy.newProxyInstance( + IBlockAccess.class.getClassLoader(), + new Class[] { IBlockAccess.class }, + (proxy, method, args) -> callback.apply(method.getName(), args)); + } +} diff --git a/src/test/java/codechicken/microblock/PlacementGridsCharacterizationTest.java b/src/test/java/codechicken/microblock/PlacementGridsCharacterizationTest.java new file mode 100644 index 0000000..5e1bb3c --- /dev/null +++ b/src/test/java/codechicken/microblock/PlacementGridsCharacterizationTest.java @@ -0,0 +1,202 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Vector3; +import codechicken.multipart.PartMap; + +class PlacementGridsCharacterizationTest { + + private static final Set GRID_METHODS = signatures( + "drawLines()V", + "getHitSlot(Lcodechicken/lib/vec/Vector3;I)I", + "glTransformFace(Lcodechicken/lib/vec/Vector3;I)V", + "render(Lcodechicken/lib/vec/Vector3;I)V"); + private static final Set HELPER_METHODS = signatures( + "$init$(Lcodechicken/microblock/PlacementGrid;)V", + "drawLines(Lcodechicken/microblock/PlacementGrid;)V", + "glTransformFace(Lcodechicken/microblock/PlacementGrid;Lcodechicken/lib/vec/Vector3;I)V", + "render(Lcodechicken/microblock/PlacementGrid;Lcodechicken/lib/vec/Vector3;I)V"); + + @Test + void keepsTheNineClassHierarchyAndCallableSurface() throws Exception { + assertTrue(PlacementGrid.class.isInterface()); + assertEquals(GRID_METHODS, publicDeclaredMethods(PlacementGrid.class)); + + assertSame(Object.class, PlacementGrid$class.class.getSuperclass()); + assertTrue(Modifier.isPublic(PlacementGrid$class.class.getModifiers())); + assertTrue(Modifier.isAbstract(PlacementGrid$class.class.getModifiers())); + assertEquals(HELPER_METHODS, publicDeclaredMethods(PlacementGrid$class.class)); + + assertSame(Object.class, FaceEdgeGrid.class.getSuperclass()); + assertEquals(Arrays.asList(PlacementGrid.class), Arrays.asList(FaceEdgeGrid.class.getInterfaces())); + assertEquals(GRID_METHODS, publicDeclaredMethods(FaceEdgeGrid.class)); + assertTrue(Modifier.isPublic(FaceEdgeGrid.class.getConstructor(double.class).getModifiers())); + Field size = FaceEdgeGrid.class.getDeclaredField("size"); + assertSame(double.class, size.getType()); + assertTrue(Modifier.isPrivate(size.getModifiers())); + assertTrue(Modifier.isFinal(size.getModifiers())); + + assertCompanion(FacePlacementGrid$.class, FaceEdgeGrid.class, signatures(), "MODULE$"); + assertCompanion(CornerPlacementGrid$.class, Object.class, GRID_METHODS, "MODULE$"); + assertCompanion(EdgePlacementGrid$.class, Object.class, GRID_METHODS, "MODULE$"); + assertFacade(FacePlacementGrid.class); + assertFacade(CornerPlacementGrid.class); + assertFacade(EdgePlacementGrid.class); + + assertSame(FacePlacementGrid$.MODULE$, FacePlacementGrid$.class.getField("MODULE$").get(null)); + assertSame(CornerPlacementGrid$.MODULE$, CornerPlacementGrid$.class.getField("MODULE$").get(null)); + assertSame(EdgePlacementGrid$.MODULE$, EdgePlacementGrid$.class.getField("MODULE$").get(null)); + } + + @Test + void faceGridKeepsCenterAxisTieAndStrictBoundarySelection() { + for (int side = 0; side < 6; side++) { + int s1 = (side + 2) % 6; + int s2 = (side + 4) % 6; + assertFaceSlot(side ^ 1, side, 0, 0); + assertFaceSlot(side ^ 1, side, 0.249999, 0); + assertFaceSlot(s1, side, 0.25, 0); + assertFaceSlot(s1, side, 0.3, 0); + assertFaceSlot(s1 ^ 1, side, -0.3, 0); + assertFaceSlot(s2, side, 0, 0.3); + assertFaceSlot(s2 ^ 1, side, 0, -0.3); + assertFaceSlot(s2, side, 0.3, 0.3); + } + } + + @Test + void faceEdgeGridKeepsItsConfiguredCenterSize() { + FaceEdgeGrid hollowGrid = new FaceEdgeGrid(3 / 8d); + for (int side = 0; side < 6; side++) { + int s1 = (side + 2) % 6; + assertEquals(side ^ 1, hollowGrid.getHitSlot(point(side, 0.374999, 0), side)); + assertEquals(s1, hollowGrid.getHitSlot(point(side, 0.375, 0), side)); + } + } + + @Test + void cornerGridKeepsAllQuadrantsForEveryHitSide() { + int[][] expected = { { 8, 12, 10, 14 }, { 7, 11, 9, 13 }, { 9, 10, 13, 14 }, { 7, 8, 11, 12 }, + { 11, 13, 12, 14 }, { 7, 9, 8, 10 } }; + for (int side = 0; side < 6; side++) { + int index = 0; + for (double u : new double[] { -0.2, 0.2 }) { + for (double v : new double[] { -0.2, 0.2 }) { + assertEquals( + expected[side][index++], + CornerPlacementGrid.getHitSlot(cornerPoint(side, u, v), side)); + } + } + } + } + + @Test + void edgeGridKeepsCenterSingleAxisDiagonalAndBoundarySelection() { + for (int side = 0; side < 6; side++) { + int s1 = (side + 2) % 6; + int s2 = (side + 4) % 6; + assertEdgeSlot(-1, side, 0, 0); + assertEdgeSlot(-1, side, 0.249999, 0.249999); + assertEdgeSlot(PartMap.edgeBetween(side ^ 1, s2), side, 0.25, 0.25); + assertEdgeSlot(PartMap.edgeBetween(side ^ 1, s1), side, 0.3, 0); + assertEdgeSlot(PartMap.edgeBetween(side ^ 1, s1 ^ 1), side, -0.3, 0); + assertEdgeSlot(PartMap.edgeBetween(side ^ 1, s2), side, 0, 0.3); + assertEdgeSlot(PartMap.edgeBetween(side ^ 1, s2 ^ 1), side, 0, -0.3); + assertEdgeSlot(PartMap.edgeBetween(s1, s2), side, 0.3, 0.3); + assertEdgeSlot(PartMap.edgeBetween(s1 ^ 1, s2), side, -0.3, 0.3); + assertEdgeSlot(PartMap.edgeBetween(s1, s2 ^ 1), side, 0.3, -0.3); + assertEdgeSlot(PartMap.edgeBetween(s1 ^ 1, s2 ^ 1), side, -0.3, -0.3); + } + } + + private static void assertFaceSlot(int expected, int side, double u, double v) { + Vector3 hit = point(side, u, v); + assertEquals(expected, FacePlacementGrid.getHitSlot(hit, side)); + assertEquals(expected, FacePlacementGrid$.MODULE$.getHitSlot(hit, side)); + } + + private static void assertEdgeSlot(int expected, int side, double u, double v) { + Vector3 hit = point(side, u, v); + assertEquals(expected, EdgePlacementGrid.getHitSlot(hit, side)); + assertEquals(expected, EdgePlacementGrid$.MODULE$.getHitSlot(hit, side)); + } + + private static Vector3 point(int side, double u, double v) { + int s1 = (side + 2) % 6; + int s2 = (side + 4) % 6; + return point(s1, s2, u, v); + } + + private static Vector3 cornerPoint(int side, double u, double v) { + int s1 = ((side & 6) + 3) % 6; + int s2 = ((side & 6) + 5) % 6; + return point(s1, s2, u, v); + } + + private static Vector3 point(int s1, int s2, double u, double v) { + Vector3 axis1 = Rotation.axes[s1]; + Vector3 axis2 = Rotation.axes[s2]; + return new Vector3( + 0.5 + axis1.x * u + axis2.x * v, + 0.5 + axis1.y * u + axis2.y * v, + 0.5 + axis1.z * u + axis2.z * v); + } + + private static void assertCompanion(Class type, Class superclass, Set methods, String moduleName) + throws Exception { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(superclass, type.getSuperclass()); + assertEquals(methods, publicDeclaredMethods(type)); + Field module = type.getField(moduleName); + assertSame(type, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + } + + private static void assertFacade(Class type) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + assertEquals( + signatures( + "drawLines()V", + "getHitSlot(Lcodechicken/lib/vec/Vector3;I)I", + "glTransformFace(Lcodechicken/lib/vec/Vector3;I)V", + "render(Lcodechicken/lib/vec/Vector3;I)V"), + publicDeclaredMethods(type)); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertTrue(Modifier.isStatic(method.getModifiers())); + } + } + } + + private static Set signatures(String... signatures) { + return new TreeSet<>(Arrays.asList(signatures)); + } + + private static Set publicDeclaredMethods(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/microblock/PostMicroblockClientCharacterizationTest.java b/src/test/java/codechicken/microblock/PostMicroblockClientCharacterizationTest.java new file mode 100644 index 0000000..2116e08 --- /dev/null +++ b/src/test/java/codechicken/microblock/PostMicroblockClientCharacterizationTest.java @@ -0,0 +1,389 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.reflect.Proxy; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.collection.Seq; +import scala.collection.mutable.ArrayBuffer; + +class PostMicroblockClientCharacterizationTest { + + @Test + void onlyMinusOneRendersPhysicalBoundsAndAllOtherPassesUseBothSegments() throws Exception { + Fixture f = new Fixture(); + assertEquals(41, f.part.material()); + assertNull(f.client.renderBounds1()); + assertNull(f.client.renderBounds2()); + Cuboid6 first = new Cuboid6(0.1, 0.2, 0.3, 0.4, 0.5, 0.6); + Cuboid6 second = new Cuboid6(0.4, 0.5, 0.6, 0.7, 0.8, 0.9); + f.client.renderBounds1_$eq(first); + f.client.renderBounds2_$eq(second); + for (int pass : new int[] { -1, -2, 0, 1 }) { + f.clear(); + f.client.render(f.position, pass); + if (pass == -1) { + f.assertDraw(0, f.bounds, pass); + assertEquals(6, f.faces.size()); + assertEquals(Arrays.asList("material", "bounds:self"), f.events); + } else { + f.assertDraw(0, first, pass); + f.assertDraw(6, second, pass); + assertEquals(12, f.faces.size()); + assertEquals(Collections.singletonList("material"), f.events); + } + } + f.client.renderBounds2_$eq(null); + f.clear(); + f.client.render(f.position, 0); + assertEquals(6, f.faces.size()); + } + + @Test + void renderCachesMaterialButReadsTheSecondSegmentAfterTheFirstDraw() throws Exception { + Fixture f = new Fixture(); + Cuboid6 second = new Cuboid6(0.2, 0.6, 0.2, 0.8, 1, 0.8); + f.client.renderBounds1_$eq(f.bounds); + f.afterFace = () -> { + f.setUnchecked(f.part, "selectedMaterial", IMicroMaterial.class, null); + f.client.renderBounds2_$eq(second); + }; + f.client.render(f.position, 0); + f.assertDraw(0, f.bounds, 0); + f.assertDraw(6, second, 0); + assertEquals(12, f.faces.size()); + assertEquals(Collections.singletonList("material"), f.events); + f.afterFace = null; + f.clear(); + assertThrows(NullPointerException.class, () -> f.client.render(f.position, -1)); + assertEquals(Arrays.asList("material", "bounds:self"), f.events); + } + + @Test + void shrinkPriorityUsesSizeThenTransparencyThenAxisWithRepeatedVirtualReads() throws Exception { + Fixture f = new Fixture(); + Microblock other = f.newPart("other"); + for (int ownSize : new int[] { -1, 2, 4, 6 }) { + for (int otherSize : new int[] { -1, 2, 4, 6 }) { + for (boolean ownTransparent : new boolean[] { false, true }) { + for (boolean otherTransparent : new boolean[] { false, true }) { + for (int axis = 0; axis < 3; axis++) { + f.set(f.part, "selectedSize", int.class, ownSize); + f.set(other, "selectedSize", int.class, otherSize); + f.set(f.part, "transparent", boolean.class, ownTransparent); + f.set(other, "transparent", boolean.class, otherTransparent); + f.set(f.part, "selectedShape", int.class, axis); + f.set(other, "selectedShape", int.class, 1); + f.clear(); + boolean expected = ownSize != otherSize ? ownSize < otherSize + : ownTransparent != otherTransparent ? ownTransparent : axis > 1; + assertEquals(expected, f.client.thisShrinks((PostMicroblock) other)); + List calls = new ArrayList<>(Arrays.asList("size:self", "size:other")); + if (ownSize != otherSize) calls.addAll(Arrays.asList("size:self", "size:other")); + else { + calls.addAll(Arrays.asList("transparent:self", "transparent:other")); + calls.addAll( + ownTransparent != otherTransparent + ? Collections.singletonList("transparent:self") + : Arrays.asList("shape:self", "shape:other")); + } + assertEquals(calls, f.events); + } + } + } + } + } + f.set(f.part, "selectedSize", int.class, 2); + f.set(f.part, "sizeAdvance", int.class, 5); + f.set(other, "selectedSize", int.class, 3); + assertFalse(f.client.thisShrinks((PostMicroblock) other)); + f.set(f.part, "sizeAdvance", int.class, 0); + f.set(f.part, "selectedSize", int.class, 3); + f.set(f.part, "transparent", boolean.class, false); + f.set(f.part, "flipTransparency", boolean.class, true); + f.set(other, "transparent", boolean.class, true); + assertTrue(f.client.thisShrinks((PostMicroblock) other)); + } + + @Test + void lifecycleKeepsSuperOrderingPacketIdentityAndShortCircuitOnFailure() throws Exception { + Fixture f = new Fixture(); + f.set(f.part, "runRecalc", boolean.class, false); + f.part.onAdded(); + assertEquals(Arrays.asList("superAdded", "recalc"), f.events); + f.clear(); + MCDataInput packet = (MCDataInput) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, args) -> { throw new AssertionError(method.getName()); }); + f.part.read(packet); + assertSame(packet, f.part.getClass().getMethod("seenPacket").invoke(f.part)); + assertEquals(Arrays.asList("superRead", "recalc"), f.events); + f.clear(); + f.part.onPartChanged(null); + assertEquals(Collections.singletonList("recalc"), f.events); + f.set(f.part, "failSuper", boolean.class, true); + f.clear(); + assertThrows(IllegalStateException.class, f.part::onAdded); + assertEquals(Collections.singletonList("superAdded"), f.events); + f.clear(); + assertThrows(IllegalStateException.class, () -> f.part.read(packet)); + assertEquals(Collections.singletonList("superRead"), f.events); + } + + @Test + void equalityUsesTheOtherReceiverEvenForTheSameObjectAndCanSuppressShrinking() throws Exception { + Fixture f = new Fixture(); + Microblock other = f.newPart("other"); + f.set(other, "forceEquality", boolean.class, true); + f.set(other, "equalityResult", boolean.class, true); + f.client.shrinkPost((PostMicroblock) other); + assertEquals(Arrays.asList("post", "equals:other"), f.events); + f.clear(); + f.client.shrinkPost(f.client); + assertEquals(Arrays.asList("post", "equals:self"), f.events); + f.set(f.part, "forceEquality", boolean.class, true); + f.set(f.part, "equalityResult", boolean.class, false); + f.clear(); + f.client.shrinkPost(f.client); + assertEquals( + Arrays.asList( + "post", + "equals:self", + "size:self", + "size:self", + "transparent:self", + "transparent:self", + "shape:self", + "shape:self"), + f.events); + } + + @Test + void splitBoundsCopyOnceAndReadOtherBoundsAndOwnAxisTwice() throws Exception { + Fixture f = new Fixture(); + Microblock other = f.newPart("other"); + Cuboid6 crossing = new Cuboid6(0, 0.25, 0, 1, 0.75, 1); + f.set(other, "bounds", Cuboid6.class, crossing); + f.set(other, "selectedSize", int.class, 4); + f.client.renderBounds1_$eq(f.bounds.copy()); + f.client.shrinkPost((PostMicroblock) other); + assertEquals(0.25, f.client.renderBounds1().max.y); + assertEquals(0.75, f.client.renderBounds2().min.y); + assertNotSame(f.bounds, f.client.renderBounds2()); + assertEquals(0, f.bounds.min.y); + assertEquals(1, f.bounds.max.y); + assertEquals(2, Collections.frequency(f.events, "bounds:other")); + assertEquals(2, Collections.frequency(f.events, "shape:self")); + Cuboid6 second = f.client.renderBounds2(); + f.clear(); + f.client.shrinkPost((PostMicroblock) other); + assertSame(second, f.client.renderBounds2()); + assertFalse(f.events.contains("bounds:self")); + f.client.renderBounds1_$eq(Cuboid6.full.copy()); + f.client.renderBounds2_$eq(Cuboid6.full.copy()); + f.set(f.part, "shapeAdvance", int.class, 1); + f.client.shrinkPost((PostMicroblock) other); + assertEquals(0.25, f.client.renderBounds1().max.y); + assertEquals(1, f.client.renderBounds2().min.z); + assertEquals(0, f.client.renderBounds2().min.y); + } + + @Test + void recalculationResetsThenDispatchesBothFacesAndTheCollectionsForeachInOrder() throws Exception { + Fixture f = new Fixture(); + Microblock equal = f.newPart("equal"); + Microblock other = f.newPart("other"); + f.set(equal, "forceEquality", boolean.class, true); + f.set(equal, "equalityResult", boolean.class, true); + f.set(f.part, "runShrinks", boolean.class, false); + ArrayBuffer parts = new ArrayBuffer<>(); + for (TMultiPart p : Arrays.asList(null, new BarePart("bare"), f.part, equal, other)) parts.$plus$eq(p); + @SuppressWarnings("unchecked") + Seq sequence = (Seq) Proxy + .newProxyInstance(getClass().getClassLoader(), new Class[] { Seq.class }, (proxy, method, args) -> { + f.events.add(method.getName()); + return method.invoke(parts, args); + }); + TileMultipart tile = new TileMultipart(); + tile.partList_$eq(sequence); + f.part.bind(tile); + f.client.renderBounds2_$eq(Cuboid6.full); + f.clear(); + f.client.recalcBounds(); + assertEquals( + Arrays.asList( + "recalc", + "bounds:self", + "shape:self", + "face:0", + "shape:self", + "face:1", + "tile:self", + "foreach", + "equals:self", + "equals:equal", + "equals:other", + "post"), + f.events); + assertNotSame(f.bounds, f.client.renderBounds1()); + assertBounds(f.bounds, f.client.renderBounds1()); + assertNull(f.client.renderBounds2()); + } + + @Test + void faceFiltersAndFailuresPreserveStateAndCallOrdering() throws Exception { + Fixture f = new Fixture(); + SlotTile tile = new SlotTile(); + f.part.bind(tile); + Cuboid6 render = f.bounds.copy(); + f.client.renderBounds1_$eq(render); + f.client.shrinkFace(0); + tile.part = new BarePart("other"); + f.client.shrinkFace(0); + assertSame(render, f.client.renderBounds1()); + assertBounds(f.bounds, render); + tile.part = new BarePart(null); + assertThrows(NullPointerException.class, () -> f.client.shrinkFace(0)); + tile.part = new BarePart("mcr_face"); + assertThrows(ClassCastException.class, () -> f.client.shrinkFace(0)); + f.client.renderBounds2_$eq(render); + f.set(f.part, "bounds", Cuboid6.class, null); + assertThrows(NullPointerException.class, f.client::recalcBounds); + assertSame(render, f.client.renderBounds2()); + } + + private static void assertBounds(Cuboid6 expected, Cuboid6 actual) { + assertArrayEquals( + new double[] { expected.min.x, expected.min.y, expected.min.z, expected.max.x, expected.max.y, + expected.max.z }, + new double[] { actual.min.x, actual.min.y, actual.min.z, actual.max.x, actual.max.y, actual.max.z }, + 1e-12); + } + + private static final class BarePart extends TMultiPart { + + final String type; + + BarePart(String type) { + this.type = type; + } + + @Override + public String getType() { + return type; + } + } + + private static final class SlotTile extends TileMultipart { + + TMultiPart part; + + @Override + public TMultiPart partMap(int slot) { + return part; + } + } + + private static final class Face { + + final Cuboid6 bounds; + final Vector3 position; + final int pass; + final int side; + + Face(Object[] args) { + position = (Vector3) args[0]; + pass = (Integer) args[1]; + bounds = (Cuboid6) args[2]; + side = MicroblockRender.face().get().side; + } + } + + private static final class Fixture extends ClassLoader { + + final List events = new ArrayList<>(); + final List faces = new ArrayList<>(); + final Microblock part; + final PostMicroblockClient client; + final Cuboid6 bounds; + final Vector3 position = new Vector3(2, 3, 4); + Runnable afterFace; + + Fixture() throws Exception { + super(Microblock.class.getClassLoader()); + for (String name : new String[] { "ReferencePostClientBase", "ReferenceScalaPostMicroblockClient" }) { + InputStream input = Objects + .requireNonNull(getClass().getResourceAsStream("/compat/" + name + ".class.b64")); + byte[] bytes; + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + part = newPart("self"); + client = (PostMicroblockClient) part; + bounds = (Cuboid6) part.getClass().getMethod("bounds").invoke(part); + IMicroMaterial material = (IMicroMaterial) Proxy + .newProxyInstance(getParent(), new Class[] { IMicroMaterial.class }, (proxy, method, args) -> { + assertEquals("renderMicroFace", method.getName()); + faces.add(new Face(args)); + if (afterFace != null) afterFace.run(); + return null; + }); + set(part, "selectedMaterial", IMicroMaterial.class, material); + } + + Microblock newPart(String label) throws Exception { + Microblock result = (Microblock) loadClass( + "codechicken.multipart.compat.ReferenceScalaPostMicroblockClient").getConstructor().newInstance(); + set(result, "events", List.class, events); + set(result, "label", String.class, label); + return result; + } + + void set(Object target, String name, Class type, Object value) throws Exception { + target.getClass().getMethod(name + "_$eq", type).invoke(target, value); + } + + void setUnchecked(Object target, String name, Class type, Object value) { + try { + set(target, name, type, value); + } catch (Exception e) { + throw new AssertionError(e); + } + } + + void clear() { + events.clear(); + faces.clear(); + } + + void assertDraw(int offset, Cuboid6 bounds, int pass) { + for (int side = 0; side < 6; side++) { + Face face = faces.get(offset + side); + assertSame(bounds, face.bounds); + assertSame(position, face.position); + assertEquals(pass, face.pass); + assertEquals(side, face.side); + } + } + } +} diff --git a/src/test/java/codechicken/microblock/PostMicroblockTraitsCharacterizationTest.java b/src/test/java/codechicken/microblock/PostMicroblockTraitsCharacterizationTest.java new file mode 100644 index 0000000..1b4ce51 --- /dev/null +++ b/src/test/java/codechicken/microblock/PostMicroblockTraitsCharacterizationTest.java @@ -0,0 +1,223 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.JNormalOcclusion; +import codechicken.multipart.JPartialOcclusion; +import codechicken.multipart.TMultiPart; + +/** Executes frozen Scala forwarders, including the real predecessor of PostMicroblock's super accessor. */ +class PostMicroblockTraitsCharacterizationTest { + + @Test + void occlusionListsAreFreshReadOnlySnapshotsWithVirtualBoundsAndPartialDispatch() throws Exception { + Fixture f = new Fixture(); + Cuboid6 bounds = new Cuboid6(0, 0, 0, 0.5, 1, 1); + f.set(f.part, "selectedBounds", Cuboid6.class, bounds); + List first = f.post.getOcclusionBoxes(); + assertEquals(Arrays.asList("boxes:self", "bounds:self"), f.events); + assertSame(bounds, first.get(0)); + assertEquals(1, first.size()); + assertThrows(UnsupportedOperationException.class, () -> first.add(bounds)); + assertThrows(UnsupportedOperationException.class, () -> first.set(0, bounds)); + assertThrows(UnsupportedOperationException.class, () -> first.remove(0)); + List second = f.post.getOcclusionBoxes(); + assertNotSame(first, second); + f.set(f.part, "selectedBounds", Cuboid6.class, null); + assertNull(f.post.getOcclusionBoxes().get(0)); + assertSame(bounds, first.get(0)); + bounds.max.x = 0.75; + assertEquals(0.75, first.get(0).max.x); + + List replacement = new ArrayList<>(); + f.set(f.part, "replacementBoxes", List.class, replacement); + f.events.clear(); + assertSame(replacement, f.post.getPartialOcclusionBoxes()); + assertEquals(Collections.singletonList("boxes:self"), f.events); + } + + @Test + void torchSupportUsesTheVirtualShapeOnceWithoutMaskingIt() throws Exception { + Fixture f = new Fixture(); + for (int shape : new int[] { Integer.MIN_VALUE, -1, 0, 1, 2, 16, Integer.MAX_VALUE }) { + f.set(f.part, "selectedShape", int.class, shape); + f.events.clear(); + assertEquals(shape == 0, f.post.canPlaceTorchOnTop()); + assertEquals(Collections.singletonList("shape:self"), f.events); + } + } + + @Test + void postsCompareOtherShapeFirstAndBypassTypeBoundsAndSuper() throws Exception { + Fixture f = new Fixture(); + Microblock other = f.newPost("other"); + f.set(f.part, "superFailure", boolean.class, true); + for (int ownShape : new int[] { -1, 0, 1, 2, 16, Integer.MAX_VALUE }) { + f.set(f.part, "selectedShape", int.class, ownShape); + for (int otherShape : new int[] { -1, 0, 1, 2, 16, Integer.MAX_VALUE }) { + f.set(other, "selectedShape", int.class, otherShape); + f.events.clear(); + assertEquals(ownShape != otherShape, f.part.occlusionTest(other)); + assertEquals(Arrays.asList("shape:other", "shape:self"), f.events); + } + } + f.events.clear(); + assertFalse(f.part.occlusionTest(f.part)); + assertEquals(Arrays.asList("shape:self", "shape:self"), f.events); + } + + @Test + void alignedFacesBypassOverlapAndSuperUsingArithmeticSlotShift() throws Exception { + Fixture f = new Fixture(); + TMultiPart face = f.newFace(); + f.set(f.part, "superFailure", boolean.class, true); + for (int shape = -2; shape <= 3; shape++) { + f.set(f.part, "selectedShape", int.class, shape); + for (int slot = -4; slot < 8; slot++) { + f.set(face, "slot", int.class, slot); + f.events.clear(); + boolean aligned = Math.floorDiv(slot, 2) == shape; + assertEquals(aligned, f.part.occlusionTest(face)); + List expected = new ArrayList<>(Arrays.asList("type:face", "slot:face", "shape:self")); + if (!aligned) expected.addAll(Arrays.asList("bounds:face", "boxes:self", "bounds:self")); + assertEquals(expected, f.events); + } + } + } + + @Test + void normalAndPartialBoxesPrecedeAndShortCircuitTheRealSuperclass() throws Exception { + Fixture f = new Fixture(); + Candidate other = new Candidate(f.events, "test:other"); + Cuboid6 separate = new Cuboid6(2, 2, 2, 3, 3, 3); + for (boolean partialOverlap : new boolean[] { false, true }) { + other.normal = Collections.singletonList(partialOverlap ? separate : Cuboid6.full); + other.partial = Collections.singletonList(partialOverlap ? Cuboid6.full : separate); + f.events.clear(); + assertFalse(f.part.occlusionTest(other)); + assertEquals( + Arrays.asList("type:other", "normal:other", "partial:other", "boxes:self", "bounds:self"), + f.events); + } + other.normal = Collections.singletonList(separate); + other.partial = Collections.emptyList(); + for (boolean result : new boolean[] { false, true }) { + f.set(f.part, "superResult", boolean.class, result); + f.events.clear(); + assertEquals(result, f.part.occlusionTest(other)); + assertEquals( + Arrays.asList( + "type:other", + "normal:other", + "partial:other", + "boxes:self", + "bounds:self", + "super:self"), + f.events); + } + f.set(f.part, "superFailure", boolean.class, true); + assertEquals( + "super failure", + assertThrows(IllegalStateException.class, () -> f.part.occlusionTest(other)).getMessage()); + } + + @Test + void malformedCandidatesFailBeforeBoundsAndSuperclassDispatch() throws Exception { + Fixture f = new Fixture(); + assertThrows(NullPointerException.class, () -> f.part.occlusionTest(null)); + assertTrue(f.events.isEmpty()); + Candidate other = new Candidate(f.events, null); + assertThrows(NullPointerException.class, () -> f.part.occlusionTest(other)); + assertEquals(Collections.singletonList("type:other"), f.events); + f.events.clear(); + other.type = "mcr_face"; + assertThrows(ClassCastException.class, () -> f.part.occlusionTest(other)); + assertEquals(Collections.singletonList("type:other"), f.events); + } + + private static final class Candidate extends TMultiPart implements JNormalOcclusion, JPartialOcclusion { + + final List events; + String type; + Iterable normal = Collections.emptyList(); + Iterable partial = Collections.emptyList(); + + Candidate(List events, String type) { + this.events = events; + this.type = type; + } + + @Override + public String getType() { + events.add("type:other"); + return type; + } + + @Override + public Iterable getOcclusionBoxes() { + events.add("normal:other"); + return normal; + } + + @Override + public Iterable getPartialOcclusionBoxes() { + events.add("partial:other"); + return partial; + } + } + + private static final class Fixture extends ClassLoader { + + final List events = new ArrayList<>(); + final Microblock part; + final PostMicroblock post; + + Fixture() throws Exception { + super(Microblock.class.getClassLoader()); + for (String name : new String[] { "ReferencePostMicroblockBase", "ReferenceScalaPostMicroblock", + "ReferencePostFace" }) { + InputStream input = Objects + .requireNonNull(getClass().getResourceAsStream("/compat/" + name + ".class.b64")); + byte[] bytes; + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + part = newPost("self"); + post = (PostMicroblock) part; + } + + Microblock newPost(String label) throws Exception { + Microblock result = (Microblock) loadClass("codechicken.multipart.compat.ReferenceScalaPostMicroblock") + .getConstructor().newInstance(); + set(result, "label", String.class, label); + set(result, "events", List.class, events); + return result; + } + + TMultiPart newFace() throws Exception { + TMultiPart result = (TMultiPart) loadClass("codechicken.multipart.compat.ReferencePostFace") + .getConstructor().newInstance(); + set(result, "events", List.class, events); + return result; + } + + void set(Object target, String name, Class type, Object value) throws Exception { + target.getClass().getMethod(name + "_$eq", type).invoke(target, value); + } + } +} diff --git a/src/test/java/codechicken/microblock/SawBinaryCompatibilityTest.java b/src/test/java/codechicken/microblock/SawBinaryCompatibilityTest.java new file mode 100644 index 0000000..e701aa9 --- /dev/null +++ b/src/test/java/codechicken/microblock/SawBinaryCompatibilityTest.java @@ -0,0 +1,53 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import net.minecraft.item.Item; + +import org.junit.jupiter.api.Test; + +/** + * Loads a Scala class compiled against the reference dev jar, whose forwarder calls Saw$class.getMaxCuttingStrength and + * whose constructor calls Saw$class.$init$. ProjRed links against both. + */ +class SawBinaryCompatibilityTest { + + @Test + void referenceScalaImplementorStillLinksThroughTheBridge() throws Exception { + Class fixtureClass = new FixtureClassLoader(Saw.class.getClassLoader()).define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + assertTrue(fixture instanceof Saw); + assertTrue(fixture instanceof Item); + Saw saw = (Saw) fixture; + + // The fixture returns 7 only when handed a stack that actually wraps itself. + assertEquals(7, saw.getMaxCuttingStrength()); + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + SawBinaryCompatibilityTest.class.getResourceAsStream("/compat/ReferenceScalaSaw.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/microblock/SawCharacterizationTest.java b/src/test/java/codechicken/microblock/SawCharacterizationTest.java new file mode 100644 index 0000000..7277af5 --- /dev/null +++ b/src/test/java/codechicken/microblock/SawCharacterizationTest.java @@ -0,0 +1,82 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import org.junit.jupiter.api.Test; + +class SawCharacterizationTest { + + @Test + void maxCuttingStrengthAsksTheSawAboutAStackOfItself() { + SpySaw saw = new SpySaw(5); + + assertEquals(5, saw.getMaxCuttingStrength()); + assertEquals(1, saw.queried.size()); + ItemStack queried = saw.queried.get(0); + assertNotNull(queried); + assertSame(saw, queried.getItem()); + assertEquals(1, queried.stackSize); + } + + @Test + void deprecatedBridgeBuildsTheSameStack() { + SpySaw saw = new SpySaw(3); + + assertEquals(3, Saw$class.getMaxCuttingStrength(saw)); + assertEquals(1, saw.queried.size()); + assertSame(saw, saw.queried.get(0).getItem()); + } + + /** + * Unlike the constant-returning bridges, this one dispatches getCuttingStrength through the interface, so a + * subclass override is honoured even when the bridge is called directly. + */ + @Test + void deprecatedBridgeHonoursACuttingStrengthOverride() { + SpySaw saw = new StrongerSaw(); + + assertEquals(9, Saw$class.getMaxCuttingStrength(saw)); + } + + private static class SpySaw extends Item implements Saw { + + private final List queried = new ArrayList<>(); + private final int strength; + + private SpySaw(int strength) { + this.strength = strength; + } + + @Override + public int getCuttingStrength(ItemStack item) { + queried.add(item); + return strength; + } + + @Override + public int getMaxCuttingStrength() { + return Saw$class.getMaxCuttingStrength(this); + } + } + + private static final class StrongerSaw extends SpySaw { + + private StrongerSaw() { + super(1); + } + + @Override + public int getCuttingStrength(ItemStack item) { + super.getCuttingStrength(item); + return 9; + } + } +} diff --git a/src/test/java/codechicken/microblock/TMicroOcclusionCharacterizationTest.java b/src/test/java/codechicken/microblock/TMicroOcclusionCharacterizationTest.java new file mode 100644 index 0000000..3a6f6ab --- /dev/null +++ b/src/test/java/codechicken/microblock/TMicroOcclusionCharacterizationTest.java @@ -0,0 +1,269 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; + +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.TMultiPart; + +class TMicroOcclusionCharacterizationTest { + + @Test + void superclassRunsOnceBeforeNullAndNonMicroblockGuards() throws Exception { + Fixture f = new Fixture(); + TMultiPart plain = new TMultiPart() { + + @Override + public String getType() { + throw new AssertionError("type lookup"); + } + }; + for (TMultiPart candidate : new TMultiPart[] { null, plain, f.other }) { + f.set(f.part, "superResult", boolean.class, false); + f.events.clear(); + assertFalse(f.part.occlusionTest(candidate)); + assertEquals(Collections.singletonList("super:self"), f.events); + } + f.set(f.part, "superResult", boolean.class, true); + for (TMultiPart candidate : new TMultiPart[] { null, plain }) { + f.events.clear(); + assertTrue(f.part.occlusionTest(candidate)); + assertEquals(Collections.singletonList("super:self"), f.events); + } + f.set(f.part, "superFailure", boolean.class, true); + f.events.clear(); + assertEquals("super", assertThrows(IllegalStateException.class, () -> f.part.occlusionTest(null)).getMessage()); + assertEquals(Collections.singletonList("super:self"), f.events); + } + + @Test + void sizeThresholdUsesOtherThenSelfAndKeepsSignedOverflow() throws Exception { + Fixture f = new Fixture(); + f.configure(f.part, 0, 4, 0); + f.configure(f.other, 1, 4, 1); + int[][] sizes = { { 4, 4 }, { -1, 9 }, { Integer.MAX_VALUE, Integer.MAX_VALUE }, { Integer.MIN_VALUE, 0 } }; + for (int[] pair : sizes) { + f.set(f.part, "size", int.class, pair[0]); + f.set(f.other, "size", int.class, pair[1]); + f.events.clear(); + assertTrue(f.part.occlusionTest(f.other)); + assertEquals(Arrays.asList("super:self", "slot:self", "slot:other", "size:other", "size:self"), f.events); + } + f.set(f.part, "size", int.class, Integer.MIN_VALUE); + f.set(f.other, "size", int.class, -1); + assertFalse(f.part.occlusionTest(f.other)); + } + + @Test + void opposingFacesRereadOtherSlotBeforeOwnAndBypassMaterials() throws Exception { + Fixture f = new Fixture(); + f.configure(f.part, 0, 5, 0); + f.configure(f.other, 0, 5, 0); + f.set(f.part, "slotAdvance", int.class, 1); + f.set(f.part, "failOn", String.class, "material"); + f.set(f.other, "failOn", String.class, "material"); + assertFalse(f.part.occlusionTest(f.other)); + assertEquals( + Arrays.asList( + "super:self", + "slot:self", + "slot:other", + "size:other", + "size:self", + "slot:other", + "slot:self"), + f.events); + } + + @Test + void matchingMaterialsBypassCornerAndEdgeRulesAfterOtherFirstMaterialReads() throws Exception { + Fixture f = new Fixture(); + for (int[] slots : new int[][] { { 7, 10 }, { 15, 18 }, { 15, 8 } }) { + f.configure(f.part, slots[0], 5, 17); + f.configure(f.other, slots[1], 5, 17); + f.set(f.part, "failOn", String.class, "edge"); + f.events.clear(); + assertTrue(f.part.occlusionTest(f.other)); + assertEquals( + Arrays.asList( + "super:self", + "slot:self", + "slot:other", + "size:other", + "size:self", + "material:other", + "material:self"), + f.events); + } + } + + @Test + void diagonalCornersAndOppositeParallelEdgesUseFreshSlotsWithoutBounds() throws Exception { + Fixture f = new Fixture(); + for (int[] slots : new int[][] { { 7, 10 }, { 15, 18 } }) { + f.configure(f.part, slots[0], 5, 0); + f.configure(f.other, slots[1], 5, 1); + f.events.clear(); + assertFalse(f.part.occlusionTest(f.other)); + assertEquals( + Arrays.asList( + "super:self", + "slot:self", + "slot:other", + "size:other", + "size:self", + "material:other", + "material:self", + "slot:self", + "slot:other"), + f.events); + f.configure(f.part, slots[0], 5, 0); + f.configure(f.other, slots[1], 5, 1); + f.set(f.part, "slotAdvance", int.class, 1); + assertTrue(f.part.occlusionTest(f.other)); + f.set(f.part, "slotAdvance", int.class, 0); + } + // Slot 6 follows the reference's corner priority; it is not rejected as an invalid face slot. + f.configure(f.part, 6, 5, 0); + f.configure(f.other, 7, 5, 1); + assertTrue(f.part.occlusionTest(f.other)); + f.configure(f.part, -1, 5, 0); + f.configure(f.other, -2, 5, 1); + assertFalse(f.part.occlusionTest(f.other)); + } + + @Test + void edgeCornerDelegationUsesOwnOverrideAndPassesEdgeFirstInBothDirections() throws Exception { + Fixture f = new Fixture(); + f.set(f.part, "useActualEdge", boolean.class, false); + f.set(f.other, "failOn", String.class, "edge"); + for (boolean ownIsEdge : new boolean[] { false, true }) { + f.configure(f.part, ownIsEdge ? 15 : 7, 5, 0); + f.configure(f.other, ownIsEdge ? 7 : 15, 5, 1); + for (boolean result : new boolean[] { false, true }) { + f.set(f.part, "edgeResult", boolean.class, result); + f.events.clear(); + assertEquals(result, f.part.occlusionTest(f.other)); + assertEquals( + Arrays.asList( + "super:self", + "slot:self", + "slot:other", + "size:other", + "size:self", + "material:other", + "material:self", + "edge:self"), + f.events); + assertSame(ownIsEdge ? f.part : f.other, f.part.getClass().getMethod("seenEdge").invoke(f.part)); + assertSame(ownIsEdge ? f.other : f.part, f.part.getClass().getMethod("seenCorner").invoke(f.part)); + } + } + } + + @Test + void edgeCornerMappingKeepsCornerFirstAndTwoIndependentEdgeReads() throws Exception { + Fixture f = new Fixture(); + int[] masks = { 6, 5, 3 }; + int[] positions = { 0, 2, 4, 6, 0, 4, 1, 5, 0, 1, 2, 3 }; + for (int edge = 0; edge < 12; edge++) { + f.configure(f.part, 15 + edge, 5, 0); + for (int corner = 0; corner < 8; corner++) { + f.configure(f.other, 7 + corner, 5, 1); + f.events.clear(); + assertEquals( + (corner & masks[edge / 4]) == positions[edge], + f.micro.edgeCornerOcclusionTest(f.micro, f.otherMicro)); + assertEquals(Arrays.asList("edge:self", "slot:other", "slot:self", "slot:self"), f.events); + } + } + f.configure(f.part, 16, 5, 0); + f.configure(f.other, 11, 5, 1); + f.set(f.part, "slotAdvance", int.class, 4); + assertTrue(f.micro.edgeCornerOcclusionTest(f.micro, f.otherMicro)); + f.configure(f.part, 15, 5, 0); + f.set(f.part, "slotAdvance", int.class, 12); + f.events.clear(); + assertEquals( + "Switch Falloff", + assertThrows( + IllegalArgumentException.class, + () -> f.micro.edgeCornerOcclusionTest(f.micro, f.otherMicro)).getMessage()); + assertEquals(Arrays.asList("edge:self", "slot:other", "slot:self", "slot:self"), f.events); + f.configure(f.part, 27, 5, 0); + f.events.clear(); + assertThrows(IllegalArgumentException.class, () -> f.micro.edgeCornerOcclusionTest(f.micro, f.otherMicro)); + assertEquals(Arrays.asList("edge:self", "slot:other", "slot:self"), f.events); + f.events.clear(); + assertThrows(NullPointerException.class, () -> f.micro.edgeCornerOcclusionTest(null, null)); + assertEquals(Collections.singletonList("edge:self"), f.events); + } + + @Test + void getterFailuresStopBeforeLaterVirtualReads() throws Exception { + Fixture f = new Fixture(); + f.configure(f.part, 7, 5, 0); + f.configure(f.other, 10, 5, 1); + String[] expected = { "super:self", "slot:self", "slot:other", "size:other", "size:self", "material:other", + "material:self" }; + for (int i = 1; i < expected.length; i++) { + String[] pieces = expected[i].split(":"); + TMultiPart failing = pieces[1].equals("self") ? f.part : f.other; + f.set(failing, "failOn", String.class, pieces[0]); + f.events.clear(); + assertEquals( + pieces[0], + assertThrows(IllegalStateException.class, () -> f.part.occlusionTest(f.other)).getMessage()); + assertEquals(Arrays.asList(Arrays.copyOf(expected, i + 1)), f.events); + f.set(failing, "failOn", String.class, ""); + } + } + + private static final class Fixture extends ClassLoader { + + final List events = new ArrayList<>(); + final TMultiPart part; + final TMultiPart other; + final TMicroOcclusion micro; + final TMicroOcclusion otherMicro; + + Fixture() throws Exception { + super(TMultiPart.class.getClassLoader()); + for (String name : new String[] { "ReferenceMicroOcclusionBase", "ReferenceScalaTMicroOcclusion" }) { + byte[] bytes; + try (Scanner scanner = new Scanner( + getResourceAsStream("compat/" + name + ".class.b64"), + StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + Class type = loadClass("codechicken.multipart.compat.ReferenceScalaTMicroOcclusion"); + part = (TMultiPart) type.getConstructor().newInstance(); + other = (TMultiPart) type.getConstructor().newInstance(); + micro = (TMicroOcclusion) part; + otherMicro = (TMicroOcclusion) other; + set(part, "events", List.class, events); + set(other, "events", List.class, events); + set(other, "label", String.class, "other"); + } + + void set(TMultiPart target, String name, Class type, Object value) throws Exception { + target.getClass().getMethod(name + "_$eq", type).invoke(target, value); + } + + void configure(TMultiPart target, int slot, int size, int material) throws Exception { + set(target, "slot", int.class, slot); + set(target, "size", int.class, size); + set(target, "material", int.class, material); + } + } +} diff --git a/src/test/java/codechicken/microblock/TMicroOcclusionClientCharacterizationTest.java b/src/test/java/codechicken/microblock/TMicroOcclusionClientCharacterizationTest.java new file mode 100644 index 0000000..df7882f --- /dev/null +++ b/src/test/java/codechicken/microblock/TMicroOcclusionClientCharacterizationTest.java @@ -0,0 +1,237 @@ +package codechicken.microblock; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.reflect.Proxy; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +class TMicroOcclusionClientCharacterizationTest { + + @Test + void frozenLifecycleCallsSuperThenVirtualRecalcWithOriginalArguments() throws Exception { + Fixture f = new Fixture(); + f.set("runRecalc", boolean.class, false); + assertNull(f.client.renderBounds()); + assertEquals(0, f.client.renderMask()); + f.part.onAdded(); + assertEquals(Arrays.asList("superAdded", "recalc"), f.events); + f.events.clear(); + f.part.onPartChanged(f.part); + assertSame(f.part, f.get("seenPart")); + assertEquals(Arrays.asList("superChanged", "recalc"), f.events); + f.events.clear(); + MCDataInput packet = (MCDataInput) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, args) -> { throw new AssertionError("Unexpected packet read: " + method.getName()); }); + f.part.read(packet); + assertSame(packet, f.get("seenPacket")); + assertEquals(Arrays.asList("superRead", "recalc"), f.events); + f.events.clear(); + f.part.read(null); + assertNull(f.get("seenPacket")); + f.part.onPartChanged(null); + assertNull(f.get("seenPart")); + assertEquals(Arrays.asList("superRead", "recalc", "superChanged", "recalc"), f.events); + } + + @Test + void predecessorFailuresSkipRecalculationAndRecalcFailuresFollowSuper() throws Exception { + Fixture f = new Fixture(); + RuntimeException failure = new IllegalStateException("sentinel"); + f.client.renderBounds_$eq(Cuboid6.full); + f.client.renderMask_$eq(91); + Runnable[] calls = { f.part::onAdded, () -> f.part.onPartChanged(null), () -> f.part.read(null) }; + String[] names = { "superAdded", "superChanged", "superRead" }; + for (int i = 0; i < calls.length; i++) { + f.set("failure", RuntimeException.class, failure); + f.events.clear(); + assertSame(failure, assertThrows(IllegalStateException.class, calls[i]::run)); + assertEquals(Collections.singletonList(names[i]), f.events); + f.set("failure", RuntimeException.class, null); + f.set("recalcFailure", RuntimeException.class, failure); + f.events.clear(); + assertSame(failure, assertThrows(IllegalStateException.class, calls[i]::run)); + assertEquals(Arrays.asList(names[i], "recalc"), f.events); + assertSame(Cuboid6.full, f.client.renderBounds()); + assertEquals(91, f.client.renderMask()); + } + } + + @Test + void lifecycleRecalculatesUsingStatePublishedByItsPredecessor() throws Exception { + Fixture f = new Fixture(); + Cuboid6 changed = new Cuboid6(0.2, 0.3, 0.4, 0.8, 0.9, 1); + f.set("afterSuper", Runnable.class, (Runnable) () -> { + try { + f.set("bounds", Cuboid6.class, changed); + } catch (Exception e) { + throw new AssertionError(e); + } + }); + for (Runnable call : new Runnable[] { f.part::onAdded, () -> f.part.onPartChanged(null), + () -> f.part.read(null) }) { + f.set("bounds", Cuboid6.class, null); + f.client.renderMask_$eq(63); + call.run(); + assertNotSame(changed, f.client.renderBounds()); + assertBounds(changed, f.client.renderBounds()); + assertEquals(0, f.client.renderMask()); + } + } + + @Test + void recalculationPublishesVirtualCopyBeforeTraversalAndReplacesOldMask() throws Exception { + Fixture f = new Fixture(); + Cuboid6 copy = new Cuboid6(0.1, 0.2, 0.3, 0.7, 0.8, 0.9); + f.set("bounds", Cuboid6.class, new Cuboid6(Cuboid6.full) { + + @Override + public Cuboid6 copy() { + f.events.add("copy"); + return copy; + } + }); + f.client.renderMask_$eq(45); + f.tile.onVisit = () -> { + assertSame(copy, f.client.renderBounds()); + assertEquals(45, f.client.renderMask()); + }; + f.client.recalcBounds(); + assertEquals(Arrays.asList("recalc", "bounds", "copy"), f.events); + assertEquals(Arrays.asList(0, 1, 2, 3, 5), f.tile.visited); + assertSame(copy, f.client.renderBounds()); + assertEquals(0, f.client.renderMask()); + } + + @Test + void priorityControlsClippingAndOpaqueMaskAndEveryRecalcStartsFromPhysicalBounds() throws Exception { + Fixture f = new Fixture(); + Fixture neighbor = new Fixture(); + neighbor.set("slot", int.class, 0); + neighbor.set("size", int.class, 1); + neighbor.set("bounds", Cuboid6.class, new Cuboid6(0, 0, 0, 1, 0.125, 1)); + f.tile.parts[0] = neighbor.part; + f.client.recalcBounds(); + assertEquals(1, f.client.renderMask()); + assertEquals(0, f.client.renderBounds().min.y); + neighbor.set("size", int.class, 4); + neighbor.set("bounds", Cuboid6.class, new Cuboid6(0, 0, 0, 1, 0.5, 1)); + Cuboid6 previous = f.client.renderBounds(); + f.client.recalcBounds(); + assertNotSame(previous, f.client.renderBounds()); + assertEquals(0.5, f.client.renderBounds().min.y); + assertEquals(0, f.client.renderMask()); + assertEquals(0, ((Cuboid6) f.get("bounds")).min.y); + f.tile.parts[0] = null; + f.client.recalcBounds(); + assertEquals(0, f.client.renderBounds().min.y); + assertEquals(0, f.client.renderMask()); + } + + @Test + void copyFailuresKeepOldStateAndTraversalFailureKeepsPublishedPartialBoundsAndOldMask() throws Exception { + Fixture f = new Fixture(); + Cuboid6 old = Cuboid6.full.copy(); + f.client.renderBounds_$eq(old); + f.client.renderMask_$eq(37); + f.set("bounds", Cuboid6.class, null); + assertThrows(NullPointerException.class, f.client::recalcBounds); + assertSame(old, f.client.renderBounds()); + RuntimeException failure = new IllegalStateException("copy"); + f.set("bounds", Cuboid6.class, new Cuboid6(Cuboid6.full) { + + @Override + public Cuboid6 copy() { + throw failure; + } + }); + assertSame(failure, assertThrows(IllegalStateException.class, f.client::recalcBounds)); + assertSame(old, f.client.renderBounds()); + assertEquals(37, f.client.renderMask()); + f.set("bounds", Cuboid6.class, old); + Fixture neighbor = new Fixture(); + neighbor.set("slot", int.class, 0); + neighbor.set("size", int.class, 4); + neighbor.set("bounds", Cuboid6.class, new Cuboid6(0, 0, 0, 1, 0.5, 1)); + f.tile.parts[0] = neighbor.part; + f.tile.onVisit = () -> { if (f.tile.visited.size() == 2) throw failure; }; + assertSame(failure, assertThrows(IllegalStateException.class, f.client::recalcBounds)); + assertNotSame(old, f.client.renderBounds()); + assertEquals(0.5, f.client.renderBounds().min.y); + assertEquals(0, old.min.y); + assertEquals(37, f.client.renderMask()); + } + + private static void assertBounds(Cuboid6 expected, Cuboid6 actual) { + assertArrayEquals( + new double[] { expected.min.x, expected.min.y, expected.min.z, expected.max.x, expected.max.y, + expected.max.z }, + new double[] { actual.min.x, actual.min.y, actual.min.z, actual.max.x, actual.max.y, actual.max.z }, + 1e-12); + } + + private static final class SlotTile extends TileMultipart { + + final TMultiPart[] parts = new TMultiPart[27]; + final List visited = new ArrayList<>(); + Runnable onVisit; + + @Override + public TMultiPart partMap(int slot) { + visited.add(slot); + if (onVisit != null) onVisit.run(); + return parts[slot]; + } + } + + private static final class Fixture extends ClassLoader { + + final TMultiPart part; + final TMicroOcclusionClient client; + final List events = new ArrayList<>(); + final SlotTile tile = new SlotTile(); + + Fixture() throws Exception { + super(TMultiPart.class.getClassLoader()); + for (String name : new String[] { "ReferenceMicroOcclusionClientBase", + "ReferenceScalaTMicroOcclusionClient" }) { + InputStream input = Objects + .requireNonNull(getClass().getResourceAsStream("/compat/" + name + ".class.b64")); + byte[] bytes; + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + part = (TMultiPart) loadClass("codechicken.multipart.compat.ReferenceScalaTMicroOcclusionClient") + .getConstructor().newInstance(); + client = (TMicroOcclusionClient) part; + set("events", List.class, events); + part.bind(tile); + } + + void set(String name, Class type, Object value) throws Exception { + part.getClass().getMethod(name + "_$eq", type).invoke(part, value); + } + + Object get(String name) throws Exception { + return part.getClass().getMethod(name).invoke(part); + } + } +} diff --git a/src/test/java/codechicken/microblock/examples/MaterialEnumerationExample.java b/src/test/java/codechicken/microblock/examples/MaterialEnumerationExample.java new file mode 100644 index 0000000..d5eabc5 --- /dev/null +++ b/src/test/java/codechicken/microblock/examples/MaterialEnumerationExample.java @@ -0,0 +1,21 @@ +package codechicken.microblock.examples; + +import java.util.ArrayList; +import java.util.List; + +import codechicken.microblock.MicroMaterialRegistry; + +/** Compiling example for docs/api/MATERIAL_ENUMERATION.md; call after material IDs are ready. */ +public final class MaterialEnumerationExample { + + private MaterialEnumerationExample() {} + + public static List materialNames() { + int count = MicroMaterialRegistry.materialCount(); + List names = new ArrayList<>(count); + for (int id = 0; id < count; id++) { + names.add(MicroMaterialRegistry.materialName(id)); + } + return names; + } +} diff --git a/src/test/java/codechicken/microblock/examples/SawStrengthExample.java b/src/test/java/codechicken/microblock/examples/SawStrengthExample.java new file mode 100644 index 0000000..b24a33a --- /dev/null +++ b/src/test/java/codechicken/microblock/examples/SawStrengthExample.java @@ -0,0 +1,27 @@ +package codechicken.microblock.examples; + +import net.minecraft.item.Item; + +import codechicken.microblock.ItemSaw; +import codechicken.microblock.handler.MicroblockProxy; + +/** Compiling example for docs/api/SAW_STRENGTH.md. */ +public final class SawStrengthExample { + + private SawStrengthExample() {} + + /** Applies a consumer's remapped harvest level to an existing FMP saw. */ + public static void updateStrength(ItemSaw saw, int harvestLevel) { + saw.setHarvestLevel(harvestLevel); + } + + /** Returns the built-in saws without accessing the retained Scala companion. */ + public static Item[] builtInSaws() { + return new Item[] { MicroblockProxy.sawStone(), MicroblockProxy.sawIron(), MicroblockProxy.sawDiamond() }; + } + + /** Returns whether FMP uses item icons instead of its 3D saw renderer. */ + public static boolean usesSawIcons() { + return MicroblockProxy.useSawIcons(); + } +} diff --git a/src/test/java/codechicken/microblock/handler/MicroblockEventHandlerCharacterizationTest.java b/src/test/java/codechicken/microblock/handler/MicroblockEventHandlerCharacterizationTest.java new file mode 100644 index 0000000..beb8b6b --- /dev/null +++ b/src/test/java/codechicken/microblock/handler/MicroblockEventHandlerCharacterizationTest.java @@ -0,0 +1,90 @@ +package codechicken.microblock.handler; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +class MicroblockEventHandlerCharacterizationTest { + + private static final Set EVENT_METHODS = new TreeSet<>( + Arrays.asList( + "drawBlockHighlight(Lnet/minecraftforge/client/event/DrawBlockHighlightEvent;)V", + "postTextureStitch(Lnet/minecraftforge/client/event/TextureStitchEvent$Post;)V")); + + @Test + void keepsBothSingletonTypesAndEventDescriptors() throws Exception { + assertHandlerType(MicroblockEventHandler.class, true); + assertHandlerType(MicroblockEventHandler$.class, false); + + assertEquals(0, MicroblockEventHandler.class.getFields().length); + Field module = MicroblockEventHandler$.class.getField("MODULE$"); + assertSame(MicroblockEventHandler$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(MicroblockEventHandler$.MODULE$, module.get(null)); + } + + @Test + void keepsBothClientOnlyEventAnnotations() { + assertEventAnnotations(MicroblockEventHandler.class); + assertEventAnnotations(MicroblockEventHandler$.class); + } + + private static void assertHandlerType(Class type, boolean staticMethods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertNull(type.getAnnotation(SideOnly.class)); + assertEquals(EVENT_METHODS, publicMethodSignatures(type)); + + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertEquals(staticMethods, Modifier.isStatic(method.getModifiers())); + } + } + } + + private static void assertEventAnnotations(Class type) { + for (Method method : type.getDeclaredMethods()) { + if (!Modifier.isPublic(method.getModifiers())) { + continue; + } + + SubscribeEvent subscribe = method.getAnnotation(SubscribeEvent.class); + assertNotNull(subscribe, method.toString()); + assertEquals(EventPriority.NORMAL, subscribe.priority(), method.toString()); + assertFalse(subscribe.receiveCanceled(), method.toString()); + + SideOnly sideOnly = method.getAnnotation(SideOnly.class); + assertNotNull(sideOnly, method.toString()); + assertEquals(Side.CLIENT, sideOnly.value(), method.toString()); + } + } + + private static Set publicMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/microblock/handler/MicroblockModCharacterizationTest.java b/src/test/java/codechicken/microblock/handler/MicroblockModCharacterizationTest.java new file mode 100644 index 0000000..30f6808 --- /dev/null +++ b/src/test/java/codechicken/microblock/handler/MicroblockModCharacterizationTest.java @@ -0,0 +1,103 @@ +package codechicken.microblock.handler; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.microblock.AngelicaCompat; +import codechicken.multipart.Tags; +import cpw.mods.fml.common.Mod; + +class MicroblockModCharacterizationTest { + + private static final Set EVENT_METHOD_NAMES = new TreeSet<>( + Arrays.asList("beforeServerStart", "handleIMC", "init", "postInit", "preInit")); + + private static final Set PUBLIC_METHODS = new TreeSet<>( + Arrays.asList( + "angelicaCompat()Lcodechicken/microblock/AngelicaCompat;", + "angelicaCompat_$eq(Lcodechicken/microblock/AngelicaCompat;)V", + "beforeServerStart(Lcpw/mods/fml/common/event/FMLServerAboutToStartEvent;)V", + "handleIMC(Lcpw/mods/fml/common/event/FMLInterModComms$IMCEvent;)V", + "init(Lcpw/mods/fml/common/event/FMLInitializationEvent;)V", + "postInit(Lcpw/mods/fml/common/event/FMLPostInitializationEvent;)V", + "preInit(Lcpw/mods/fml/common/event/FMLPreInitializationEvent;)V")); + + @Test + void keepsBothAnnotatedSingletonTypesAndPublicMethods() throws Exception { + assertModType(MicroblockMod.class, true); + assertModType(MicroblockMod$.class, false); + + assertEquals(0, MicroblockMod.class.getFields().length); + Field module = MicroblockMod$.class.getField("MODULE$"); + assertSame(MicroblockMod$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(MicroblockMod$.MODULE$, module.get(null)); + + Field compat = MicroblockMod$.class.getDeclaredField("angelicaCompat"); + assertSame(AngelicaCompat.class, compat.getType()); + assertTrue(Modifier.isPrivate(compat.getModifiers())); + } + + @Test + void staticAndCompanionAccessorsShareAngelicaCompat() { + AngelicaCompat original = MicroblockMod.angelicaCompat(); + AngelicaCompat marker = new AngelicaCompat(); + try { + assertSame(original, MicroblockMod$.MODULE$.angelicaCompat()); + + MicroblockMod.angelicaCompat_$eq(marker); + assertSame(marker, MicroblockMod$.MODULE$.angelicaCompat()); + + MicroblockMod$.MODULE$.angelicaCompat_$eq(original); + assertSame(original, MicroblockMod.angelicaCompat()); + } finally { + MicroblockMod.angelicaCompat_$eq(original); + } + } + + private static void assertModType(Class type, boolean staticMethods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertEquals(PUBLIC_METHODS, publicMethodSignatures(type)); + + Mod mod = type.getAnnotation(Mod.class); + assertEquals("ForgeMicroblock", mod.modid()); + assertEquals("Forge Microblocks", mod.name()); + assertEquals("[1.7.10]", mod.acceptedMinecraftVersions()); + assertEquals("required-after:CodeChickenCore@[1.4.20,);required-after:ForgeMultipart", mod.dependencies()); + assertEquals(Tags.VERSION, mod.version()); + assertEquals("scala", mod.modLanguage()); + + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertEquals( + EVENT_METHOD_NAMES.contains(method.getName()), + method.isAnnotationPresent(Mod.EventHandler.class), + method.toString()); + assertEquals(staticMethods, Modifier.isStatic(method.getModifiers())); + } + } + } + + private static Set publicMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/microblock/handler/MicroblockPacketHandlerBehaviorTest.java b/src/test/java/codechicken/microblock/handler/MicroblockPacketHandlerBehaviorTest.java new file mode 100644 index 0000000..af519f0 --- /dev/null +++ b/src/test/java/codechicken/microblock/handler/MicroblockPacketHandlerBehaviorTest.java @@ -0,0 +1,114 @@ +package codechicken.microblock.handler; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.lang.reflect.Field; +import java.lang.reflect.Proxy; +import java.util.concurrent.atomic.AtomicReference; + +import net.minecraft.client.Minecraft; +import net.minecraft.network.play.INetHandlerPlayClient; +import net.minecraft.network.play.server.S40PacketDisconnect; +import net.minecraft.util.ChatComponentTranslation; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.packet.PacketCustom; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MissingMicroMaterial; +import codechicken.microblock.MissingMicroMaterial$; +import io.netty.buffer.Unpooled; +import scala.MatchError; + +class MicroblockPacketHandlerBehaviorTest { + + @Test + void skipsTheSharedRegistryPacketInSinglePlayer() throws Exception { + PacketCustom packetWithoutPayload = new PacketCustom(Unpooled.buffer().writeByte(1)); + + assertDoesNotThrow( + () -> MicroblockCPH.handlePacket(packetWithoutPayload, minecraft(true), clientHandler(null))); + } + + @Test + void reportsEveryMissingServerMaterialInOrder() throws Exception { + if (MicroMaterialRegistry.getMaterial(MissingMicroMaterial.key()) == null) { + MicroMaterialRegistry.registerMaterial(MissingMicroMaterial$.MODULE$, MissingMicroMaterial.key()); + } + + AtomicReference disconnect = new AtomicReference<>(); + PacketCustom packet = incomingPacket(1, "server:missing-one", "server:missing-two"); + try { + MicroblockCPH.handleMaterialRegistration(packet, clientHandler(disconnect)); + } finally { + MicroMaterialRegistry.setupIDMap(); + } + + S40PacketDisconnect disconnectPacket = disconnect.get(); + assertNotNull(disconnectPacket); + ChatComponentTranslation reason = (ChatComponentTranslation) disconnectPacket.func_149165_c(); + assertEquals("microblock.missing", reason.getKey()); + assertArrayEquals(new Object[] { "server:missing-one, server:missing-two" }, reason.getFormatArgs()); + } + + @Test + void rejectsUnknownClientPacketTypesLikeTheScalaMatch() throws Exception { + PacketCustom packet = new PacketCustom(Unpooled.buffer().writeByte(2)); + + assertThrows(MatchError.class, () -> MicroblockCPH.handlePacket(packet, null, clientHandler(null))); + } + + @Test + void leavesTheServerPacketCallbackAsANoOp() { + assertDoesNotThrow(() -> MicroblockSPH.handlePacket(null, null, null)); + assertDoesNotThrow(() -> MicroblockSPH$.MODULE$.handlePacket(null, null, null)); + } + + private static PacketCustom incomingPacket(int type, String... materialNames) { + PacketCustom packet = new PacketCustom("test", type).writeInt(materialNames.length); + for (String materialName : materialNames) { + packet.writeString(materialName); + } + return new PacketCustom(packet.getByteBuf().copy()); + } + + private static INetHandlerPlayClient clientHandler(AtomicReference disconnect) { + return (INetHandlerPlayClient) Proxy.newProxyInstance( + INetHandlerPlayClient.class.getClassLoader(), + new Class[] { INetHandlerPlayClient.class }, + (proxy, method, arguments) -> { + if ("handleDisconnect".equals(method.getName())) { + if (disconnect != null) { + disconnect.set((S40PacketDisconnect) arguments[0]); + } + return null; + } + throw new AssertionError("Unexpected client callback: " + method.getName()); + }); + } + + private static Minecraft minecraft(boolean singlePlayer) throws Exception { + Minecraft minecraft = (Minecraft) allocateInstance(Minecraft.class); + if (singlePlayer) { + Field running = Minecraft.class.getDeclaredField("integratedServerIsRunning"); + running.setAccessible(true); + running.setBoolean(minecraft, true); + + Field server = Minecraft.class.getDeclaredField("theIntegratedServer"); + server.setAccessible(true); + server.set(minecraft, allocateInstance(server.getType())); + } + return minecraft; + } + + private static Object allocateInstance(Class type) throws Exception { + Class unsafe = Class.forName("sun.misc.Unsafe"); + Field field = unsafe.getDeclaredField("theUnsafe"); + field.setAccessible(true); + return unsafe.getMethod("allocateInstance", Class.class).invoke(field.get(null), type); + } +} diff --git a/src/test/java/codechicken/microblock/handler/MicroblockPacketHandlerCharacterizationTest.java b/src/test/java/codechicken/microblock/handler/MicroblockPacketHandlerCharacterizationTest.java new file mode 100644 index 0000000..2b629ad --- /dev/null +++ b/src/test/java/codechicken/microblock/handler/MicroblockPacketHandlerCharacterizationTest.java @@ -0,0 +1,121 @@ +package codechicken.microblock.handler; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.packet.PacketCustom.IClientPacketHandler; +import codechicken.lib.packet.PacketCustom.IHandshakeHandler; +import codechicken.lib.packet.PacketCustom.IServerPacketHandler; + +class MicroblockPacketHandlerCharacterizationTest { + + private static final Set CLIENT_METHODS = new TreeSet<>( + Arrays.asList( + "handleMaterialRegistration(Lcodechicken/lib/packet/PacketCustom;Lnet/minecraft/network/play/INetHandlerPlayClient;)V", + "handlePacket(Lcodechicken/lib/packet/PacketCustom;Lnet/minecraft/client/Minecraft;Lnet/minecraft/network/play/INetHandlerPlayClient;)V")); + private static final Set SERVER_METHODS = new TreeSet<>( + Arrays.asList( + "handlePacket(Lcodechicken/lib/packet/PacketCustom;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/play/INetHandlerPlayServer;)V", + "handshakeRecieved(Lnet/minecraft/network/NetHandlerPlayServer;)V")); + + @Test + void keepsTheSharedPacketHandlerBase() throws Exception { + assertTrue(Modifier.isPublic(MicroblockPH.class.getModifiers())); + assertFalse(Modifier.isFinal(MicroblockPH.class.getModifiers())); + assertArrayEquals(new Class[0], MicroblockPH.class.getInterfaces()); + assertEquals( + new TreeSet<>(Arrays.asList("registryChannel()Ljava/lang/String;")), + publicMethodSignatures(MicroblockPH.class)); + + Field channel = MicroblockPH.class.getDeclaredField("registryChannel"); + assertSame(String.class, channel.getType()); + assertTrue(Modifier.isPrivate(channel.getModifiers())); + assertTrue(Modifier.isFinal(channel.getModifiers())); + assertEquals("ForgeMicroblock", new MicroblockPH().registryChannel()); + } + + @Test + void keepsTheClientFacadeAndCompanion() throws Exception { + assertFacade(MicroblockCPH.class, withRegistryChannel(CLIENT_METHODS)); + assertCompanion(MicroblockCPH$.class, IClientPacketHandler.class, CLIENT_METHODS); + assertSame(MicroblockCPH$.class, MicroblockCPH$.class.getField("MODULE$").getType()); + assertSame(MicroblockCPH$.MODULE$, MicroblockCPH$.class.getField("MODULE$").get(null)); + assertEquals("ForgeMicroblock", MicroblockCPH.registryChannel()); + } + + @Test + void keepsTheServerFacadeAndCompanion() throws Exception { + assertFacade(MicroblockSPH.class, withRegistryChannel(SERVER_METHODS)); + assertCompanion( + MicroblockSPH$.class, + new Class[] { IServerPacketHandler.class, IHandshakeHandler.class }, + SERVER_METHODS); + assertSame(MicroblockSPH$.class, MicroblockSPH$.class.getField("MODULE$").getType()); + assertSame(MicroblockSPH$.MODULE$, MicroblockSPH$.class.getField("MODULE$").get(null)); + assertEquals("ForgeMicroblock", MicroblockSPH.registryChannel()); + } + + private static void assertFacade(Class type, Set methods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertArrayEquals(new Class[0], type.getInterfaces()); + assertEquals(methods, publicMethodSignatures(type)); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertTrue(Modifier.isStatic(method.getModifiers()), method.toString()); + } + } + } + + private static void assertCompanion(Class type, Class packetInterface, Set methods) throws Exception { + assertCompanion(type, new Class[] { packetInterface }, methods); + } + + private static void assertCompanion(Class type, Class[] packetInterfaces, Set methods) + throws Exception { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(MicroblockPH.class, type.getSuperclass()); + assertArrayEquals(packetInterfaces, type.getInterfaces()); + assertEquals(methods, publicMethodSignatures(type)); + + Field module = type.getField("MODULE$"); + assertTrue(Modifier.isPublic(module.getModifiers())); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertFalse(Modifier.isStatic(method.getModifiers()), method.toString()); + } + } + } + + private static Set withRegistryChannel(Set methods) { + Set result = new TreeSet<>(methods); + result.add("registryChannel()Ljava/lang/String;"); + return result; + } + + private static Set publicMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/microblock/handler/MicroblockProxyCharacterizationTest.java b/src/test/java/codechicken/microblock/handler/MicroblockProxyCharacterizationTest.java new file mode 100644 index 0000000..8f627e6 --- /dev/null +++ b/src/test/java/codechicken/microblock/handler/MicroblockProxyCharacterizationTest.java @@ -0,0 +1,193 @@ +package codechicken.microblock.handler; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.Item; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.microblock.ItemMicroPart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import scala.collection.mutable.MutableList; + +class MicroblockProxyCharacterizationTest { + + private static final Set SERVER_METHODS = new TreeSet<>( + Arrays.asList( + "addSawRecipe(Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;)V", + "createSaw(Lcodechicken/lib/config/ConfigFile;Ljava/lang/String;I)Lnet/minecraft/item/Item;", + "init()V", + "itemMicro()Lcodechicken/microblock/ItemMicroPart;", + "itemMicro_$eq(Lcodechicken/microblock/ItemMicroPart;)V", + "logger()Lorg/apache/logging/log4j/Logger;", + "logger_$eq(Lorg/apache/logging/log4j/Logger;)V", + "postInit()V", + "preInit(Lorg/apache/logging/log4j/Logger;)V", + "sawDiamond()Lnet/minecraft/item/Item;", + "sawDiamond_$eq(Lnet/minecraft/item/Item;)V", + "sawIron()Lnet/minecraft/item/Item;", + "sawIron_$eq(Lnet/minecraft/item/Item;)V", + "sawStone()Lnet/minecraft/item/Item;", + "sawStone_$eq(Lnet/minecraft/item/Item;)V", + "saws()Lscala/collection/mutable/MutableList;", + "saws_$eq(Lscala/collection/mutable/MutableList;)V", + "stoneRod()Lnet/minecraft/item/Item;", + "stoneRod_$eq(Lnet/minecraft/item/Item;)V", + "useSawIcons()Z", + "useSawIcons_$eq(Z)V")); + private static final Set CLIENT_METHODS = new TreeSet<>( + Arrays.asList("init()V", "postInit()V", "renderBlocks()Lnet/minecraft/client/renderer/RenderBlocks;")); + private static final Set FACADE_METHODS = new TreeSet<>(); + private static final Set CLIENT_ONLY_METHODS = new TreeSet<>(Arrays.asList("init()V", "postInit()V")); + + static { + FACADE_METHODS.addAll(SERVER_METHODS); + FACADE_METHODS.remove("saws()Lscala/collection/mutable/MutableList;"); + FACADE_METHODS.remove("saws_$eq(Lscala/collection/mutable/MutableList;)V"); + FACADE_METHODS.add("renderBlocks()Lnet/minecraft/client/renderer/RenderBlocks;"); + } + + @Test + void keepsTheFourTypeHierarchyAndPublicSurfaces() throws Exception { + assertEquals(Object.class, MicroblockProxy_serverImpl.class.getSuperclass()); + assertEquals(MicroblockProxy_serverImpl.class, MicroblockProxy_clientImpl.class.getSuperclass()); + assertEquals(Object.class, MicroblockProxy.class.getSuperclass()); + assertEquals(MicroblockProxy_clientImpl.class, MicroblockProxy$.class.getSuperclass()); + assertFalse(Modifier.isFinal(MicroblockProxy_serverImpl.class.getModifiers())); + assertFalse(Modifier.isFinal(MicroblockProxy_clientImpl.class.getModifiers())); + assertTrue(Modifier.isFinal(MicroblockProxy.class.getModifiers())); + assertTrue(Modifier.isFinal(MicroblockProxy$.class.getModifiers())); + + assertEquals(SERVER_METHODS, publicDeclaredMethodSignatures(MicroblockProxy_serverImpl.class)); + assertEquals(CLIENT_METHODS, publicDeclaredMethodSignatures(MicroblockProxy_clientImpl.class)); + assertEquals(FACADE_METHODS, publicDeclaredMethodSignatures(MicroblockProxy.class)); + assertEquals(new TreeSet(), publicDeclaredMethodSignatures(MicroblockProxy$.class)); + + for (Method method : MicroblockProxy.class.getDeclaredMethods()) { + assertTrue(Modifier.isStatic(method.getModifiers()), method.toString()); + } + + Field module = MicroblockProxy$.class.getField("MODULE$"); + assertSame(MicroblockProxy$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(MicroblockProxy$.MODULE$, module.get(null)); + } + + @Test + void keepsTheMutableFieldsAndLazyRendererShape() throws Exception { + assertEquals(8, MicroblockProxy_serverImpl.class.getDeclaredFields().length); + assertPrivateField(MicroblockProxy_serverImpl.class, "logger", Logger.class, false); + assertPrivateField(MicroblockProxy_serverImpl.class, "itemMicro", ItemMicroPart.class, false); + assertPrivateField(MicroblockProxy_serverImpl.class, "sawStone", Item.class, false); + assertPrivateField(MicroblockProxy_serverImpl.class, "sawIron", Item.class, false); + assertPrivateField(MicroblockProxy_serverImpl.class, "sawDiamond", Item.class, false); + assertPrivateField(MicroblockProxy_serverImpl.class, "stoneRod", Item.class, false); + assertPrivateField(MicroblockProxy_serverImpl.class, "useSawIcons", boolean.class, false); + assertPrivateField(MicroblockProxy_serverImpl.class, "saws", MutableList.class, false); + + assertEquals(2, MicroblockProxy_clientImpl.class.getDeclaredFields().length); + assertPrivateField(MicroblockProxy_clientImpl.class, "renderBlocks", RenderBlocks.class, true); + Field bitmap = assertPrivateField(MicroblockProxy_clientImpl.class, "bitmap$0", boolean.class, false); + assertTrue(Modifier.isVolatile(bitmap.getModifiers())); + + Method lazyCompute = MicroblockProxy_clientImpl.class.getDeclaredMethod("renderBlocks$lzycompute"); + assertSame(RenderBlocks.class, lazyCompute.getReturnType()); + assertTrue(Modifier.isPrivate(lazyCompute.getModifiers())); + assertNull(lazyCompute.getAnnotation(SideOnly.class)); + } + + @Test + void keepsOnlyTheClientLifecycleOverridesSideOnly() { + assertSideOnlyMethods(MicroblockProxy_serverImpl.class, new TreeSet()); + assertSideOnlyMethods(MicroblockProxy_clientImpl.class, CLIENT_ONLY_METHODS); + assertSideOnlyMethods(MicroblockProxy.class, CLIENT_ONLY_METHODS); + assertSideOnlyMethods(MicroblockProxy$.class, new TreeSet()); + + assertNull(MicroblockProxy_serverImpl.class.getAnnotation(SideOnly.class)); + assertNull(MicroblockProxy_clientImpl.class.getAnnotation(SideOnly.class)); + assertNull(MicroblockProxy.class.getAnnotation(SideOnly.class)); + assertNull(MicroblockProxy$.class.getAnnotation(SideOnly.class)); + } + + @Test + void facadeAndCompanionShareStateWhileServerInstancesKeepIndependentSawLists() { + Logger originalLogger = MicroblockProxy.logger(); + boolean originalIcons = MicroblockProxy.useSawIcons(); + Logger marker = LogManager.getLogger("MicroblockProxyCharacterizationTest.marker"); + try { + MicroblockProxy.logger_$eq(marker); + MicroblockProxy.useSawIcons_$eq(!originalIcons); + assertSame(marker, MicroblockProxy$.MODULE$.logger()); + assertEquals(!originalIcons, MicroblockProxy$.MODULE$.useSawIcons()); + } finally { + MicroblockProxy.logger_$eq(originalLogger); + MicroblockProxy.useSawIcons_$eq(originalIcons); + } + + MicroblockProxy_serverImpl first = new MicroblockProxy_serverImpl(); + MicroblockProxy_serverImpl second = new MicroblockProxy_serverImpl(); + first.logger_$eq(marker); + assertSame(marker, first.logger()); + assertNull(second.logger()); + assertNotNull(first.saws()); + assertTrue(first.saws().isEmpty()); + assertTrue(second.saws().isEmpty()); + assertNotSame(first.saws(), second.saws()); + } + + private static Field assertPrivateField(Class owner, String name, Class type, boolean clientOnly) + throws Exception { + Field field = owner.getDeclaredField(name); + assertSame(type, field.getType()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + SideOnly annotation = field.getAnnotation(SideOnly.class); + if (clientOnly) { + assertNotNull(annotation); + assertEquals(Side.CLIENT, annotation.value()); + } else { + assertNull(annotation); + } + return field; + } + + private static void assertSideOnlyMethods(Class type, Set expected) { + Set actual = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + SideOnly annotation = method.getAnnotation(SideOnly.class); + if (annotation != null) { + assertEquals(Side.CLIENT, annotation.value(), method.toString()); + actual.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + assertEquals(expected, actual); + } + + private static Set publicDeclaredMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/multipart/BlockMultipartCharacterizationTest.java b/src/test/java/codechicken/multipart/BlockMultipartCharacterizationTest.java new file mode 100644 index 0000000..ae8c782 --- /dev/null +++ b/src/test/java/codechicken/multipart/BlockMultipartCharacterizationTest.java @@ -0,0 +1,198 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.util.Arrays; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.util.ForgeDirection; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.multipart.examples.HitPartExample; +import scala.Tuple2; + +class BlockMultipartCharacterizationTest { + + private static final Vec3 ORIGIN = Vec3.createVectorHelper(0, 0, 0); + + @Test + void getTileOnlyReturnsNonEmptyMultipartTiles() { + TestBlockAccess world = new TestBlockAccess(); + + assertNull(BlockMultipart.getTile(world, 1, 2, 3)); + + world.tile = new TileEntity(); + assertNull(BlockMultipart.getTile(world, 1, 2, 3)); + + TileMultipart multipart = new TileMultipart(); + world.tile = multipart; + assertNull(BlockMultipart.getTile(world, 1, 2, 3)); + + multipart.addPart_do(new TestPart()); + assertSame(multipart, BlockMultipart.getTile(world, 1, 2, 3)); + } + + @Test + void reduceMOPReturnsTheBoxedPartIndexAndARebasedHit() { + TileMultipart tile = hitTile(); + ExtendedMOP hit = tile.collisionRayTrace(ORIGIN, ORIGIN); + + List> results = Arrays + .asList(BlockMultipart.reduceMOP(hit), BlockMultipart$.MODULE$.reduceMOP(hit)); + for (Tuple2 reduced : results) { + // GT5U 5.09.54.205 casts _1() straight to Integer and indexes jPartList() with it. + assertEquals(Integer.class, reduced._1().getClass()); + assertEquals(2, (int) (Integer) reduced._1()); + assertNotSame(hit, reduced._2()); + assertEquals("near-data", reduced._2().data); + assertEquals(hit.dist, reduced._2().dist); + assertEquals(hit.blockX, reduced._2().blockX); + } + } + + @Test + void hitPartIndexMatchesReduceMOPForEveryHit() { + TileMultipart tile = hitTile(); + + int hits = 0; + for (ExtendedMOP hit : tile.rayTraceAll(ORIGIN, ORIGIN)) { + int index = BlockMultipart.hitPartIndex(hit); + assertEquals(BlockMultipart.reduceMOP(hit)._1(), index); + assertSame(((HitPart) tile.jPartList().get(index)).produced, hit); + assertSame(tile.jPartList().get(index), HitPartExample.struckPart(tile, hit)); + hits++; + } + assertEquals(2, hits); + } + + @Test + void hitPartIndexIsMinusOneWhenTheHitCarriesNoPartIndex() { + Tuple2 nonIntegerIndex = new Tuple2<>("0", null); + for (Object data : new Object[] { null, "subhit", 3, nonIntegerIndex }) { + assertEquals(-1, BlockMultipart.hitPartIndex(new ExtendedMOP(0, 0, 0, 0, ORIGIN, data))); + } + assertEquals(-1, BlockMultipart.hitPartIndex(new MovingObjectPosition(0, 0, 0, 0, ORIGIN))); + assertEquals(-1, BlockMultipart.hitPartIndex(null)); + assertNull(HitPartExample.struckPart(new TileMultipart(), null)); + } + + @Test + void exampleRejectsAnIndexOutsideTheTile() { + TileMultipart tile = hitTile(); + ExtendedMOP hit = tile.collisionRayTrace(ORIGIN, ORIGIN); + TileMultipart smaller = new TileMultipart(); + smaller.addPart_do(new TestPart()); + + assertNull(HitPartExample.struckPart(smaller, hit)); + } + + /** Parts 0 and 2 are hit, part 1 misses; part 2 is nearest. */ + private static TileMultipart hitTile() { + TileMultipart tile = new TileMultipart(); + tile.addPart_do(new HitPart(9d, "far-data")); + tile.addPart_do(new HitPart(null, null)); + tile.addPart_do(new HitPart(1d, "near-data")); + return tile; + } + + private static final class TestPart extends TMultiPart { + + @Override + public String getType() { + return "block_characterization"; + } + } + + private static final class HitPart extends TMultiPart { + + private final Double dist; + private final Object data; + private ExtendedMOP produced; + + private HitPart(Double dist, Object data) { + this.dist = dist; + this.data = data; + } + + @Override + public String getType() { + return "block_characterization_hit"; + } + + @Override + public ExtendedMOP collisionRayTrace(Vec3 start, Vec3 end) { + if (dist == null) { + return null; + } + produced = new ExtendedMOP(0, 0, 0, 0, ORIGIN, data); + produced.dist = dist; + return produced; + } + } + + private static final class TestBlockAccess implements IBlockAccess { + + private TileEntity tile; + + @Override + public Block getBlock(int x, int y, int z) { + return null; + } + + @Override + public TileEntity getTileEntity(int x, int y, int z) { + return tile; + } + + @Override + public int getLightBrightnessForSkyBlocks(int x, int y, int z, int minimum) { + return 0; + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + return 0; + } + + @Override + public int isBlockProvidingPowerTo(int x, int y, int z, int direction) { + return 0; + } + + @Override + public boolean isAirBlock(int x, int y, int z) { + return false; + } + + @Override + public BiomeGenBase getBiomeGenForCoords(int x, int z) { + return null; + } + + @Override + public int getHeight() { + return 0; + } + + @Override + public boolean extendedLevelsInChunkCache() { + return false; + } + + @Override + public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean defaultValue) { + return defaultValue; + } + } +} diff --git a/src/test/java/codechicken/multipart/ConsumerReflectionCompatibilityTest.java b/src/test/java/codechicken/multipart/ConsumerReflectionCompatibilityTest.java new file mode 100644 index 0000000..a903f6d --- /dev/null +++ b/src/test/java/codechicken/multipart/ConsumerReflectionCompatibilityTest.java @@ -0,0 +1,75 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; + +import net.minecraft.block.Block; + +import org.junit.jupiter.api.Test; + +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.ItemSaw; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial; +import codechicken.multipart.minecraft.ButtonPart; +import cpw.mods.fml.relauncher.ReflectionHelper; + +/** Source-only compatibility contracts used by optional integrations in the target pack. */ +class ConsumerReflectionCompatibilityTest { + + @Test + void guideNhMixinCanTargetBlockMicroMaterialFields() throws NoSuchFieldException { + Field block = field(BlockMicroMaterial.class, "block", Block.class); + Field meta = field(BlockMicroMaterial.class, "meta", int.class); + + assertFalse(Modifier.isStatic(block.getModifiers())); + assertFalse(Modifier.isStatic(meta.getModifiers())); + } + + @Test + void etFuturumCanReplaceButtonOrientationArrays() { + Field metaSideMap = ReflectionHelper.findField(ButtonPart.class, "metaSideMap"); + Field sideMetaMap = ReflectionHelper.findField(ButtonPart.class, "sideMetaMap"); + + assertMutableStaticIntArray(metaSideMap); + assertMutableStaticIntArray(sideMetaMap); + } + + @Test + void iguanaCanFindTheSawHarvestLevel() throws NoSuchFieldException { + Field harvestLevel = field(ItemSaw.class, "harvestLevel", int.class); + + assertFalse(Modifier.isStatic(harvestLevel.getModifiers())); + } + + @Test + void galacticraftNameOnlyLookupFindsOneCompatibleRegistrationMethod() throws NoSuchMethodException { + Method[] methods = Arrays.stream(MicroMaterialRegistry.class.getMethods()) + .filter(method -> method.getName().equals("registerMaterial")).toArray(Method[]::new); + + assertEquals(1, methods.length, "Galacticraft invokes the first public method with this name"); + assertTrue(Modifier.isStatic(methods[0].getModifiers())); + assertArrayEquals(new Class[] { IMicroMaterial.class, String.class }, methods[0].getParameterTypes()); + assertNotNull(BlockMicroMaterial.class.getConstructor(Block.class, int.class)); + } + + private static Field field(Class owner, String name, Class type) throws NoSuchFieldException { + Field field = owner.getDeclaredField(name); + assertEquals(type, field.getType()); + return field; + } + + private static void assertMutableStaticIntArray(Field field) { + assertEquals(int[].class, field.getType()); + assertTrue(Modifier.isStatic(field.getModifiers())); + assertFalse(Modifier.isFinal(field.getModifiers())); + } +} diff --git a/src/test/java/codechicken/multipart/ControlKeyModiferCharacterizationTest.java b/src/test/java/codechicken/multipart/ControlKeyModiferCharacterizationTest.java new file mode 100644 index 0000000..4da0461 --- /dev/null +++ b/src/test/java/codechicken/multipart/ControlKeyModiferCharacterizationTest.java @@ -0,0 +1,35 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; + +import net.minecraft.entity.player.EntityPlayer; + +import org.junit.jupiter.api.Test; + +/** + * Every branch of isControlDown needs a player with a world, so the behavior is covered by the Forge server suite + * against a FakePlayer. What is pinned here is the Java-facing entry point, which the reference scaladoc calls out as + * existing for Java callers rather than for the Scala implicit. + */ +class ControlKeyModiferCharacterizationTest { + + /** The class name carries a typo in the reference. It is the published name, so the port keeps it. */ + @Test + void theTypoInTheClassNameIsPreserved() { + assertEquals("codechicken.multipart.ControlKeyModifer", ControlKeyModifer.class.getName()); + } + + @Test + void theJavaFacingQueryIsAPublicStaticTakingAPlayer() throws Exception { + Method isControlDown = ControlKeyModifer.class.getDeclaredMethod("isControlDown", EntityPlayer.class); + + assertSame(boolean.class, isControlDown.getReturnType()); + assertTrue(Modifier.isPublic(isControlDown.getModifiers())); + assertTrue(Modifier.isStatic(isControlDown.getModifiers())); + } +} diff --git a/src/test/java/codechicken/multipart/CuboidPartCharacterizationTest.java b/src/test/java/codechicken/multipart/CuboidPartCharacterizationTest.java new file mode 100644 index 0000000..e67a3a3 --- /dev/null +++ b/src/test/java/codechicken/multipart/CuboidPartCharacterizationTest.java @@ -0,0 +1,129 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.vec.Cuboid6; + +class CuboidPartCharacterizationTest { + + @Test + void subPartsHoldOneIndexedCopyOfTheBounds() { + TestPart part = new TestPart(box(0, 0, 0, 0.5, 0.5, 0.5)); + + List subParts = drain(part.getSubParts()); + + assertEquals(1, subParts.size()); + IndexedCuboid6 only = assertInstanceOf(IndexedCuboid6.class, subParts.get(0)); + assertEquals(Integer.valueOf(0), only.data); + assertGeometry(part.getBounds(), only); + assertNotSame(part.getBounds(), only); + } + + @Test + void collisionBoxesAliasTheBoundsInstance() { + TestPart part = new TestPart(box(0, 0, 0, 1, 1, 1)); + + List boxes = drain(part.getCollisionBoxes()); + + assertEquals(1, boxes.size()); + assertSame(part.getBounds(), boxes.get(0)); + } + + @Test + void resultsFollowTheCurrentBounds() { + TestPart part = new TestPart(box(0, 0, 0, 1, 1, 1)); + part.bounds = box(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); + + assertGeometry(part.getBounds(), drain(part.getSubParts()).get(0)); + assertSame(part.getBounds(), drain(part.getCollisionBoxes()).get(0)); + } + + @Test + @SuppressWarnings("unchecked") + void deprecatedBridgeMatchesTheInstanceMethods() { + TestPart part = new TestPart(box(0.1, 0.2, 0.3, 0.4, 0.5, 0.6)); + + List bridgeSubParts = drain(TCuboidPart$class.getSubParts(part)); + List bridgeBoxes = drain(TCuboidPart$class.getCollisionBoxes(part)); + + assertEquals(1, bridgeSubParts.size()); + assertEquals(Integer.valueOf(0), bridgeSubParts.get(0).data); + assertGeometry(part.getBounds(), bridgeSubParts.get(0)); + assertEquals(1, bridgeBoxes.size()); + assertSame(part.getBounds(), bridgeBoxes.get(0)); + } + + /** + * TMultiPart supplies empty defaults. A cuboid part must not fall back to them: on the JVM a superclass method + * beats an interface default, so this is the guard against the port silently losing the cuboid behavior. + */ + @Test + void cuboidBehaviorWinsOverTheEmptyTMultiPartDefaults() { + TMultiPart bare = new TMultiPart() { + + @Override + public String getType() { + return "test:bare"; + } + }; + + assertFalse(bare.getSubParts().iterator().hasNext()); + assertFalse(bare.getCollisionBoxes().iterator().hasNext()); + + TestPart part = new TestPart(box(0, 0, 0, 1, 1, 1)); + assertTrue(part.getSubParts().iterator().hasNext()); + assertTrue(part.getCollisionBoxes().iterator().hasNext()); + } + + private static void assertGeometry(Cuboid6 expected, Cuboid6 actual) { + assertEquals(expected.min.x, actual.min.x); + assertEquals(expected.min.y, actual.min.y); + assertEquals(expected.min.z, actual.min.z); + assertEquals(expected.max.x, actual.max.x); + assertEquals(expected.max.y, actual.max.y); + assertEquals(expected.max.z, actual.max.z); + } + + private static List drain(Iterable values) { + List result = new ArrayList<>(); + for (Iterator iterator = values.iterator(); iterator.hasNext();) { + result.add(iterator.next()); + } + return result; + } + + private static Cuboid6 box(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + return new Cuboid6(minX, minY, minZ, maxX, maxY, maxZ); + } + + private static final class TestPart extends JCuboidPart { + + private Cuboid6 bounds; + + private TestPart(Cuboid6 bounds) { + this.bounds = bounds; + } + + @Override + public Cuboid6 getBounds() { + return bounds; + } + + @Override + public String getType() { + return "test:cuboid"; + } + } +} diff --git a/src/test/java/codechicken/multipart/EdgePartCharacterizationTest.java b/src/test/java/codechicken/multipart/EdgePartCharacterizationTest.java new file mode 100644 index 0000000..6d1b864 --- /dev/null +++ b/src/test/java/codechicken/multipart/EdgePartCharacterizationTest.java @@ -0,0 +1,58 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +class EdgePartCharacterizationTest { + + @Test + void edgePartsDoNotConductRedstoneByDefault() { + assertFalse(new ForwardingPart().conductsRedstone()); + } + + /** The bridge holds the trait default rather than dispatching, so an override does not change what it returns. */ + @Test + void deprecatedBridgeReturnsTheTraitDefaultEvenWhenOverridden() { + assertFalse(TEdgePart$class.conductsRedstone(new ForwardingPart())); + assertTrue(new ConductingPart().conductsRedstone()); + assertFalse(TEdgePart$class.conductsRedstone(new ConductingPart())); + } + + @Test + void edgePartIsASlottedPart() { + ForwardingPart part = new ForwardingPart(); + + assertTrue(part instanceof TSlottedPart); + assertEquals(1 << 15, part.getSlotMask()); + } + + /** Mirrors the forwarder Scala emits for a class mixing in the trait without overriding it. */ + private static class ForwardingPart extends TMultiPart implements TEdgePart { + + @Override + public String getType() { + return "test:edge"; + } + + @Override + public int getSlotMask() { + return 1 << 15; + } + + @Override + public boolean conductsRedstone() { + return TEdgePart$class.conductsRedstone(this); + } + } + + private static final class ConductingPart extends ForwardingPart { + + @Override + public boolean conductsRedstone() { + return true; + } + } +} diff --git a/src/test/java/codechicken/multipart/FacePartCharacterizationTest.java b/src/test/java/codechicken/multipart/FacePartCharacterizationTest.java new file mode 100644 index 0000000..1d06b83 --- /dev/null +++ b/src/test/java/codechicken/multipart/FacePartCharacterizationTest.java @@ -0,0 +1,88 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +class FacePartCharacterizationTest { + + @Test + void defaultsAreSolidOnEverySideAndConductNothing() { + ForwardingPart part = new ForwardingPart(); + + for (int side = 0; side < 6; side++) { + assertTrue(part.solid(side)); + } + assertTrue(part.solid(-1)); + assertTrue(part.solid(99)); + assertEquals(0, part.redstoneConductionMap()); + } + + @Test + void deprecatedBridgeMatchesTheDefaults() { + ForwardingPart part = new ForwardingPart(); + + for (int side = 0; side < 6; side++) { + assertTrue(TFacePart$class.solid(part, side)); + } + assertEquals(0, TFacePart$class.redstoneConductionMap(part)); + } + + /** The bridge holds the trait defaults rather than dispatching, so an override does not change what it returns. */ + @Test + void deprecatedBridgeReturnsTheTraitDefaultsEvenWhenOverridden() { + OverridingPart part = new OverridingPart(); + + assertFalse(part.solid(0)); + assertEquals(0x10, part.redstoneConductionMap()); + assertTrue(TFacePart$class.solid(part, 0)); + assertEquals(0, TFacePart$class.redstoneConductionMap(part)); + } + + @Test + void facePartIsASlottedPart() { + ForwardingPart part = new ForwardingPart(); + + assertTrue(part instanceof TSlottedPart); + assertEquals(0x3f, part.getSlotMask()); + } + + /** Mirrors the forwarders Scala emits for a class mixing in the trait without overriding either member. */ + private static class ForwardingPart extends TMultiPart implements TFacePart { + + @Override + public String getType() { + return "test:face"; + } + + @Override + public int getSlotMask() { + return 0x3f; + } + + @Override + public boolean solid(int side) { + return TFacePart$class.solid(this, side); + } + + @Override + public int redstoneConductionMap() { + return TFacePart$class.redstoneConductionMap(this); + } + } + + private static final class OverridingPart extends ForwardingPart { + + @Override + public boolean solid(int side) { + return false; + } + + @Override + public int redstoneConductionMap() { + return 0x10; + } + } +} diff --git a/src/test/java/codechicken/multipart/IDWriterCharacterizationTest.java b/src/test/java/codechicken/multipart/IDWriterCharacterizationTest.java new file mode 100644 index 0000000..0904ee8 --- /dev/null +++ b/src/test/java/codechicken/multipart/IDWriterCharacterizationTest.java @@ -0,0 +1,84 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Proxy; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.data.MCDataOutputWrapper; + +class IDWriterCharacterizationTest { + + @ParameterizedTest(name = "max {0} encodes {1} as {2}") + @CsvSource({ "0, 305419896, '78', 120", "255, 305419896, '78', 120", + "256, 305419896, '56 78', 22136", "65535, 305419896, '56 78', 22136", + "65536, 305419896, '12 34 56 78', 305419896", "2147483647, 305419896, '12 34 56 78', 305419896", + "-2147483648, 305419896, '78', 120", "-1, 305419896, '78', 120", }) + void selectsCarrierFromMaximum(int maximum, int value, String encodedHex, int decodedValue) throws Exception { + IDWriter writer = new IDWriter(); + writer.setMax(maximum); + + byte[] encoded = encode(writer, value); + + assertArrayEquals(hex(encodedHex), encoded); + assertEquals(decodedValue, decode(writer, encoded)); + } + + private static byte[] encode(IDWriter writer, int value) { + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + MCDataOutput output = new MCDataOutputWrapper(new DataOutputStream(bytes)); + writer.write(output, value); + return bytes.toByteArray(); + } + + private static int decode(IDWriter writer, byte[] bytes) throws Exception { + DataInputStream data = new DataInputStream(new ByteArrayInputStream(bytes)); + MCDataInput input = (MCDataInput) Proxy.newProxyInstance( + MCDataInput.class.getClassLoader(), + new Class[] { MCDataInput.class }, + (proxy, method, arguments) -> { + switch (method.getName()) { + case "readUByte": + return (short) data.readUnsignedByte(); + case "readUShort": + return data.readUnsignedShort(); + case "readInt": + return data.readInt(); + default: + throw new AssertionError("Unexpected read method: " + method.getName()); + } + }); + + int value = writer.read(input); + assertEquals(0, data.available(), "The selected reader must consume its whole carrier"); + return value; + } + + @Test + void rejectsUseBeforeSetMax() { + IDWriter writer = new IDWriter(); + + assertThrows(IllegalStateException.class, () -> writer.write(null, 0)); + assertThrows(IllegalStateException.class, () -> writer.read(null)); + } + + private static byte[] hex(String value) { + String[] octets = value.split(" "); + byte[] bytes = new byte[octets.length]; + for (int i = 0; i < octets.length; i++) { + bytes[i] = (byte) Integer.parseInt(octets[i], 16); + } + return bytes; + } +} diff --git a/src/test/java/codechicken/multipart/IconHitEffectsCharacterizationTest.java b/src/test/java/codechicken/multipart/IconHitEffectsCharacterizationTest.java new file mode 100644 index 0000000..2a411a7 --- /dev/null +++ b/src/test/java/codechicken/multipart/IconHitEffectsCharacterizationTest.java @@ -0,0 +1,100 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.util.IIcon; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; + +/** + * The particle calls themselves need a world and an EffectRenderer, so they cannot run headless. What is asserted here + * is the part of the contract that is reachable: icon selection, the order and range of the icons requested, and + * whether the part's own bounds are consulted. Actual particle appearance stays on the manual checklist. + */ +class IconHitEffectsCharacterizationTest { + + @Test + void breakingIconFallsBackToTheBrokenIconForThatSide() { + SpyPart part = new SpyPart(); + + assertNull(part.getBreakingIcon("ignored-subpart", 3)); + assertEquals(1, part.brokenIconSides.size()); + assertEquals(3, part.brokenIconSides.get(0)); + } + + @Test + void deprecatedBridgeMatchesTheBreakingIconFallback() { + SpyPart part = new SpyPart(); + + assertNull(JIconHitEffects$class.getBreakingIcon(part, null, 5)); + assertEquals(1, part.brokenIconSides.size()); + assertEquals(5, part.brokenIconSides.get(0)); + } + + @Test + void destroyEffectsRequestAllSixSidesInOrderAndScaleToTheBounds() { + SpyPart part = new SpyPart(); + + // The tile is null, so this reaches part.tile after collecting the icons and bounds. + assertThrows(NullPointerException.class, () -> IconHitEffects.addDestroyEffects(part, null)); + + assertEquals(Arrays.asList(0, 1, 2, 3, 4, 5), part.brokenIconSides); + assertEquals(1, part.boundsRequested); + } + + @Test + void destroyEffectsWithoutDensityScalingIgnoreTheBounds() { + SpyPart part = new SpyPart(); + + assertThrows(NullPointerException.class, () -> IconHitEffects.addDestroyEffects(part, null, false)); + + assertEquals(Arrays.asList(0, 1, 2, 3, 4, 5), part.brokenIconSides); + assertEquals(0, part.boundsRequested); + } + + @Test + void iconHitEffectsPartIsAMultiPart() { + SpyPart part = new SpyPart(); + + assertTrue(part instanceof JIconHitEffects); + assertTrue(part instanceof TMultiPart); + } + + /** Mirrors the forwarder Scala emits for a class that does not override getBreakingIcon. */ + private static final class SpyPart extends TMultiPart implements JIconHitEffects { + + private final List brokenIconSides = new ArrayList<>(); + private int boundsRequested; + + @Override + public String getType() { + return "test:icon-hit"; + } + + @Override + public Cuboid6 getBounds() { + boundsRequested++; + return new Cuboid6(0, 0, 0, 1, 1, 1); + } + + @Override + public IIcon getBrokenIcon(int side) { + brokenIconSides.add(side); + return null; + } + + @Override + public IIcon getBreakingIcon(Object subPart, int side) { + return JIconHitEffects$class.getBreakingIcon(this, subPart, side); + } + } +} diff --git a/src/test/java/codechicken/multipart/ItemMultiPartCharacterizationTest.java b/src/test/java/codechicken/multipart/ItemMultiPartCharacterizationTest.java new file mode 100644 index 0000000..7ad0adb --- /dev/null +++ b/src/test/java/codechicken/multipart/ItemMultiPartCharacterizationTest.java @@ -0,0 +1,140 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Vector3; + +/** + * Placement short-circuits as soon as newPart returns null, before any world, player or stack access, so the branch and + * offset logic is reachable headless with null arguments. Actual placement needs a world and stays on the functional + * and manual layers. + */ +class ItemMultiPartCharacterizationTest { + + @Test + void hitDepthProjectsOntoTheSideAxisAndOffsetsOddSides() { + SpyItem item = new SpyItem(); + Vector3 vhit = new Vector3(0.25, 0.5, 0.75); + + assertEquals(0.5, item.getHitDepth(vhit, 0)); + assertEquals(0.5, item.getHitDepth(vhit, 1)); + assertEquals(0.25, item.getHitDepth(vhit, 2)); + assertEquals(0.75, item.getHitDepth(vhit, 3)); + assertEquals(0.75, item.getHitDepth(vhit, 4)); + assertEquals(0.25, item.getHitDepth(vhit, 5)); + } + + @Test + void hitDepthDoesNotMutateTheSuppliedVector() { + SpyItem item = new SpyItem(); + Vector3 vhit = new Vector3(0.25, 0.5, 0.75); + + item.getHitDepth(vhit, 3); + + assertEquals(0.25, vhit.x); + assertEquals(0.5, vhit.y); + assertEquals(0.75, vhit.z); + } + + @Test + void deprecatedBridgeMatchesTheHitDepth() { + SpyItem item = new SpyItem(); + Vector3 vhit = new Vector3(0.25, 0.5, 0.75); + + for (int side = 0; side < 6; side++) { + assertEquals(item.getHitDepth(vhit, side), TItemMultiPart$class.getHitDepth(item, vhit, side)); + } + } + + @Test + void shallowHitTriesTheClickedBlockThenTheNeighbour() { + SpyItem item = new SpyItem(); + + // side 1 projects onto +y with no offset, so hitY 0.3 gives a depth below 1. + assertFalse(item.onItemUse(null, null, null, 4, 5, 6, 1, 0f, 0.3f, 0f)); + + assertEquals(2, item.attempts.size()); + assertEquals("4,5,6", item.attempts.get(0)); + assertEquals("4,6,6", item.attempts.get(1)); + } + + @Test + void deepHitOnlyTriesTheNeighbour() { + SpyItem item = new SpyItem(); + + // hitY 1.0 gives a depth of exactly 1, which is not below the threshold. + assertFalse(item.onItemUse(null, null, null, 4, 5, 6, 1, 0f, 1f, 0f)); + + assertEquals(1, item.attempts.size()); + assertEquals("4,6,6", item.attempts.get(0)); + } + + @Test + void bothAttemptsShareOneMutatedBlockCoordInstance() { + SpyItem item = new SpyItem(); + + item.onItemUse(null, null, null, 4, 5, 6, 1, 0f, 0.3f, 0f); + + assertEquals(2, item.positions.size()); + assertSame(item.positions.get(0), item.positions.get(1)); + } + + @Test + void newPartReceivesTheHitVectorAndSide() { + SpyItem item = new SpyItem(); + + // Depth here is 0.3, so both attempts run and each must see the same side and hit vector. + item.onItemUse(null, null, null, 0, 0, 0, 3, 0.1f, 0.2f, 0.3f); + + assertEquals(Arrays.asList(3, 3), item.sides); + assertSame(item.hits.get(0), item.hits.get(1)); + Vector3 vhit = item.hits.get(0); + assertEquals(0.1, vhit.x, 1e-6); + assertEquals(0.2, vhit.y, 1e-6); + assertEquals(0.3, vhit.z, 1e-6); + } + + /** Mirrors the forwarders Scala emits, so this file compiles against the trait and against the Java interface. */ + private static final class SpyItem extends Item implements TItemMultiPart { + + private final List attempts = new ArrayList<>(); + private final List positions = new ArrayList<>(); + private final List hits = new ArrayList<>(); + private final List sides = new ArrayList<>(); + + @Override + public double getHitDepth(Vector3 vhit, int side) { + return TItemMultiPart$class.getHitDepth(this, vhit, side); + } + + @Override + public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { + return TItemMultiPart$class.onItemUse(this, item, player, world, x, y, z, side, hitX, hitY, hitZ); + } + + @Override + public TMultiPart newPart(ItemStack item, EntityPlayer player, World world, BlockCoord pos, int side, + Vector3 vhit) { + attempts.add(pos.x + "," + pos.y + "," + pos.z); + positions.add(pos); + hits.add(vhit); + sides.add(side); + return null; + } + } +} diff --git a/src/test/java/codechicken/multipart/MarkerInterfaceCharacterizationTest.java b/src/test/java/codechicken/multipart/MarkerInterfaceCharacterizationTest.java new file mode 100644 index 0000000..9e5acc4 --- /dev/null +++ b/src/test/java/codechicken/multipart/MarkerInterfaceCharacterizationTest.java @@ -0,0 +1,141 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Random; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; + +/** + * The marker interfaces carry no implementation, so their characterization is their shape: every member abstract, no + * superinterface, and the exact names downstream parts implement. + */ +class MarkerInterfaceCharacterizationTest { + + @Test + void slottedPartIsABareInterfaceDespiteExtendingTMultiPartInSource() { + assertBareInterface(TSlottedPart.class, "getSlotMask()int"); + } + + @Test + void randomDisplayTickDeclaresOnlyTheTickCallback() { + assertBareInterface(IRandomDisplayTick.class, "randomDisplayTick(java.util.Random)void"); + } + + @Test + void neighborTileChangeDeclaresBothCallbacks() { + assertBareInterface( + INeighborTileChange.class, + "weakTileChanges()boolean", + "onNeighborTileChanged(int,boolean)void"); + } + + @Test + void randomUpdateTickDeclaresOnWorldJoinAbstract() { + assertBareInterface(TRandomUpdateTick.class, "randomUpdate()void", "onWorldJoin()void"); + } + + /** + * The auto-registration lives in the {@code $class} helper, which only Scala implementors reach. A part that does + * not declare {@code onWorldJoin} resolves it to {@link TMultiPart}, which does nothing -- notably it does not + * reach {@link TickScheduler}, which would need a world. + */ + @Test + void randomUpdateTickImplementorWithoutOwnOnWorldJoinInheritsTheNoOp() throws Exception { + SilentPart part = new SilentPart(); + + part.onWorldJoin(); + + assertEquals(TMultiPart.class, SilentPart.class.getMethod("onWorldJoin").getDeclaringClass()); + } + + @Test + void markersAreImplementableAlongsideTMultiPart() { + MarkedPart part = new MarkedPart(); + + assertTrue(part instanceof TSlottedPart); + assertTrue(part instanceof IRandomDisplayTick); + assertTrue(part instanceof INeighborTileChange); + assertEquals(1 << 6, part.getSlotMask()); + assertFalse(part.weakTileChanges()); + + part.randomDisplayTick(new Random(0)); + part.onNeighborTileChanged(3, false); + assertEquals(3, part.lastTileChangeSide); + } + + private static void assertBareInterface(Class type, String... expectedMembers) { + assertTrue(type.isInterface(), type.getName() + " must stay an interface"); + assertEquals( + 0, + type.getInterfaces().length, + type.getName() + " must carry no superinterface, as the Scala trait emits none"); + + Set actual = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + assertTrue(Modifier.isAbstract(method.getModifiers()), method + " must stay abstract"); + assertTrue(Modifier.isPublic(method.getModifiers()), method + " must stay public"); + actual.add(signature(method)); + } + assertEquals(new TreeSet<>(Arrays.asList(expectedMembers)), actual); + } + + private static String signature(Method method) { + StringBuilder out = new StringBuilder(method.getName()).append('('); + Class[] parameters = method.getParameterTypes(); + for (int i = 0; i < parameters.length; i++) { + if (i > 0) { + out.append(','); + } + out.append(parameters[i].getName()); + } + return out.append(')').append(method.getReturnType().getName()).toString(); + } + + private static class SilentPart extends TMultiPart implements TRandomUpdateTick { + + @Override + public String getType() { + return "test:silent"; + } + + @Override + public void randomUpdate() {} + } + + private static final class MarkedPart extends TMultiPart + implements TSlottedPart, IRandomDisplayTick, INeighborTileChange { + + int lastTileChangeSide = -1; + + @Override + public String getType() { + return "test:marked"; + } + + @Override + public int getSlotMask() { + return 1 << 6; + } + + @Override + public void randomDisplayTick(Random random) {} + + @Override + public boolean weakTileChanges() { + return false; + } + + @Override + public void onNeighborTileChanged(int side, boolean weak) { + lastTileChangeSide = side; + } + } +} diff --git a/src/test/java/codechicken/multipart/MultiPartRegistryCharacterizationTest.java b/src/test/java/codechicken/multipart/MultiPartRegistryCharacterizationTest.java new file mode 100644 index 0000000..a78a096 --- /dev/null +++ b/src/test/java/codechicken/multipart/MultiPartRegistryCharacterizationTest.java @@ -0,0 +1,260 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.function.Function; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultiPartRegistry.IPartConverter; +import codechicken.multipart.MultiPartRegistry.IPartFactory2; +import cpw.mods.fml.relauncher.ReflectionHelper; +import scala.Option; + +/** + * Part registration needs FML's active mod container, so it cannot run headless; that half of the registry is + * characterized in the Forge server suite instead. Converter dispatch and the Schematica reflection contract touch + * neither FML nor the logger, so they are covered here. + */ +class MultiPartRegistryCharacterizationTest { + + @Test + void javaFactoryLookupTracksRegistryWithoutConstructingParts() { + checkFactoryLookup(MultiPartRegistry::getPartFactory); + } + + @Test + void reflectedFactoryLookupTracksRegistryWithoutConstructingParts() throws IllegalAccessException { + checkFactoryLookup(reflectedFactoryLookup()); + } + + @SuppressWarnings("unchecked") + private static Function reflectedFactoryLookup() throws IllegalAccessException { + Field field = ReflectionHelper + .findField(MultiPartRegistry$.class, "codechicken$multipart$MultiPartRegistry$$typeMap"); + scala.collection.mutable.Map map = (scala.collection.mutable.Map) field + .get(MultiPartRegistry$.MODULE$); + return name -> { + Option factory = map.get(name); + return factory.isEmpty() ? null : factory.get(); + }; + } + + private static void checkFactoryLookup(Function lookup) { + String name = "test:factory_lookup"; + TestFactory first = new TestFactory(new TestPart()); + TestFactory second = new TestFactory(new TestPart()); + assertNull(lookup.apply(name)); + assertNull(lookup.apply("")); + try { + MultiPartRegistry.typeMapBacking().put(name, first); + assertSame(first, lookup.apply(new String(name))); + assertNull(lookup.apply("TEST:factory_lookup")); + MultiPartRegistry.typeMapBacking().put(name, second); + assertSame(second, lookup.apply(name)); + MultiPartRegistry.typeMapBacking().remove(name); + assertNull(lookup.apply(name)); + assertEquals(0, first.calls); + assertEquals(0, second.calls); + } finally { + MultiPartRegistry.typeMapBacking().remove(name); + } + } + + @Test + void noPartsAreLoadedBeforeRegistrationRuns() { + assertFalse(MultiPartRegistry.loaded()); + } + + @Test + void packetAwareFactoriesOptInToNbtPreviewConstruction() { + TestFactory factory = new TestFactory(new TestPart()); + + assertNull(factory.createPartForClientPreview("test:preview", new NBTTagCompound())); + assertEquals(0, factory.calls); + } + + @Test + void unknownModContainerThrowsRatherThanReturningNull() { + assertThrows(NoSuchElementException.class, () -> MultiPartRegistry.getModContainer("test:nosuchpart")); + } + + @Test + @SuppressWarnings("unchecked") + void schematicaCanReadTheLiveScalaTypeMap() throws IllegalAccessException { + Field moduleField = ReflectionHelper.findField(MultiPartRegistry$.class, "MODULE$"); + Field typeMapField = ReflectionHelper + .findField(MultiPartRegistry$.class, "codechicken$multipart$MultiPartRegistry$$typeMap"); + Object module = moduleField.get(MultiPartRegistry$.class); + scala.collection.mutable.Map reflectedTypeMap = (scala.collection.mutable.Map) typeMapField + .get(module); + + String type = "test:schematica_reflection"; + TestPart part = new TestPart(); + TestFactory factory = new TestFactory(part); + reflectedTypeMap.put(type, factory); + try { + Option reflectedFactory = reflectedTypeMap.get(type); + assertFalse(reflectedFactory.isEmpty()); + assertSame(factory, reflectedFactory.get()); + assertSame(part, MultiPartRegistry.loadPart(type, new NBTTagCompound())); + } finally { + reflectedTypeMap.remove(type); + } + } + + @Test + void convertersAreDispatchedPerBlockAndFirstNonNullWins() { + Block block = new Block(Material.rock) {}; + Block other = new Block(Material.rock) {}; + + RecordingConverter declines = new RecordingConverter(block, null); + RecordingConverter accepts = new RecordingConverter(block, new TestPart()); + RecordingConverter unrelated = new RecordingConverter(other, new TestPart()); + + MultiPartRegistry.registerConverter(declines); + MultiPartRegistry.registerConverter(accepts); + MultiPartRegistry.registerConverter(unrelated); + + assertSame(accepts.result, MultiPartRegistry.convertBlock(null, null, block)); + assertEquals(1, declines.calls, "A converter returning null must not stop the scan"); + assertEquals(1, accepts.calls); + assertEquals(0, unrelated.calls, "Converters registered for another block must not be consulted"); + } + + @Test + void blockWithNoConverterYieldsNull() { + assertNull(MultiPartRegistry.convertBlock(null, null, new Block(Material.rock) {})); + } + + @Test + void aConverterIsRegisteredForEveryBlockItClaims() { + Block first = new Block(Material.rock) {}; + Block second = new Block(Material.rock) {}; + TestPart part = new TestPart(); + + RecordingConverter converter = new RecordingConverter(Arrays.asList(first, second), part); + MultiPartRegistry.registerConverter(converter); + + assertSame(part, MultiPartRegistry.convertBlock(null, null, first)); + assertSame(part, MultiPartRegistry.convertBlock(null, null, second)); + assertEquals(2, converter.calls); + } + + @Test + void converterRegistrationCapturesBlocksAndRetainsDuplicateEntries() { + Block original = new Block(Material.rock) {}; + Block later = new Block(Material.rock) {}; + RecordingConverter converter = new RecordingConverter(Arrays.asList(original, original), null); + MultiPartRegistry.registerConverter(converter); + converter.blocks.clear(); + converter.blocks.add(later); + MultiPartRegistry.registerConverter(converter); + + assertNull(MultiPartRegistry.convertBlock(null, null, original)); + assertEquals(2, converter.calls); + assertNull(MultiPartRegistry.convertBlock(null, null, later)); + assertEquals(3, converter.calls); + } + + @Test + void converterReceivesOriginalPositionAndFailureStopsDispatch() { + Block block = new Block(Material.rock) {}; + BlockCoord pos = new BlockCoord(2, 3, 4); + IllegalStateException failure = new IllegalStateException("converter failed"); + MultiPartRegistry.registerConverter(new IPartConverter() { + + @Override + public Iterable blockTypes() { + return Arrays.asList(block); + } + + @Override + public TMultiPart convert(World world, BlockCoord supplied) { + assertNull(world); + assertSame(pos, supplied); + throw failure; + } + }); + RecordingConverter fallback = new RecordingConverter(block, new TestPart()); + MultiPartRegistry.registerConverter(fallback); + assertSame( + failure, + assertThrows(IllegalStateException.class, () -> MultiPartRegistry.convertBlock(null, pos, block))); + assertEquals(0, fallback.calls); + } + + private static final class RecordingConverter implements IPartConverter { + + private final List blocks = new ArrayList<>(); + private final TMultiPart result; + private int calls; + + private RecordingConverter(Block block, TMultiPart result) { + this.blocks.add(block); + this.result = result; + } + + private RecordingConverter(List blocks, TMultiPart result) { + this.blocks.addAll(blocks); + this.result = result; + } + + @Override + public Iterable blockTypes() { + return blocks; + } + + @Override + public TMultiPart convert(World world, BlockCoord pos) { + calls++; + return result; + } + } + + private static final class TestPart extends TMultiPart { + + @Override + public String getType() { + return "test:converted"; + } + } + + private static final class TestFactory implements IPartFactory2 { + + private final TMultiPart part; + private int calls; + + private TestFactory(TMultiPart part) { + this.part = part; + } + + @Override + public TMultiPart createPart(String name, NBTTagCompound nbt) { + calls++; + return part; + } + + @Override + public TMultiPart createPart(String name, MCDataInput packet) { + calls++; + return part; + } + } +} diff --git a/src/test/java/codechicken/multipart/MultipartGeneratorCharacterizationTest.java b/src/test/java/codechicken/multipart/MultipartGeneratorCharacterizationTest.java new file mode 100644 index 0000000..b4d5a94 --- /dev/null +++ b/src/test/java/codechicken/multipart/MultipartGeneratorCharacterizationTest.java @@ -0,0 +1,134 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.asm.ScratchBitSet; + +class MultipartGeneratorCharacterizationTest { + + private static final Set FACADE = signatures( + "freshBitSet()Ljava/util/BitSet;", + "getBitSet()Ljava/util/BitSet;", + "registerPassThroughInterface(Ljava/lang/String;)V", + "registerPassThroughInterface(Ljava/lang/String;ZZ)V", + "registerTrait(Ljava/lang/String;Ljava/lang/String;)V", + "registerTrait(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", + "silentAddTile(Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lnet/minecraft/tileentity/TileEntity;)V"); + + @Test + void keepsExactFacadeCompanionAndScalaMapSurfaceWithoutInitializingForge() throws Exception { + Set facade = new TreeSet<>(FACADE); + facade.add( + "generateCompositeTile(Lnet/minecraft/tileentity/TileEntity;Ljava/lang/Iterable;Z)" + + "Lcodechicken/multipart/TileMultipart;"); + assertEquals(facade, publicMethods(MultipartGenerator.class)); + Set companion = new TreeSet<>(FACADE); + companion.addAll( + signatures( + "codechicken$multipart$asm$ScratchBitSet$$bitSets()Ljava/lang/ThreadLocal;", + "codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq" + + "(Ljava/lang/ThreadLocal;)V", + "codechicken$multipart$MultipartGenerator$$interfaceTraitMap(Z)Lscala/collection/mutable/Map;", + "codechicken$multipart$MultipartGenerator$$traitsForPart(Lcodechicken/multipart/TMultiPart;Z)Ljava/util/BitSet;", + "addPart(Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;Lcodechicken/multipart/TMultiPart;)" + + "Lcodechicken/multipart/TileMultipart;", + "generateCompositeTile(Lnet/minecraft/tileentity/TileEntity;Lscala/collection/Iterable;Z)" + + "Lcodechicken/multipart/TileMultipart;", + "partRemoved(Lcodechicken/multipart/TileMultipart;)Lcodechicken/multipart/TileMultipart;", + "registerTileClass(Ljava/lang/Class;Ljava/util/BitSet;)V")); + assertEquals(companion, publicMethods(MultipartGenerator$.class)); + for (Class type : new Class[] { MultipartGenerator.class, MultipartGenerator$.class }) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(Object.class, type.getSuperclass()); + } + assertArrayEquals(new Class[] { ScratchBitSet.class }, MultipartGenerator$.class.getInterfaces()); + assertEquals(0, MultipartGenerator.class.getDeclaredFields().length); + assertEquals(8, MultipartGenerator$.class.getDeclaredFields().length); + for (String name : new String[] { "tileTraitMap", "interfaceTraitMap_c", "interfaceTraitMap_s", + "partTraitMap_c", "partTraitMap_s" }) { + Field field = MultipartGenerator$.class.getDeclaredField(name); + assertSame(scala.collection.mutable.Map.class, field.getType()); + assertEquals(Modifier.PRIVATE | Modifier.FINAL, field.getModifiers()); + } + Field module = MultipartGenerator$.class.getDeclaredField("MODULE$"); + assertSame(MultipartGenerator$.class, module.getType()); + assertEquals(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, module.getModifiers()); + assertTrue(Modifier.isPrivate(MultipartGenerator$.class.getDeclaredConstructor().getModifiers())); + } + + @Test + void keepsSideSafeProxyCallbackAndCompanionOnlyGenerationCall() throws Exception { + assertCall( + MultipartGenerator$.class, + "registerTileClass", + Opcodes.INVOKEVIRTUAL, + "codechicken/multipart/handler/MultipartProxy$", + "onTileClassBuilt", + "(Ljava/lang/Class;)V"); + assertCall( + codechicken.multipart.asm.MultipartMixinFactory$.class, + "onCompiled", + Opcodes.INVOKEVIRTUAL, + "codechicken/multipart/MultipartGenerator$", + "registerTileClass", + "(Ljava/lang/Class;Ljava/util/BitSet;)V"); + assertCall( + MultipartHelper.class, + "createTileFromParts", + Opcodes.INVOKEVIRTUAL, + "codechicken/multipart/MultipartGenerator$", + "generateCompositeTile", + "(Lnet/minecraft/tileentity/TileEntity;Lscala/collection/Iterable;Z)Lcodechicken/multipart/TileMultipart;"); + } + + private static Set publicMethods(Class type) { + Set result = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) + result.add(method.getName() + Type.getMethodDescriptor(method)); + } + return result; + } + + private static Set signatures(String... values) { + return new TreeSet<>(Arrays.asList(values)); + } + + private static void assertCall(Class type, String methodName, int opcode, String owner, String name, + String descriptor) throws Exception { + ClassNode node = new ClassNode(); + new ClassReader(type.getName()).accept(node, 0); + for (MethodNode method : node.methods) { + if (!method.name.equals(methodName)) continue; + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (!(instruction instanceof MethodInsnNode)) continue; + MethodInsnNode call = (MethodInsnNode) instruction; + if (call.getOpcode() == opcode && call.owner.equals(owner) + && call.name.equals(name) + && call.desc.equals(descriptor)) + return; + } + } + throw new AssertionError("Missing call " + owner + '.' + name + descriptor); + } +} diff --git a/src/test/java/codechicken/multipart/MultipartHelperCharacterizationTest.java b/src/test/java/codechicken/multipart/MultipartHelperCharacterizationTest.java new file mode 100644 index 0000000..5af77c4 --- /dev/null +++ b/src/test/java/codechicken/multipart/MultipartHelperCharacterizationTest.java @@ -0,0 +1,192 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +/** + * Covers the part of MultipartHelper that does not need a world: the id guard on createTileFromNBT and the whole of + * IPartTileConverter. registerTileConverter, createTileFromParts and sendDescPacket need the save/load hooks, the ASM + * generator or a chunk, so the Forge server suite covers those instead. + */ +class MultipartHelperCharacterizationTest { + + /** + * MultipartSaveLoad cannot class-initialize headless -- it reflects into TileEntity's static maps through + * ObfMapping. That makes it a usable probe: returning null rather than raising a LinkageError is what proves the id + * guard short-circuits before the loadingWorld assignment. + */ + @Test + void aTagThatIsNotASavedMultipartReturnsNullBeforeTouchingTheLoader() { + assertNull(MultipartHelper.createTileFromNBT(null, new NBTTagCompound())); + assertNull(MultipartHelper.createPreviewTileFromNBT(null, null)); + assertNull(MultipartHelper.createPreviewTileFromNBT(null, new NBTTagCompound())); + + NBTTagCompound wrongId = new NBTTagCompound(); + wrongId.setString("id", "somethingElse"); + assertNull(MultipartHelper.createTileFromNBT(null, wrongId)); + assertNull(MultipartHelper.createPreviewTileFromNBT(null, wrongId)); + } + + /** The other half of the same probe: the matching branch does reach the loader. */ + @Test + void aSavedMultipartTagReachesTheLoader() { + NBTTagCompound tag = new NBTTagCompound(); + tag.setString("id", "savedMultipart"); + + assertThrows(LinkageError.class, () -> MultipartHelper.createTileFromNBT(null, tag)); + } + + @Test + void aConverterMatchesOnlyInstancesOfItsOwnTileClass() { + CountingConverter converter = new CountingConverter(TileMultipart.class); + + assertSame(TileMultipart.class, converter.clazz()); + assertTrue(converter.canConvert(new TileMultipart())); + assertFalse(converter.canConvert(new PlainTile())); + assertFalse(converter.canConvert(null)); + } + + @Test + void convertMultiYieldsNothingWhenConvertOneReturnsNull() { + CountingConverter converter = new CountingConverter(TileMultipart.class); + converter.result = null; + + assertTrue(drain(converter.convertMulti(new TileMultipart())).isEmpty()); + } + + @Test + void convertMultiWrapsTheSinglePartConvertOneReturns() { + CountingConverter converter = new CountingConverter(TileMultipart.class); + NamedPart part = new NamedPart("only"); + converter.result = part; + + List parts = drain(converter.convertMulti(new TileMultipart())); + + assertEquals(1, parts.size()); + assertSame(part, parts.get(0)); + } + + @Test + void convertCastsTheTileAndRoutesThroughConvertMulti() { + CountingConverter converter = new CountingConverter(TileMultipart.class); + TileMultipart tile = new TileMultipart(); + converter.result = new NamedPart("routed"); + + List parts = drain(converter.convert(tile)); + + assertEquals(1, converter.convertMultiCalls); + assertSame(tile, converter.lastConvertMultiArgument); + assertEquals(1, parts.size()); + } + + @Test + void convertFailsOnATileTheConverterDoesNotAccept() { + CountingConverter converter = new CountingConverter(TileMultipart.class); + + assertThrows(ClassCastException.class, () -> converter.convert(new PlainTile())); + } + + /** + * guidenh reflects on both of these names and on nothing else here, so the ABI diff cannot see this break. The two + * statics are the members other jars link against. + */ + @Test + void theNamesAndStaticsDownstreamReflectsOnStillResolve() throws Exception { + Method createTileFromNBT = MultipartHelper.class + .getDeclaredMethod("createTileFromNBT", World.class, NBTTagCompound.class); + assertSame(TileEntity.class, createTileFromNBT.getReturnType()); + assertPublicStatic(createTileFromNBT); + + Method sendDescPacket = MultipartHelper.class + .getDeclaredMethod("sendDescPacket", World.class, TileEntity.class); + assertSame(void.class, sendDescPacket.getReturnType()); + assertPublicStatic(sendDescPacket); + + Method createPreviewTileFromNBT = MultipartHelper.class + .getDeclaredMethod("createPreviewTileFromNBT", World.class, NBTTagCompound.class); + assertSame(TileMultipart.class, createPreviewTileFromNBT.getReturnType()); + assertPublicStatic(createPreviewTileFromNBT); + + Class companion = Class.forName("codechicken.multipart.MultipartHelper$"); + Field module = companion.getField("MODULE$"); + assertSame(companion, module.getType()); + assertPublicStatic(module); + assertNotNull(module.get(null)); + } + + private static void assertPublicStatic(Method method) { + assertTrue(Modifier.isPublic(method.getModifiers()), method + " must stay public"); + assertTrue(Modifier.isStatic(method.getModifiers()), method + " must stay static"); + } + + private static void assertPublicStatic(Field field) { + assertTrue(Modifier.isPublic(field.getModifiers()), field + " must stay public"); + assertTrue(Modifier.isStatic(field.getModifiers()), field + " must stay static"); + } + + private static List drain(Iterable parts) { + List drained = new ArrayList<>(); + for (Iterator iterator = parts.iterator(); iterator.hasNext();) { + drained.add(iterator.next()); + } + return drained; + } + + private static class CountingConverter extends MultipartHelper.IPartTileConverter { + + TMultiPart result; + int convertMultiCalls; + TileMultipart lastConvertMultiArgument; + + CountingConverter(Class clazz) { + super(clazz); + } + + @Override + public Iterable convertMulti(TileMultipart tile) { + convertMultiCalls++; + lastConvertMultiArgument = tile; + return super.convertMulti(tile); + } + + @Override + public TMultiPart convertOne(TileMultipart tile) { + return result; + } + } + + private static final class PlainTile extends TileEntity { + } + + private static final class NamedPart extends TMultiPart { + + private final String type; + + NamedPart(String type) { + this.type = type; + } + + @Override + public String getType() { + return type; + } + } +} diff --git a/src/test/java/codechicken/multipart/MultipartRendererCharacterizationTest.java b/src/test/java/codechicken/multipart/MultipartRendererCharacterizationTest.java new file mode 100644 index 0000000..d8b80ee --- /dev/null +++ b/src/test/java/codechicken/multipart/MultipartRendererCharacterizationTest.java @@ -0,0 +1,145 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; + +import org.junit.jupiter.api.Test; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Everything this class does needs a client: a GL context, a tessellator and a live render pass. Nothing here can run + * it. What can be pinned is the contract two other parties depend on and the ABI diff cannot see. + *

+ * guidenh reflects on both {@code MultipartRenderer} and {@code MultipartRenderer$} by name, calling renderWorldBlock + * as a static first and falling back to the companion's MODULE$. Forge needs the singleton to be both a + * TileEntitySpecialRenderer and an ISimpleBlockRenderingHandler to accept it at registration. + *

+ * Every lookup uses {@code initialize = false}. Initialising the companion runs its constructor, which claims a render + * id from Forge's RenderingRegistry, and that has no business happening in a test. + */ +class MultipartRendererCharacterizationTest { + + private static final String RENDERER = "codechicken.multipart.MultipartRenderer"; + private static final String COMPANION = "codechicken.multipart.MultipartRenderer$"; + + @Test + void theStaticGuidenhCallsFirstKeepsItsExactSignature() throws Exception { + Method renderWorldBlock = load(RENDERER).getDeclaredMethod( + "renderWorldBlock", + IBlockAccess.class, + int.class, + int.class, + int.class, + Block.class, + int.class, + RenderBlocks.class); + + assertSame(boolean.class, renderWorldBlock.getReturnType()); + assertTrue(Modifier.isPublic(renderWorldBlock.getModifiers())); + assertTrue(Modifier.isStatic(renderWorldBlock.getModifiers())); + } + + @Test + void theRemainingRenderingCallbacksStayAvailableAsStatics() throws Exception { + Class renderer = load(RENDERER); + + assertStatic(renderer.getDeclaredMethod("getRenderId"), int.class); + assertStatic( + renderer.getDeclaredMethod( + "renderTileEntityAt", + TileEntity.class, + double.class, + double.class, + double.class, + float.class), + void.class); + assertStatic( + renderer.getDeclaredMethod( + "renderInventoryBlock", + Block.class, + int.class, + int.class, + RenderBlocks.class), + void.class); + assertStatic(renderer.getDeclaredMethod("shouldRender3DInInventory", int.class), boolean.class); + } + + /** guidenh's fallback path, and the only handle on the instance Forge registers. */ + @Test + void theCompanionKeepsItsSingletonField() throws Exception { + Class companion = load(COMPANION); + Field module = companion.getField("MODULE$"); + + assertSame(companion, module.getType()); + assertTrue(Modifier.isPublic(module.getModifiers())); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + } + + /** Forge rejects the registration outright if either of these is missing. */ + @Test + void theSingletonIsBothRendererKindsForgeRegisters() throws Exception { + Class companion = load(COMPANION); + + assertTrue( + TileEntitySpecialRenderer.class.isAssignableFrom(companion), + "bindTileEntitySpecialRenderer needs a TileEntitySpecialRenderer"); + assertTrue( + ISimpleBlockRenderingHandler.class.isAssignableFrom(companion), + "registerBlockHandler needs an ISimpleBlockRenderingHandler"); + } + + /** Both classes are stripped on a dedicated server, so both must carry the annotation, not just the companion. */ + @Test + void bothClassesStayClientOnly() throws Exception { + for (String name : new String[] { RENDERER, COMPANION }) { + SideOnly sideOnly = load(name).getAnnotation(SideOnly.class); + + assertNotNull(sideOnly, name + " must stay @SideOnly"); + assertEquals(Side.CLIENT, sideOnly.value(), name); + } + } + + @Test + void customAndJsonModelRenderContractsRemainAvailable() throws Exception { + assertSame( + boolean.class, + ISBRHPart.class.getMethod( + "renderWorldBlock", + IBlockAccess.class, + int.class, + int.class, + int.class, + RenderBlocks.class).getReturnType()); + assertSame(Block.class, JsonModeledPart.class.getMethod("getBlock").getReturnType()); + assertSame(IBlockAccess.class, JsonModeledPart.class.getMethod("getRenderWorld").getReturnType()); + assertFalse(ISBRHPart.class.isAnnotationPresent(Deprecated.class)); + assertFalse(JsonModeledPart.class.isAnnotationPresent(Deprecated.class)); + } + + private static void assertStatic(Method method, Class returnType) { + assertSame(returnType, method.getReturnType(), method.getName()); + assertTrue(Modifier.isPublic(method.getModifiers()), method.getName()); + assertTrue(Modifier.isStatic(method.getModifiers()), method.getName()); + } + + private static Class load(String name) throws Exception { + return Class.forName(name, false, MultipartRendererCharacterizationTest.class.getClassLoader()); + } +} diff --git a/src/test/java/codechicken/multipart/NormalOcclusionBoxTest.java b/src/test/java/codechicken/multipart/NormalOcclusionBoxTest.java new file mode 100644 index 0000000..d21ce6a --- /dev/null +++ b/src/test/java/codechicken/multipart/NormalOcclusionBoxTest.java @@ -0,0 +1,180 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.function.BiFunction; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.examples.BoxOcclusionExample; +import scala.collection.JavaConversions; +import scala.collection.Traversable; + +class NormalOcclusionBoxTest { + + private static final List, Iterable, Boolean>> LEGACY = Arrays.asList( + (left, right) -> NormalOcclusionTest.apply(scala(left), scala(right)), + (left, right) -> NormalOcclusionTest$.MODULE$.apply(scala(left), scala(right))); + + @Test + void legacyEntriesSnapshotBothInputsBeforeOrderedShortCircuiting() { + LEGACY.forEach(NormalOcclusionBoxTest::assertSnapshotAndOrder); + } + + @Test + void legacyEntriesPropagateInputFailuresBeforeTestingGeometry() { + LEGACY.forEach(NormalOcclusionBoxTest::assertInputFailures); + } + + @Test + void legacyEntriesKeepLazyNullBoxesAndOriginalGeometryFailures() { + LEGACY.forEach(NormalOcclusionBoxTest::assertNullsAndGeometryFailures); + } + + @Test + void javaEntrySnapshotsSinglePassInputsBeforeOrderedShortCircuiting() { + assertSnapshotAndOrder(NormalOcclusionTest::testBoxes); + } + + @Test + void javaEntryPropagatesInputFailuresBeforeTestingGeometry() { + assertInputFailures(NormalOcclusionTest::testBoxes); + } + + @Test + void javaEntryKeepsLazyNullBoxesAndOriginalGeometryFailures() { + assertNullsAndGeometryFailures(NormalOcclusionTest::testBoxes); + } + + @Test + void javaExampleKeepsTouchingToleranceAndOverlapRules() { + List occupied = Collections.singletonList(new Cuboid6(0, 0, 0, 0.5, 1, 1)); + assertTrue(BoxOcclusionExample.fitsBounds(occupied, new Cuboid6(0.5, 0, 0, 1, 1, 1))); + assertTrue(BoxOcclusionExample.fitsBounds(occupied, new Cuboid6(0.499995, 0, 0, 1, 1, 1))); + assertFalse(BoxOcclusionExample.fitsBounds(occupied, new Cuboid6(0.49998, 0, 0, 1, 1, 1))); + assertFalse(BoxOcclusionExample.fitsBounds(occupied, new Cuboid6(0.1, 0.1, 0.1, 0.2, 0.2, 0.2))); + assertTrue(BoxOcclusionExample.fitsBounds(Collections.emptyList(), occupied.get(0))); + } + + private static void assertSnapshotAndOrder(BiFunction, Iterable, Boolean> query) { + List calls = new ArrayList<>(); + List left = new ArrayList<>(); + List right = new ArrayList<>(); + Cuboid6 first = new Cuboid6(0, 0, 0, 1, 1, 1) { + + @Override + public boolean intersects(Cuboid6 other) { + calls.add("first:" + other.min.x); + left.clear(); + right.clear(); + return false; + } + }; + Cuboid6 last = new Cuboid6(0, 0, 0, 1, 1, 1) { + + @Override + public boolean intersects(Cuboid6 other) { + calls.add("last:" + other.min.x); + return true; + } + }; + left.addAll(Arrays.asList(first, first, last)); + right.addAll(Arrays.asList(new Cuboid6(1, 0, 0, 2, 1, 1), new Cuboid6(2, 0, 0, 3, 1, 1))); + assertFalse(query.apply(observed("left", left, calls), observed("right", right, calls))); + assertEquals( + Arrays.asList("left", "right", "first:1.0", "first:2.0", "first:1.0", "first:2.0", "last:1.0"), + calls); + assertTrue(left.isEmpty()); + assertTrue(right.isEmpty()); + } + + private static void assertInputFailures(BiFunction, Iterable, Boolean> query) { + List calls = new ArrayList<>(); + IllegalStateException failure = new IllegalStateException("input failed after first box"); + Cuboid6 full = new Cuboid6(0, 0, 0, 1, 1, 1); + Iterable failing = () -> new Iterator() { + + private boolean first = true; + + @Override + public boolean hasNext() { + return true; + } + + @Override + public Cuboid6 next() { + if (!first) { + throw failure; + } + first = false; + return full; + } + }; + assertSame( + failure, + assertThrows( + IllegalStateException.class, + () -> query.apply(failing, observed("right", Collections.singletonList(full), calls)))); + assertTrue(calls.isEmpty(), "A left collection failure must not start the right input"); + assertSame( + failure, + assertThrows(IllegalStateException.class, () -> query.apply(Collections.singletonList(full), failing)), + "Collection finishes before the first overlapping pair"); + assertSame( + failure, + assertThrows(IllegalStateException.class, () -> query.apply(Collections.emptyList(), failing)), + "Even an empty left side consumes the right input"); + } + + private static void assertNullsAndGeometryFailures( + BiFunction, Iterable, Boolean> query) { + List empty = Collections.emptyList(); + List nullBox = Collections.singletonList(null); + List full = Collections.singletonList(new Cuboid6(0, 0, 0, 1, 1, 1)); + assertThrows(NullPointerException.class, () -> query.apply(null, empty)); + assertThrows(NullPointerException.class, () -> query.apply(empty, null)); + assertTrue(query.apply(empty, nullBox)); + assertTrue(query.apply(nullBox, empty)); + assertThrows(NullPointerException.class, () -> query.apply(nullBox, full)); + assertThrows(NullPointerException.class, () -> query.apply(full, nullBox)); + assertFalse(query.apply(full, Arrays.asList(full.get(0), null))); + IllegalArgumentException failure = new IllegalArgumentException("intersects failed"); + Cuboid6 broken = new Cuboid6(0, 0, 0, 1, 1, 1) { + + @Override + public boolean intersects(Cuboid6 other) { + throw failure; + } + }; + assertSame( + failure, + assertThrows( + IllegalArgumentException.class, + () -> query.apply(Collections.singletonList(broken), full))); + } + + private static Iterable observed(String name, List boxes, List calls) { + return () -> { + assertFalse(calls.contains(name), "Input iterator must be requested only once"); + calls.add(name); + return boxes.iterator(); + }; + } + + private static Traversable scala(Iterable boxes) { + if (boxes == null) { + return null; + } + return JavaConversions.iterableAsScalaIterable(boxes); + } +} diff --git a/src/test/java/codechicken/multipart/NormalOcclusionCharacterizationTest.java b/src/test/java/codechicken/multipart/NormalOcclusionCharacterizationTest.java new file mode 100644 index 0000000..300535c --- /dev/null +++ b/src/test/java/codechicken/multipart/NormalOcclusionCharacterizationTest.java @@ -0,0 +1,202 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; +import scala.collection.Traversable; +import scala.collection.mutable.ArrayBuffer; + +class NormalOcclusionCharacterizationTest { + + @Test + void emptyInputsAreCompatible() { + Cuboid6 box = box(0, 0, 0, 1, 1, 1); + + assertTrue(NormalOcclusionTest.apply(scalaBoxes(), scalaBoxes())); + assertTrue(NormalOcclusionTest.apply(scalaBoxes(box), scalaBoxes())); + assertTrue(NormalOcclusionTest.apply(scalaBoxes(), scalaBoxes(box))); + } + + @Test + void separationOnAnyAxisIsCompatible() { + Cuboid6 origin = box(0, 0, 0, 0.25, 0.25, 0.25); + Cuboid6[] separated = { box(0.5, 0, 0, 0.75, 0.25, 0.25), box(0, 0.5, 0, 0.25, 0.75, 0.25), + box(0, 0, 0.5, 0.25, 0.25, 0.75) }; + + for (Cuboid6 other : separated) { + assertTrue(compatible(origin, other)); + assertTrue(compatible(other, origin)); + } + } + + @Test + void touchingAndSubToleranceOverlapAreCompatible() { + Cuboid6 origin = box(0, 0, 0, 0.5, 1, 1); + + assertTrue(compatible(origin, box(0.5, 0, 0, 1, 1, 1))); + assertTrue(compatible(origin, box(0.499995, 0, 0, 1, 1, 1))); + assertFalse(compatible(origin, box(0.49998, 0, 0, 1, 1, 1))); + } + + @Test + void partialOverlapContainmentAndIdentityAreIncompatible() { + Cuboid6 origin = box(0, 0, 0, 0.75, 0.75, 0.75); + + assertFalse(compatible(origin, box(0.5, 0.5, 0.5, 1, 1, 1))); + assertFalse(compatible(origin, box(0.1, 0.1, 0.1, 0.2, 0.2, 0.2))); + assertFalse(compatible(origin, box(0, 0, 0, 0.75, 0.75, 0.75))); + } + + @Test + void everyBoxPairMustBeCompatible() { + Traversable existing = scalaBoxes(box(0, 0, 0, 0.2, 0.2, 0.2), box(0.8, 0.8, 0.8, 1, 1, 1)); + + assertTrue(NormalOcclusionTest.apply(existing, scalaBoxes(box(0.3, 0.3, 0.3, 0.4, 0.4, 0.4)))); + assertFalse( + NormalOcclusionTest.apply( + existing, + scalaBoxes(box(0.3, 0.3, 0.3, 0.4, 0.4, 0.4), box(0.9, 0.9, 0.9, 0.95, 0.95, 0.95)))); + } + + @Test + void normallyOccludedPartsUseTheSameRule() { + NormallyOccludedPart origin = new NormallyOccludedPart(box(0, 0, 0, 0.5, 1, 1)); + NormallyOccludedPart touching = new NormallyOccludedPart(box(0.5, 0, 0, 1, 1, 1)); + NormallyOccludedPart overlapping = new NormallyOccludedPart(box(0.25, 0, 0, 0.75, 1, 1)); + + assertTrue(origin.occlusionTest(touching)); + assertTrue(touching.occlusionTest(origin)); + assertFalse(origin.occlusionTest(overlapping)); + assertFalse(overlapping.occlusionTest(origin)); + } + + @Test + void partHelperIncludesPartialOcclusionBoxes() { + NormallyOccludedPart origin = new NormallyOccludedPart(box(0, 0, 0, 0.5, 1, 1)); + PartialPart touching = new PartialPart(box(0.5, 0, 0, 1, 1, 1)); + PartialPart overlapping = new PartialPart(box(0.25, 0, 0, 0.75, 1, 1)); + + assertTrue(NormalOcclusionTest.apply(origin, touching)); + assertFalse(NormalOcclusionTest.apply(origin, overlapping)); + } + + @Test + void partWithoutOcclusionInterfacesIsCompatible() { + NormallyOccludedPart origin = new NormallyOccludedPart(box(0, 0, 0, 1, 1, 1)); + TMultiPart barePart = new TMultiPart() { + + @Override + public String getType() { + return "test:bare"; + } + }; + + assertTrue(NormalOcclusionTest.apply(origin, barePart)); + } + + @Test + void singletonAndStaticForwardersAgree() { + Traversable left = scalaBoxes(box(0, 0, 0, 0.5, 1, 1)); + Traversable fits = scalaBoxes(box(0.5, 0, 0, 1, 1, 1)); + Traversable overlaps = scalaBoxes(box(0.25, 0, 0, 1, 1, 1)); + + assertTrue(NormalOcclusionTest$.MODULE$.apply(left, fits)); + assertFalse(NormalOcclusionTest$.MODULE$.apply(left, overlaps)); + + NormallyOccludedPart part = new NormallyOccludedPart(box(0, 0, 0, 0.5, 1, 1)); + NormallyOccludedPart neighbour = new NormallyOccludedPart(box(0.5, 0, 0, 1, 1, 1)); + assertEquals(NormalOcclusionTest.apply(part, neighbour), NormalOcclusionTest$.MODULE$.apply(part, neighbour)); + } + + @Test + void bridgeCombinesTheBoxTestWithTheSuperChain() { + NormallyOccludedPart part = new NormallyOccludedPart(box(0, 0, 0, 0.5, 1, 1)); + TMultiPart fits = new NormallyOccludedPart(box(0.5, 0, 0, 1, 1, 1)); + TMultiPart overlaps = new NormallyOccludedPart(box(0.25, 0, 0, 1, 1, 1)); + + assertTrue(TNormalOcclusion$class.occlusionTest(part, fits)); + assertFalse(TNormalOcclusion$class.occlusionTest(part, overlaps)); + } + + /** + * The super accessor is ACC_SYNTHETIC in the reference, so javac hides it and only reflection can reach it. The + * bridge calls it through invokeinterface, so its name and descriptor are part of the supported ABI. + */ + @Test + void superAccessorExistsAndChainsToTheTMultiPartDefault() throws Exception { + NormallyOccludedPart part = new NormallyOccludedPart(box(0, 0, 0, 0.5, 1, 1)); + Method accessor = TNormalOcclusion.class + .getMethod("codechicken$multipart$TNormalOcclusion$$super$occlusionTest", TMultiPart.class); + + assertEquals(Boolean.TRUE, accessor.invoke(part, new NormallyOccludedPart(box(0.25, 0, 0, 1, 1, 1)))); + assertNull(part.getType()); + } + + @Test + void singleBoxConstructorMatchesTheIterableConstructor() { + Cuboid6 bound = box(0, 0, 0, 0.5, 1, 1); + NormallyOccludedPart single = new NormallyOccludedPart(bound); + TMultiPart overlaps = new NormallyOccludedPart(box(0.25, 0, 0, 1, 1, 1)); + + List boxes = new ArrayList<>(); + for (Cuboid6 box : single.getOcclusionBoxes()) { + boxes.add(box); + } + + assertEquals(1, boxes.size()); + assertSame(bound, boxes.get(0)); + assertFalse(single.occlusionTest(overlaps)); + } + + private static boolean compatible(Cuboid6 first, Cuboid6 second) { + return NormalOcclusionTest.apply(scalaBoxes(first), scalaBoxes(second)); + } + + private static Traversable scalaBoxes(Cuboid6... boxes) { + ArrayBuffer result = new ArrayBuffer<>(); + for (Cuboid6 box : boxes) { + result.$plus$eq(box); + } + return result; + } + + private static Cuboid6 box(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + return new Cuboid6(minX, minY, minZ, maxX, maxY, maxZ); + } + + private static final class PartialPart extends TMultiPart implements JPartialOcclusion { + + private final Iterable boxes; + + private PartialPart(Cuboid6... boxes) { + this.boxes = Collections.unmodifiableList(Arrays.asList(boxes)); + } + + @Override + public String getType() { + return "test:partial"; + } + + @Override + public Iterable getPartialOcclusionBoxes() { + return boxes; + } + + @Override + public boolean allowCompleteOcclusion() { + return false; + } + } +} diff --git a/src/test/java/codechicken/multipart/PacketSchedulerCharacterizationTest.java b/src/test/java/codechicken/multipart/PacketSchedulerCharacterizationTest.java new file mode 100644 index 0000000..d03ec9a --- /dev/null +++ b/src/test/java/codechicken/multipart/PacketSchedulerCharacterizationTest.java @@ -0,0 +1,128 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; + +/** + * schedulePacket refuses a client world and everything else here needs a bound tile, so the behavior lives in the Forge + * server suite. What is worth pinning headless is the shape of the two interfaces, and in particular that read cannot + * become a default method. + */ +class PacketSchedulerCharacterizationTest { + + @Test + void theCallbackInterfaceDeclaresThreeAbstractMembersAndExtendsNothing() { + assertTrue(IScheduledPacketPart.class.isInterface()); + assertEquals(0, IScheduledPacketPart.class.getInterfaces().length); + + for (Method method : IScheduledPacketPart.class.getDeclaredMethods()) { + assertTrue(Modifier.isAbstract(method.getModifiers()), method + " must stay abstract"); + } + assertEquals( + new TreeSet<>( + Arrays.asList( + "writeScheduled(long,codechicken.lib.data.MCDataOutput)void", + "readScheduled(long,codechicken.lib.data.MCDataInput)void", + "maskWidth()int")), + instanceSignatures(IScheduledPacketPart.class)); + } + + /** + * The two callbacks the trait supplied empty bodies for are now interface defaults, which is what mixing the Scala + * trait in already gave a Scala implementor. read stays abstract for the reason below. + */ + @Test + void thePartTraitExtendsTheCallbackInterfaceAndAddsRead() { + assertTrue(TScheduledPacketPart.class.isInterface()); + assertEquals( + new TreeSet<>(Arrays.asList(IScheduledPacketPart.class.getName())), + names(TScheduledPacketPart.class.getInterfaces())); + assertEquals( + new TreeSet<>( + Arrays.asList( + "read(codechicken.lib.data.MCDataInput)void", + "writeScheduled(long,codechicken.lib.data.MCDataOutput)void", + "readScheduled(long,codechicken.lib.data.MCDataInput)void")), + instanceSignatures(TScheduledPacketPart.class)); + } + + @Test + void theOptionalCallbacksDoNothingUnlessOverridden() { + SilentPart part = new SilentPart(); + + part.writeScheduled(0xffL, null); + part.readScheduled(0xffL, null); + } + + /** + * TMultiPart declares read, so a superclass method would beat any default the interface tried to supply. A part + * that does not declare read resolves it to TMultiPart's, which reads a description rather than a mask. + */ + @Test + void readMustStayAbstractBecauseTMultiPartDeclaresIt() throws Exception { + Method onTheInterface = TScheduledPacketPart.class.getDeclaredMethod("read", MCDataInput.class); + assertTrue(Modifier.isAbstract(onTheInterface.getModifiers())); + + assertSame( + TMultiPart.class, + SilentPart.class.getMethod("read", MCDataInput.class).getDeclaringClass(), + "An implementor that does not declare read falls back to TMultiPart, not to the interface"); + } + + /** Declared instance methods only, so the static mask reader is not counted as part of the contract. */ + private static Set instanceSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isStatic(method.getModifiers())) { + continue; + } + assertTrue(Modifier.isPublic(method.getModifiers()), method + " must stay public"); + signatures.add(signature(method)); + } + return signatures; + } + + private static Set names(Class[] types) { + Set names = new TreeSet<>(); + for (Class type : types) { + names.add(type.getName()); + } + return names; + } + + private static String signature(Method method) { + StringBuilder out = new StringBuilder(method.getName()).append('('); + Class[] parameters = method.getParameterTypes(); + for (int i = 0; i < parameters.length; i++) { + if (i > 0) { + out.append(','); + } + out.append(parameters[i].getName()); + } + return out.append(')').append(method.getReturnType().getName()).toString(); + } + + private static final class SilentPart extends TMultiPart implements TScheduledPacketPart { + + @Override + public String getType() { + return "test:silent"; + } + + @Override + public int maskWidth() { + return 1; + } + } +} diff --git a/src/test/java/codechicken/multipart/PartialOcclusionCharacterizationTest.java b/src/test/java/codechicken/multipart/PartialOcclusionCharacterizationTest.java new file mode 100644 index 0000000..3877a40 --- /dev/null +++ b/src/test/java/codechicken/multipart/PartialOcclusionCharacterizationTest.java @@ -0,0 +1,170 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.Collections; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; + +class PartialOcclusionCharacterizationTest { + + @Test + void hasFixedGridAndIgnoresUnfilledEntries() { + PartialOcclusionTest test = new PartialOcclusionTest(2); + + assertEquals(8, test.res()); + assertEquals(8 * 8 * 8, test.bits().length); + assertEquals(2, test.partial().length); + assertTrue(test.apply()); + } + + @Test + void mapsPartIdsToXMajorVoxels() { + PartialOcclusionTest test = new PartialOcclusionTest(1); + test.fill(0, Collections.singletonList(voxel(2, 3, 4)), false); + + assertTrue(test.partial()[0]); + assertEquals(1, test.bits()[index(2, 3, 4)]); + assertEquals(1, occupiedCells(test)); + assertTrue(test.apply()); + } + + @Test + void roundsBoxCoordinatesAtHalfVoxel() { + PartialOcclusionTest belowThreshold = new PartialOcclusionTest(1); + belowThreshold.fill(0, Collections.singletonList(box(0, 0, 0, 0.06249, 0.06249, 0.06249)), false); + + PartialOcclusionTest atThreshold = new PartialOcclusionTest(1); + atThreshold.fill(0, Collections.singletonList(box(0, 0, 0, 0.0625, 0.0625, 0.0625)), false); + + assertFalse(belowThreshold.apply()); + assertTrue(atThreshold.apply()); + } + + @Test + void requiredPartWithoutVisibleVoxelsFails() { + PartialOcclusionTest test = new PartialOcclusionTest(1); + test.fill(0, Collections.emptyList(), false); + + assertTrue(test.partial()[0]); + assertFalse(test.apply()); + } + + @Test + void completeOcclusionFlagExemptsPartFromVisibility() { + PartialOcclusionTest test = new PartialOcclusionTest(1); + test.fill(0, Collections.emptyList(), true); + + assertFalse(test.partial()[0]); + assertTrue(test.apply()); + } + + @Test + void javaInterfaceDefaultsToRequiredVisibility() { + JPartialOcclusion part = Collections::emptyList; + + assertFalse(part.allowCompleteOcclusion()); + } + + @Test + void fullyOverlappingPartsLoseTheirVisibleVoxel() { + PartialOcclusionTest test = new PartialOcclusionTest(2); + test.fill(0, Collections.singletonList(voxel(0, 0, 0)), false); + test.fill(1, Collections.singletonList(voxel(0, 0, 0)), false); + + assertEquals(-1, test.bits()[index(0, 0, 0)]); + assertFalse(test.apply()); + } + + @Test + void everyRequiredPartNeedsAnExclusiveVoxel() { + PartialOcclusionTest bothVisible = new PartialOcclusionTest(2); + bothVisible.fill(0, Collections.singletonList(voxels(0, 0, 0, 2, 1, 1)), false); + bothVisible.fill(1, Collections.singletonList(voxels(1, 0, 0, 3, 1, 1)), false); + + PartialOcclusionTest secondCovered = new PartialOcclusionTest(2); + secondCovered.fill(0, Collections.singletonList(voxels(0, 0, 0, 2, 1, 1)), false); + secondCovered.fill(1, Collections.singletonList(voxel(1, 0, 0)), false); + + assertTrue(bothVisible.apply()); + assertFalse(secondCovered.apply()); + } + + @Test + void overlappingBoxesFromOnePartInvalidateSharedVoxels() { + PartialOcclusionTest test = new PartialOcclusionTest(1); + Cuboid6 box = voxel(0, 0, 0); + test.fill(0, Arrays.asList(box, box.copy()), false); + + assertEquals(-1, test.bits()[index(0, 0, 0)]); + assertFalse(test.apply()); + } + + @Test + void partOverloadUsesBoxesAndCompleteOcclusionFlag() { + PartialOcclusionTest visible = new PartialOcclusionTest(1); + visible.fill(0, new TestPart(false, voxel(0, 0, 0))); + + PartialOcclusionTest missing = new PartialOcclusionTest(1); + missing.fill(0, new TestPart(false)); + + PartialOcclusionTest exempt = new PartialOcclusionTest(1); + exempt.fill(0, new TestPart(true)); + + assertTrue(visible.apply()); + assertFalse(missing.apply()); + assertTrue(exempt.apply()); + } + + private static int occupiedCells(PartialOcclusionTest test) { + int occupied = 0; + for (byte value : test.bits()) { + if (value != 0) { + occupied++; + } + } + return occupied; + } + + private static int index(int x, int y, int z) { + return (x * 8 + y) * 8 + z; + } + + private static Cuboid6 voxel(int x, int y, int z) { + return voxels(x, y, z, x + 1, y + 1, z + 1); + } + + private static Cuboid6 voxels(int minX, int minY, int minZ, int maxX, int maxY, int maxZ) { + return box(minX / 8d, minY / 8d, minZ / 8d, maxX / 8d, maxY / 8d, maxZ / 8d); + } + + private static Cuboid6 box(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + return new Cuboid6(minX, minY, minZ, maxX, maxY, maxZ); + } + + private static final class TestPart implements JPartialOcclusion { + + private final boolean allowCompleteOcclusion; + private final Iterable boxes; + + private TestPart(boolean allowCompleteOcclusion, Cuboid6... boxes) { + this.allowCompleteOcclusion = allowCompleteOcclusion; + this.boxes = Collections.unmodifiableList(Arrays.asList(boxes)); + } + + @Override + public Iterable getPartialOcclusionBoxes() { + return boxes; + } + + @Override + public boolean allowCompleteOcclusion() { + return allowCompleteOcclusion; + } + } +} diff --git a/src/test/java/codechicken/multipart/RedstoneInteractionsCharacterizationTest.java b/src/test/java/codechicken/multipart/RedstoneInteractionsCharacterizationTest.java new file mode 100644 index 0000000..9e3e89b --- /dev/null +++ b/src/test/java/codechicken/multipart/RedstoneInteractionsCharacterizationTest.java @@ -0,0 +1,334 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Rotation; + +/** Pure redstone masks, routing precedence, and the Scala-facing ABI shared by several downstream mods. */ +class RedstoneInteractionsCharacterizationTest { + + @Test + void theSixInterfacesKeepTheirExactAbstractShape() { + assertInterface( + IRedstonePart.class, + new Class[0], + "canConnectRedstone(int)boolean", + "strongPowerLevel(int)int", + "weakPowerLevel(int)int"); + assertInterface(IFaceRedstonePart.class, new Class[] { IRedstonePart.class }, "getFace()int"); + assertInterface(IMaskedRedstonePart.class, new Class[] { IRedstonePart.class }, "getConnectionMask(int)int"); + assertInterface( + IRedstoneConnector.class, + new Class[0], + "getConnectionMask(int)int", + "weakPowerLevel(int,int)int"); + assertInterface(IRedstoneTile.class, new Class[] { IRedstoneConnector.class }, "openConnections(int)int"); + assertInterface( + IRedstoneConnectorBlock.class, + new Class[0], + "getConnectionMask(net.minecraft.world.IBlockAccess,int,int,int,int)int", + "weakPowerLevel(net.minecraft.world.IBlockAccess,int,int,int,int,int)int"); + } + + @Test + void theStaticFacadeAndCompanionKeepTheirPublishedEntryPoints() throws Exception { + Set expected = new TreeSet<>( + Arrays.asList( + "connectionMask(codechicken.multipart.TMultiPart,int)int", + "fullVanillaBlocks()scala.collection.immutable.Set", + "getConnectionMask(net.minecraft.world.IBlockAccess,int,int,int,int,boolean)int", + "getPower(net.minecraft.world.World,int,int,int,int,int)int", + "getPowerTo(codechicken.multipart.TMultiPart,int)int", + "getPowerTo(net.minecraft.world.World,int,int,int,int,int)int", + "otherConnectionMask(net.minecraft.world.IBlockAccess,int,int,int,int,boolean)int", + "sideVanillaMap()[I", + "vanillaConnectionMask(net.minecraft.block.Block,net.minecraft.world.IBlockAccess,int,int,int,int,boolean)int", + "vanillaSideMap()[I", + "vanillaToSide(int)int")); + + assertEquals(expected, publicSignatures(RedstoneInteractions.class, true)); + assertEquals(expected, publicSignatures(RedstoneInteractions$.class, false)); + assertTrue(Modifier.isFinal(RedstoneInteractions.class.getModifiers())); + assertTrue(Modifier.isFinal(RedstoneInteractions$.class.getModifiers())); + + Field module = RedstoneInteractions$.class.getField("MODULE$"); + assertSame(RedstoneInteractions$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(RedstoneInteractions$.MODULE$, module.get(null)); + } + + @Test + void sideMapsAndFullVanillaBlocksStayPublishedByIdentity() { + assertArrayEquals(new int[] { -2, -1, 0, 2, 3, 1 }, RedstoneInteractions.vanillaSideMap()); + assertArrayEquals(new int[] { 1, 2, 5, 3, 4 }, RedstoneInteractions.sideVanillaMap()); + assertSame(RedstoneInteractions$.MODULE$.vanillaSideMap(), RedstoneInteractions.vanillaSideMap()); + assertSame(RedstoneInteractions$.MODULE$.sideVanillaMap(), RedstoneInteractions.sideVanillaMap()); + assertSame(RedstoneInteractions$.MODULE$.fullVanillaBlocks(), RedstoneInteractions.fullVanillaBlocks()); + assertEquals(5, RedstoneInteractions.vanillaToSide(1)); + } + + @Test + void partConnectionMasksHonorConnectabilityAndPartKind() { + assertEquals(0, RedstoneInteractions.connectionMask(new NonRedstonePart(), 2)); + assertEquals(0, RedstoneInteractions.connectionMask(new RedstonePart(false), 2)); + assertEquals(0x1F, RedstoneInteractions.connectionMask(new RedstonePart(true), 2)); + assertEquals(0x0B, RedstoneInteractions.connectionMask(new MaskedPart(0x0B), 2)); + + assertEquals(0x10, RedstoneInteractions.connectionMask(new FacePart(3), 2)); + assertEquals(1 << Rotation.rotationTo(0, 2), RedstoneInteractions.connectionMask(new FacePart(2), 0)); + assertEquals( + 1 << Rotation.rotationTo(0, 2), + RedstoneInteractions.connectionMask(new FaceMaskedPart(2, 0x0B), 0), + "Face routing takes precedence when a part also supplies a custom mask"); + } + + @Test + void connectionLookupPrefersConnectorTilesThenBlocksThenVanilla() { + ConnectorTile tile = new ConnectorTile(0x12); + ConnectorBlock block = new ConnectorBlock(0x0A); + + assertEquals(0x12, RedstoneInteractions.getConnectionMask(access(tile, block, 0, null), 1, 2, 3, 4, false)); + assertEquals(4, tile.lastSide); + assertEquals(-1, block.lastSide, "The block must not be queried when the tile handled the request"); + + assertEquals(0x0A, RedstoneInteractions.getConnectionMask(access(null, block, 0, null), 1, 2, 3, 5, false)); + assertEquals(5, block.lastSide); + ConnectableBlock connectable = new ConnectableBlock(true); + assertEquals( + 0x1F, + RedstoneInteractions.getConnectionMask(access(null, connectable, 0, null), 1, 2, 3, 5, false)); + assertEquals(1, connectable.lastSide, "Side 5 is translated to vanilla side 1"); + } + + @Test + void otherConnectionMaskOffsetsCoordinatesAndFlipsTheSide() { + int[] queried = new int[3]; + ConnectorTile tile = new ConnectorTile(0x15); + IBlockAccess world = access(tile, Blocks.air, 0, queried); + + assertEquals(0x15, RedstoneInteractions.otherConnectionMask(world, 10, 20, 30, 5, false)); + assertArrayEquals(new int[] { 11, 20, 30 }, queried); + assertEquals(4, tile.lastSide); + } + + private static void assertInterface(Class type, Class[] parents, String... signatures) { + assertTrue(type.isInterface(), type.getName()); + assertArrayEquals(parents, type.getInterfaces(), type.getName()); + for (Method method : type.getDeclaredMethods()) { + assertTrue(Modifier.isPublic(method.getModifiers()), method.toString()); + assertTrue(Modifier.isAbstract(method.getModifiers()), method.toString()); + } + assertEquals(new TreeSet<>(Arrays.asList(signatures)), publicSignatures(type, false)); + } + + private static Set publicSignatures(Class type, boolean requireStatic) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (!Modifier.isPublic(method.getModifiers())) { + continue; + } + assertEquals(requireStatic, Modifier.isStatic(method.getModifiers()), method.toString()); + signatures.add(signature(method)); + } + return signatures; + } + + private static String signature(Method method) { + StringBuilder out = new StringBuilder(method.getName()).append('('); + Class[] parameters = method.getParameterTypes(); + for (int i = 0; i < parameters.length; i++) { + if (i > 0) { + out.append(','); + } + out.append(parameters[i].getName()); + } + return out.append(')').append(method.getReturnType().getName()).toString(); + } + + private static IBlockAccess access(TileEntity tile, Block block, int metadata, int[] queried) { + return (IBlockAccess) Proxy.newProxyInstance( + IBlockAccess.class.getClassLoader(), + new Class[] { IBlockAccess.class }, + (proxy, method, arguments) -> { + switch (method.getName()) { + case "getTileEntity": + if (queried != null) { + queried[0] = (Integer) arguments[0]; + queried[1] = (Integer) arguments[1]; + queried[2] = (Integer) arguments[2]; + } + return tile; + case "getBlock": + return block; + case "getBlockMetadata": + return metadata; + default: + return method.getReturnType() == boolean.class ? false : 0; + } + }); + } + + private static class NonRedstonePart extends TMultiPart { + + @Override + public String getType() { + return "test:non_redstone"; + } + } + + private static class RedstonePart extends NonRedstonePart implements IRedstonePart { + + private final boolean connects; + + private RedstonePart(boolean connects) { + this.connects = connects; + } + + @Override + public int strongPowerLevel(int side) { + return 0; + } + + @Override + public int weakPowerLevel(int side) { + return 0; + } + + @Override + public boolean canConnectRedstone(int side) { + return connects; + } + } + + private static final class FacePart extends RedstonePart implements IFaceRedstonePart { + + private final int face; + + private FacePart(int face) { + super(true); + this.face = face; + } + + @Override + public int getFace() { + return face; + } + } + + private static final class MaskedPart extends RedstonePart implements IMaskedRedstonePart { + + private final int mask; + + private MaskedPart(int mask) { + super(true); + this.mask = mask; + } + + @Override + public int getConnectionMask(int side) { + return mask; + } + } + + private static final class FaceMaskedPart extends RedstonePart implements IFaceRedstonePart, IMaskedRedstonePart { + + private final int face; + private final int mask; + + private FaceMaskedPart(int face, int mask) { + super(true); + this.face = face; + this.mask = mask; + } + + @Override + public int getFace() { + return face; + } + + @Override + public int getConnectionMask(int side) { + return mask; + } + } + + private static final class ConnectorTile extends TileEntity implements IRedstoneConnector { + + private final int mask; + private int lastSide = -1; + + private ConnectorTile(int mask) { + this.mask = mask; + } + + @Override + public int getConnectionMask(int side) { + lastSide = side; + return mask; + } + + @Override + public int weakPowerLevel(int side, int mask) { + return 0; + } + } + + private static final class ConnectorBlock extends Block implements IRedstoneConnectorBlock { + + private final int mask; + private int lastSide = -1; + + private ConnectorBlock(int mask) { + super(Material.rock); + this.mask = mask; + } + + @Override + public int getConnectionMask(IBlockAccess world, int x, int y, int z, int side) { + lastSide = side; + return mask; + } + + @Override + public int weakPowerLevel(IBlockAccess world, int x, int y, int z, int side, int mask) { + return 0; + } + } + + private static final class ConnectableBlock extends Block { + + private final boolean connects; + private int lastSide = -1; + + private ConnectableBlock(boolean connects) { + super(Material.rock); + this.connects = connects; + } + + @Override + public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side) { + lastSide = side; + return connects; + } + } +} diff --git a/src/test/java/codechicken/multipart/TCuboidPartBinaryCompatibilityTest.java b/src/test/java/codechicken/multipart/TCuboidPartBinaryCompatibilityTest.java new file mode 100644 index 0000000..78f4043 --- /dev/null +++ b/src/test/java/codechicken/multipart/TCuboidPartBinaryCompatibilityTest.java @@ -0,0 +1,68 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Iterator; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.raytracer.IndexedCuboid6; +import codechicken.lib.vec.Cuboid6; + +/** + * Loads a Scala class compiled against the reference dev jar, whose forwarders call TCuboidPart$class directly. + * Recompiling the fixture against the port would hide the linkage failure this exists to catch. + */ +class TCuboidPartBinaryCompatibilityTest { + + @Test + void referenceScalaImplementorStillLinksThroughTheBridge() throws Exception { + byte[] bytecode = loadFixture(); + Class fixtureClass = new FixtureClassLoader(TCuboidPart.class.getClassLoader()).define(bytecode); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + assertTrue(fixture instanceof TCuboidPart); + assertTrue(fixture instanceof TMultiPart); + TCuboidPart part = (TCuboidPart) fixture; + + Cuboid6 bounds = part.getBounds(); + assertEquals(0.5, bounds.max.x); + + Iterator subParts = part.getSubParts().iterator(); + IndexedCuboid6 only = subParts.next(); + assertEquals(Integer.valueOf(0), only.data); + assertEquals(0.5, only.max.x); + assertFalse(subParts.hasNext()); + + Iterator boxes = part.getCollisionBoxes().iterator(); + assertEquals(0.5, boxes.next().max.x); + assertFalse(boxes.hasNext()); + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + TCuboidPartBinaryCompatibilityTest.class + .getResourceAsStream("/compat/ReferenceScalaCuboidPart.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/multipart/TEdgePartBinaryCompatibilityTest.java b/src/test/java/codechicken/multipart/TEdgePartBinaryCompatibilityTest.java new file mode 100644 index 0000000..87b4c7a --- /dev/null +++ b/src/test/java/codechicken/multipart/TEdgePartBinaryCompatibilityTest.java @@ -0,0 +1,53 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +/** + * Loads a Scala class compiled against the reference dev jar, whose forwarder calls TEdgePart$class.conductsRedstone + * and whose constructor calls TEdgePart$class.$init$. OpenComputers links against the latter. + */ +class TEdgePartBinaryCompatibilityTest { + + @Test + void referenceScalaImplementorStillLinksThroughTheBridge() throws Exception { + Class fixtureClass = new FixtureClassLoader(TEdgePart.class.getClassLoader()).define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + assertTrue(fixture instanceof TEdgePart); + assertTrue(fixture instanceof TSlottedPart); + assertTrue(fixture instanceof TMultiPart); + TEdgePart part = (TEdgePart) fixture; + + assertFalse(part.conductsRedstone()); + assertEquals(1 << 15, part.getSlotMask()); + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + TEdgePartBinaryCompatibilityTest.class.getResourceAsStream("/compat/ReferenceScalaEdgePart.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/multipart/TFacePartBinaryCompatibilityTest.java b/src/test/java/codechicken/multipart/TFacePartBinaryCompatibilityTest.java new file mode 100644 index 0000000..6a99073 --- /dev/null +++ b/src/test/java/codechicken/multipart/TFacePartBinaryCompatibilityTest.java @@ -0,0 +1,55 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +/** + * Loads a Scala class compiled against the reference dev jar, whose forwarders call all three TFacePart$class statics. + * Recompiling the fixture against the port would hide the linkage failure this exists to catch. + */ +class TFacePartBinaryCompatibilityTest { + + @Test + void referenceScalaImplementorStillLinksThroughTheBridge() throws Exception { + Class fixtureClass = new FixtureClassLoader(TFacePart.class.getClassLoader()).define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + assertTrue(fixture instanceof TFacePart); + assertTrue(fixture instanceof TSlottedPart); + assertTrue(fixture instanceof TMultiPart); + TFacePart part = (TFacePart) fixture; + + for (int side = 0; side < 6; side++) { + assertTrue(part.solid(side)); + } + assertEquals(0, part.redstoneConductionMap()); + assertEquals(0x3f, part.getSlotMask()); + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + TFacePartBinaryCompatibilityTest.class.getResourceAsStream("/compat/ReferenceScalaFacePart.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/multipart/TIconHitEffectsBinaryCompatibilityTest.java b/src/test/java/codechicken/multipart/TIconHitEffectsBinaryCompatibilityTest.java new file mode 100644 index 0000000..2221535 --- /dev/null +++ b/src/test/java/codechicken/multipart/TIconHitEffectsBinaryCompatibilityTest.java @@ -0,0 +1,68 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import net.minecraft.client.particle.EffectRenderer; + +import org.junit.jupiter.api.Test; + +/** + * Loads a Scala class compiled against the reference dev jar. Its forwarders call all five statics across both + * JIconHitEffects$class and TIconHitEffects$class. + */ +class TIconHitEffectsBinaryCompatibilityTest { + + @Test + void referenceScalaImplementorStillLinksThroughBothBridges() throws Exception { + Class fixtureClass = new FixtureClassLoader(TIconHitEffects.class.getClassLoader()).define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + assertTrue(fixture instanceof TIconHitEffects); + assertTrue(fixture instanceof JIconHitEffects); + assertTrue(fixture instanceof TMultiPart); + TIconHitEffects part = (TIconHitEffects) fixture; + + // Runs JIconHitEffects$class.getBreakingIcon, which must delegate to the fixture's getBrokenIcon. + assertNull(part.getBreakingIcon(null, 4)); + assertEquals(4, fixtureClass.getMethod("lastSide").invoke(fixture)); + + // Runs TIconHitEffects$class.addDestroyEffects. The fixture's tile is null, so it collects all six icons and + // then fails on the tile; reaching that point proves the static resolved rather than failing to link. + InvocationTargetException thrown = assertThrows( + InvocationTargetException.class, + () -> fixtureClass.getMethod("addDestroyEffects", EffectRenderer.class).invoke(fixture, (Object) null)); + assertInstanceOf(NullPointerException.class, thrown.getCause()); + assertEquals(5, fixtureClass.getMethod("lastSide").invoke(fixture)); + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + TIconHitEffectsBinaryCompatibilityTest.class + .getResourceAsStream("/compat/ReferenceScalaIconHitEffects.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/multipart/TItemMultiPartBinaryCompatibilityTest.java b/src/test/java/codechicken/multipart/TItemMultiPartBinaryCompatibilityTest.java new file mode 100644 index 0000000..5c31674 --- /dev/null +++ b/src/test/java/codechicken/multipart/TItemMultiPartBinaryCompatibilityTest.java @@ -0,0 +1,77 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.lang.reflect.Method; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Vector3; + +/** + * Loads a Scala class compiled against the reference dev jar, whose forwarders call all three TItemMultiPart$class + * statics. Its newPart returns null, so placement short-circuits before touching the world. + */ +class TItemMultiPartBinaryCompatibilityTest { + + @Test + void referenceScalaImplementorStillLinksThroughTheBridge() throws Exception { + Class fixtureClass = new FixtureClassLoader(TItemMultiPart.class.getClassLoader()).define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + assertTrue(fixture instanceof TItemMultiPart); + assertTrue(fixture instanceof Item); + TItemMultiPart item = (TItemMultiPart) fixture; + + assertEquals(0.75, item.getHitDepth(new Vector3(0.25, 0.5, 0.75), 3)); + + Method onItemUse = fixtureClass.getMethod( + "onItemUse", + ItemStack.class, + EntityPlayer.class, + World.class, + int.class, + int.class, + int.class, + int.class, + float.class, + float.class, + float.class); + assertFalse((Boolean) onItemUse.invoke(fixture, null, null, null, 4, 5, 6, 1, 0f, 0.3f, 0f)); + + // A shallow hit tries the clicked block first, then its neighbour on that side. + assertEquals("4,5,6;4,6,6;", fixtureClass.getMethod("attempts").invoke(fixture)); + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + TItemMultiPartBinaryCompatibilityTest.class + .getResourceAsStream("/compat/ReferenceScalaItemMultiPart.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/multipart/TMultiPartTileAccessorRegressionTest.java b/src/test/java/codechicken/multipart/TMultiPartTileAccessorRegressionTest.java new file mode 100644 index 0000000..f5a1eae --- /dev/null +++ b/src/test/java/codechicken/multipart/TMultiPartTileAccessorRegressionTest.java @@ -0,0 +1,142 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; + +import net.minecraft.block.Block; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.data.MCDataOutputWrapper; + +class TMultiPartTileAccessorRegressionTest { + + @Test + void bindingUsesTheOverriddenSetterIncludingUnbinding() { + VirtualPart part = new VirtualPart(); + RecordingTile tile = new RecordingTile(); + + part.bind(tile); + assertSame(tile, part.current); + assertEquals(1, part.binds); + part.bind(null); + assertNull(part.current); + assertEquals(2, part.binds); + } + + @Test + void convenienceMethodsUseTheTileSuppliedByTheOverride() { + VirtualPart part = new VirtualPart(); + RecordingTile tile = new RecordingTile(); + part.current = tile; + tile.xCoord = 42; + tile.yCoord = 73; + tile.zCoord = -4; + + assertSame(tile, part.getTile()); + assertEquals(42, part.x()); + assertEquals(73, part.y()); + assertEquals(-4, part.z()); + assertNull(part.world()); + assertEquals(1, tile.worldReads); + assertSame(tile.stream, part.getWriteStream()); + assertSame(part, tile.streamPart); + assertNull(part.collisionRayTrace(Vec3.createVectorHelper(0, 0, 0), Vec3.createVectorHelper(1, 1, 1))); + assertEquals(1, tile.blockReads); + } + + @Test + void descriptionUpdatesFollowTheTilePublishedByReadDescAndSkipAnUnboundPart() { + VirtualPart part = new VirtualPart(); + RecordingTile original = new RecordingTile(); + RecordingTile replacement = new RecordingTile(); + part.current = original; + part.onRead = () -> part.current = replacement; + + part.read(null); + assertEquals(0, original.renderUpdates); + assertEquals(1, replacement.renderUpdates); + part.sendDescUpdate(); + assertEquals(0, original.bytes.size()); + assertArrayEquals(new byte[] { 7 }, replacement.bytes.toByteArray()); + + part.current = null; + assertNull(part.world()); + part.sendDescUpdate(); + assertEquals(1, part.descriptionsWritten); + } + + private static final class VirtualPart extends TMultiPart { + + TileMultipart current; + int binds; + int descriptionsWritten; + Runnable onRead; + + @Override + public String getType() { + return "test:virtual-tile"; + } + + @Override + public TileMultipart tile() { + return current; + } + + @Override + public void tile_$eq(TileMultipart value) { + binds++; + current = value; + } + + @Override + public void readDesc(MCDataInput packet) { + onRead.run(); + } + + @Override + public void writeDesc(MCDataOutput packet) { + descriptionsWritten++; + packet.writeByte(7); + } + } + + private static final class RecordingTile extends TileMultipart { + + final ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + final MCDataOutput stream = new MCDataOutputWrapper(new DataOutputStream(bytes)); + TMultiPart streamPart; + int worldReads; + int blockReads; + int renderUpdates; + + @Override + public World getWorldObj() { + worldReads++; + return null; + } + + @Override + public Block getBlockType() { + blockReads++; + return null; + } + + @Override + public MCDataOutput getWriteStream(TMultiPart part) { + streamPart = part; + return stream; + } + + @Override + public void markRender() { + renderUpdates++; + } + } +} diff --git a/src/test/java/codechicken/multipart/TNormalOcclusionBinaryCompatibilityTest.java b/src/test/java/codechicken/multipart/TNormalOcclusionBinaryCompatibilityTest.java new file mode 100644 index 0000000..78b8c14 --- /dev/null +++ b/src/test/java/codechicken/multipart/TNormalOcclusionBinaryCompatibilityTest.java @@ -0,0 +1,55 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; + +/** + * Loads a Scala class compiled against the reference dev jar. Its occlusionTest forwards to TNormalOcclusion$class, + * which in turn calls back through the generated super accessor, so this covers the whole bridge contract. + */ +class TNormalOcclusionBinaryCompatibilityTest { + + @Test + void referenceScalaImplementorStillLinksThroughTheBridge() throws Exception { + Class fixtureClass = new FixtureClassLoader(TNormalOcclusion.class.getClassLoader()).define(loadFixture()); + Object fixture = fixtureClass.getDeclaredConstructor().newInstance(); + + assertTrue(fixture instanceof TNormalOcclusion); + assertTrue(fixture instanceof JNormalOcclusion); + TNormalOcclusion part = (TNormalOcclusion) fixture; + + // The fixture occupies x 0.0 to 0.5, so a touching neighbour fits and an overlapping one does not. + assertTrue(part.occlusionTest(new NormallyOccludedPart(new Cuboid6(0.5, 0, 0, 1, 1, 1)))); + assertFalse(part.occlusionTest(new NormallyOccludedPart(new Cuboid6(0.25, 0, 0, 1, 1, 1)))); + } + + private static byte[] loadFixture() { + InputStream input = Objects.requireNonNull( + TNormalOcclusionBinaryCompatibilityTest.class + .getResourceAsStream("/compat/ReferenceScalaNormalOcclusion.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static final class FixtureClassLoader extends ClassLoader { + + private FixtureClassLoader(ClassLoader parent) { + super(parent); + } + + private Class define(byte[] bytecode) { + return defineClass(null, bytecode, 0, bytecode.length); + } + } +} diff --git a/src/test/java/codechicken/multipart/TickSchedulerCallbackRegressionTest.java b/src/test/java/codechicken/multipart/TickSchedulerCallbackRegressionTest.java new file mode 100644 index 0000000..90b0662 --- /dev/null +++ b/src/test/java/codechicken/multipart/TickSchedulerCallbackRegressionTest.java @@ -0,0 +1,55 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import net.minecraft.world.chunk.Chunk; + +import org.junit.jupiter.api.Test; + +class TickSchedulerCallbackRegressionTest { + + @Test + void callbacksCanUnloadTheirChunksWithoutLosingOtherScheduledTicks() { + TickScheduler.WorldTickScheduler world = new TickScheduler.WorldTickScheduler(null); + int[] unloadedCalls = { 0 }; + for (int i = 0; i < 3; i++) { + TickScheduler.ChunkTickScheduler chunk = new TickScheduler.ChunkTickScheduler(new Chunk(null, i, 0), world); + chunk.scheduleTick(part(() -> { + unloadedCalls[0]++; + chunk.unload(); + }), 0, false); + } + int[] retainedCalls = { 0 }; + TickScheduler.ChunkTickScheduler retained = new TickScheduler.ChunkTickScheduler(new Chunk(null, 3, 0), world); + retained.scheduleTick(part(() -> retainedCalls[0]++), 1, false); + + world.preTick(); + world.postTick(); + assertEquals(3, unloadedCalls[0]); + assertEquals(0, retainedCalls[0]); + + world.preTick(); + world.postTick(); + world.preTick(); + world.postTick(); + assertEquals(3, unloadedCalls[0]); + assertEquals(1, retainedCalls[0]); + } + + private static TMultiPart part(Runnable callback) { + TMultiPart part = new TMultiPart() { + + @Override + public String getType() { + return "test:scheduled-callback"; + } + + @Override + public void scheduledTick() { + callback.run(); + } + }; + part.bind(new TileMultipart()); + return part; + } +} diff --git a/src/test/java/codechicken/multipart/TickSchedulerClockRegressionTest.java b/src/test/java/codechicken/multipart/TickSchedulerClockRegressionTest.java new file mode 100644 index 0000000..f4270a5 --- /dev/null +++ b/src/test/java/codechicken/multipart/TickSchedulerClockRegressionTest.java @@ -0,0 +1,58 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; + +import net.minecraft.nbt.NBTTagCompound; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +class TickSchedulerClockRegressionTest { + + @Test + void savedClockSurvivesReload(@TempDir Path directory) { + File file = directory.resolve("multipart.dat").toFile(); + TickScheduler.WorldTickScheduler writer = scheduler(file); + NBTTagCompound tag = new NBTTagCompound(); + tag.setLong("schedTime", 1234); + writer.loadTag(tag); + writer.save(); + TickScheduler.WorldTickScheduler reader = scheduler(file); + reader.load(); + assertEquals(1234, reader.saveTag().getLong("schedTime")); + } + + @Test + void missingOrUnreadableClockStillUsesTheFallback(@TempDir Path directory) throws Exception { + File file = directory.resolve("multipart.dat").toFile(); + TickScheduler.WorldTickScheduler scheduler = scheduler(file); + scheduler.load(); + assertEquals(900, scheduler.saveTag().getLong("schedTime")); + Files.write(file.toPath(), new byte[] { 1, 2, 3 }); + scheduler.load(); + assertEquals(900, scheduler.saveTag().getLong("schedTime")); + } + + private static TickScheduler.WorldTickScheduler scheduler(File file) { + return new TickScheduler.WorldTickScheduler(null) { + + @Override + File saveFile() { + return file; + } + + @Override + void loadTag(NBTTagCompound tag) { + // Supply a deterministic fallback clock without starting a Minecraft world. + if (!tag.hasKey("schedTime")) { + tag.setLong("schedTime", 900); + } + super.loadTag(tag); + } + }; + } +} diff --git a/src/test/java/codechicken/multipart/TickSchedulerEqualityRegressionTest.java b/src/test/java/codechicken/multipart/TickSchedulerEqualityRegressionTest.java new file mode 100644 index 0000000..faab6b0 --- /dev/null +++ b/src/test/java/codechicken/multipart/TickSchedulerEqualityRegressionTest.java @@ -0,0 +1,90 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.*; + +import net.minecraft.world.chunk.Chunk; + +import org.junit.jupiter.api.Test; + +class TickSchedulerEqualityRegressionTest { + + @Test + void equalPartsShareOneEntryAndKeepTheOriginalCallbackTarget() { + TickScheduler.ChunkTickScheduler scheduler = scheduler(); + EqualPart first = new EqualPart("same"); + EqualPart equal = new EqualPart("same"); + EqualPart different = new EqualPart("different"); + + scheduler.scheduleTick(first, 0, false); + scheduler.scheduleTick(equal, 0, false); + scheduler.scheduleTick(different, 0, false); + + assertFalse(scheduler.processTicks()); + assertEquals(1, first.calls); + assertEquals(0, equal.calls); + assertEquals(1, different.calls); + } + + @Test + void anEqualPartCanPromoteARandomEntryToAnImmediateScheduledTick() { + TickScheduler.ChunkTickScheduler scheduler = scheduler(); + EqualPart first = new EqualPart("same"); + EqualPart equal = new EqualPart("same"); + + scheduler.scheduleTick(first, 100, true); + scheduler.scheduleTick(equal, 0, false); + + assertFalse(scheduler.processTicks()); + assertEquals(1, first.calls); + assertEquals(0, equal.calls); + } + + @Test + void anEqualPartDoesNotReplaceAnExistingExplicitTick() { + TickScheduler.ChunkTickScheduler scheduler = scheduler(); + EqualPart first = new EqualPart("same"); + EqualPart equal = new EqualPart("same"); + + scheduler.scheduleTick(first, 100, false); + scheduler.scheduleTick(equal, 0, false); + + assertTrue(scheduler.processTicks()); + assertEquals(0, first.calls); + assertEquals(0, equal.calls); + } + + private static TickScheduler.ChunkTickScheduler scheduler() { + return new TickScheduler.ChunkTickScheduler(new Chunk(null, 0, 0), new TickScheduler.WorldTickScheduler(null)); + } + + private static final class EqualPart extends TMultiPart { + + private final String key; + int calls; + + EqualPart(String key) { + this.key = key; + bind(new TileMultipart()); + } + + @Override + public String getType() { + return "test:equal-scheduled"; + } + + @Override + public boolean equals(Object other) { + return other instanceof EqualPart && key.equals(((EqualPart) other).key); + } + + @Override + public int hashCode() { + return key.hashCode(); + } + + @Override + public void scheduledTick() { + calls++; + } + } +} diff --git a/src/test/java/codechicken/multipart/TickSchedulerMoveRegressionTest.java b/src/test/java/codechicken/multipart/TickSchedulerMoveRegressionTest.java new file mode 100644 index 0000000..f463a68 --- /dev/null +++ b/src/test/java/codechicken/multipart/TickSchedulerMoveRegressionTest.java @@ -0,0 +1,106 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.world.chunk.Chunk; + +import org.junit.jupiter.api.Test; + +class TickSchedulerMoveRegressionTest { + + @Test + void movedTileKeepsItsScheduledTickAfterTheSourceChunkUnloads() { + MappedScheduler world = new MappedScheduler(); + TickScheduler.ChunkTickScheduler source = world.chunk(0, 0); + world.chunk(1, 0); + int[] calls = { 0 }; + TileMultipart tile = tile(0); + TMultiPart part = part(tile, () -> calls[0]++); + source.scheduleTick(part, 2, false); + + tile.xCoord = 16; + world.moveTile(tile); + source.unload(); + + tick(world, 4); + assertEquals(1, calls[0]); + } + + @Test + void moveRequestedFromACallbackIsAppliedAfterProcessing() { + MappedScheduler world = new MappedScheduler(); + TickScheduler.ChunkTickScheduler source = world.chunk(0, 0); + world.chunk(1, 0); + int[] calls = { 0 }; + TileMultipart moved = tile(0); + TMultiPart late = part(moved, () -> calls[0]++); + TMultiPart mover = part(tile(0), () -> { + moved.xCoord = 16; + world.moveTile(moved); + }); + source.scheduleTick(mover, 0, false); + source.scheduleTick(late, 2, false); + + tick(world, 1); + source.unload(); + tick(world, 3); + assertEquals(1, calls[0]); + } + + private static void tick(TickScheduler.WorldTickScheduler world, int ticks) { + for (int i = 0; i < ticks; i++) { + world.preTick(); + world.postTick(); + } + } + + private static TileMultipart tile(int x) { + TileMultipart tile = new TileMultipart(); + tile.xCoord = x; + return tile; + } + + private static TMultiPart part(TileMultipart tile, Runnable callback) { + TMultiPart part = new TMultiPart() { + + @Override + public String getType() { + return "test:moved-callback"; + } + + @Override + public void scheduledTick() { + callback.run(); + } + }; + part.bind(tile); + return part; + } + + private static final class MappedScheduler extends TickScheduler.WorldTickScheduler { + + private final Map chunks = new HashMap<>(); + + MappedScheduler() { + super(null); + } + + TickScheduler.ChunkTickScheduler chunk(int x, int z) { + TickScheduler.ChunkTickScheduler chunk = new TickScheduler.ChunkTickScheduler(new Chunk(null, x, z), this); + chunks.put(key(x, z), chunk); + return chunk; + } + + @Override + TickScheduler.ChunkTickScheduler chunkScheduler(int chunkX, int chunkZ) { + return chunks.get(key(chunkX, chunkZ)); + } + + private static long key(int x, int z) { + return ((long) x << 32) | (z & 0xFFFFFFFFL); + } + } +} diff --git a/src/test/java/codechicken/multipart/TickSchedulerPersistenceRegressionTest.java b/src/test/java/codechicken/multipart/TickSchedulerPersistenceRegressionTest.java new file mode 100644 index 0000000..f6800eb --- /dev/null +++ b/src/test/java/codechicken/multipart/TickSchedulerPersistenceRegressionTest.java @@ -0,0 +1,56 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Collections; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.chunk.Chunk; + +import org.junit.jupiter.api.Test; + +class TickSchedulerPersistenceRegressionTest { + + @Test + void savedTicksResumeAfterChunkReloadAndFireOnlyOnce() { + TickScheduler.WorldTickScheduler world = new TickScheduler.WorldTickScheduler(null); + Chunk chunk = new Chunk(null, 2, -3); + TileMultipart tile = new TileMultipart(); + tile.xCoord = 35; + tile.yCoord = 64; + tile.zCoord = -44; + int[] calls = { 0 }; + TMultiPart part = new TMultiPart() { + + @Override + public String getType() { + return "test:restored-tick"; + } + + @Override + public void scheduledTick() { + calls[0]++; + } + }; + tile.setPartList(Collections.singletonList(part)); + part.bind(tile); + chunk.chunkTileEntityMap.put(new ChunkPosition(3, 64, 4), tile); + TickScheduler.ChunkTickScheduler scheduler = new TickScheduler.ChunkTickScheduler(chunk, world); + scheduler.scheduleTick(part, 2, false); + NBTTagCompound saved = new NBTTagCompound(); + scheduler.saveData(saved); + assertEquals(1, saved.getTagList("multipartTicks", 10).tagCount()); + scheduler.unload(); + world = new TickScheduler.WorldTickScheduler(null); + TickScheduler.ChunkTickScheduler restored = new TickScheduler.ChunkTickScheduler(chunk, world); + restored.loadData(saved); + restored.scheduleTick(part, 0, false); + for (int tick = 0; tick < 4; tick++) { + world.preTick(); + world.postTick(); + assertEquals(tick < 2 ? 0 : 1, calls[0]); + } + } + +} diff --git a/src/test/java/codechicken/multipart/TickSchedulerSaveFailureRegressionTest.java b/src/test/java/codechicken/multipart/TickSchedulerSaveFailureRegressionTest.java new file mode 100644 index 0000000..3f3a744 --- /dev/null +++ b/src/test/java/codechicken/multipart/TickSchedulerSaveFailureRegressionTest.java @@ -0,0 +1,25 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +class TickSchedulerSaveFailureRegressionTest { + + @Test + void savePropagatesTheOriginalIoException(@TempDir Path directory) { + TickScheduler.WorldTickScheduler scheduler = new TickScheduler.WorldTickScheduler(null) { + + @Override + File saveFile() { + return directory.toFile(); + } + }; + assertThrows(IOException.class, scheduler::save); + } +} diff --git a/src/test/java/codechicken/multipart/TileCacheCharacterizationTest.java b/src/test/java/codechicken/multipart/TileCacheCharacterizationTest.java new file mode 100644 index 0000000..737cbce --- /dev/null +++ b/src/test/java/codechicken/multipart/TileCacheCharacterizationTest.java @@ -0,0 +1,118 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.BlockCoord; + +/** + * The cache is global mutable state, so every test clears it on both sides. findTile needs a world and is covered by + * the Forge server suite instead. + */ +class TileCacheCharacterizationTest { + + @BeforeEach + @AfterEach + void clearCache() { + TileCache.clear(); + } + + @Test + void addStoresTheTileAtItsOwnCoordinatesAndNotFlaggedRemoved() { + TileMultipart tile = tileAt(3, 4, 5); + + TileCache.add(tile); + + TileCache.FlaggedTile entry = entryAt(new BlockCoord(3, 4, 5)); + assertNotNull(entry); + assertSame(tile, entry.t()); + assertFalse(entry.removed()); + } + + @Test + void removeStoresTheSameTileFlaggedRemoved() { + TileMultipart tile = tileAt(3, 4, 5); + TileCache.add(tile); + + TileCache.remove(tile); + + TileCache.FlaggedTile entry = entryAt(new BlockCoord(3, 4, 5)); + assertNotNull(entry); + assertSame(tile, entry.t()); + assertTrue(entry.removed()); + assertEquals(1, cacheSize(), "remove replaces the entry rather than dropping it"); + } + + /** The cache is keyed by coordinate value, which is what makes a lookup from a fresh BlockCoord work at all. */ + @Test + void entriesAreKeyedByCoordinateValueNotByIdentity() { + TileMultipart tile = tileAt(-7, 200, 12); + TileCache.add(tile); + + assertNotNull(entryAt(new BlockCoord(-7, 200, 12))); + assertNull(entryAt(new BlockCoord(-7, 200, 13))); + } + + @Test + void aSecondTileAtTheSameCoordinateReplacesTheFirst() { + TileMultipart first = tileAt(1, 1, 1); + TileMultipart second = tileAt(1, 1, 1); + TileCache.add(first); + + TileCache.add(second); + + assertSame(second, entryAt(new BlockCoord(1, 1, 1)).t()); + assertEquals(1, cacheSize()); + } + + @Test + void separateCoordinatesAreHeldIndependently() { + TileCache.add(tileAt(0, 0, 0)); + TileCache.add(tileAt(0, 1, 0)); + + assertEquals(2, cacheSize()); + assertNotNull(entryAt(new BlockCoord(0, 0, 0))); + assertNotNull(entryAt(new BlockCoord(0, 1, 0))); + } + + @Test + void anUnknownCoordinateResolvesToNothing() { + assertNull(entryAt(new BlockCoord(9, 9, 9))); + } + + @Test + void clearEmptiesTheCache() { + TileCache.add(tileAt(2, 2, 2)); + + TileCache.clear(); + + assertEquals(0, cacheSize()); + assertNull(entryAt(new BlockCoord(2, 2, 2))); + } + + private static TileMultipart tileAt(int x, int y, int z) { + TileMultipart tile = new TileMultipart(); + tile.xCoord = x; + tile.yCoord = y; + tile.zCoord = z; + return tile; + } + + // The two adapters below are the only places the cache's collection types are named. + + private static TileCache.FlaggedTile entryAt(BlockCoord coord) { + return TileCache.apply(coord); + } + + private static int cacheSize() { + return TileCache.map().size(); + } +} diff --git a/src/test/java/codechicken/multipart/TileMultipartCharacterizationTest.java b/src/test/java/codechicken/multipart/TileMultipartCharacterizationTest.java new file mode 100644 index 0000000..9c07541 --- /dev/null +++ b/src/test/java/codechicken/multipart/TileMultipartCharacterizationTest.java @@ -0,0 +1,764 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.Consumer; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.multipart.examples.PartTraversalExample; +import scala.Function1; +import scala.Tuple2; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.runtime.AbstractFunction1; +import scala.runtime.BoxedUnit; + +/** + * Covers the part of TileMultipart that does not need a world: list storage, the operate guard, and the pure predicates + * built on top of them. Anything touching worldObj, the registry or packets is exercised by the Forge server suite + * instead, because it cannot run headless. + */ +class TileMultipartCharacterizationTest { + + private static final Vec3 ORIGIN = Vec3.createVectorHelper(0, 0, 0); + + @Test + void aFreshTileHoldsNoPartsAndDoesNotTick() { + TileMultipart tile = new TileMultipart(); + + assertEquals(0, tile.partList().size()); + assertTrue(tile.jPartList().isEmpty()); + assertFalse(tile.canUpdate()); + assertNull(tile.partMap(0)); + } + + @Test + void addingPartsAppendsInOrderAndBindsThem() { + TileMultipart tile = new TileMultipart(); + CountingPart first = new CountingPart("a"); + CountingPart second = new CountingPart("b"); + + tile.addPart_do(first); + tile.addPart_do(second); + + assertEquals(Arrays.asList(first, second), tile.jPartList()); + assertSame(tile, first.tile()); + assertSame(tile, second.tile()); + } + + @Test + void thePartListIsReplacedRatherThanMutated() { + TileMultipart tile = new TileMultipart(); + Seq before = tile.partList(); + + tile.addPart_do(new CountingPart("a")); + + assertNotSame(before, tile.partList(), "Each mutation must publish a new immutable Seq"); + assertEquals(0, before.size(), "The previously published Seq must not change under a caller"); + assertEquals(1, tile.partList().size()); + } + + @Test + void jPartListReflectsTheCurrentParts() { + TileMultipart tile = new TileMultipart(); + CountingPart part = new CountingPart("a"); + tile.addPart_do(part); + + assertEquals(1, tile.jPartList().size()); + assertSame(part, tile.jPartList().get(0)); + assertSame(part, tile.partList().apply(0)); + } + + @Test + void jPartListKeepsItsCapturedSequenceWhenTheTilePublishesAnother() { + TileMultipart tile = new TileMultipart(); + CountingPart first = new CountingPart("first"); + CountingPart second = new CountingPart("second"); + tile.addPart_do(first); + List captured = tile.jPartList(); + + tile.addPart_do(second); + assertEquals(Arrays.asList(first), captured); + assertEquals(Arrays.asList(first, second), tile.jPartList()); + assertThrows(UnsupportedOperationException.class, () -> captured.add(second)); + tile.clearParts(); + assertEquals(Arrays.asList(first), captured); + assertTrue(tile.jPartList().isEmpty()); + } + + @Test + void readQueriesAndPublishedViewsAcceptAMutableSeq() { + TileMultipart tile = new TileMultipart(); + List backing = new ArrayList<>(); + backing.add(new LightPart(4)); + tile.partList_$eq(JavaConversions.asScalaBuffer(backing)); + List publishedView = tile.jPartList(); + + assertEquals(4, tile.getLightValue()); + assertFalse(tile.canPlaceTorchOnTop()); + + TorchSupportingPart support = new TorchSupportingPart(); + backing.add(new LightPart(11)); + backing.add(support); + + assertEquals(3, publishedView.size(), "The Java ABI exposes a live view of the supplied Seq"); + assertSame(support, tile.partList().apply(2)); + assertEquals(11, tile.getLightValue()); + assertTrue(tile.canPlaceTorchOnTop()); + } + + @Test + void clearPartsEmptiesTheList() { + TileMultipart tile = new TileMultipart(); + tile.addPart_do(new CountingPart("a")); + + tile.clearParts(); + + assertEquals(0, tile.partList().size()); + assertTrue(tile.jPartList().isEmpty()); + } + + @Test + void overriddenPartListDrivesQueriesAndCallbacks() { + AccessorTile tile = new AccessorTile(); + CountingPart first = new CountingPart("first"); + RayTracingPart hit = new RayTracingPart("hit", 1d); + tile.parts = seq(first, new LightPart(13), new TorchSupportingPart(), hit); + tile.loadFrom(new TileMultipart()); + + assertEquals(4, tile.jPartList().size()); + assertSame(tile, first.tile()); + assertEquals(13, tile.getLightValue()); + assertTrue(tile.canPlaceTorchOnTop()); + assertFalse(tile.canReplacePart(first, hit)); + tile.onChunkLoad(); + assertEquals(1, first.chunkLoads); + tile.parts = seq(new RayTracingPart("missing", null), hit); + assertEquals(1, index(tile.collisionRayTrace(ORIGIN, ORIGIN))); + tile.harvestPart(1, null, null); + assertEquals(1, hit.harvests); + } + + @Test + void overriddenPartListReceivesMutationsAndCopies() { + AccessorTile source = new AccessorTile(); + CountingPart first = new CountingPart("first"); + Seq before = source.parts; + source.addPart_do(first); + assertEquals(1, source.writes); + assertEquals(seq(first), source.parts); + assertTrue(before.isEmpty()); + + AccessorTile target = new AccessorTile(); + target.copyFrom(source); + assertEquals(1, target.writes); + assertSame(source.parts, target.parts); + target.loadFrom(source); + assertSame(target, first.tile()); + target.clearParts(); + assertEquals(2, target.writes); + assertTrue(target.parts.isEmpty()); + assertEquals(seq(first), source.parts); + } + + @Test + void overriddenPartListKeepsTheCapturedTraversalAndDetachedPartGuard() { + AccessorTile tile = new AccessorTile(); + CountingPart first = new CountingPart("first"); + CountingPart removed = new CountingPart("removed"); + CountingPart last = new CountingPart("last"); + CountingPart added = new CountingPart("added"); + tile.parts = seq(first, removed, last); + tile.loadFrom(new TileMultipart()); + List visited = new ArrayList<>(); + + tile.operate(action(part -> { + visited.add(part.getType()); + if (part == first) { + tile.partList_$eq(seq(first, last, added)); + removed.tile_$eq(null); + added.bind(tile); + } + })); + + assertEquals(Arrays.asList("first", "last"), visited); + assertEquals(seq(first, last, added), tile.parts); + } + + @Test + void overriddenPartListKeepsLightAndResistanceLookupOrder() { + int[] reads = { 0 }; + TileMultipart tile = new TileMultipart() { + + @Override + public Seq partList() { + return ++reads[0] == 1 ? seq(new ResistancePart(9f)) : seq(new LightPart(13)); + } + }; + assertEquals(13, tile.getLightValue()); + assertEquals(2, reads[0]); + reads[0] = 0; + assertEquals(9f, tile.getExplosionResistance(null)); + assertEquals(1, reads[0]); + } + + @Test + void operateSkipsPartsWhoseTileHasBeenCleared() { + TileMultipart tile = new TileMultipart(); + CountingPart kept = new CountingPart("a"); + CountingPart detached = new CountingPart("b"); + tile.addPart_do(kept); + tile.addPart_do(detached); + detached.tile_$eq(null); + + tile.onChunkLoad(); + + assertEquals(1, kept.chunkLoads); + assertEquals(0, detached.chunkLoads, "A part with a null tile must be skipped"); + } + + @Test + void operateDoesNotVisitPartsAddedByItsCallback() { + TileMultipart tile = new TileMultipart(); + CountingPart first = new CountingPart("first"); + CountingPart second = new CountingPart("second"); + CountingPart added = new CountingPart("added"); + List visited = new ArrayList<>(); + tile.addPart_do(first); + tile.addPart_do(second); + + tile.operate(action(part -> { + visited.add(part.getType()); + if (part == first) { + tile.addPart_do(added); + } + })); + + assertEquals(Arrays.asList("first", "second"), visited); + assertEquals(Arrays.asList(first, second, added), tile.jPartList()); + } + + @Test + void operateSkipsAPartDetachedByAnEarlierCallback() { + TileMultipart tile = new TileMultipart(); + CountingPart first = new CountingPart("first"); + CountingPart detached = new CountingPart("detached"); + CountingPart last = new CountingPart("last"); + List visited = new ArrayList<>(); + tile.addPart_do(first); + tile.addPart_do(detached); + tile.addPart_do(last); + + tile.operate(action(part -> { + visited.add(part.getType()); + if (part == first) { + tile.partList_$eq(seq(first, last)); + detached.tile_$eq(null); + } + })); + + assertEquals(Arrays.asList("first", "last"), visited); + assertEquals(Arrays.asList(first, last), tile.jPartList()); + } + + @Test + void operateAcceptsAMutableSeqThroughThePublishedSetter() { + TileMultipart tile = new TileMultipart(); + CountingPart first = new CountingPart("first"); + CountingPart second = new CountingPart("second"); + tile.addPart_do(first); + tile.addPart_do(second); + tile.partList_$eq(JavaConversions.asScalaBuffer(new ArrayList<>(tile.jPartList()))); + + tile.onChunkLoad(); + + assertEquals(1, first.chunkLoads); + assertEquals(1, second.chunkLoads); + } + + @Test + void replacedTilesDoNotForwardQueuedCallbacksAfterTransfer() { + for (boolean mutable : new boolean[] { false, true }) { + TileMultipart oldTile = new TileMultipart(); + CountingPart part = new CountingPart("transferred"); + oldTile.addPart_do(part); + if (mutable) { + oldTile.partList_$eq(JavaConversions.asScalaBuffer(new ArrayList<>(oldTile.jPartList()))); + } + TileMultipart replacement = new TileMultipart(); + replacement.from(oldTile); + assertSame(replacement, part.tile()); + + oldTile.onChunkLoad(); + assertEquals(0, part.chunkLoads); + replacement.onChunkLoad(); + assertEquals(1, part.chunkLoads); + } + } + + @Test + void lifecycleCallbacksStillDispatchThroughAnOperateOverride() { + List calls = new ArrayList<>(); + TileMultipart tile = new TileMultipart() { + + @Override + public void operate(Function1 f) { + calls.add("operate"); + super.operate(f); + } + }; + CountingPart part = new CountingPart("part"); + tile.addPart_do(part); + + tile.onChunkLoad(); + tile.onNeighborBlockChange(); + assertEquals(Arrays.asList("operate", "operate"), calls); + assertEquals(1, part.chunkLoads); + } + + @Test + void operateChecksOwnershipAndStopsAtTheOriginalCallbackFailure() { + TileMultipart tile = new TileMultipart(); + CountingPart detached = new CountingPart("detached"); + CountingPart rebound = new CountingPart("rebound"); + CountingPart last = new CountingPart("last"); + tile.addPart_do(detached); + tile.addPart_do(rebound); + tile.addPart_do(last); + detached.bind(null); + rebound.bind(new TileMultipart()); + List visited = new ArrayList<>(); + IllegalStateException failure = new IllegalStateException("callback failed"); + + assertSame(failure, assertThrows(IllegalStateException.class, () -> tile.operate(action(part -> { + visited.add(part.getType()); + throw failure; + })))); + assertEquals(Arrays.asList("last"), visited); + } + + @Test + void javaTraversalKeepsAccessorDispatchAndCallbackMutationSemantics() { + AccessorTile tile = new AccessorTile(); + CountingPart first = new CountingPart("first"); + CountingPart removed = new CountingPart("removed"); + CountingPart rebound = new CountingPart("rebound"); + CountingPart added = new CountingPart("added"); + tile.parts = seq(first, removed, rebound); + tile.loadFrom(new TileMultipart()); + List visited = new ArrayList<>(); + List nested = new ArrayList<>(); + + tile.forEachPart(part -> { + visited.add(part.getType()); + if (part == first) { + tile.partList_$eq(seq(first, rebound, added)); + removed.bind(null); + rebound.bind(new TileMultipart()); + added.bind(tile); + tile.forEachPart(p -> nested.add(p.getType())); + } + }); + + assertEquals(Arrays.asList("first"), visited); + assertEquals(Arrays.asList("first", "added"), nested); + } + + @Test + void javaTraversalUsesTheLegacyOverrideAndDoesNotReplaceItsLifecycleHook() { + CountingPart supplied = new CountingPart("supplied"); + List calls = new ArrayList<>(); + TileMultipart tile = new TileMultipart() { + + @Override + public void operate(Function1 f) { + calls.add("operate"); + f.apply(supplied); + } + + @Override + public void forEachPart(Consumer consumer) { + calls.add("forEachPart"); + super.forEachPart(consumer); + } + }; + List visited = new ArrayList<>(); + tile.forEachPart(visited::add); + tile.onChunkLoad(); + + assertEquals(Arrays.asList("forEachPart", "operate", "operate"), calls); + assertEquals(Arrays.asList(supplied), visited); + assertEquals(1, supplied.chunkLoads); + } + + @Test + void javaTraversalRetainsMutableSequenceAndCallbackFailureBehavior() { + TileMultipart tile = new TileMultipart(); + tile.forEachPart(null); + CountingPart detached = new CountingPart("detached"); + tile.partList_$eq(seq(detached)); + tile.forEachPart(null); + detached.bind(tile); + assertThrows(NullPointerException.class, () -> tile.forEachPart(null)); + + CountingPart last = new CountingPart("last"); + last.bind(tile); + tile.partList_$eq(JavaConversions.asScalaBuffer(new ArrayList<>(Arrays.asList(detached, last)))); + List visited = new ArrayList<>(); + tile.forEachPart(visited::add); + assertEquals(Arrays.asList(detached, last), visited); + visited.clear(); + IllegalStateException failure = new IllegalStateException("callback failed"); + assertSame(failure, assertThrows(IllegalStateException.class, () -> tile.forEachPart(part -> { + visited.add(part); + throw failure; + }))); + assertEquals(Arrays.asList(detached), visited); + } + + @Test + void javaExamplesDistinguishCollectionAccessFromBoundPartTraversal() { + TileMultipart tile = new TileMultipart(); + CountingPart first = new CountingPart("first"); + CountingPart detached = new CountingPart("detached"); + tile.addPart_do(first); + tile.addPart_do(detached); + detached.bind(null); + + assertEquals(Arrays.asList("first", "detached"), PartTraversalExample.partTypes(tile)); + assertEquals(Arrays.asList("first"), PartTraversalExample.boundPartTypes(tile)); + } + + @Test + void ticksOnlyOnceATickingPartIsPresent() { + TileMultipart quiet = new TileMultipart(); + assertFalse(quiet.canUpdate()); + + // TMultiPart.doesTick defaults to true, so a part must opt out to leave the tile idle. + quiet.addPart_do(new StillPart()); + assertFalse(quiet.canUpdate()); + + TileMultipart ticking = new TileMultipart(); + ticking.addPart_do(new CountingPart("a")); + assertTrue(ticking.canUpdate(), "A default part ticks, so it starts the tile ticking"); + } + + @Test + void lightValueIsTheMaximumAndZeroWhenEmpty() { + TileMultipart tile = new TileMultipart(); + assertEquals(0, tile.getLightValue()); + + tile.addPart_do(new LightPart(4)); + tile.addPart_do(new LightPart(11)); + tile.addPart_do(new LightPart(7)); + + assertEquals(11, tile.getLightValue()); + } + + @Test + void explosionResistanceIsTheMaximumButThrowsWhenEmpty() { + TileMultipart tile = new TileMultipart(); + + assertThrows(UnsupportedOperationException.class, () -> tile.getExplosionResistance(null)); + + tile.addPart_do(new ResistancePart(2f)); + tile.addPart_do(new ResistancePart(9f)); + + assertEquals(9f, tile.getExplosionResistance(null)); + } + + @Test + void occlusionTestRequiresAgreementInBothDirections() { + TileMultipart tile = new TileMultipart(); + TMultiPart accepting = new CountingPart("a"); + RejectingPart rejecting = new RejectingPart(); + + assertTrue(tile.occlusionTest(seq(accepting), new CountingPart("b"))); + assertFalse(tile.occlusionTest(seq(rejecting), new CountingPart("b")), "An existing part may refuse"); + assertFalse(tile.occlusionTest(seq(accepting), rejecting), "The incoming part may refuse"); + assertTrue(tile.occlusionTest(seq(), rejecting), "Nothing to conflict with"); + } + + @Test + void canReplacePartIgnoresTheOutgoingPartAndRejectsDuplicates() { + TileMultipart tile = new TileMultipart(); + RejectingPart outgoing = new RejectingPart(); + CountingPart other = new CountingPart("b"); + tile.addPart_do(outgoing); + tile.addPart_do(other); + + // The outgoing part is excluded from the test even though it refuses everything. + assertTrue(tile.canReplacePart(outgoing, new CountingPart("c"))); + // A part already present, other than the outgoing one, cannot be added again. + assertFalse(tile.canReplacePart(outgoing, other)); + assertEquals(Arrays.asList(outgoing, other), tile.jPartList(), "A replacement check must not mutate order"); + assertSame(tile, outgoing.tile()); + assertSame(tile, other.tile()); + } + + @Test + void solidityAndTorchPlacementFallBackToTheParts() { + TileMultipart tile = new TileMultipart(); + + // partMap is null on a bare tile, so nothing is solid and no torch may be placed. + assertFalse(tile.isSolid(1)); + assertFalse(tile.canPlaceTorchOnTop()); + + tile.addPart_do(new TorchSupportingPart()); + assertTrue(tile.canPlaceTorchOnTop()); + } + + @Test + void rayTraceAllTagsEachHitWithItsPartListIndex() { + TileMultipart tile = new TileMultipart(); + tile.addPart_do(new RayTracingPart("far", 9d)); + tile.addPart_do(new RayTracingPart("missing", null)); + tile.addPart_do(new RayTracingPart("near", 1d)); + + List hits = hits(tile); + + // Sorted nearest first, but the part that missed still consumed its index. + assertEquals(Arrays.asList(2, 0), Arrays.asList(index(hits.get(0)), index(hits.get(1)))); + } + + @Test + void rayTraceAllIndicesStillSelectTheProducingPart() { + TileMultipart tile = new TileMultipart(); + tile.addPart_do(new RayTracingPart("far", 9d)); + tile.addPart_do(new RayTracingPart("missing", null)); + tile.addPart_do(new RayTracingPart("near", 1d)); + + // The round trip every click, activate, harvest and pick block depends on. + for (ExtendedMOP hit : hits(tile)) { + TMultiPart part = tile.partList().apply(index(hit)); + assertSame(hit, ((RayTracingPart) part).produced); + } + } + + @Test + void rayTraceAllNestsThePartsOwnDataUnderTheIndex() { + TileMultipart tile = new TileMultipart(); + RayTracingPart part = new RayTracingPart("only", 1d); + part.data = "subhit"; + tile.addPart_do(part); + + ExtendedMOP hit = hits(tile).get(0); + + assertEquals("subhit", ExtendedMOP.>getData(hit)._2()); + assertEquals(-1, hit.subHit, "data is assigned directly, so subHit keeps its default"); + } + + @Test + void rayTraceAllIsEmptyWhenNothingIsHit() { + TileMultipart tile = new TileMultipart(); + assertTrue(hits(tile).isEmpty()); + + tile.addPart_do(new RayTracingPart("missing", null)); + assertTrue(hits(tile).isEmpty()); + } + + @Test + void collisionRayTraceReturnsTheNearestHitOrNull() { + TileMultipart tile = new TileMultipart(); + assertNull(tile.collisionRayTrace(ORIGIN, ORIGIN)); + + tile.addPart_do(new RayTracingPart("far", 9d)); + RayTracingPart near = new RayTracingPart("near", 1d); + tile.addPart_do(near); + + ExtendedMOP nearest = tile.collisionRayTrace(ORIGIN, ORIGIN); + + assertSame(near.produced, nearest); + } + + @Test + void harvestPartSelectsByPartListIndex() { + TileMultipart tile = new TileMultipart(); + RayTracingPart first = new RayTracingPart("first", null); + RayTracingPart second = new RayTracingPart("second", null); + tile.addPart_do(first); + tile.addPart_do(second); + + tile.harvestPart(1, null, null); + + assertEquals(0, first.harvests); + assertEquals(1, second.harvests); + assertThrows(IndexOutOfBoundsException.class, () -> tile.harvestPart(2, null, null)); + } + + private static List hits(TileMultipart tile) { + List list = new ArrayList<>(); + for (ExtendedMOP hit : tile.rayTraceAll(ORIGIN, ORIGIN)) { + list.add(hit); + } + return list; + } + + private static int index(ExtendedMOP hit) { + return (Integer) ExtendedMOP.>getData(hit)._1(); + } + + private static Seq seq(TMultiPart... parts) { + List list = new ArrayList<>(Arrays.asList(parts)); + return JavaConversions.asScalaBuffer(list).toList(); + } + + private static AbstractFunction1 action(Consumer action) { + return new AbstractFunction1() { + + @Override + public BoxedUnit apply(TMultiPart part) { + action.accept(part); + return BoxedUnit.UNIT; + } + }; + } + + private static final class AccessorTile extends TileMultipart { + + private Seq parts = seq(); + private int writes; + + @Override + public Seq partList() { + return parts; + } + + @Override + public void partList_$eq(Seq value) { + writes++; + parts = value; + } + } + + private static class CountingPart extends TMultiPart { + + private final String type; + private int chunkLoads; + + private CountingPart(String type) { + this.type = type; + } + + @Override + public String getType() { + return type; + } + + @Override + public void onChunkLoad() { + chunkLoads++; + } + } + + private static final class StillPart extends CountingPart { + + private StillPart() { + super("still"); + } + + @Override + public boolean doesTick() { + return false; + } + } + + private static final class LightPart extends CountingPart { + + private final int light; + + private LightPart(int light) { + super("light"); + this.light = light; + } + + @Override + public int getLightValue() { + return light; + } + } + + private static final class ResistancePart extends CountingPart { + + private final float resistance; + + private ResistancePart(float resistance) { + super("resistance"); + this.resistance = resistance; + } + + @Override + public float explosionResistance(Entity entity) { + return resistance; + } + } + + private static final class RejectingPart extends CountingPart { + + private RejectingPart() { + super("rejecting"); + } + + @Override + public boolean occlusionTest(TMultiPart npart) { + return false; + } + } + + private static final class TorchSupportingPart extends CountingPart { + + private TorchSupportingPart() { + super("torchsupport"); + } + + @Override + public boolean canPlaceTorchOnTop() { + return true; + } + } + + /** Returns a canned hit so raytrace bookkeeping can be checked without a world. */ + private static final class RayTracingPart extends CountingPart { + + private final Double dist; + private Object data; + private ExtendedMOP produced; + private int harvests; + + private RayTracingPart(String type, Double dist) { + super(type); + this.dist = dist; + } + + @Override + public ExtendedMOP collisionRayTrace(Vec3 start, Vec3 end) { + if (dist == null) { + return null; + } + produced = new ExtendedMOP(0, 0, 0, 0, ORIGIN, data); + produced.dist = dist; + return produced; + } + + @Override + public void harvest(MovingObjectPosition hit, EntityPlayer player) { + harvests++; + } + } +} diff --git a/src/test/java/codechicken/multipart/TileMultipartEqualityRegressionTest.java b/src/test/java/codechicken/multipart/TileMultipartEqualityRegressionTest.java new file mode 100644 index 0000000..3adef71 --- /dev/null +++ b/src/test/java/codechicken/multipart/TileMultipartEqualityRegressionTest.java @@ -0,0 +1,272 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.*; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import scala.collection.JavaConversions; +import scala.collection.Seq; + +/** Equality and callback semantics of the pre-port TileMultipart implementation. */ +class TileMultipartEqualityRegressionTest { + + @Test + void localChangeUsesCapturedOrderSkipsDetachedPartsAndPropagatesCallbackFailures() { + List events = new ArrayList<>(); + TileMultipart tile = new TileMultipart(); + EqualPart detached = new EqualPart("detached", "detached", events); + EqualPart rebound = new EqualPart("rebound", "rebound", events); + EqualPart added = new EqualPart("added", "added", events); + EqualPart first = new EqualPart("first", "first", events) { + + @Override + public void onPartChanged(TMultiPart part) { + super.onPartChanged(part); + detached.bind(null); + rebound.bind(new TileMultipart()); + tile.setPartList(Arrays.asList(added)); + } + }; + RuntimeException failure = new IllegalStateException("local change failure"); + EqualPart failing = new EqualPart("failing", "failing", events) { + + @Override + public void onPartChanged(TMultiPart part) { + super.onPartChanged(part); + throw failure; + } + }; + EqualPart later = new EqualPart("later", "later", events); + add(tile, first, detached, rebound, failing, later); + added.bind(tile); + + assertSame(failure, assertThrows(RuntimeException.class, () -> tile.internalPartChange(null))); + assertEquals(Arrays.asList("first.changed:null", "failing.changed:null"), events); + assertEquals(Arrays.asList(added), tile.jPartList()); + assertNull(tile.getWorldObj(), "Local notification requires no world and performs no world notification"); + } + + @Test + void internalPartChangeExcludesDistinctEqualPartsAndStillBroadcastsNull() { + List events = new ArrayList<>(); + TileMultipart tile = new TileMultipart(); + EqualPart first = new EqualPart("equal", "first", events); + EqualPart second = new EqualPart("equal", "second", events); + EqualPart other = new EqualPart("other", "other", events); + add(tile, first, second, other); + + tile.internalPartChange(new EqualPart("equal", "external", events)); + assertEquals(Arrays.asList("other.changed:external"), events); + events.clear(); + tile.internalPartChange(null); + assertEquals(Arrays.asList("first.changed:null", "second.changed:null", "other.changed:null"), events); + } + + @Test + void replacementFiltersEveryEqualPartBeforeOcclusionAndDuplicateChecks() { + List events = new ArrayList<>(); + TileMultipart tile = new TileMultipart(); + EqualPart first = new EqualPart("equal", "first", events); + EqualPart second = new EqualPart("equal", "second", events); + EqualPart survivor = new EqualPart("other", "survivor", events); + first.rejectOcclusion = true; + second.rejectOcclusion = true; + add(tile, first, second, survivor); + + assertTrue( + tile.canReplacePart( + new EqualPart("equal", "external", events), + new EqualPart("equal", "incoming", events))); + assertEquals(Arrays.asList("survivor.occlusion:incoming", "incoming.occlusion:survivor"), events); + assertFalse(tile.canReplacePart(first, new EqualPart("other", "duplicate", events))); + assertSame(first, tile.partList().apply(0)); + assertSame(second, tile.partList().apply(1)); + assertSame(survivor, tile.partList().apply(2)); + } + + @Test + void removalFiltersAllEqualEntriesButKeepsTheOriginalIndexAndCallbackTarget() throws Throwable { + List events = new ArrayList<>(); + RecordingTile tile = new RecordingTile(events); + EqualPart survivor = new EqualPart("other", "survivor", events); + EqualPart first = new EqualPart("equal", "first", events); + EqualPart second = new EqualPart("equal", "second", events); + add(tile, survivor, first, second); + Seq published = tile.partList(); + + assertEquals(1, remove(tile, second)); + assertEquals(Arrays.asList("second.light", "second.pre", "tile.removed:second:1", "second.removed"), events); + assertEquals(1, tile.partList().size()); + assertSame(survivor, tile.partList().head()); + assertEquals(3, published.size()); + assertNull(second.tile()); + assertSame(tile, first.tile()); // The reference only detaches the requested instance. + } + + @Test + void removalReadsThePublishedListAfterLightAndPreRemoveCallbacks() throws Throwable { + List events = new ArrayList<>(); + RecordingTile tile = new RecordingTile(events); + EqualPart victim = new EqualPart("victim", "victim", events); + EqualPart stale = new EqualPart("stale", "stale", events); + EqualPart addedByLight = new EqualPart("light", "light", events); + EqualPart addedByPre = new EqualPart("pre", "pre", events); + add(tile, stale, victim); + victim.lightAction = () -> tile.partList_$eq(seq(victim, addedByLight)); + victim.preAction = () -> { + assertSame(addedByLight, tile.partList().apply(1)); + tile.partList_$eq(seq(addedByPre, victim, addedByLight)); + }; + + assertEquals(1, remove(tile, victim)); + assertEquals(2, tile.partList().size()); + assertSame(addedByPre, tile.partList().apply(0)); + assertSame(addedByLight, tile.partList().apply(1)); + assertEquals(Arrays.asList("victim.light", "victim.pre", "tile.removed:victim:1", "victim.removed"), events); + } + + @Test + void removalUsesTheListPublishedByOnRemovedWhenCheckingForAnEmptyTile() throws Throwable { + List events = new ArrayList<>(); + RecordingTile tile = new RecordingTile(events); + EqualPart victim = new EqualPart("victim", "victim", events); + EqualPart replacement = new EqualPart("replacement", "replacement", events); + add(tile, victim); + victim.removedAction = () -> tile.partList_$eq(seq(replacement)); + + assertEquals(0, remove(tile, victim)); + assertSame(replacement, tile.partList().head()); + assertNull(victim.tile()); + } + + @Test + void lightFailureStopsRemovalBeforePreRemoveOrListMutation() { + List events = new ArrayList<>(); + RecordingTile tile = new RecordingTile(events); + EqualPart victim = new EqualPart("victim", "victim", events); + EqualPart survivor = new EqualPart("other", "survivor", events); + add(tile, victim, survivor); + Seq published = tile.partList(); + IllegalStateException failure = new IllegalStateException("light failed"); + victim.lightAction = () -> { throw failure; }; + + assertSame(failure, assertThrows(IllegalStateException.class, () -> remove(tile, victim))); + assertSame(published, tile.partList()); + assertSame(tile, victim.tile()); + assertEquals(Arrays.asList("victim.light"), events); + } + + @Test + void missingPartFailsBeforeInvokingItsLightOrRemovalHooks() { + List events = new ArrayList<>(); + RecordingTile tile = new RecordingTile(events); + add(tile, new EqualPart("present", "present", events)); + assertThrows(IllegalArgumentException.class, () -> remove(tile, new EqualPart("absent", "absent", events))); + assertTrue(events.isEmpty()); + } + + private static int remove(TileMultipart tile, TMultiPart part) throws Throwable { + Method method = TileMultipart.class.getDeclaredMethod("remPart_do", TMultiPart.class, boolean.class); + method.setAccessible(true); + try { + return (Integer) method.invoke(tile, part, false); + } catch (InvocationTargetException exception) { + throw exception.getCause(); + } + } + + private static void add(TileMultipart tile, TMultiPart... parts) { + for (TMultiPart part : parts) tile.addPart_do(part); + } + + private static Seq seq(TMultiPart... parts) { + return JavaConversions.asScalaBuffer(Arrays.asList(parts)).toList(); + } + + private static final class RecordingTile extends TileMultipart { + + private final List events; + + RecordingTile(List events) { + this.events = events; + } + + @Override + public void partRemoved(TMultiPart part, int index) { + events.add("tile.removed:" + ((EqualPart) part).name + ":" + index); + } + } + + private static class EqualPart extends TMultiPart { + + private final String key; + private final String name; + private final List events; + private boolean rejectOcclusion; + private Runnable lightAction = () -> {}; + private Runnable preAction = () -> {}; + private Runnable removedAction = () -> {}; + + EqualPart(String key, String name, List events) { + this.key = key; + this.name = name; + this.events = events; + } + + @Override + public String getType() { + return name; + } + + @Override + public boolean doesTick() { + return false; + } + + @Override + public boolean equals(Object other) { + return other instanceof EqualPart && key.equals(((EqualPart) other).key); + } + + @Override + public int hashCode() { + return key.hashCode(); + } + + @Override + public void onPartChanged(TMultiPart part) { + events.add(name + ".changed:" + (part == null ? "null" : ((EqualPart) part).name)); + } + + @Override + public boolean occlusionTest(TMultiPart other) { + events.add(name + ".occlusion:" + ((EqualPart) other).name); + return !rejectOcclusion; + } + + @Override + public int getLightValue() { + events.add(name + ".light"); + lightAction.run(); + return 7; + } + + @Override + public void preRemove() { + events.add(name + ".pre"); + preAction.run(); + } + + @Override + public void onRemoved() { + events.add(name + ".removed"); + removedAction.run(); + } + } +} diff --git a/src/test/java/codechicken/multipart/TileMultipartLoadingTest.java b/src/test/java/codechicken/multipart/TileMultipartLoadingTest.java new file mode 100644 index 0000000..a47ae06 --- /dev/null +++ b/src/test/java/codechicken/multipart/TileMultipartLoadingTest.java @@ -0,0 +1,280 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.examples.PartLoadingExample; +import scala.collection.JavaConversions; +import scala.collection.Seq; + +/** Storage assignment and reconstruction contracts used by GuideNH and Schematica. */ +class TileMultipartLoadingTest { + + @Test + void legacySetterSharesStorageWithoutBindingOrChangingTickState() { + TileMultipart tile = new TileMultipart(); + Part part = new Part("part", new ArrayList<>()); + List input = new ArrayList<>(Arrays.asList(part)); + Seq sequence = JavaConversions.asScalaBuffer(input); + tile.partList_$eq(sequence); + + assertSame(sequence, tile.partList()); + assertNull(part.tile()); + assertFalse(tile.canUpdate()); + input.clear(); + assertTrue(tile.jPartList().isEmpty()); + tile.partList_$eq(null); + assertNull(tile.partList()); + } + + @Test + void legacyLoadingRebuildsThroughHooksButDoesNotRemoveOldPartsOrResetTicking() { + List events = new ArrayList<>(); + LoadingTile tile = new LoadingTile(events); + Part old = new Part("old", events); + tile.addPart_do(old); + events.clear(); + Part first = new Part("first", events); + Part second = new Part("second", events); + tile.loadParts(seq(first, second)); + + assertEquals(Arrays.asList("clear", "cache:first", "bind:first", "cache:second", "bind:second"), events); + assertEquals(Arrays.asList(first, second), tile.jPartList()); + assertSame(tile, first.tile()); + assertSame(tile, second.tile()); + assertSame(tile, old.tile()); + assertTrue(tile.canUpdate()); + events.clear(); + tile.loadParts(seq()); + assertEquals(Arrays.asList("clear"), events); + assertTrue(tile.jPartList().isEmpty()); + assertTrue(tile.canUpdate(), "Loading does not reset the existing ticking flag"); + } + + @Test + void compositeReplacementRefreshesConsumerHostThroughBindWithoutRestartingParts() { + List events = new ArrayList<>(); + List hosts = new ArrayList<>(); + Part part = new Part("cable", events) { + + @Override + public void bind(TileMultipart host) { + super.bind(host); + // AE2 refreshes its hosted parts from tile() after calling super.bind. + hosts.add(tile()); + } + }; + TileMultipart original = new TileMultipart(); + original.loadPartList(Arrays.asList(part)); + TileMultipart expanded = new TileMultipart(); + expanded.from(original); + TileMultipart reduced = new TileMultipart(); + reduced.from(expanded); + + assertEquals(Arrays.asList(original, expanded, reduced), hosts); + assertSame(reduced, part.tile()); + assertEquals(Arrays.asList(part), reduced.jPartList()); + assertEquals(Arrays.asList("bind:cable", "bind:cable", "bind:cable"), events); + } + + @Test + void legacyLoadingFailuresLeaveClearedOrPartiallyLoadedState() { + List events = new ArrayList<>(); + LoadingTile tile = new LoadingTile(events); + Part old = new Part("old", events); + tile.addPart_do(old); + assertThrows(NullPointerException.class, () -> tile.loadParts((scala.collection.Iterable) null)); + assertTrue(tile.jPartList().isEmpty()); + assertSame(tile, old.tile()); + + Part first = new Part("first", events); + Part last = new Part("last", events); + assertThrows(NullPointerException.class, () -> tile.loadParts(seq(first, null, last))); + assertEquals(Arrays.asList(first, null), tile.jPartList()); + assertSame(tile, first.tile()); + assertNull(last.tile()); + } + + @Test + void legacyReflectionResolvesTheSetterAndOneAssignableLoader() throws Exception { + TileMultipart tile = new TileMultipart(); + Part part = new Part("part", new ArrayList<>()); + Seq input = seq(part); + TileMultipart.class.getMethod("partList_$eq", Seq.class).invoke(tile, input); + assertSame(input, tile.partList()); + assertNull(part.tile()); + Method exact = TileMultipart.class.getMethod("loadParts", scala.collection.Iterable.class); + List matches = new ArrayList<>(); + for (Method method : TileMultipart.class.getMethods()) { + if (method.getName().equals("loadParts") && method.getParameterCount() == 1 + && method.getParameterTypes()[0].isAssignableFrom(input.getClass())) { + matches.add(method); + } + } + assertEquals(Arrays.asList(exact), matches); + matches.get(0).invoke(tile, input); + assertSame(tile, part.tile()); + assertEquals(Arrays.asList(part), tile.jPartList()); + } + + @Test + void javaSetterCopiesInOrderAndRetainsTheLegacyOverrideAndNullState() { + List> writes = new ArrayList<>(); + TileMultipart tile = new TileMultipart() { + + @Override + public void partList_$eq(Seq parts) { + writes.add(parts); + super.partList_$eq(parts); + } + }; + Part part = new Part("part", new ArrayList<>()); + List input = new ArrayList<>(Arrays.asList(part, part, null)); + PartLoadingExample.stageParts(tile, input); + assertEquals(1, writes.size()); + assertSame(writes.get(0), tile.partList()); + assertEquals(input, tile.jPartList()); + input.clear(); + assertEquals(Arrays.asList(part, part, null), tile.jPartList()); + assertThrows(UnsupportedOperationException.class, () -> tile.jPartList().clear()); + assertNull(part.tile()); + assertFalse(tile.canUpdate()); + tile.setPartList(null); + assertNull(writes.get(1)); + assertNull(tile.partList()); + tile.setPartList(Collections.emptyList()); + assertEquals(3, writes.size()); + assertTrue(tile.jPartList().isEmpty()); + } + + @Test + void javaLoaderUsesTheLegacyOverrideWithAnOrderedNonListCollection() { + List> calls = new ArrayList<>(); + TileMultipart tile = new TileMultipart() { + + @Override + public void loadParts(scala.collection.Iterable parts) { + calls.add(parts); + super.loadParts(parts); + } + }; + List events = new ArrayList<>(); + Part first = new Part("first", events); + Part second = new Part("second", events); + Collection input = new LinkedHashSet<>(Arrays.asList(first, second)); + tile.loadPartList(input); + assertEquals(1, calls.size()); + assertEquals(Arrays.asList("bind:first", "bind:second"), events); + input.clear(); + assertEquals(Arrays.asList(first, second), tile.jPartList()); + assertSame(tile, first.tile()); + assertSame(tile, second.tile()); + PartLoadingExample.reloadParts(tile); + assertEquals(2, calls.size()); + assertEquals(Arrays.asList(first, second), tile.jPartList()); + } + + @Test + void javaLoaderReadsTheLiveInputAndKeepsFailureOrdering() { + TileMultipart tile = new TileMultipart(); + List input = new ArrayList<>(); + List events = new ArrayList<>(); + Part replaced = new Part("replaced", events); + Part replacement = new Part("replacement", events); + Part first = new Part("first", events) { + + @Override + public void bind(TileMultipart host) { + super.bind(host); + input.set(1, replacement); + } + }; + input.add(first); + input.add(replaced); + tile.loadPartList(input); + assertEquals(Arrays.asList(first, replacement), tile.jPartList()); + assertNull(replaced.tile()); + assertSame(tile, replacement.tile()); + assertThrows(NullPointerException.class, () -> tile.loadPartList((Collection) null)); + assertTrue(tile.jPartList().isEmpty()); + assertSame(tile, first.tile()); + assertThrows(NullPointerException.class, () -> tile.loadPartList(Arrays.asList(replacement, null, replaced))); + assertEquals(Arrays.asList(replacement, null), tile.jPartList()); + assertNull(replaced.tile()); + } + + private static Seq seq(TMultiPart... parts) { + return JavaConversions.asScalaBuffer(Arrays.asList(parts)).toList(); + } + + private static class LoadingTile extends TileMultipart { + + private final List events; + + private LoadingTile(List events) { + this.events = events; + } + + @Override + public void clearParts() { + events.add("clear"); + super.clearParts(); + } + + @Override + public void bindPart(TMultiPart part) { + events.add("cache:" + (part == null ? "null" : part.getType())); + } + } + + private static class Part extends TMultiPart { + + private final String name; + private final List events; + + private Part(String name, List events) { + this.name = name; + this.events = events; + } + + @Override + public String getType() { + return name; + } + + @Override + public void bind(TileMultipart tile) { + events.add("bind:" + name); + super.bind(tile); + } + + @Override + public void onAdded() { + events.add("added:" + name); + } + + @Override + public void onRemoved() { + events.add("removed:" + name); + } + + @Override + public void onWorldJoin() { + events.add("join:" + name); + } + } +} diff --git a/src/test/java/codechicken/multipart/TileMultipartOcclusionTest.java b/src/test/java/codechicken/multipart/TileMultipartOcclusionTest.java new file mode 100644 index 0000000..2775486 --- /dev/null +++ b/src/test/java/codechicken/multipart/TileMultipartOcclusionTest.java @@ -0,0 +1,226 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.examples.OcclusionExample; +import scala.collection.JavaConversions; +import scala.collection.Seq; + +/** Pair ordering, failures and the tile-level override hook behind collection occlusion queries. */ +class TileMultipartOcclusionTest { + + @Test + void legacyQueryChecksBothDirectionsInOrderAndStopsAtEitherRejection() { + TileMultipart tile = new TileMultipart(); + List calls = new ArrayList<>(); + Part first = new Part("first", calls); + Part second = new Part("second", calls); + Part candidate = new Part("candidate", calls); + assertTrue(tile.occlusionTest(seq(first, second), candidate)); + assertEquals( + Arrays.asList("first:candidate", "candidate:first", "second:candidate", "candidate:second"), + calls); + assertNull(first.tile(), "Unbound parts participate in geometry queries"); + calls.clear(); + first.accepts = false; + assertFalse(tile.occlusionTest(seq(first, second), candidate)); + assertEquals(Arrays.asList("first:candidate"), calls); + calls.clear(); + first.accepts = true; + candidate.accepts = false; + assertFalse(tile.occlusionTest(seq(first, second), candidate)); + assertEquals(Arrays.asList("first:candidate", "candidate:first"), calls); + } + + @Test + void legacyQueryRetainsLazyNullChecksAndOriginalCallbackFailures() { + TileMultipart tile = new TileMultipart(); + List calls = new ArrayList<>(); + Part existing = new Part("existing", calls); + Part candidate = new Part("candidate", calls); + assertTrue(tile.occlusionTest(seq(), null)); + assertThrows(NullPointerException.class, () -> tile.occlusionTest(null, candidate)); + existing.accepts = false; + assertFalse(tile.occlusionTest(seq(existing, null), null)); + assertEquals(Arrays.asList("existing:null"), calls); + existing.accepts = true; + calls.clear(); + IllegalStateException failure = new IllegalStateException("candidate callback"); + candidate.failure = failure; + assertSame( + failure, + assertThrows(IllegalStateException.class, () -> tile.occlusionTest(seq(existing, null), candidate))); + assertEquals(Arrays.asList("existing:candidate", "candidate:existing"), calls); + } + + @Test + void replacementChecksKeepTheLegacyTileOverrideAndExcludeTheOutgoingPart() { + List calls = new ArrayList<>(); + List> inputs = new ArrayList<>(); + TileMultipart tile = new TileMultipart() { + + @Override + public boolean occlusionTest(Seq parts, TMultiPart candidate) { + inputs.add(parts); + return false; + } + }; + Part outgoing = new Part("outgoing", calls); + Part retained = new Part("retained", calls); + Part candidate = new Part("candidate", calls); + tile.partList_$eq(seq(outgoing, retained)); + assertFalse(tile.canReplacePart(outgoing, candidate)); + assertEquals(Arrays.asList(seq(retained)), inputs); + assertTrue(calls.isEmpty(), "The override can reject without invoking pair callbacks"); + assertEquals(Arrays.asList(outgoing, retained), tile.jPartList()); + } + + @Test + void javaQuerySnapshotsTheSuppliedCollectionAndRetainsDuplicatesAndUnboundParts() { + TileMultipart tile = new TileMultipart(); + List calls = new ArrayList<>(); + Part stored = new Part("stored", calls); + stored.accepts = false; + tile.setPartList(Arrays.asList(stored)); + Part first = new Part("first", calls); + Part second = new Part("second", calls); + Part candidate = new Part("candidate", calls); + List input = new ArrayList<>(Arrays.asList(first, second, first)); + first.onTest = input::clear; + + assertTrue(tile.testOcclusion(input, candidate)); + assertEquals( + Arrays.asList( + "first:candidate", + "candidate:first", + "second:candidate", + "candidate:second", + "first:candidate", + "candidate:first"), + calls); + assertTrue(input.isEmpty()); + assertEquals( + Arrays.asList(stored), + tile.jPartList(), + "The query uses the supplied collection, not tile storage"); + assertNull(first.tile()); + assertNull(candidate.tile()); + } + + @Test + void javaQueryPreservesTheLegacyOverrideAndDoesNotReplaceTheInternalHook() { + List calls = new ArrayList<>(); + List> inputs = new ArrayList<>(); + TileMultipart tile = new TileMultipart() { + + @Override + public boolean occlusionTest(Seq parts, TMultiPart candidate) { + calls.add("legacy"); + inputs.add(parts); + return false; + } + + @Override + public boolean testOcclusion(Collection parts, TMultiPart candidate) { + calls.add("java"); + return super.testOcclusion(parts, candidate); + } + }; + Part first = new Part("first", calls); + Part second = new Part("second", calls); + Part candidate = new Part("candidate", calls); + assertFalse(tile.testOcclusion(new LinkedHashSet<>(Arrays.asList(first, second)), candidate)); + tile.setPartList(Arrays.asList(first, second)); + assertFalse(tile.canReplacePart(first, candidate)); + assertEquals(Arrays.asList("java", "legacy", "legacy"), calls); + assertEquals(Arrays.asList(seq(first, second), seq(second)), inputs); + } + + @Test + void javaQueryKeepsShortCircuitingAndCallbackFailureBoundaries() { + TileMultipart tile = new TileMultipart(); + List calls = new ArrayList<>(); + Part first = new Part("first", calls); + Part candidate = new Part("candidate", calls); + assertTrue(tile.testOcclusion(Collections.emptyList(), null)); + assertThrows(NullPointerException.class, () -> tile.testOcclusion(null, candidate)); + first.accepts = false; + assertFalse(tile.testOcclusion(Arrays.asList(first, null), null)); + assertEquals(Arrays.asList("first:null"), calls); + first.accepts = true; + candidate.accepts = false; + calls.clear(); + assertFalse(tile.testOcclusion(Arrays.asList(first, null), candidate)); + assertEquals(Arrays.asList("first:candidate", "candidate:first"), calls); + calls.clear(); + IllegalStateException failure = new IllegalStateException("candidate callback"); + candidate.failure = failure; + assertSame( + failure, + assertThrows( + IllegalStateException.class, + () -> tile.testOcclusion(Arrays.asList(first, null), candidate))); + assertEquals(Arrays.asList("first:candidate", "candidate:first"), calls); + } + + @Test + void javaShapeExampleDistinguishesTouchingFromOverlappingBounds() { + TileMultipart tile = new TileMultipart(); + NormallyOccludedPart existing = new NormallyOccludedPart(new Cuboid6(0, 0, 0, 0.5, 1, 1)); + List input = Arrays.asList(existing); + assertTrue(OcclusionExample.fitsShape(tile, input, new Cuboid6(0.5, 0, 0, 1, 1, 1))); + assertFalse(OcclusionExample.fitsShape(tile, input, new Cuboid6(0.25, 0, 0, 1, 1, 1))); + assertTrue(tile.jPartList().isEmpty()); + assertNull(existing.tile()); + } + + private static Seq seq(TMultiPart... parts) { + return JavaConversions.asScalaBuffer(Arrays.asList(parts)).toList(); + } + + private static class Part extends TMultiPart { + + private final String name; + private final List calls; + private boolean accepts = true; + private RuntimeException failure; + private Runnable onTest; + + private Part(String name, List calls) { + this.name = name; + this.calls = calls; + } + + @Override + public String getType() { + return name; + } + + @Override + public boolean occlusionTest(TMultiPart other) { + calls.add(name + ":" + (other == null ? "null" : other.getType())); + if (onTest != null) { + onTest.run(); + } + if (failure != null) { + throw failure; + } + return accepts; + } + } +} diff --git a/src/test/java/codechicken/multipart/TileMultipartRenderIdTest.java b/src/test/java/codechicken/multipart/TileMultipartRenderIdTest.java new file mode 100644 index 0000000..dab3b65 --- /dev/null +++ b/src/test/java/codechicken/multipart/TileMultipartRenderIdTest.java @@ -0,0 +1,58 @@ +package codechicken.multipart; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.examples.RenderIdExample; + +class TileMultipartRenderIdTest { + + @Test + void javaAccessorsAndExampleShareAllLegacyReadersAndWriters() { + int previous = TileMultipart.getRenderID(); + BlockMultipart block = new BlockMultipart(); + try { + for (int value : new int[] { -1, 0, 37, Integer.MIN_VALUE, Integer.MAX_VALUE }) { + TileMultipart.setRenderID(value); + assertEquals(value, TileMultipart.renderID()); + assertEquals(value, TileMultipart$.MODULE$.renderID()); + assertEquals(value, RenderIdExample.multipartRenderType()); + assertEquals(value, block.getRenderType()); + TileMultipart.renderID_$eq(~value); + assertEquals(~value, TileMultipart.getRenderID()); + TileMultipart$.MODULE$.renderID_$eq(value); + assertEquals(value, TileMultipart.getRenderID()); + } + } finally { + TileMultipart.setRenderID(previous); + } + } + + @Test + void uninitializedRenderIdIsTheSharedMinusOneSentinel() { + assertEquals(-1, TileMultipart.renderID()); + assertEquals(-1, TileMultipart$.MODULE$.renderID()); + assertEquals(-1, new BlockMultipart().getRenderType()); + } + + @Test + void bothLegacySettersUpdateOneGlobalValueWithoutValidation() { + int previous = TileMultipart.renderID(); + BlockMultipart first = new BlockMultipart(); + BlockMultipart second = new BlockMultipart(); + try { + for (int value : new int[] { 0, 37, -1, Integer.MIN_VALUE, Integer.MAX_VALUE }) { + TileMultipart.renderID_$eq(value); + assertEquals(value, TileMultipart$.MODULE$.renderID()); + assertEquals(value, first.getRenderType()); + TileMultipart$.MODULE$.renderID_$eq(~value); + assertEquals(~value, TileMultipart.renderID()); + assertEquals(~value, first.getRenderType()); + assertEquals(~value, second.getRenderType()); + } + } finally { + TileMultipart.renderID_$eq(previous); + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ASMImplicitsCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/ASMImplicitsCharacterizationTest.java new file mode 100644 index 0000000..7f5633a --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ASMImplicitsCharacterizationTest.java @@ -0,0 +1,256 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.BitSet; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +class ASMImplicitsCharacterizationTest { + + @Test + void keepsFacadeCompanionAndValueClassSurfaces() throws Exception { + Set facadeMethods = signatures( + "ExtBitSet(Ljava/util/BitSet;)Ljava/util/BitSet;", + "ExtClass(Ljava/lang/Class;)Ljava/lang/Class;", + "nodeName(Ljava/lang/String;)Ljava/lang/String;"); + assertShape(ASMImplicits.class, Modifier.PUBLIC | Modifier.FINAL); + assertShape(ASMImplicits$.class, Modifier.PUBLIC | Modifier.FINAL); + assertEquals(facadeMethods, methods(ASMImplicits.class, Modifier.PUBLIC | Modifier.STATIC)); + assertEquals(facadeMethods, methods(ASMImplicits$.class, Modifier.PUBLIC)); + assertEquals(0, ASMImplicits.class.getDeclaredFields().length); + assertModule(ASMImplicits$.class, ASMImplicits$.MODULE$); + assertTrue(Modifier.isPrivate(ASMImplicits$.class.getDeclaredConstructor().getModifiers())); + + assertWrapper(ASMImplicits.ExtBitSet.class, BitSet.class, "bitset"); + assertEquals( + signatures( + "bitset()Ljava/util/BitSet;", + "set(Ljava/util/BitSet;)Ljava/util/BitSet;", + "copy()Ljava/util/BitSet;", + "hashCode()I", + "equals(Ljava/lang/Object;)Z"), + methods(ASMImplicits.ExtBitSet.class, Modifier.PUBLIC)); + assertWrapper(ASMImplicits.ExtClass.class, Class.class, "clazz"); + assertEquals( + signatures( + "clazz()Ljava/lang/Class;", + "nodeName()Ljava/lang/String;", + "hashCode()I", + "equals(Ljava/lang/Object;)Z"), + methods(ASMImplicits.ExtClass.class, Modifier.PUBLIC)); + + assertShape(ASMImplicits.ExtBitSet$.class, Modifier.PUBLIC | Modifier.STATIC); + assertShape(ASMImplicits.ExtClass$.class, Modifier.PUBLIC | Modifier.STATIC); + assertModule(ASMImplicits.ExtBitSet$.class, ASMImplicits.ExtBitSet$.MODULE$); + assertModule(ASMImplicits.ExtClass$.class, ASMImplicits.ExtClass$.MODULE$); + assertEquals(Modifier.PUBLIC, ASMImplicits.ExtBitSet$.class.getDeclaredConstructor().getModifiers()); + assertEquals(Modifier.PUBLIC, ASMImplicits.ExtClass$.class.getDeclaredConstructor().getModifiers()); + assertEquals( + signatures( + "set$extension(Ljava/util/BitSet;Ljava/util/BitSet;)Ljava/util/BitSet;", + "copy$extension(Ljava/util/BitSet;)Ljava/util/BitSet;", + "hashCode$extension(Ljava/util/BitSet;)I", + "equals$extension(Ljava/util/BitSet;Ljava/lang/Object;)Z"), + methods(ASMImplicits.ExtBitSet$.class, Modifier.PUBLIC | Modifier.FINAL)); + assertEquals( + signatures( + "nodeName$extension(Ljava/lang/Class;)Ljava/lang/String;", + "hashCode$extension(Ljava/lang/Class;)I", + "equals$extension(Ljava/lang/Class;Ljava/lang/Object;)Z"), + methods(ASMImplicits.ExtClass$.class, Modifier.PUBLIC | Modifier.FINAL)); + } + + @Test + void convertsNamesWithoutChangingTheIdentityConversionsOrNullRules() { + BitSet bits = new BitSet(); + assertSame(bits, ASMImplicits.ExtBitSet(bits)); + assertSame(bits, ASMImplicits$.MODULE$.ExtBitSet(bits)); + assertNull(ASMImplicits.ExtBitSet(null)); + assertSame(String.class, ASMImplicits.ExtClass(String.class)); + assertSame(String.class, ASMImplicits$.MODULE$.ExtClass(String.class)); + assertNull(ASMImplicits.ExtClass(null)); + assertNull(ASMImplicits.nodeName(null)); + assertNull(ASMImplicits$.MODULE$.nodeName(null)); + assertEquals("", ASMImplicits.nodeName("")); + assertEquals("a//b$C", ASMImplicits.nodeName("a..b$C")); + String internal = "already/internal$Name"; + assertSame(internal, ASMImplicits.nodeName(internal)); + Class[] types = { String.class, String[].class, int.class, int[][].class, void.class, + ASMImplicits.ExtClass.class }; + for (Class type : types) { + String expected = type.getName().replace('.', '/'); + assertEquals(expected, ASMImplicits.nodeName(type.getName())); + assertEquals(expected, ASMImplicits$.MODULE$.nodeName(type.getName())); + assertEquals(expected, ASMImplicits.ExtClass$.MODULE$.nodeName$extension(type)); + ASMImplicits.ExtClass wrapped = new ASMImplicits.ExtClass(type); + assertSame(type, wrapped.clazz()); + assertEquals(expected, wrapped.nodeName()); + } + assertThrows(NullPointerException.class, () -> ASMImplicits.ExtClass$.MODULE$.nodeName$extension(null)); + assertThrows(NullPointerException.class, () -> new ASMImplicits.ExtClass(null).nodeName()); + } + + @Test + void replacementClearsBeforeOrIncludingAliasingAndNullFailure() { + TrackingBitSet destination = new TrackingBitSet(); + destination.set(4096); + BitSet source = bits(0, 63, 64, 127); + ASMImplicits.ExtBitSet wrapper = new ASMImplicits.ExtBitSet(destination); + assertSame(destination, wrapper.bitset()); + assertSame(destination, wrapper.set(source)); + assertEquals("clear,or,", destination.calls); + assertEquals(source, destination); + assertEquals(bits(0, 63, 64, 127), source); + + destination.calls = ""; + assertSame(destination, ASMImplicits.ExtBitSet$.MODULE$.set$extension(destination, destination)); + assertTrue(destination.isEmpty(), "Self-replacement clears the set before reading it"); + assertEquals("clear,or,", destination.calls); + + destination.set(7); + destination.calls = ""; + assertThrows(NullPointerException.class, () -> wrapper.set(null)); + assertTrue(destination.isEmpty(), "Null source failure happens after clearing the destination"); + assertEquals("clear,or,", destination.calls); + assertThrows(NullPointerException.class, () -> ASMImplicits.ExtBitSet$.MODULE$.set$extension(null, source)); + } + + @Test + void copiesIntoIndependentPlainBitSetsInsteadOfCloningTheSource() { + TrackingBitSet source = new TrackingBitSet(); + source.set(0); + source.set(64); + source.set(4096); + BitSet expected = bits(0, 64, 4096); + BitSet first = ASMImplicits.ExtBitSet$.MODULE$.copy$extension(source); + BitSet second = new ASMImplicits.ExtBitSet(source).copy(); + assertNotSame(first, second); + for (BitSet copy : new BitSet[] { first, second }) { + assertSame(BitSet.class, copy.getClass()); + assertNotSame(source, copy); + assertEquals(expected, copy); + copy.clear(); + assertEquals(expected, source); + } + assertEquals("", source.calls); + BitSet empty = ASMImplicits.ExtBitSet$.MODULE$.copy$extension(new BitSet(8192)); + assertTrue(empty.isEmpty()); + assertEquals(new BitSet().size(), empty.size(), "Copy does not retain spare source capacity"); + assertThrows(NullPointerException.class, () -> ASMImplicits.ExtBitSet$.MODULE$.copy$extension(null)); + } + + @Test + void boxedValueClassesKeepValueEqualityAndNullHashFailures() { + TrackingBitSet shared = new TrackingBitSet(); + assertTrue(new ASMImplicits.ExtBitSet(shared).equals(new ASMImplicits.ExtBitSet(shared))); + assertEquals(1, shared.equalsCalls, "Even identical non-null values dispatch BitSet.equals"); + BitSet value = bits(1, 65); + ASMImplicits.ExtBitSet wrapper = new ASMImplicits.ExtBitSet(value); + assertEquals(wrapper, new ASMImplicits.ExtBitSet(bits(1, 65))); + assertFalse(wrapper.equals(new ASMImplicits.ExtBitSet(bits(1)))); + assertFalse(wrapper.equals(value)); + assertFalse(wrapper.equals(null)); + assertEquals(value.hashCode(), wrapper.hashCode()); + assertTrue(ASMImplicits.ExtBitSet$.MODULE$.equals$extension(value, wrapper)); + assertEquals(new ASMImplicits.ExtBitSet(null), new ASMImplicits.ExtBitSet(null)); + assertFalse(ASMImplicits.ExtBitSet$.MODULE$.equals$extension(null, wrapper)); + assertThrows(NullPointerException.class, () -> new ASMImplicits.ExtBitSet(null).hashCode()); + + ASMImplicits.ExtClass clazz = new ASMImplicits.ExtClass(String.class); + assertEquals(clazz, new ASMImplicits.ExtClass(String.class)); + assertFalse(clazz.equals(new ASMImplicits.ExtClass(Object.class))); + assertFalse(clazz.equals(String.class)); + assertFalse(clazz.equals(null)); + assertEquals(String.class.hashCode(), clazz.hashCode()); + assertTrue(ASMImplicits.ExtClass$.MODULE$.equals$extension(String.class, clazz)); + assertEquals(new ASMImplicits.ExtClass(null), new ASMImplicits.ExtClass(null)); + assertFalse(ASMImplicits.ExtClass$.MODULE$.equals$extension(null, clazz)); + assertThrows(NullPointerException.class, () -> new ASMImplicits.ExtClass(null).hashCode()); + } + + private static void assertShape(Class type, int modifiers) { + assertEquals(modifiers, type.getModifiers()); + assertSame(Object.class, type.getSuperclass()); + assertEquals(0, type.getInterfaces().length); + } + + private static void assertModule(Class type, Object instance) throws Exception { + assertEquals(1, type.getDeclaredFields().length); + Field module = type.getDeclaredField("MODULE$"); + assertEquals(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, module.getModifiers()); + assertSame(type, module.getType()); + assertSame(instance, module.get(null)); + } + + private static void assertWrapper(Class type, Class valueType, String fieldName) throws Exception { + assertShape(type, Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL); + assertSame(ASMImplicits.class, type.getDeclaringClass()); + assertEquals(1, type.getDeclaredFields().length); + Field field = type.getDeclaredField(fieldName); + assertEquals(Modifier.PRIVATE | Modifier.FINAL, field.getModifiers()); + assertSame(valueType, field.getType()); + assertEquals(Modifier.PUBLIC, type.getDeclaredConstructor(valueType).getModifiers()); + } + + private static Set signatures(String... values) { + return new TreeSet<>(Arrays.asList(values)); + } + + private static Set methods(Class type, int modifiers) { + Set result = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + assertEquals(modifiers, method.getModifiers()); + result.add(method.getName() + Type.getMethodDescriptor(method)); + } + return result; + } + + private static BitSet bits(int... positions) { + BitSet bits = new BitSet(); + for (int position : positions) bits.set(position); + return bits; + } + + private static class TrackingBitSet extends BitSet { + + private String calls = ""; + private int equalsCalls; + + @Override + public boolean equals(Object other) { + equalsCalls++; + return super.equals(other); + } + + @Override + public void clear() { + calls += "clear,"; + super.clear(); + } + + @Override + public void or(BitSet set) { + calls += "or,"; + super.or(set); + } + + @Override + public Object clone() { + throw new AssertionError("Copy must construct a plain BitSet, not invoke clone"); + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ASMMixinFactoryCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/ASMMixinFactoryCharacterizationTest.java new file mode 100644 index 0000000..1f29dda --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ASMMixinFactoryCharacterizationTest.java @@ -0,0 +1,135 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.BitSet; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.ClassNode; + +import scala.Predef$; +import scala.collection.Seq; + +/** + * Registration and construction need the mixin compiler, which cannot run outside Forge; the Forge suite covers those + * paths. What is checked here is the surface downstream mods link against and the state the factory owns. + */ +class ASMMixinFactoryCharacterizationTest { + + @Test + void keepsExactPublicSurface() throws Exception { + assertEquals(Modifier.PUBLIC, ASMMixinFactory.class.getModifiers()); + assertSame(Object.class, ASMMixinFactory.class.getSuperclass()); + assertEquals(0, ASMMixinFactory.class.getInterfaces().length); + assertEquals( + signatures( + "baseType()Ljava/lang/Class;", + "construct(Ljava/util/BitSet;Lscala/collection/Seq;)Ljava/lang/Object;", + "getId(Ljava/lang/String;)I", + "registerTrait(Ljava/lang/Class;)I", + "registerTrait(Ljava/lang/String;)I", + "onCompiled(Ljava/lang/Class;Ljava/util/BitSet;)V", + "autoCompleteJavaTrait(Lorg/objectweb/asm/tree/ClassNode;)V", + "codechicken$multipart$asm$ASMMixinFactory$$concreteParent$1" + + "(Lcodechicken/multipart/asm/ASMMixinCompiler$ClassInfo;)" + + "Lcodechicken/multipart/asm/ASMMixinCompiler$ClassInfo;", + "codechicken$multipart$asm$ASMMixinFactory$$checkParent$1" + + "(Lcodechicken/multipart/asm/ASMMixinCompiler$ClassInfo;Ljava/lang/String;)Z"), + publicMethods(ASMMixinFactory.class)); + + assertEquals(1, ASMMixinFactory.class.getDeclaredConstructors().length); + assertEquals( + "(Ljava/lang/Class;Lscala/collection/Seq;)V", + Type.getConstructorDescriptor(ASMMixinFactory.class.getDeclaredConstructor(Class.class, Seq.class))); + + // MicroblockGenerator and MultipartMixinFactory extend this, and both override the two callbacks. + for (String name : new String[] { "onCompiled", "autoCompleteJavaTrait" }) { + for (Method method : ASMMixinFactory.class.getDeclaredMethods()) { + if (method.getName().equals(name)) { + assertTrue(Modifier.isPublic(method.getModifiers())); + assertFalse(Modifier.isFinal(method.getModifiers())); + } + } + } + } + + @Test + void keepsTheSixFieldsThatHoldTheTraitAndClassCaches() throws Exception { + assertField("baseType", Class.class, Modifier.PRIVATE | Modifier.FINAL); + assertField("paramTypes", Seq.class, Modifier.PRIVATE | Modifier.FINAL); + assertField("traitMap", scala.collection.mutable.Map.class, Modifier.PRIVATE | Modifier.FINAL); + assertField("traits", scala.collection.mutable.ArrayBuffer.class, Modifier.PRIVATE | Modifier.FINAL); + assertField("classMap", scala.collection.mutable.Map.class, Modifier.PRIVATE | Modifier.FINAL); + assertField("ugenid", int.class, Modifier.PRIVATE); + assertEquals(6, ASMMixinFactory.class.getDeclaredFields().length); + } + + @Test + void generatesClassNamesFromTheBaseTypeInRegistrationOrder() throws Exception { + ASMMixinFactory factory = factory(String.class); + assertSame(String.class, factory.baseType()); + + Method nextName = ASMMixinFactory.class.getDeclaredMethod("nextName"); + nextName.setAccessible(true); + assertEquals("String_cmp$$0", nextName.invoke(factory)); + assertEquals("String_cmp$$1", nextName.invoke(factory)); + assertEquals("String_cmp$$2", nextName.invoke(factory)); + + assertEquals("Object_cmp$$0", nextName.invoke(factory(Object.class))); + } + + @Test + void reportsAnUnregisteredTraitAsAMissingMapKey() { + ASMMixinFactory factory = factory(String.class); + NoSuchElementException error = assertThrows(NoSuchElementException.class, () -> factory.getId("test/Missing")); + assertEquals("key not found: test/Missing", error.getMessage()); + } + + @Test + void leavesBothCallbacksAsNoOps() { + ASMMixinFactory factory = factory(String.class); + ClassNode cnode = new ClassNode(); + cnode.visit(50, 0, "test/JTrait", null, "java/lang/Object", null); + + factory.autoCompleteJavaTrait(cnode); + factory.onCompiled(String.class, new BitSet()); + + assertEquals(0, cnode.methods.size()); + } + + private static ASMMixinFactory factory(Class baseType) { + return new ASMMixinFactory<>(baseType, Predef$.MODULE$.wrapRefArray(new Class[0])); + } + + private static void assertField(String name, Class type, int modifiers) throws Exception { + Field field = ASMMixinFactory.class.getDeclaredField(name); + assertSame(type, field.getType()); + assertEquals(modifiers, field.getModifiers()); + } + + private static Set publicMethods(Class type) { + Set result = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + result.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return result; + } + + private static Set signatures(String... values) { + return new TreeSet<>(Arrays.asList(values)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/ByteCodeReaderCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/ByteCodeReaderCharacterizationTest.java new file mode 100644 index 0000000..7c82bc0 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ByteCodeReaderCharacterizationTest.java @@ -0,0 +1,155 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.multipart.asm.ScalaSignature.Bytes; + +class ByteCodeReaderCharacterizationTest { + + @Test + void keepsExactReaderSurface() throws Exception { + assertEquals(Modifier.PUBLIC, ByteCodeReader.class.getModifiers()); + assertSame(Object.class, ByteCodeReader.class.getSuperclass()); + assertEquals(0, ByteCodeReader.class.getInterfaces().length); + assertEquals( + signatures( + "advance(ILjava/lang/Object;)Ljava/lang/Object;", + "bc()Lcodechicken/multipart/asm/ScalaSignature$Bytes;", + "more()Z", + "pos()I", + "pos_$eq(I)V", + "readByte()B", + "readLong()J", + "readNat()I", + "readString(I)Ljava/lang/String;"), + publicMethods(ByteCodeReader.class)); + + Field bc = ByteCodeReader.class.getDeclaredField("bc"); + assertEquals(Modifier.PRIVATE | Modifier.FINAL, bc.getModifiers()); + assertSame(Bytes.class, bc.getType()); + Field pos = ByteCodeReader.class.getDeclaredField("pos"); + assertEquals(Modifier.PRIVATE, pos.getModifiers()); + assertSame(int.class, pos.getType()); + + assertEquals(1, ByteCodeReader.class.getDeclaredConstructors().length); + assertEquals( + "(Lcodechicken/multipart/asm/ScalaSignature$Bytes;)V", + Type.getConstructorDescriptor(ByteCodeReader.class.getDeclaredConstructor(Bytes.class))); + } + + @Test + void startsAtTheSectionOffsetAndTracksItsOwnPosition() { + Bytes bytes = new Bytes(bytes(1, 2, 3, 4), 1, 2); + ByteCodeReader reader = bytes.reader(); + + assertSame(bytes, reader.bc()); + assertEquals(1, reader.pos()); + assertTrue(reader.more()); + + assertEquals((byte) 2, reader.readByte()); + assertEquals(2, reader.pos()); + assertTrue(reader.more()); + + assertEquals((byte) 3, reader.readByte()); + assertEquals(3, reader.pos()); + assertFalse(reader.more()); + + reader.pos_$eq(1); + assertTrue(reader.more()); + assertEquals((byte) 2, reader.readByte()); + } + + @Test + void readByteKeepsSignedValues() { + ByteCodeReader reader = new Bytes(bytes(0x80, 0xff, 0x7f), 0, 3).reader(); + assertEquals((byte) -128, reader.readByte()); + assertEquals((byte) -1, reader.readByte()); + assertEquals((byte) 127, reader.readByte()); + } + + @Test + void readNatDecodesSevenBitGroupsAndOverflowsSilently() { + ByteCodeReader reader = new Bytes(bytes(0x7f, 0x81, 0x00, 0xff, 0xff, 0x7f), 0, 6).reader(); + assertEquals(127, reader.readNat()); + assertEquals(128, reader.readNat()); + assertEquals(2097151, reader.readNat()); + + // Five continuation groups overflow an int rather than failing. + assertEquals(-1, new Bytes(bytes(0x8f, 0xff, 0xff, 0xff, 0x7f), 0, 5).reader().readNat()); + } + + @Test + void readLongConsumesTheRestOfTheSectionUnsigned() { + assertEquals(0x01ffL, new Bytes(bytes(1, 0xff), 0, 2).reader().readLong()); + assertEquals(0L, new Bytes(bytes(1, 2), 0, 0).reader().readLong()); + + Bytes section = new Bytes(bytes(9, 1, 2, 9), 1, 2); + ByteCodeReader reader = section.reader(); + assertEquals(0x0102L, reader.readLong()); + assertEquals(3, reader.pos()); + } + + @Test + void readStringUsesTheDefaultCharsetAndClampsToTheArray() { + ByteCodeReader reader = new Bytes("abcd".getBytes(StandardCharsets.UTF_8), 1, 3).reader(); + assertEquals("bc", reader.readString(2)); + assertEquals(3, reader.pos()); + + // A section longer than its array yields the remaining bytes but still advances by the requested length. + ByteCodeReader wide = new Bytes("abc".getBytes(StandardCharsets.UTF_8), 0, 10).reader(); + assertEquals("abc", wide.readString(5)); + assertEquals(5, wide.pos()); + assertEquals("", wide.readString(0)); + } + + @Test + void advanceRefusesToLeaveTheSectionAndReturnsItsArgument() { + ByteCodeReader reader = new Bytes(bytes(1, 2, 3, 4), 1, 2).reader(); + Object marker = new Object(); + assertSame(marker, reader.advance(2, marker)); + assertEquals(3, reader.pos()); + + IllegalArgumentException error = assertThrows(IllegalArgumentException.class, () -> reader.advance(1, marker)); + assertEquals("Ran off the end of bytecode", error.getMessage()); + assertEquals(3, reader.pos()); + assertThrows(IllegalArgumentException.class, reader::readByte); + assertThrows(IllegalArgumentException.class, () -> reader.readString(1)); + } + + private static byte[] bytes(int... values) { + byte[] array = new byte[values.length]; + for (int i = 0; i < values.length; i++) { + array[i] = (byte) values[i]; + } + return array; + } + + private static Set publicMethods(Class type) { + Set actual = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + actual.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return actual; + } + + private static Set signatures(String... expected) { + return new TreeSet<>(Arrays.asList(expected)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/ByteCodecsCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/ByteCodecsCharacterizationTest.java new file mode 100644 index 0000000..47dc042 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ByteCodecsCharacterizationTest.java @@ -0,0 +1,164 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Random; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +class ByteCodecsCharacterizationTest { + + @Test + void keepsExactFacadeAndCompanionSurface() throws Exception { + Set expected = new TreeSet<>( + Arrays.asList( + "avoidZero([B)[B", + "regenerateZero([B)I", + "encode8to7([B)[B", + "decode7to8([BI)I", + "encode([B)[B", + "decode([B)I")); + for (Class type : new Class[] { ByteCodecs.class, ByteCodecs$.class }) { + assertEquals(Modifier.PUBLIC | Modifier.FINAL, type.getModifiers()); + assertSame(Object.class, type.getSuperclass()); + assertEquals(0, type.getInterfaces().length); + Set actual = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + assertEquals(Modifier.PUBLIC | (type == ByteCodecs.class ? Modifier.STATIC : 0), method.getModifiers()); + actual.add(method.getName() + Type.getMethodDescriptor(method)); + } + assertEquals(expected, actual); + } + assertEquals(0, ByteCodecs.class.getDeclaredFields().length); + assertEquals(1, ByteCodecs$.class.getDeclaredFields().length); + Field module = ByteCodecs$.class.getDeclaredField("MODULE$"); + assertEquals(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, module.getModifiers()); + assertSame(ByteCodecs$.class, module.getType()); + assertSame(ByteCodecs$.MODULE$, module.get(null)); + assertTrue(Modifier.isPrivate(ByteCodecs$.class.getDeclaredConstructor().getModifiers())); + } + + @Test + void zeroEscapingPreservesSignedByteAndInPlaceSemantics() { + byte[] input = bytes(0, 1, 126, 127, 128, 255); + byte[] original = input.clone(); + byte[] escaped = ByteCodecs.avoidZero(input); + assertArrayEquals(bytes(1, 2, 127, 192, 128, 129, 0), escaped); + assertArrayEquals(original, input); + assertNotSame(input, escaped); + assertArrayEquals(escaped, ByteCodecs$.MODULE$.avoidZero(input)); + assertEquals(6, ByteCodecs.regenerateZero(escaped)); + assertArrayEquals(bytes(0, 1, 126, 127, 128, 127, 0), escaped); + + for (int value = 0; value < 256; value++) { + byte[] expected = value == 127 ? bytes(192, 128) : bytes(value + 1); + assertArrayEquals(expected, ByteCodecs.avoidZero(bytes(value))); + byte[] encoded = expected.clone(); + if (value == 191) { + assertThrows(ArrayIndexOutOfBoundsException.class, () -> ByteCodecs$.MODULE$.regenerateZero(encoded)); + assertArrayEquals(expected, encoded); + continue; + } + assertEquals(1, ByteCodecs$.MODULE$.regenerateZero(encoded)); + assertEquals((byte) (value == 255 ? 127 : value), encoded[0]); + } + byte[] nonEscape = bytes(192, 1, 0); + assertEquals(3, ByteCodecs.regenerateZero(nonEscape)); + assertArrayEquals(bytes(191, 0, 127), nonEscape); + } + + @Test + void goldenPackingAndRoundTripsCoverEveryByteAndRemainder() { + assertArrayEquals(bytes(1, 4, 12, 0), ByteCodecs.encode8to7(bytes(1, 2, 3))); + assertArrayEquals(bytes(2, 5, 13, 1), ByteCodecs.encode(bytes(1, 2, 3))); + byte[] documented = bytes(2, 5, 13, 1); + assertEquals(4, ByteCodecs.decode(documented)); + assertArrayEquals(bytes(1, 2, 3, 0), documented); + for (int value = 0; value < 256; value++) checkPacking(bytes(value)); + Random random = new Random(0xB17C0DEL); + for (int length = 0; length <= 128; length++) { + byte[] input = new byte[length]; + checkPacking(input); + Arrays.fill(input, (byte) 255); + checkPacking(input); + random.nextBytes(input); + checkPacking(input); + } + } + + @Test + void decodingUsesOnlyTheRequestedPrefixAndKeepsSignedShifts() { + byte[] prefix = bytes(1, 4, 12, 0, 55, 66, 77); + assertEquals(4, ByteCodecs.decode7to8(prefix, 4)); + assertArrayEquals(bytes(1, 2, 3, 0, 55, 66, 77), prefix); + byte[] signedTail = bytes(0, 128); + assertEquals(2, ByteCodecs.decode7to8(signedTail, 2)); + assertArrayEquals(bytes(0, 192), signedTail); + byte[] signedBlock = bytes(0, 128, 128, 128, 128, 128, 128, 128); + assertEquals(7, ByteCodecs$.MODULE$.decode7to8(signedBlock, 8)); + assertArrayEquals(bytes(0, 192, 224, 240, 248, 252, 254, 128), signedBlock); + } + + @Test + void malformedInputKeepsPartialMutationAndUncheckedFailures() { + byte[] truncatedEscape = bytes(1, 192); + assertThrows(ArrayIndexOutOfBoundsException.class, () -> ByteCodecs.regenerateZero(truncatedEscape)); + assertArrayEquals(bytes(0, 192), truncatedEscape); + byte[] truncatedDecode = bytes(1, 192); + assertThrows(ArrayIndexOutOfBoundsException.class, () -> ByteCodecs.decode(truncatedDecode)); + assertArrayEquals(bytes(0, 192), truncatedDecode); + byte[] excessiveLength = bytes(7, 3); + assertThrows(ArrayIndexOutOfBoundsException.class, () -> ByteCodecs.decode7to8(excessiveLength, 3)); + assertArrayEquals(bytes(135, 3), excessiveLength); + assertEquals(0, ByteCodecs.decode7to8(null, 0)); + assertEquals(0, ByteCodecs.decode7to8(null, -2)); + assertEquals(-1, ByteCodecs.decode7to8(null, -3)); + assertThrows(NullPointerException.class, () -> ByteCodecs.encode(null)); + assertThrows(NullPointerException.class, () -> ByteCodecs.decode(null)); + } + + private static void checkPacking(byte[] input) { + byte[] original = input.clone(); + byte[] expected = new byte[(input.length * 8 + 6) / 7]; + // Independent bit-by-bit oracle for the reference's unrolled byte-packing algorithm. + for (int bit = 0; bit < input.length * 8; bit++) { + expected[bit / 7] |= ((input[bit / 8] >>> (bit % 8)) & 1) << (bit % 7); + } + byte[] packed = ByteCodecs.encode8to7(input); + assertArrayEquals(expected, packed); + assertArrayEquals(packed, ByteCodecs$.MODULE$.encode8to7(input)); + assertArrayEquals(original, input); + assertNotSame(input, packed); + byte[] decoded = packed.clone(); + int decodedLength = ByteCodecs.decode7to8(decoded, packed.length); + assertEquals(input.length + (input.length % 7 == 0 ? 0 : 1), decodedLength); + assertArrayEquals(Arrays.copyOf(input, decodedLength), Arrays.copyOf(decoded, decodedLength)); + assertArrayEquals( + Arrays.copyOfRange(packed, decodedLength, packed.length), + Arrays.copyOfRange(decoded, decodedLength, decoded.length)); + byte[] escaped = ByteCodecs.encode(input); + assertArrayEquals(ByteCodecs.avoidZero(expected), escaped); + assertArrayEquals(escaped, ByteCodecs$.MODULE$.encode(input)); + assertEquals(decodedLength, ByteCodecs$.MODULE$.decode(escaped)); + assertArrayEquals(Arrays.copyOf(input, decodedLength), Arrays.copyOf(escaped, decodedLength)); + assertArrayEquals(original, input); + } + + private static byte[] bytes(int... values) { + byte[] result = new byte[values.length]; + for (int i = 0; i < values.length; i++) result[i] = (byte) values[i]; + return result; + } +} diff --git a/src/test/java/codechicken/multipart/asm/ClassInfoCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/ClassInfoCharacterizationTest.java new file mode 100644 index 0000000..ea90852 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ClassInfoCharacterizationTest.java @@ -0,0 +1,357 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; + +import codechicken.multipart.asm.ASMMixinCompiler.ClassInfo; +import codechicken.multipart.asm.ASMMixinCompiler.MethodInfo; +import scala.Option; +import scala.collection.Iterable; +import scala.collection.IterableView; +import scala.collection.Iterator; +import scala.collection.mutable.ListBuffer; + +class ClassInfoCharacterizationTest { + + @Test + void traversesOwnMethodsThenSuperclassThenInterfacesWithoutDeduplicating() { + StubClass root = new StubClass("Root"), parent = new StubClass("Parent"), first = new StubClass("First"), + second = new StubClass("Second"), child = new StubClass("Child"); + StubMethod shared = root.add("shared", "()V", ACC_PUBLIC); + StubMethod inherited = parent.add("run", "()V", ACC_PUBLIC); + StubMethod own = child.add("run", "()V", ACC_PUBLIC); + StubMethod iface = first.add("run", "(I)V", ACC_PUBLIC); + parent.parent = Option.apply(root); + first.parents.$plus$eq(root); + second.parents.$plus$eq(root); + child.parent = Option.apply(parent); + child.parents.$plus$eq(first); + child.parents.$plus$eq(second); + + assertEquals(Arrays.asList(own, inherited, shared, iface, shared, shared), list(child.allMethods())); + assertEquals(Arrays.asList(inherited, shared, iface, shared, shared), list(child.parentMethods())); + assertSame(own, child.findPublicImpl("run", "()V").get()); + assertSame(iface, child.findPublicImpl("run", "(I)V").get()); + assertFalse(child.findPublicImpl("missing", "()V").isDefined()); + assertFalse(child.isScala()); + assertFalse(child.isTrait()); + assertFalse(child.isObject()); + assertEquals("Child", child.moduleName()); + assertEquals("StubClass(Child)", child.toString()); + assertEquals("Child.run()V", own.toString()); + } + + @Test + void capturesParentIdentitiesButReadsTheirMethodsLazilyOnEachTraversal() { + StubClass parent = new StubClass("Parent"), iface = new StubClass("Interface"), child = new StubClass("Child"); + StubMethod original = parent.add("original", "()V", ACC_PUBLIC); + child.parent = Option.apply(parent); + child.parents.$plus$eq(iface); + + IterableView> view = child.parentMethods(); + assertEquals(0, parent.methodReads); + assertEquals(0, iface.methodReads); + child.parent = Option.empty(); + child.parents.clear(); + StubMethod later = iface.add("later", "()V", ACC_PUBLIC); + assertEquals(Arrays.asList(original, later), list(view)); + int reads = parent.methodReads; + parent.declared.clear(); + assertEquals(Arrays.asList(later), list(view)); + assertTrue(parent.methodReads > reads); + assertTrue(list(child.parentMethods()).isEmpty()); + } + + @Test + void allMethodsMaterializesStrictInputsButKeepsAViewInputLazy() { + StubClass parent = new StubClass("Parent"), child = new StubClass("Child"); + StubMethod own = child.add("own", "()V", ACC_PUBLIC), inherited = parent.add("inherited", "()V", ACC_PUBLIC); + child.parent = Option.apply(parent); + Iterable snapshot = child.allMethods(); + assertTrue(parent.methodReads > 0); + child.declared.clear(); + parent.declared.clear(); + assertEquals(Arrays.asList(own, inherited), list(snapshot)); + + child.useView = true; + Iterable live = child.allMethods(); + StubMethod added = child.add("added", "()V", ACC_PUBLIC); + assertEquals(Arrays.asList(added), list(live)); + } + + @Test + void findsFirstConcreteNonPrivateMatchWithShortCircuitingAndVirtualDispatch() { + List calls = new ArrayList<>(); + StubClass owner = new StubClass("Owner"); + ListBuffer candidates = new ListBuffer<>(); + candidates.$plus$eq(tracked(owner, "different", "()V", 0, calls)); + candidates.$plus$eq(tracked(owner, "run", "(I)V", 0, calls)); + candidates.$plus$eq(tracked(owner, "run", "()V", ACC_ABSTRACT, calls)); + candidates.$plus$eq(tracked(owner, "run", "()V", ACC_PRIVATE, calls)); + MethodInfo protectedMethod = tracked(owner, "run", "()V", ACC_PROTECTED, calls); + candidates.$plus$eq(protectedMethod); + candidates.$plus$eq(null); // Finding a match must not evaluate a later candidate. + StubClass query = new StubClass("Query") { + + @Override + public Iterable allMethods() { + calls.add("allMethods"); + return candidates; + } + }; + assertSame(protectedMethod, query.findPublicImpl("run", "()V").get()); + assertEquals( + Arrays.asList( + "allMethods", + "name", + "name", + "desc", + "name", + "desc", + "abstract", + "name", + "desc", + "abstract", + "private", + "name", + "desc", + "abstract", + "private"), + calls); + owner.add(null, null, 0); + assertTrue(owner.findPublicImpl(null, null).isDefined()); + assertThrows(NullPointerException.class, () -> query.findPublicImpl("missing", "()V")); + } + + @Test + void nodeMethodWrappersFollowMutableMetadataAndRetainTheirOuterOwner() throws Exception { + ClassNode node = new ClassNode(); + node.name = "test/Node"; + MethodNode method = new MethodNode(ACC_PRIVATE, "read", "(I)J", null, new String[] { "java/io/IOException" }); + node.methods.add(method); + ClassInfo info = nodeInfo(node); + MethodInfo wrapped = info.methods().head(); + assertSame(node, call(info, "cnode")); + assertSame(info, wrapped.owner()); + assertSame(method, call(wrapped, "mnode")); + assertEquals("test/Node.read(I)J", wrapped.toString()); + assertTrue(wrapped.isPrivate()); + assertFalse(wrapped.isAbstract()); + assertArrayEquals(new String[] { "java/io/IOException" }, wrapped.exceptions()); + String[] exceptions = wrapped.exceptions(); + exceptions[0] = "changed"; + assertArrayEquals(new String[] { "java/io/IOException" }, wrapped.exceptions()); + + method.name = "changed"; + method.desc = "()V"; + method.access = ACC_ABSTRACT | ACC_PUBLIC; + method.exceptions.add("java/lang/Exception"); + node.name = "test/Renamed"; + assertEquals("test/Renamed.changed()V", wrapped.toString()); + assertFalse(wrapped.isPrivate()); + assertTrue(wrapped.isAbstract()); + assertArrayEquals(new String[] { "java/io/IOException", "java/lang/Exception" }, wrapped.exceptions()); + assertEquals(wrapped, copy(wrapped, MethodNode.class, call(wrapped, "copy$default$1"))); + assertSame(info, copy(wrapped, MethodNode.class, method).owner()); + assertEquals(1, ((scala.Product) wrapped).productArity()); + assertSame(method, ((scala.Product) wrapped).productElement(0)); + assertNotEquals(wrapped, nodeInfo(node).methods().head()); + Iterable previous = info.methods(); + node.methods.add(new MethodNode(ACC_PUBLIC, "added", "()I", null, null)); + assertEquals(1, previous.size()); + assertEquals(2, info.methods().size()); + assertNotSame(wrapped, info.methods().head()); + } + + @Test + void reflectionWrappersPreserveJdkOrderDescriptorsExceptionsAndCaseClassOwner() throws Exception { + ClassInfo info = reflectionInfo(Reflected.class); + Method[] reflected = Reflected.class.getMethods(); + List methods = list(info.methods()); + assertEquals(reflected.length, methods.size()); + for (int i = 0; i < reflected.length; i++) { + assertSame(info, methods.get(i).owner()); + assertEquals(reflected[i].getName(), methods.get(i).name()); + assertEquals(Type.getMethodDescriptor(reflected[i]), methods.get(i).desc()); + } + Method method = Reflected.class.getDeclaredMethod("read", long.class, String[].class); + MethodInfo wrapped = reflectionMethod(info, method); + assertEquals("(J[Ljava/lang/String;)D", wrapped.desc()); + assertArrayEquals( + new String[] { "java/io/IOException", "java/lang/ReflectiveOperationException" }, + wrapped.exceptions()); + assertFalse(wrapped.isPrivate()); + assertTrue(wrapped.isAbstract()); + assertSame(info, copy(wrapped, Method.class, call(wrapped, "copy$default$1")).owner()); + assertEquals(wrapped, copy(wrapped, Method.class, method)); + assertNotEquals(wrapped, reflectionMethod(reflectionInfo(Reflected.class), method)); + assertSame(method, ((scala.Product) wrapped).productElement(0)); + assertEquals(info.name() + ".read(J[Ljava/lang/String;)D", wrapped.toString()); + MethodInfo hidden = reflectionMethod(info, Reflected.class.getDeclaredMethod("hidden")); + assertTrue(hidden.isPrivate()); + assertFalse(hidden.isAbstract()); + } + + // Scala nests these classes under ClassInfo$ without the extra '$' javac expects in their binary names. + private static ClassInfo nodeInfo(ClassNode node) throws Exception { + return (ClassInfo) Class.forName("codechicken.multipart.asm.ASMMixinCompiler$ClassInfo$ClassNodeInfo") + .getConstructor(ClassNode.class).newInstance(node); + } + + private static ClassInfo reflectionInfo(Class type) throws Exception { + return (ClassInfo) Class.forName("codechicken.multipart.asm.ASMMixinCompiler$ClassInfo$ReflectionClassInfo") + .getConstructor(Class.class).newInstance(type); + } + + private static MethodInfo reflectionMethod(ClassInfo owner, Method method) throws Exception { + Object factory = call(owner, "ReflectionMethodInfo"); + return (MethodInfo) factory.getClass().getMethod("apply", Method.class).invoke(factory, method); + } + + private static Object call(Object target, String method) throws Exception { + return target.getClass().getMethod(method).invoke(target); + } + + private static MethodInfo copy(MethodInfo source, Class parameter, Object value) throws Exception { + return (MethodInfo) source.getClass().getMethod("copy", parameter).invoke(source, value); + } + + private static StubMethod tracked(StubClass owner, String name, String desc, int access, List calls) { + return new StubMethod(owner, name, desc, access) { + + @Override + public String name() { + calls.add("name"); + return super.name(); + } + + @Override + public String desc() { + calls.add("desc"); + return super.desc(); + } + + @Override + public boolean isAbstract() { + calls.add("abstract"); + return super.isAbstract(); + } + + @Override + public boolean isPrivate() { + calls.add("private"); + return super.isPrivate(); + } + }; + } + + private static List list(Iterable values) { + List result = new ArrayList<>(); + Iterator iterator = values.iterator(); + while (iterator.hasNext()) result.add(iterator.next()); + return result; + } + + private static class StubClass extends ClassInfo { + + private final String name; + private Option parent = Option.empty(); + private final ListBuffer parents = new ListBuffer<>(); + private final ListBuffer declared = new ListBuffer<>(); + private int methodReads; + private boolean useView; + + private StubClass(String name) { + this.name = name; + } + + private StubMethod add(String method, String desc, int access) { + StubMethod result = new StubMethod(this, method, desc, access); + declared.$plus$eq(result); + return result; + } + + @Override + public String name() { + return name; + } + + @Override + public Option superClass() { + return parent; + } + + @Override + public Iterable interfaces() { + return parents; + } + + @Override + public Iterable methods() { + methodReads++; + return useView ? scala.collection.IterableLike$class.view(declared) : declared; + } + } + + private static class StubMethod extends MethodInfo { + + private final StubClass owner; + private final String name, desc; + private final int access; + + private StubMethod(StubClass owner, String name, String desc, int access) { + this.owner = owner; + this.name = name; + this.desc = desc; + this.access = access; + } + + @Override + public ClassInfo owner() { + return owner; + } + + @Override + public String name() { + return name; + } + + @Override + public String desc() { + return desc; + } + + @Override + public String[] exceptions() { + return new String[0]; + } + + @Override + public boolean isPrivate() { + return (access & ACC_PRIVATE) != 0; + } + + @Override + public boolean isAbstract() { + return (access & ACC_ABSTRACT) != 0; + } + } + + public abstract static class Reflected { + + public abstract double read(long value, String[] names) throws IOException, ReflectiveOperationException; + + private void hidden() {} + } +} diff --git a/src/test/java/codechicken/multipart/asm/DebugPrinterCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/DebugPrinterCharacterizationTest.java new file mode 100644 index 0000000..1bc1964 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/DebugPrinterCharacterizationTest.java @@ -0,0 +1,80 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.File; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +/** + * Reflection only: initialization reads the Forge config. DebugPrinterFunctionalTest covers directory cleanup, + * enabled/disabled dumping and byte-count logging under Forge. + */ +class DebugPrinterCharacterizationTest { + + private static final Set METHODS = signatures( + "debug()Z", + "logger()Lorg/apache/logging/log4j/Logger;", + "dir()Ljava/io/File;", + "dump(Ljava/lang/String;[B)V", + "defined(Ljava/lang/String;[B)V"); + + @Test + void keepsExactFacadeAndCompanionSurface() throws Exception { + for (Class type : new Class[] { DebugPrinter.class, DebugPrinter$.class }) { + assertEquals(Modifier.PUBLIC | Modifier.FINAL, type.getModifiers()); + assertSame(Object.class, type.getSuperclass()); + assertEquals(0, type.getInterfaces().length); + assertEquals(METHODS, publicMethods(type)); + } + for (Method method : DebugPrinter.class.getDeclaredMethods()) { + assertTrue(Modifier.isStatic(method.getModifiers())); + } + assertEquals(0, DebugPrinter.class.getDeclaredFields().length); + } + + @Test + void keepsTheCompanionStateThatSurvivesBetweenDumps() throws Exception { + Field module = DebugPrinter$.class.getDeclaredField("MODULE$"); + assertEquals(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, module.getModifiers()); + assertSame(DebugPrinter$.class, module.getType()); + assertTrue(Modifier.isPrivate(DebugPrinter$.class.getDeclaredConstructor().getModifiers())); + + assertField("debug", boolean.class, Modifier.PRIVATE | Modifier.FINAL); + assertField("logger", Logger.class, Modifier.PRIVATE | Modifier.FINAL); + assertField("dir", File.class, Modifier.PRIVATE | Modifier.FINAL); + // The running permGen total is the only mutable field. + assertField("permGenUsed", int.class, Modifier.PRIVATE); + assertEquals(5, DebugPrinter$.class.getDeclaredFields().length); + } + + private static void assertField(String name, Class type, int modifiers) throws Exception { + Field field = DebugPrinter$.class.getDeclaredField(name); + assertSame(type, field.getType()); + assertEquals(modifiers, field.getModifiers()); + } + + private static Set publicMethods(Class type) { + Set result = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + result.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return result; + } + + private static Set signatures(String... values) { + return new TreeSet<>(Arrays.asList(values)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/FieldMixinAccessNameTest.java b/src/test/java/codechicken/multipart/asm/FieldMixinAccessNameTest.java new file mode 100644 index 0000000..cf596dd --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/FieldMixinAccessNameTest.java @@ -0,0 +1,144 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ASMMixinCompiler.FieldMixin; + +class FieldMixinAccessNameTest { + + @Test + void onlyThePrivateBitSelectsManglingRegardlessOfOtherFlags() { + String name = "field"; + for (int bit = 0; bit < Integer.SIZE; bit++) { + int flags = (1 << bit) & ~ACC_PRIVATE; + assertSame(name, new FieldMixin(name, null, flags).accessName(null)); + assertEquals("pkg$Owner$$field", new FieldMixin(name, null, flags | ACC_PRIVATE).accessName("pkg/Owner")); + } + assertSame(name, new FieldMixin(name, null, ~ACC_PRIVATE).accessName(null)); + assertEquals("pkg$Owner$$field", new FieldMixin(name, null, -1).accessName("pkg/Owner")); + } + + @Test + void replacesOnlyOwnerSlashesAndKeepsTheFieldNameLiteral() { + String[][] owners = { { "", "" }, { "Owner", "Owner" }, { "pkg/Owner", "pkg$Owner" }, + { "/pkg//Owner/", "$pkg$$Owner$" }, { "pkg.Owner$Inner", "pkg.Owner$Inner" }, + { "pkg\\Owner", "pkg\\Owner" }, { "caf\u00e9/Owner", "caf\u00e9$Owner" } }; + for (String name : new String[] { "field", "", "slot/part.$" }) { + FieldMixin field = new FieldMixin(name, null, ACC_PRIVATE); + for (String[] owner : owners) assertEquals(owner[1] + "$$" + name, field.accessName(owner[0])); + } + } + + @Test + void nullNamesAreReturnedDirectlyOrAppendedAsNull() { + assertNull(new FieldMixin(null, null, 0).accessName(null)); + assertNull(new FieldMixin(null, null, ACC_PUBLIC).accessName("pkg/Owner")); + assertEquals("pkg$Owner$$null", new FieldMixin(null, null, ACC_PRIVATE).accessName("pkg/Owner")); + } + + @Test + void readsVirtualAccessThenVirtualNameOncePerCallWithoutReadingDescriptor() { + List calls = new ArrayList<>(); + int[] reads = { 0 }; + FieldMixin field = new FieldMixin("stored", "stored", 0) { + + @Override + public int access() { + calls.add("access"); + return ++reads[0] == 1 ? ACC_PRIVATE : ACC_PUBLIC; + } + + @Override + public String name() { + calls.add("name"); + return "virtual" + reads[0]; + } + + @Override + public String desc() { + throw new AssertionError("Descriptor is not part of an accessor name"); + } + }; + assertEquals("pkg$Owner$$virtual1", field.accessName("pkg/Owner")); + assertEquals("virtual2", field.accessName(null)); + assertEquals(Arrays.asList("access", "name", "access", "name"), calls); + } + + @Test + void nullPrivateOwnerFailsAfterAccessButBeforeNameWhileOtherOwnersAreIgnored() { + List calls = new ArrayList<>(); + int[] flags = { ACC_PRIVATE }; + FieldMixin field = new FieldMixin("stored", null, 0) { + + @Override + public int access() { + calls.add("access"); + return flags[0]; + } + + @Override + public String name() { + calls.add("name"); + return "virtual"; + } + }; + assertThrows(NullPointerException.class, () -> field.accessName(null)); + assertEquals(Arrays.asList("access"), calls); + flags[0] = ACC_PUBLIC; + assertEquals("virtual", field.accessName(null)); + assertEquals(Arrays.asList("access", "access", "name"), calls); + } + + @Test + void accessFailuresPrecedeOwnerAndNameEvaluation() { + RuntimeException failure = new IllegalStateException("access"); + int[] reads = { 0 }; + FieldMixin field = new FieldMixin("stored", null, ACC_PRIVATE) { + + @Override + public int access() { + reads[0]++; + throw failure; + } + + @Override + public String name() { + throw new AssertionError("Name must not be read after access fails"); + } + }; + assertSame(failure, assertThrows(RuntimeException.class, () -> field.accessName(null))); + assertSame(failure, assertThrows(RuntimeException.class, () -> field.accessName("pkg/Owner"))); + assertEquals(2, reads[0]); + } + + @Test + void nameFailuresPropagateUnwrappedAfterOneAccessReadInBothBranches() { + RuntimeException failure = new IllegalStateException("name"); + for (int flags : new int[] { ACC_PRIVATE, ACC_PUBLIC }) { + List calls = new ArrayList<>(); + FieldMixin field = new FieldMixin("stored", null, 0) { + + @Override + public int access() { + calls.add("access"); + return flags; + } + + @Override + public String name() { + calls.add("name"); + throw failure; + } + }; + assertSame(failure, assertThrows(RuntimeException.class, () -> field.accessName("pkg/Owner"))); + assertEquals(Arrays.asList("access", "name"), calls); + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/MixinInfoLineariseTest.java b/src/test/java/codechicken/multipart/asm/MixinInfoLineariseTest.java new file mode 100644 index 0000000..a3460bb --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/MixinInfoLineariseTest.java @@ -0,0 +1,191 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ASMMixinCompiler.MixinInfo; +import scala.Function1; +import scala.collection.JavaConversions; +import scala.collection.Seq; +import scala.collection.Seq$; +import scala.collection.SeqLike; +import scala.collection.mutable.ArrayBuffer; + +class MixinInfoLineariseTest { + + @Test + void preservesDepthFirstParentOrderDuplicatesAndIdentity() { + MixinInfo base = info(seq()); + MixinInfo left = info(seq(base)); + MixinInfo right = info(seq(base)); + MixinInfo root = info(seq(left, right, left)); + assertEntries(base.linearise(), base); + assertEntries(root.linearise(), base, left, base, right, base, left, root); + } + + @Test + void keepsCollectionBuildersAndRereadsMutableParentsOnEachQuery() { + MixinInfo parent = info(seq()); + ArrayBuffer parents = new ArrayBuffer<>(); + MixinInfo root = info(parents); + Seq first = root.linearise(); + assertSame(ArrayBuffer.class, first.getClass()); + assertEntries(first, root); + parents.$plus$eq(parent); + assertEntries(root.linearise(), parent, root); + assertEntries(first, root); + assertTrue(info(seq()).linearise() instanceof scala.collection.immutable.List); + } + + @Test + void readsVirtualParentsOnceAndUsesVirtualParentResultsWithoutFurtherTraversal() { + List calls = new ArrayList<>(); + MixinInfo marker = info(null); + MixinInfo parent = new MixinInfo(null, null, null, null, null, null) { + + @Override + public Seq linearise() { + calls.add("parent"); + return seq(marker, null, marker); + } + }; + MixinInfo root = new MixinInfo(null, null, null, null, null, null) { + + @Override + public Seq parentTraits() { + calls.add("parents"); + return seq(parent); + } + }; + assertEntries(root.linearise(), marker, null, marker, root); + assertEquals(Arrays.asList("parents", "parent"), calls); + } + + @Test + void emptyParentOverridesContributeNoEntries() { + MixinInfo parent = new MixinInfo(null, null, null, null, null, null) { + + @Override + public Seq linearise() { + return seq(); + } + }; + MixinInfo root = info(seq(parent)); + assertEntries(root.linearise(), root); + } + + @Test + @SuppressWarnings("unchecked") + void dispatchesFlatMapThenAppendWithSeqBuildersAndAllowsASeqLikeIntermediate() { + List calls = new ArrayList<>(); + MixinInfo marker = info(seq()); + Seq result = seq(marker); + MixinInfo[] root = { null }; + SeqLike flattened = (SeqLike) Proxy.newProxyInstance( + SeqLike.class.getClassLoader(), + new Class[] { SeqLike.class }, + (proxy, method, args) -> { + assertEquals("$colon$plus", method.getName()); + calls.add("append"); + assertSame(root[0], args[0]); + assertSame(Seq$.MODULE$.canBuildFrom(), args[1]); + return result; + }); + MixinInfo parent = new MixinInfo(null, null, null, null, null, null) { + + @Override + public Seq linearise() { + calls.add("parent"); + return seq(); + } + }; + root[0] = info(collection((proxy, method, args) -> { + assertEquals("flatMap", method.getName()); + calls.add("flatMap"); + assertSame(Seq$.MODULE$.canBuildFrom(), args[1]); + assertEntries(((Function1>) args[0]).apply(parent)); + return flattened; + })); + assertSame(result, root[0].linearise()); + assertEquals(Arrays.asList("flatMap", "parent", "append"), calls); + } + + @Test + void stopsAtNullParentsAndNullOrThrowingParentResults() { + assertThrows(NullPointerException.class, () -> info(null).linearise()); + for (boolean throwsFailure : new boolean[] { false, true }) { + RuntimeException failure = new IllegalStateException("parent"); + List calls = new ArrayList<>(); + MixinInfo bad = new MixinInfo(null, null, null, null, null, null) { + + @Override + public Seq linearise() { + calls.add("bad"); + if (throwsFailure) throw failure; + return null; + } + }; + MixinInfo later = new MixinInfo(null, null, null, null, null, null) { + + @Override + public Seq linearise() { + throw new AssertionError("Later parents must not run"); + } + }; + RuntimeException actual = assertThrows(RuntimeException.class, () -> info(seq(bad, later)).linearise()); + if (throwsFailure) assertSame(failure, actual); + else assertInstanceOf(NullPointerException.class, actual); + assertEquals(Arrays.asList("bad"), calls); + assertThrows(NullPointerException.class, () -> info(seq(null, later)).linearise()); + } + } + + @Test + void preservesCollectionFailuresAndErasedIntermediateCasts() { + RuntimeException failure = new IllegalStateException("flatMap"); + assertSame( + failure, + assertThrows( + RuntimeException.class, + () -> info(collection((proxy, method, args) -> { throw failure; })).linearise())); + assertThrows(NullPointerException.class, () -> info(collection((proxy, method, args) -> null)).linearise()); + assertThrows( + ClassCastException.class, + () -> info(collection((proxy, method, args) -> new Object())).linearise()); + for (Object result : new Object[] { null, new Object() }) { + SeqLike flattened = (SeqLike) Proxy.newProxyInstance( + SeqLike.class.getClassLoader(), + new Class[] { SeqLike.class }, + (proxy, method, args) -> result); + MixinInfo root = info(collection((proxy, method, args) -> flattened)); + if (result == null) assertNull(root.linearise()); + else assertThrows(ClassCastException.class, root::linearise); + } + } + + private static MixinInfo info(Seq parents) { + return new MixinInfo(null, null, parents, null, null, null); + } + + private static Seq seq(MixinInfo... entries) { + return JavaConversions.asScalaBuffer(Arrays.asList(entries)).toList(); + } + + @SuppressWarnings("unchecked") + private static Seq collection(InvocationHandler handler) { + return (Seq) Proxy + .newProxyInstance(Seq.class.getClassLoader(), new Class[] { Seq.class }, handler); + } + + private static void assertEntries(Seq actual, MixinInfo... expected) { + assertEquals(expected.length, actual.size()); + for (int i = 0; i < expected.length; i++) assertSame(expected[i], actual.apply(i)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/MultipartMixinFactoryCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/MultipartMixinFactoryCharacterizationTest.java new file mode 100644 index 0000000..260646a --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/MultipartMixinFactoryCharacterizationTest.java @@ -0,0 +1,166 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.LdcInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +/** + * Surface and bytecode smoke checks only. Generation reaches Forge through ObfMapping; the Forge suite checks copyFrom + * guards and emitted instructions, generated tiles and pass-through delegation. + */ +class MultipartMixinFactoryCharacterizationTest { + + @Test + void keepsExactFacadeSurface() throws Exception { + assertEquals(Modifier.PUBLIC | Modifier.FINAL, MultipartMixinFactory.class.getModifiers()); + assertSame(Object.class, MultipartMixinFactory.class.getSuperclass()); + // onCompiled, autoCompleteJavaTrait and both mangled helpers are the ledger's additive forwarders. + assertEquals( + signatures( + "baseType()Ljava/lang/Class;", + "construct(Ljava/util/BitSet;Lscala/collection/Seq;)Ljava/lang/Object;", + "getId(Ljava/lang/String;)I", + "registerTrait(Ljava/lang/Class;)I", + "registerTrait(Ljava/lang/String;)I", + "onCompiled(Ljava/lang/Class;Ljava/util/BitSet;)V", + "autoCompleteJavaTrait(Lorg/objectweb/asm/tree/ClassNode;)V", + "generatePassThroughTrait(Ljava/lang/String;)Ljava/lang/String;", + "codechicken$multipart$asm$ASMMixinFactory$$concreteParent$1" + + "(Lcodechicken/multipart/asm/ASMMixinCompiler$ClassInfo;)" + + "Lcodechicken/multipart/asm/ASMMixinCompiler$ClassInfo;", + "codechicken$multipart$asm$ASMMixinFactory$$checkParent$1" + + "(Lcodechicken/multipart/asm/ASMMixinCompiler$ClassInfo;Ljava/lang/String;)Z"), + publicMethods(MultipartMixinFactory.class)); + for (Method method : MultipartMixinFactory.class.getDeclaredMethods()) { + assertTrue(Modifier.isStatic(method.getModifiers())); + } + assertEquals(0, MultipartMixinFactory.class.getDeclaredFields().length); + assertTrue(Modifier.isPrivate(MultipartMixinFactory.class.getDeclaredConstructor().getModifiers())); + } + + @Test + void keepsTheCompanionAsATileMultipartFactory() throws Exception { + assertEquals(Modifier.PUBLIC | Modifier.FINAL, MultipartMixinFactory$.class.getModifiers()); + assertSame(ASMMixinFactory.class, MultipartMixinFactory$.class.getSuperclass()); + assertEquals( + signatures( + "onCompiled(Ljava/lang/Class;Ljava/util/BitSet;)V", + "autoCompleteJavaTrait(Lorg/objectweb/asm/tree/ClassNode;)V", + "generatePassThroughTrait(Ljava/lang/String;)Ljava/lang/String;", + "codechicken$multipart$asm$MultipartMixinFactory$$methods$1" + + "(Lorg/objectweb/asm/tree/ClassNode;)Lscala/collection/immutable/Map;", + "codechicken$multipart$asm$MultipartMixinFactory$$generatePassThroughMethod$1" + + "(Lorg/objectweb/asm/tree/MethodNode;Ljava/lang/String;Ljava/lang/String;" + + "Ljava/lang/String;Ljava/lang/String;Lcodechicken/lib/asm/CC_ClassWriter;" + + "Lscala/runtime/ObjectRef;)V"), + publicMethods(MultipartMixinFactory$.class)); + + Field module = MultipartMixinFactory$.class.getDeclaredField("MODULE$"); + assertEquals(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, module.getModifiers()); + assertSame(MultipartMixinFactory$.class, module.getType()); + assertEquals(1, MultipartMixinFactory$.class.getDeclaredFields().length); + assertTrue(Modifier.isPrivate(MultipartMixinFactory$.class.getDeclaredConstructor().getModifiers())); + + ClassNode node = companion(); + assertTrue(typeConstants(node, "").contains("codechicken/multipart/TileMultipart")); + assertCall(node, "onCompiled", "codechicken/multipart/MultipartGenerator$", "registerTileClass"); + } + + @Test + void namesAndFillsThePassThroughTrait() throws Exception { + ClassNode node = companion(); + Set constants = constants(node, "generatePassThroughTrait"); + for (String constant : new String[] { "T", "$$PassThrough", "impl", "L", ";", "bindPart", + "(Lcodechicken/multipart/TMultiPart;)V", "partRemoved", "(Lcodechicken/multipart/TMultiPart;I)V", + "canAddPart", "(Lcodechicken/multipart/TMultiPart;)Z", "", "()V", + "codechicken/multipart/TileMultipart", "Unable to generate pass through trait for: ", + " class not found.", " is not an interface." }) { + assertTrue(constants.contains(constant), "missing constant " + constant); + } + assertCall(node, "generatePassThroughTrait", "codechicken/multipart/asm/ASMMixinCompiler$", "classNode"); + assertCall(node, "generatePassThroughTrait", "codechicken/multipart/asm/ASMMixinCompiler$", "internalDefine"); + assertCall( + node, + "generatePassThroughTrait", + "codechicken/multipart/asm/MultipartMixinFactory$", + "registerTrait"); + assertCall( + node, + "codechicken$multipart$asm$MultipartMixinFactory$$generatePassThroughMethod$1", + "codechicken/multipart/asm/ASMMixinCompiler$", + "finishBridgeCall"); + } + + private static ClassNode companion() throws Exception { + ClassNode node = new ClassNode(); + new ClassReader(MultipartMixinFactory$.class.getName()).accept(node, 0); + return node; + } + + private static Set constants(ClassNode node, String methodName) { + Set found = new TreeSet<>(); + for (AbstractInsnNode instruction : instructions(node, methodName)) { + if (instruction instanceof LdcInsnNode && ((LdcInsnNode) instruction).cst instanceof String) { + found.add((String) ((LdcInsnNode) instruction).cst); + } + } + return found; + } + + private static Set typeConstants(ClassNode node, String methodName) { + Set found = new TreeSet<>(); + for (AbstractInsnNode instruction : instructions(node, methodName)) { + if (instruction instanceof LdcInsnNode && ((LdcInsnNode) instruction).cst instanceof Type) { + found.add(((Type) ((LdcInsnNode) instruction).cst).getInternalName()); + } + } + return found; + } + + private static void assertCall(ClassNode node, String methodName, String owner, String name) { + for (AbstractInsnNode instruction : instructions(node, methodName)) { + if (instruction instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) instruction; + if (call.owner.equals(owner) && (name == null || call.name.equals(name))) return; + } + } + throw new AssertionError("Missing call " + owner + '.' + name + " in " + methodName); + } + + private static AbstractInsnNode[] instructions(ClassNode node, String methodName) { + for (MethodNode method : node.methods) { + if (method.name.equals(methodName)) return method.instructions.toArray(); + } + throw new AssertionError("Missing method " + methodName); + } + + private static Set publicMethods(Class type) { + Set result = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + result.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return result; + } + + private static Set signatures(String... values) { + return new TreeSet<>(Arrays.asList(values)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSigReaderCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/ScalaSigReaderCharacterizationTest.java new file mode 100644 index 0000000..8ba3d3c --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSigReaderCharacterizationTest.java @@ -0,0 +1,162 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AnnotationNode; +import org.objectweb.asm.tree.ClassNode; + +import scala.Option; + +class ScalaSigReaderCharacterizationTest { + + private static final String SIGNATURE_DESC = "Lscala/reflect/ScalaSignature;"; + + @Test + void keepsExactFacadeAndCompanionSurface() throws Exception { + Set expected = signatures( + "decode(Ljava/lang/String;)[B", + "encode([B)Ljava/lang/String;", + "read(Lorg/objectweb/asm/tree/AnnotationNode;)Lcodechicken/multipart/asm/ScalaSignature;", + "write(Lcodechicken/multipart/asm/ScalaSignature;Lorg/objectweb/asm/tree/AnnotationNode;)Ljava/lang/Object;", + "ann(Lorg/objectweb/asm/tree/ClassNode;)Lscala/Option;"); + for (Class type : new Class[] { ScalaSigReader.class, ScalaSigReader$.class }) { + assertEquals(Modifier.PUBLIC | Modifier.FINAL, type.getModifiers()); + assertSame(Object.class, type.getSuperclass()); + assertEquals(0, type.getInterfaces().length); + assertEquals(expected, publicMethods(type)); + } + for (Method method : ScalaSigReader.class.getDeclaredMethods()) { + assertTrue(Modifier.isStatic(method.getModifiers())); + } + + assertEquals(0, ScalaSigReader.class.getDeclaredFields().length); + Field module = ScalaSigReader$.class.getDeclaredField("MODULE$"); + assertEquals(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, module.getModifiers()); + assertSame(ScalaSigReader$.class, module.getType()); + assertSame(ScalaSigReader$.MODULE$, module.get(null)); + assertTrue(Modifier.isPrivate(ScalaSigReader$.class.getDeclaredConstructor().getModifiers())); + } + + @Test + void encodingDropsTheTrailingByteAndSurvivesADecodeRoundTrip() { + byte[] payload = { 0, 1, 2, 3, 100, -1, -128, 127 }; + String encoded = ScalaSigReader.encode(payload); + + assertEquals(9, encoded.length()); + for (int i = 0; i < encoded.length(); i++) { + assertTrue(encoded.charAt(i) <= 0x7f); + } + assertArrayEquals(payload, ScalaSigReader.decode(encoded)); + + assertEquals("", ScalaSigReader.encode(new byte[0])); + assertArrayEquals(new byte[0], ScalaSigReader.decode("")); + + // The dropped group is zero for 42, but carries high bits for [0, 0xfe]. + byte[] single = { 42 }; + assertArrayEquals(single, ScalaSigReader.decode(ScalaSigReader.encode(single))); + byte[] highBit = { 0, (byte) 0xfe }; + assertArrayEquals(new byte[] { 0, 62 }, ScalaSigReader.decode(ScalaSigReader.encode(highBit))); + } + + @Test + void encodingLeavesItsInputAlone() { + byte[] payload = { 1, 2, 3 }; + byte[] original = payload.clone(); + assertNotSame(payload, ScalaSigReader.decode(ScalaSigReader.encode(payload))); + assertArrayEquals(original, payload); + } + + @Test + void annReturnsTheFirstScalaSignatureAnnotationOrNone() { + ClassNode cnode = new ClassNode(); + assertFalse(ScalaSigReader.ann(cnode).isDefined()); + + cnode.visibleAnnotations = new ArrayList<>(); + cnode.visibleAnnotations.add(new AnnotationNode("Lscala/reflect/ScalaLongSignature;")); + assertFalse(ScalaSigReader.ann(cnode).isDefined()); + + AnnotationNode first = new AnnotationNode(SIGNATURE_DESC); + AnnotationNode second = new AnnotationNode(SIGNATURE_DESC); + cnode.visibleAnnotations.add(first); + cnode.visibleAnnotations.add(second); + Option found = ScalaSigReader.ann(cnode); + assertTrue(found.isDefined()); + assertSame(first, found.get()); + } + + @Test + void readsAndRewritesTheAnnotationValueOfAFrozenScalaClass() { + ClassNode cnode = new ClassNode(); + new ClassReader(fixture()).accept(cnode, 0); + AnnotationNode ann = ScalaSigReader.ann(cnode).get(); + String encoded = (String) ann.values.get(1); + + ScalaSignature sig = ScalaSigReader.read(ann); + assertEquals(0, sig.bytes().pos()); + assertEquals(sig.bytes().arr().length, sig.bytes().len()); + assertArrayEquals(ScalaSigReader.decode(encoded), sig.bytes().arr()); + + // write returns the replaced list element and re-encodes to the same string. + Object replaced = ScalaSigReader.write(sig, ann); + assertEquals(encoded, replaced); + assertEquals(encoded, ann.values.get(1)); + } + + @Test + void readFailsOnAnAnnotationWithoutAValueList() { + assertThrows(Exception.class, () -> ScalaSigReader.read(new AnnotationNode(SIGNATURE_DESC))); + + AnnotationNode wrongType = new AnnotationNode(SIGNATURE_DESC); + List values = new ArrayList<>(); + values.add("bytes"); + values.add(Integer.valueOf(1)); + wrongType.values = values; + assertThrows(ClassCastException.class, () -> ScalaSigReader.read(wrongType)); + } + + private static byte[] fixture() { + InputStream input = Objects.requireNonNull( + ScalaSigReaderCharacterizationTest.class + .getResourceAsStream("/compat/ReferenceScalaEdgePart.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } + + private static Set publicMethods(Class type) { + Set actual = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + actual.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return actual; + } + + private static Set signatures(String... expected) { + return new TreeSet<>(Arrays.asList(expected)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureAppliedTypeDescriptorTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureAppliedTypeDescriptorTest.java new file mode 100644 index 0000000..02c13c6 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureAppliedTypeDescriptorTest.java @@ -0,0 +1,180 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Base64; +import java.util.Objects; +import java.util.Scanner; +import java.util.function.Supplier; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.TypeRef; +import codechicken.multipart.asm.ScalaSignature.TypeRefType; +import scala.collection.JavaConversions; + +class ScalaSignatureAppliedTypeDescriptorTest { + + private static final Fixture FIXTURE = new Fixture(); + + @Test + void arrayBranchReadsOneNameAndTheFirstArgumentDescriptor() throws Throwable { + ScalaSignature sig = signature(); + int[] reads = { 0, 0 }; + TypeRef argument = descriptor(sig, () -> { + reads[1]++; + return "I"; + }); + TypeRefType ref = ref(sig, () -> { + reads[0]++; + return "scala.Array"; + }, scalaList(argument)); + assertEquals("[I", descriptor(ref)); + assertArrayEquals(new int[] { 1, 1 }, reads); + } + + @Test + void fallbackRereadsVirtualNameThroughTheBaseDescriptor() throws Throwable { + ScalaSignature sig = signature(); + String[][] names = { { "pkg.First", "scala.Int", null, "I" }, + { "scala.Int", "pkg.Second", "pkg.Final", "Lpkg/Final;" }, + { null, "pkg.Reference", "scala.AnyRef", "Ljava/lang/Object;" } }; + int[] expectedReads = { 2, 3, 3 }; + for (int i = 0; i < names.length; i++) { + String[] c = names[i]; + int[] reads = { 0 }; + TypeRefType ref = ref(sig, () -> c[reads[0]++], null); + assertEquals(c[3], descriptor(ref)); + assertEquals(expectedReads[i], reads[0]); + } + } + + @Test + void repeatedQueriesDoNotCacheBranchNamesOrArgumentDescriptors() throws Throwable { + ScalaSignature sig = signature(); + int[] reads = { 0, 0 }; + TypeRef argument = descriptor(sig, () -> Integer.toString(++reads[1])); + TypeRefType ref = ref(sig, () -> { + reads[0]++; + return "scala.Array"; + }, scalaList(argument)); + assertEquals("[1", descriptor(ref)); + assertEquals("[2", descriptor(ref)); + assertArrayEquals(new int[] { 2, 2 }, reads); + } + + @Test + void arrayBranchPreservesNullAndMalformedArgumentBehavior() throws Throwable { + ScalaSignature sig = signature(); + assertEquals("[null", descriptor(ref(sig, () -> "scala.Array", scalaList(descriptor(sig, () -> null))))); + assertThrows( + IndexOutOfBoundsException.class, + () -> descriptor(ref(sig, () -> "scala.Array", scalaList(new TypeRef[0])))); + assertThrows(NullPointerException.class, () -> descriptor(ref(sig, () -> "scala.Array", null))); + assertThrows( + NullPointerException.class, + () -> descriptor(ref(sig, () -> "scala.Array", scalaList((TypeRef) null)))); + } + + @Test + void failuresStopAtTheSelectedNameOrDescriptorRead() throws Throwable { + ScalaSignature sig = signature(); + RuntimeException failure = new IllegalStateException("applied descriptor getter"); + int[] reads = { 0 }; + TypeRefType firstName = ref(sig, () -> { throw failure; }, null); + assertSame(failure, assertThrows(RuntimeException.class, () -> descriptor(firstName))); + TypeRefType secondName = ref(sig, () -> { + if (++reads[0] == 2) throw failure; + return "pkg.Name"; + }, null); + assertSame(failure, assertThrows(RuntimeException.class, () -> descriptor(secondName))); + assertEquals(2, reads[0]); + TypeRefType argument = ref(sig, () -> "scala.Array", scalaList(descriptor(sig, () -> { throw failure; }))); + assertSame(failure, assertThrows(RuntimeException.class, () -> descriptor(argument))); + } + + @Test + void nonArrayFallbackNeverTouchesTheArgumentList() throws Throwable { + ScalaSignature sig = signature(); + assertEquals("Ljava/lang/String;", descriptor(ref(sig, () -> "java.lang.String", null))); + } + + @Test + void retainedMethodTypeViewUsesTheSameAppliedReturnDescriptor() throws Throwable { + ScalaSignature sig = signature(); + TypeRefType ref = ref(sig, () -> "scala.Array", scalaList(descriptor(sig, () -> "J"))); + assertEquals("[J", ref.jDesc()); + assertTrue(ref.params().isEmpty()); + assertSame(ref, ref.returnType()); + } + + private static TypeRef descriptor(ScalaSignature sig, Supplier value) { + return sig.new ThisType(null) { + + @Override + public String jDesc() { + return value.get(); + } + }; + } + + private static TypeRefType ref(ScalaSignature sig, Supplier name, + scala.collection.immutable.List arguments) throws Throwable { + return (TypeRefType) FIXTURE.ref.invoke(sig, name, arguments); + } + + private static String descriptor(TypeRefType ref) throws Throwable { + return (String) FIXTURE.descriptor.invoke(ref); + } + + @SafeVarargs + private static scala.collection.immutable.List scalaList(T... values) { + return JavaConversions.asScalaBuffer(Arrays.asList(values)).toList(); + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } + + private static final class Fixture extends ClassLoader { + + final MethodHandle ref; + final MethodHandle descriptor; + + Fixture() { + super(ScalaSignatureAppliedTypeDescriptorTest.class.getClassLoader()); + try { + String base = "ReferenceScalaAppliedTypeDescriptor"; + for (String suffix : new String[] { "", "$$anon$1" }) { + byte[] bytes; + try (InputStream stream = Objects + .requireNonNull(getResourceAsStream("compat/" + base + suffix + ".class.b64")); + Scanner scanner = new Scanner(stream, StandardCharsets.UTF_8.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + Class type = loadClass("codechicken.multipart.compat." + base); + Object instance = type.getConstructor().newInstance(); + ref = MethodHandles.publicLookup() + .unreflect( + type.getMethod( + "ref", + ScalaSignature.class, + Supplier.class, + scala.collection.immutable.List.class)) + .bindTo(instance); + descriptor = MethodHandles.publicLookup().unreflect(type.getMethod("descriptor", TypeRefType.class)) + .bindTo(instance); + } catch (ReflectiveOperationException | java.io.IOException e) { + throw new AssertionError(e); + } + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureBytesSectionTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureBytesSectionTest.java new file mode 100644 index 0000000..a8a41e5 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureBytesSectionTest.java @@ -0,0 +1,160 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; + +class ScalaSignatureBytesSectionTest { + + @Test + void clampsDropAndTakeIndependentlyIncludingIntegerExtremes() { + byte[] source = { 1, 2, 3, 4 }; + int[][] cases = { { 0, 4, 0, 4 }, { 1, 2, 1, 3 }, { -1, 2, 0, 2 }, + { Integer.MIN_VALUE, Integer.MAX_VALUE, 0, 4 }, { 1, Integer.MAX_VALUE, 1, 4 }, { 3, 10, 3, 4 }, + { 4, 1, 4, 4 }, { 5, 10, 4, 4 }, { Integer.MAX_VALUE, Integer.MAX_VALUE, 4, 4 }, { 1, -1, 1, 1 }, + { 1, Integer.MIN_VALUE, 1, 1 }, { 0, 0, 0, 0 }, { -1, -1, 0, 0 } }; + for (int[] c : cases) { + assertArrayEquals(Arrays.copyOfRange(source, c[2], c[3]), new Bytes(source, c[0], c[1]).section()); + } + } + + @Test + void alwaysReturnsFreshArraysWithoutAliasingTheSourceOrOtherResults() { + for (byte[] source : new byte[][] { {}, { 1, 2, 3 } }) { + for (int length : new int[] { 0, Integer.MAX_VALUE }) { + Bytes bytes = new Bytes(source, 0, length); + byte[] first = bytes.section(); + byte[] second = bytes.section(); + assertNotSame(source, first); + assertNotSame(first, second); + assertArrayEquals(first, second); + if (first.length != 0) { + first[0] = 9; + assertEquals(1, source[0]); + assertEquals(1, second[0]); + source[0] = 8; + assertEquals(1, second[0]); + assertEquals(8, bytes.section()[0]); + } + } + } + } + + @Test + void readsVirtualGettersOnceAndCopiesAfterPositionButBeforeLength() { + for (int position : new int[] { -1, 0, 1 }) { + byte[] source = { 1, 2, 3, 4 }; + List calls = new ArrayList<>(); + Bytes bytes = new Bytes(null, 99, 99) { + + @Override + public byte[] arr() { + calls.add("arr"); + return source; + } + + @Override + public int pos() { + calls.add("pos"); + source[1] = 22; + return position; + } + + @Override + public int len() { + calls.add("len"); + Arrays.fill(source, (byte) 0); + return 2; + } + }; + assertArrayEquals(position == 1 ? new byte[] { 22, 3 } : new byte[] { 1, 22 }, bytes.section()); + assertEquals(Arrays.asList("arr", "pos", "len"), calls); + } + } + + @Test + void nullArrayStillReadsPositionBeforeFailingAndNeverReadsLength() { + for (boolean positionFails : new boolean[] { false, true }) { + RuntimeException failure = new IllegalStateException("pos"); + List calls = new ArrayList<>(); + Bytes bytes = new Bytes(null, 0, 0) { + + @Override + public byte[] arr() { + calls.add("arr"); + return null; + } + + @Override + public int pos() { + calls.add("pos"); + if (positionFails) throw failure; + return 0; + } + + @Override + public int len() { + throw new AssertionError("Length must not be read after drop fails"); + } + }; + RuntimeException actual = assertThrows(RuntimeException.class, bytes::section); + if (positionFails) assertSame(failure, actual); + else assertInstanceOf(NullPointerException.class, actual); + assertEquals(Arrays.asList("arr", "pos"), calls); + } + } + + @Test + void propagatesEveryGetterFailureWithoutWrappingOrReadingLaterGetters() { + for (String failed : Arrays.asList("arr", "pos", "len")) { + RuntimeException failure = new IllegalStateException(failed); + List calls = new ArrayList<>(); + Bytes bytes = new Bytes(null, 0, 0) { + + @Override + public byte[] arr() { + calls.add("arr"); + if (failed.equals("arr")) throw failure; + return new byte[] { 1, 2 }; + } + + @Override + public int pos() { + calls.add("pos"); + if (failed.equals("pos")) throw failure; + return 0; + } + + @Override + public int len() { + calls.add("len"); + throw failure; + } + }; + assertSame(failure, assertThrows(RuntimeException.class, bytes::section)); + List order = Arrays.asList("arr", "pos", "len"); + assertEquals(order.subList(0, order.indexOf(failed) + 1), calls); + } + } + + @Test + void stillReadsLengthWhenDropHasAlreadyProducedAnEmptyArray() { + RuntimeException failure = new IllegalStateException("len"); + for (byte[] source : new byte[][] { {}, { 1 } }) { + Bytes bytes = new Bytes(source, Integer.MAX_VALUE, 0) { + + @Override + public int len() { + throw failure; + } + }; + assertSame(failure, assertThrows(RuntimeException.class, bytes::section)); + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureClassParentTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureClassParentTest.java new file mode 100644 index 0000000..d843ee6 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureClassParentTest.java @@ -0,0 +1,226 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Proxy; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.Scanner; +import java.util.function.Supplier; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.ClassSymbolRef; +import codechicken.multipart.asm.ScalaSignature.ClassType; +import codechicken.multipart.asm.ScalaSignature.TypeRef; +import scala.collection.JavaConversions; + +class ScalaSignatureClassParentTest { + + private static final Fixture FIXTURE = new Fixture(); + + @Test + void concreteClassAndObjectSymbolsReturnTheFirstParentName() throws Throwable { + ScalaSignature sig = signature(); + ClassType info = classType(sig, scalaList(type(sig, () -> "pkg/Parent"))); + ClassSymbolRef klass = sig.new ClassSymbol("Name", null, 0, 0) { + + @Override + public ClassType info() { + return info; + } + }; + ClassSymbolRef object = sig.new ObjectSymbol("Module", null, 0, 0) { + + @Override + public ClassType info() { + return info; + } + }; + assertEquals("pkg/Parent", klass.jParent()); + assertEquals("pkg/Parent", object.jParent()); + } + + @Test + void frozenScalaBridgeReadsInfoParentAndNameInOrderOnEveryQuery() throws Throwable { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + int[] query = { 0 }; + TypeRef parent = type(sig, () -> { + calls.add("jName"); + return "Parent" + query[0]++; + }); + ClassType info = info(sig, () -> { + calls.add("parent"); + return parent; + }); + ClassSymbolRef ref = ref(sig, () -> { + calls.add("info"); + return info; + }); + assertEquals("Parent0", parent(ref)); + assertEquals("Parent1", parent(ref)); + assertEquals(Arrays.asList("info", "parent", "jName", "info", "parent", "jName"), calls); + } + + @Test + void defaultClassTypeParentUsesTheHeadWithoutReadingInterfaces() throws Throwable { + ScalaSignature sig = signature(); + TypeRef first = type(sig, () -> "First"); + TypeRef second = type(sig, () -> { throw new AssertionError("interface jName"); }); + ClassType info = classType(sig, scalaList(first, second)); + ClassSymbolRef ref = ref(sig, () -> info); + assertEquals("First", parent(ref)); + } + + @Test + void emptyParentListKeepsItsNoSuchElementFailure() throws Throwable { + ScalaSignature sig = signature(); + ClassType info = classType(sig, scalaList(new TypeRef[0])); + ClassSymbolRef ref = ref(sig, () -> info); + assertThrows(NoSuchElementException.class, () -> parent(ref)); + } + + @Test + void nullInfoAndParentFailWhileNullNamesPassThrough() throws Throwable { + ScalaSignature sig = signature(); + assertThrows(NullPointerException.class, () -> parent(ref(sig, () -> null))); + ClassType nullParent = info(sig, () -> null); + assertThrows(NullPointerException.class, () -> parent(ref(sig, () -> nullParent))); + ClassType nullName = info(sig, () -> type(sig, () -> null)); + assertNull(parent(ref(sig, () -> nullName))); + } + + @Test + void failuresStopAtTheSelectedInfoParentOrNameRead() throws Throwable { + ScalaSignature sig = signature(); + List order = Arrays.asList("info", "parent", "jName"); + RuntimeException failure = new IllegalStateException("class parent getter"); + for (String failing : order) { + List calls = new ArrayList<>(); + TypeRef parent = type(sig, () -> read(calls, "jName", "Parent", failing, failure)); + ClassType info = info(sig, () -> read(calls, "parent", parent, failing, failure)); + ClassSymbolRef ref = ref(sig, () -> read(calls, "info", info, failing, failure)); + assertSame(failure, assertThrows(RuntimeException.class, () -> parent(ref))); + assertEquals(order.subList(0, order.indexOf(failing) + 1), calls); + } + } + + @Test + void legacyStaticTraitBridgeKeepsItsDescriptorAndNullReceiverFailure() throws Throwable { + MethodHandle bridge = MethodHandles.lookup().findStatic( + Class.forName("codechicken.multipart.asm.ScalaSignature$ClassSymbolRef$class"), + "jParent", + MethodType.methodType(String.class, ClassSymbolRef.class)); + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + TypeRef parent = type(sig, () -> { + calls.add("jName"); + return "Parent"; + }); + ClassType info = info(sig, () -> { + calls.add("parent"); + return parent; + }); + ClassSymbolRef ref = (ClassSymbolRef) Proxy.newProxyInstance( + ClassSymbolRef.class.getClassLoader(), + new Class[] { ClassSymbolRef.class }, + (proxy, method, args) -> { + calls.add(method.getName()); + if (method.getName().equals("info")) return info; + throw new AssertionError(method.getName()); + }); + assertEquals("Parent", (String) bridge.invokeExact(ref)); + assertEquals(Arrays.asList("info", "parent", "jName"), calls); + assertThrows(NullPointerException.class, () -> bridge.invokeWithArguments(new Object[] { null })); + } + + private static T read(List calls, String name, T value, String failing, RuntimeException failure) { + calls.add(name); + if (name.equals(failing)) throw failure; + return value; + } + + private static TypeRef type(ScalaSignature sig, Supplier names) { + return sig.new ThisType(null) { + + @Override + public String jName() { + return names.get(); + } + }; + } + + private static ClassType info(ScalaSignature sig, Supplier parents) throws Throwable { + return (ClassType) FIXTURE.info.invoke(sig, parents); + } + + private static ClassType classType(ScalaSignature sig, scala.collection.immutable.List parents) + throws Throwable { + return (ClassType) FIXTURE.classType.invoke(sig, parents); + } + + private static ClassSymbolRef ref(ScalaSignature sig, Supplier infos) throws Throwable { + return (ClassSymbolRef) FIXTURE.ref.invoke(sig, infos); + } + + private static String parent(ClassSymbolRef ref) throws Throwable { + return (String) FIXTURE.parent.invoke(ref); + } + + @SafeVarargs + private static scala.collection.immutable.List scalaList(T... values) { + return JavaConversions.asScalaBuffer(Arrays.asList(values)).toList(); + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } + + private static final class Fixture extends ClassLoader { + + final MethodHandle classType; + final MethodHandle info; + final MethodHandle ref; + final MethodHandle parent; + + Fixture() { + super(ScalaSignatureClassParentTest.class.getClassLoader()); + try { + String base = "ReferenceScalaClassParent"; + for (String suffix : new String[] { "", "$$anon$1", "$$anon$2" }) { + byte[] bytes; + try (InputStream stream = Objects + .requireNonNull(getResourceAsStream("compat/" + base + suffix + ".class.b64")); + Scanner scanner = new Scanner(stream, StandardCharsets.UTF_8.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + Class type = loadClass("codechicken.multipart.compat." + base); + Object instance = type.getConstructor().newInstance(); + classType = MethodHandles.publicLookup().unreflect( + type.getMethod("classType", ScalaSignature.class, scala.collection.immutable.List.class)) + .bindTo(instance); + info = MethodHandles.publicLookup() + .unreflect(type.getMethod("info", ScalaSignature.class, Supplier.class)).bindTo(instance); + ref = MethodHandles.publicLookup() + .unreflect(type.getMethod("ref", ScalaSignature.class, Supplier.class)).bindTo(instance); + parent = MethodHandles.publicLookup().unreflect(type.getMethod("parent", ClassSymbolRef.class)) + .bindTo(instance); + } catch (ReflectiveOperationException | java.io.IOException e) { + throw new AssertionError(e); + } + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureClassSymbolFullTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureClassSymbolFullTest.java new file mode 100644 index 0000000..2296334 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureClassSymbolFullTest.java @@ -0,0 +1,220 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Proxy; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; +import java.util.function.Supplier; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.ClassSymbolRef; +import codechicken.multipart.asm.ScalaSignature.SymbolRef; + +class ScalaSignatureClassSymbolFullTest { + + private static final Fixture FIXTURE = new Fixture(); + + @Test + void concreteClassAndObjectSymbolsJoinTheirOwnerAndName() { + ScalaSignature sig = signature(); + assertEquals("pkg.Owner.Name", sig.new ClassSymbol("Name", sig.new ExternalSymbol("pkg.Owner"), 0, 0).full()); + assertEquals(".Module", sig.new ObjectSymbol("Module", sig.NoSymbol(), 0, 0).full()); + assertEquals("..a,b(c)", sig.new ClassSymbol("a,b(c)", sig.new ExternalSymbol("."), 0, 0).full()); + } + + @Test + void nullFullNameAndNameAreFormattedLiterally() { + ScalaSignature sig = signature(); + SymbolRef nullFull = sig.new ExternalSymbol("unused") { + + @Override + public String full() { + return null; + } + }; + assertEquals("null.Name", sig.new ClassSymbol("Name", nullFull, 0, 0).full()); + assertEquals("pkg.Owner.null", sig.new ClassSymbol(null, sig.new ExternalSymbol("pkg.Owner"), 0, 0).full()); + } + + @Test + void frozenScalaImplementorReadsOwnerFullAndNameInOrderOnEveryQuery() throws Throwable { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + int[] query = { 0 }; + SymbolRef owner = sig.new ExternalSymbol("unused") { + + @Override + public String full() { + calls.add("owner.full"); + return "Owner" + query[0]; + } + }; + ClassSymbolRef ref = ref(sig, () -> { + calls.add("owner"); + return owner; + }, () -> { + calls.add("name"); + return "Name" + query[0]++; + }); + assertEquals("Owner0.Name0", full(ref)); + assertEquals("Owner1.Name1", full(ref)); + assertEquals(Arrays.asList("owner", "owner.full", "name", "owner", "owner.full", "name"), calls); + } + + @Test + void failuresStopAtTheSelectedOwnerOrNameRead() throws Throwable { + ScalaSignature sig = signature(); + List order = Arrays.asList("owner", "owner.full", "name"); + RuntimeException failure = new IllegalStateException("class symbol full getter"); + for (String failing : order) { + List calls = new ArrayList<>(); + SymbolRef owner = sig.new ExternalSymbol("unused") { + + @Override + public String full() { + return read(calls, "owner.full", "Owner", failing, failure); + } + }; + ClassSymbolRef ref = ref( + sig, + () -> read(calls, "owner", owner, failing, failure), + () -> read(calls, "name", "Name", failing, failure)); + assertSame(failure, assertThrows(RuntimeException.class, () -> full(ref))); + assertEquals(order.subList(0, order.indexOf(failing) + 1), calls); + } + } + + @Test + void nullOwnerFailsBeforeReadingTheName() throws Throwable { + ScalaSignature sig = signature(); + int[] nameReads = { 0 }; + ClassSymbolRef ref = ref(sig, () -> null, () -> { + nameReads[0]++; + return "Name"; + }); + assertThrows(NullPointerException.class, () -> full(ref)); + assertEquals(0, nameReads[0]); + } + + @Test + void fullDoesNotReadOwnerStringOrOtherSymbolMembers() { + ScalaSignature sig = signature(); + SymbolRef owner = sig.new ExternalSymbol("Owner") { + + @Override + public String toString() { + throw new AssertionError("owner.toString"); + } + }; + ClassSymbolRef ref = sig.new ClassSymbol("Name", owner, 0, 0) { + + @Override + public int flags() { + throw new AssertionError("flags"); + } + + @Override + public int infoId() { + throw new AssertionError("infoId"); + } + + @Override + public String toString() { + throw new AssertionError("toString"); + } + }; + assertEquals("Owner.Name", ref.full()); + } + + @Test + void legacyStaticTraitBridgeKeepsItsDescriptorAndNullReceiverFailure() throws Throwable { + MethodHandle bridge = MethodHandles.lookup().findStatic( + Class.forName("codechicken.multipart.asm.ScalaSignature$ClassSymbolRef$class"), + "full", + MethodType.methodType(String.class, ClassSymbolRef.class)); + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + SymbolRef owner = sig.new ExternalSymbol("unused") { + + @Override + public String full() { + calls.add("owner.full"); + return "Owner"; + } + }; + ClassSymbolRef ref = (ClassSymbolRef) Proxy.newProxyInstance( + ClassSymbolRef.class.getClassLoader(), + new Class[] { ClassSymbolRef.class }, + (proxy, method, args) -> { + calls.add(method.getName()); + if (method.getName().equals("owner")) return owner; + if (method.getName().equals("name")) return "Name"; + throw new AssertionError(method.getName()); + }); + assertEquals("Owner.Name", (String) bridge.invokeExact(ref)); + assertEquals(Arrays.asList("owner", "owner.full", "name"), calls); + assertThrows(NullPointerException.class, () -> bridge.invokeWithArguments(new Object[] { null })); + } + + private static T read(List calls, String name, T value, String failing, RuntimeException failure) { + calls.add(name); + if (name.equals(failing)) throw failure; + return value; + } + + private static ClassSymbolRef ref(ScalaSignature sig, Supplier owners, Supplier names) + throws Throwable { + return (ClassSymbolRef) FIXTURE.ref.invoke(sig, owners, names); + } + + private static String full(ClassSymbolRef ref) throws Throwable { + return (String) FIXTURE.full.invoke(ref); + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } + + private static final class Fixture extends ClassLoader { + + final MethodHandle ref; + final MethodHandle full; + + Fixture() { + super(ScalaSignatureClassSymbolFullTest.class.getClassLoader()); + try { + String base = "ReferenceScalaClassSymbolFull"; + for (String suffix : new String[] { "", "$$anon$1" }) { + byte[] bytes; + try (InputStream stream = Objects + .requireNonNull(getResourceAsStream("compat/" + base + suffix + ".class.b64")); + Scanner scanner = new Scanner(stream, StandardCharsets.UTF_8.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + Class type = loadClass("codechicken.multipart.compat." + base); + Object instance = type.getConstructor().newInstance(); + ref = MethodHandles.publicLookup() + .unreflect(type.getMethod("ref", ScalaSignature.class, Supplier.class, Supplier.class)) + .bindTo(instance); + full = MethodHandles.publicLookup().unreflect(type.getMethod("full", ClassSymbolRef.class)) + .bindTo(instance); + } catch (ReflectiveOperationException | java.io.IOException e) { + throw new AssertionError(e); + } + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureClassSymbolStringTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureClassSymbolStringTest.java new file mode 100644 index 0000000..43c3e2f --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureClassSymbolStringTest.java @@ -0,0 +1,204 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.ClassSymbolRef; +import codechicken.multipart.asm.ScalaSignature.SymbolRef; + +class ScalaSignatureClassSymbolStringTest { + + @Test + void concreteClassAndObjectSymbolsUseTheirTrimmedRuntimeNames() { + ScalaSignature sig = signature(); + SymbolRef owner = sig.new ExternalSymbol("pkg.Owner"); + assertEquals("ClassSymbol(Name,pkg.Owner,0,7)", sig.new ClassSymbol("Name", owner, 0, 7).toString()); + assertEquals( + "ObjectSymbol(Module,pkg.Owner,400,9)", + sig.new ObjectSymbol("Module", owner, 0x400, 9).toString()); + } + + @Test + void formatsValuesLiterallyWithLowercaseTwosComplementHexadecimalFlags() { + ScalaSignature sig = signature(); + Object[][] cases = { { "a,b(c)", null, 15, -12, "ClassSymbol(a,b(c),null,f,-12)" }, + { null, sig.NoSymbol(), -1, Integer.MIN_VALUE, "ClassSymbol(null,NoSymbol,ffffffff,-2147483648)" }, + { "", sig.new ExternalSymbol(""), Integer.MIN_VALUE, Integer.MAX_VALUE, + "ClassSymbol(,,80000000,2147483647)" } }; + for (Object[] c : cases) { + assertEquals( + c[4], + sig.new ClassSymbol((String) c[0], (SymbolRef) c[1], (Integer) c[2], (Integer) c[3]).toString()); + } + } + + @Test + void readsVirtualFieldsOnceInTheirOriginalOrderOnEveryQuery() { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + int[] query = { 0 }; + ClassSymbolRef symbol = sig.new ClassSymbol(null, null, 0, 0) { + + @Override + public String name() { + calls.add("name"); + return "Name" + query[0]; + } + + @Override + public SymbolRef owner() { + calls.add("owner"); + return sig.new ExternalSymbol("Owner" + query[0]); + } + + @Override + public int flags() { + calls.add("flags"); + return query[0]; + } + + @Override + public int infoId() { + calls.add("infoId"); + return query[0]++; + } + }; + String prefix = symbol.getClass().getName().replaceAll(".+\\$", ""); + assertEquals(prefix + "(Name0,Owner0,0,0)", symbol.toString()); + assertEquals(prefix + "(Name1,Owner1,1,1)", symbol.toString()); + assertEquals(Arrays.asList("name", "owner", "flags", "infoId", "name", "owner", "flags", "infoId"), calls); + } + + @Test + void ownerFormattingHappensAfterTheOwnerGetterAndAcceptsANullResult() { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + SymbolRef owner = sig.new ExternalSymbol("unused") { + + @Override + public String toString() { + calls.add("owner.toString"); + return null; + } + }; + ClassSymbolRef symbol = sig.new ClassSymbol("Name", null, 0, 1) { + + @Override + public SymbolRef owner() { + calls.add("owner"); + return owner; + } + + @Override + public int flags() { + calls.add("flags"); + return 0; + } + }; + String prefix = symbol.getClass().getName().replaceAll(".+\\$", ""); + assertEquals(prefix + "(Name,null,0,1)", symbol.toString()); + assertEquals(Arrays.asList("owner", "owner.toString", "flags"), calls); + } + + @Test + void failuresPropagateAtEachGetterAndDuringOwnerFormattingWithoutLaterReads() { + ScalaSignature sig = signature(); + List order = Arrays.asList("name", "owner", "owner.toString", "flags", "infoId"); + RuntimeException failure = new IllegalStateException("symbol string getter"); + for (String failing : order) { + List calls = new ArrayList<>(); + SymbolRef owner = sig.new ExternalSymbol("unused") { + + @Override + public String toString() { + return read(calls, "owner.toString", "Owner", failing, failure); + } + }; + ClassSymbolRef symbol = sig.new ClassSymbol(null, null, 0, 0) { + + @Override + public String name() { + return read(calls, "name", "Name", failing, failure); + } + + @Override + public SymbolRef owner() { + return read(calls, "owner", owner, failing, failure); + } + + @Override + public int flags() { + return read(calls, "flags", 15, failing, failure); + } + + @Override + public int infoId() { + return read(calls, "infoId", 4, failing, failure); + } + }; + assertSame(failure, assertThrows(RuntimeException.class, symbol::toString)); + assertEquals(order.subList(0, order.indexOf(failing) + 1), calls); + } + } + + @Test + void anonymousSubclassNamesUseOnlyTheSuffixAfterTheLastDollar() { + ScalaSignature sig = signature(); + ClassSymbolRef symbol = sig.new ClassSymbol("Name", null, 0, 0) {}; + String expected = symbol.getClass().getName().replaceAll(".+\\$", ""); + assertFalse(expected.contains(".")); + assertFalse(expected.contains("$")); + assertEquals(expected + "(Name,null,0,0)", symbol.toString()); + } + + @Test + void legacyStaticTraitBridgeNeedsNoOuterInstanceAndRejectsNullReceivers() throws Throwable { + MethodHandle bridge = MethodHandles.lookup().findStatic( + Class.forName("codechicken.multipart.asm.ScalaSignature$ClassSymbolRef$class"), + "toString", + MethodType.methodType(String.class, ClassSymbolRef.class)); + List calls = new ArrayList<>(); + ClassSymbolRef symbol = (ClassSymbolRef) Proxy.newProxyInstance( + ClassSymbolRef.class.getClassLoader(), + new Class[] { ClassSymbolRef.class }, + (proxy, method, args) -> { + calls.add(method.getName()); + switch (method.getName()) { + case "name": + return "Proxy"; + case "owner": + return null; + case "flags": + return 0xabcdef; + case "infoId": + return -3; + default: + throw new AssertionError(method.getName()); + } + }); + String runtimeName = symbol.getClass().getName().replaceAll(".+\\$", ""); + assertEquals(runtimeName + "(Proxy,null,abcdef,-3)", (String) bridge.invokeExact(symbol)); + assertEquals(Arrays.asList("name", "owner", "flags", "infoId"), calls); + assertThrows(NullPointerException.class, () -> bridge.invokeWithArguments(new Object[] { null })); + } + + private static T read(List calls, String name, T value, String failing, RuntimeException failure) { + calls.add(name); + if (name.equals(failing)) throw failure; + return value; + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureInterfaceNamesTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureInterfaceNamesTest.java new file mode 100644 index 0000000..4ea5674 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureInterfaceNamesTest.java @@ -0,0 +1,251 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Proxy; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; +import java.util.function.Supplier; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.ClassSymbolRef; +import codechicken.multipart.asm.ScalaSignature.ClassType; +import codechicken.multipart.asm.ScalaSignature.TypeRef; +import scala.collection.JavaConversions; +import scala.collection.immutable.Nil$; + +class ScalaSignatureInterfaceNamesTest { + + private static final Fixture FIXTURE = new Fixture(); + + @Test + void classAndObjectSymbolsSkipTheParentAndKeepInterfaceOrder() throws Throwable { + ScalaSignature sig = signature(); + TypeRef parent = named(sig, () -> { throw new AssertionError("Parent name must not be read"); }); + ClassType info = classType( + sig, + scalaList( + parent, + sig.new ThisType(sig.new ExternalSymbol("pkg.First")), + sig.new ThisType(sig.new ExternalSymbol("scala.AnyRef")), + sig.new SingleType(null, sig.new ExternalSymbol("pkg.Module")))); + ClassSymbolRef klass = sig.new ClassSymbol("unused", null, 0, -1) { + + @Override + public ClassType info() { + return info; + } + }; + ClassSymbolRef object = sig.new ObjectSymbol("unused", null, 0, -1) { + + @Override + public ClassType info() { + return info; + } + }; + for (ClassSymbolRef symbol : new ClassSymbolRef[] { klass, object }) { + scala.collection.immutable.List result = (scala.collection.immutable.List) FIXTURE.names + .invoke(symbol); + assertEquals(Arrays.asList("pkg/First", "java/lang/Object", "pkg/Module$"), javaList(result)); + } + } + + @Test + void emptyAndParentOnlyHierarchiesReturnTheEmptyListSingleton() throws Throwable { + ScalaSignature sig = signature(); + for (scala.collection.immutable.List parents : Arrays + .asList(scalaList(new TypeRef[0]), scalaList((TypeRef) null))) { + ClassType info = classType(sig, parents); + ClassSymbolRef symbol = symbol(sig, () -> info); + assertSame(Nil$.MODULE$, symbol.jInterfaces()); + } + } + + @Test + void virtualInfoAndInterfacesAreReadOnceBeforeOrderedJavaNames() throws Throwable { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + String firstName = new String("literal.Name"); + TypeRef first = named(sig, () -> { + calls.add("first.jName"); + return firstName; + }); + TypeRef second = named(sig, () -> { + calls.add("second.jName"); + return null; + }); + ClassType info = info(sig, () -> { + calls.add("interfaces"); + return scalaList(first, second, first); + }); + ClassSymbolRef symbol = symbol(sig, () -> { + calls.add("info"); + return info; + }); + scala.collection.immutable.List result = symbol.jInterfaces(); + assertEquals(Arrays.asList(firstName, null, firstName), javaList(result)); + assertSame(firstName, result.apply(0)); + assertSame(firstName, result.apply(2)); + assertEquals(Arrays.asList("info", "interfaces", "first.jName", "second.jName", "first.jName"), calls); + } + + @Test + void repeatedQueriesRereadInfoInterfacesAndNamesWithoutChangingPreviousResults() throws Throwable { + ScalaSignature sig = signature(); + int[] reads = { 0, 0, 0 }; + TypeRef ref = named(sig, () -> "name" + ++reads[2]); + ClassType info = info(sig, () -> ++reads[1] == 1 ? scalaList(ref, ref) : scalaList(ref)); + ClassSymbolRef symbol = symbol(sig, () -> { + reads[0]++; + return info; + }); + scala.collection.immutable.List first = symbol.jInterfaces(); + assertEquals(Arrays.asList("name1", "name2"), javaList(first)); + assertEquals(Arrays.asList("name3"), javaList(symbol.jInterfaces())); + assertEquals(Arrays.asList("name1", "name2"), javaList(first)); + assertArrayEquals(new int[] { 2, 2, 3 }, reads); + } + + @Test + void getterFailuresStopEvaluationWithoutWrappingOrRetrying() throws Throwable { + ScalaSignature sig = signature(); + List order = Arrays.asList("info", "interfaces", "first", "second"); + RuntimeException failure = new IllegalStateException("interface getter"); + for (String failing : order) { + List calls = new ArrayList<>(); + TypeRef first = named(sig, () -> read(calls, "first", "A", failing, failure)); + TypeRef second = named(sig, () -> read(calls, "second", "B", failing, failure)); + ClassType info = info(sig, () -> read(calls, "interfaces", scalaList(first, second), failing, failure)); + ClassSymbolRef symbol = symbol(sig, () -> read(calls, "info", info, failing, failure)); + assertSame(failure, assertThrows(RuntimeException.class, symbol::jInterfaces)); + assertEquals(order.subList(0, order.indexOf(failing) + 1), calls); + } + } + + @Test + void nullInfoListsAndElementsKeepTheirOriginalFailureBoundaries() throws Throwable { + ScalaSignature sig = signature(); + assertThrows(NullPointerException.class, symbol(sig, () -> null)::jInterfaces); + ClassType nullInterfaces = info(sig, () -> null); + assertThrows(NullPointerException.class, symbol(sig, () -> nullInterfaces)::jInterfaces); + ClassType nullParents = classType(sig, null); + assertThrows(NullPointerException.class, symbol(sig, () -> nullParents)::jInterfaces); + List calls = new ArrayList<>(); + ClassType nullElement = info(sig, () -> scalaList(named(sig, () -> { + calls.add("first"); + return "A"; + }), null, named(sig, () -> { throw new AssertionError("Name read after null element"); }))); + assertThrows(NullPointerException.class, symbol(sig, () -> nullElement)::jInterfaces); + assertEquals(Arrays.asList("first"), calls); + } + + @Test + void legacyStaticTraitBridgeNeedsOnlyVirtualInfoWithoutAnOuterInstance() throws Throwable { + ScalaSignature sig = signature(); + ClassType info = info(sig, () -> scalaList(named(sig, () -> "custom/Interface"))); + List calls = new ArrayList<>(); + ClassSymbolRef ref = (ClassSymbolRef) Proxy.newProxyInstance( + ClassSymbolRef.class.getClassLoader(), + new Class[] { ClassSymbolRef.class }, + (proxy, method, args) -> { + calls.add(method.getName()); + assertEquals("info", method.getName()); + return info; + }); + MethodHandle bridge = MethodHandles.lookup().findStatic( + Class.forName("codechicken.multipart.asm.ScalaSignature$ClassSymbolRef$class"), + "jInterfaces", + MethodType.methodType(scala.collection.immutable.List.class, ClassSymbolRef.class)); + scala.collection.immutable.List result = (scala.collection.immutable.List) bridge.invokeExact(ref); + assertEquals(Arrays.asList("custom/Interface"), javaList(result)); + assertEquals(Arrays.asList("info"), calls); + assertThrows(NullPointerException.class, () -> bridge.invokeWithArguments(new Object[] { null })); + } + + private static T read(List calls, String name, T value, String failing, RuntimeException failure) { + calls.add(name); + if (name.equals(failing)) throw failure; + return value; + } + + private static TypeRef named(ScalaSignature sig, Supplier name) { + return sig.new ThisType(null) { + + @Override + public String jName() { + return name.get(); + } + }; + } + + private static ClassType classType(ScalaSignature sig, scala.collection.immutable.List parents) + throws Exception { + return (ClassType) ClassType.class.getConstructors()[0].newInstance(sig, null, parents); + } + + private static ClassType info(ScalaSignature sig, Supplier> interfaces) + throws Throwable { + return (ClassType) FIXTURE.info.invoke(sig, interfaces); + } + + private static ClassSymbolRef symbol(ScalaSignature sig, Supplier info) throws Throwable { + return (ClassSymbolRef) FIXTURE.symbol.invoke(sig, info); + } + + private static List javaList(scala.collection.immutable.List list) { + return JavaConversions.seqAsJavaList(list); + } + + @SafeVarargs + private static scala.collection.immutable.List scalaList(T... values) { + return JavaConversions.asScalaBuffer(Arrays.asList(values)).toList(); + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } + + private static final class Fixture extends ClassLoader { + + final MethodHandle info; + final MethodHandle symbol; + final MethodHandle names; + + Fixture() { + super(ScalaSignatureInterfaceNamesTest.class.getClassLoader()); + try { + String base = "ReferenceScalaInterfaceNames"; + for (String suffix : new String[] { "", "$$anon$1", "$$anon$2" }) { + byte[] bytes; + try (InputStream stream = Objects + .requireNonNull(getResourceAsStream("compat/" + base + suffix + ".class.b64")); + Scanner scanner = new Scanner(stream, StandardCharsets.UTF_8.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + Class type = loadClass("codechicken.multipart.compat." + base); + Object instance = type.getConstructor().newInstance(); + info = MethodHandles.publicLookup() + .unreflect(type.getMethod("info", ScalaSignature.class, Supplier.class)).bindTo(instance); + symbol = MethodHandles.publicLookup() + .unreflect(type.getMethod("symbol", ScalaSignature.class, Supplier.class)).bindTo(instance); + names = MethodHandles.publicLookup().unreflect(type.getMethod("names", ClassSymbolRef.class)) + .bindTo(instance); + } catch (ReflectiveOperationException | java.io.IOException e) { + throw new AssertionError(e); + } + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodDescriptorTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodDescriptorTest.java new file mode 100644 index 0000000..e2f2f0b --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodDescriptorTest.java @@ -0,0 +1,236 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.Supplier; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.MethodSymbol; +import codechicken.multipart.asm.ScalaSignature.TMethodType; +import codechicken.multipart.asm.ScalaSignature.TypeRef; +import scala.collection.JavaConversions; + +class ScalaSignatureMethodDescriptorTest { + + @Test + void parameterlessAndMethodModelsAssembleLiteralDescriptorsInOrder() throws Exception { + ScalaSignature sig = signature(); + assertEquals("()V", sig.new ParameterlessType(namedType(sig, "scala.Unit")).jDesc()); + List parameters = new ArrayList<>(); + for (String name : new String[] { "scala.Int", "scala.Long", "scala.Char", "java.lang.String" }) { + parameters.add(parameter(sig, () -> sig.new ParameterlessType(namedType(sig, name)))); + } + TMethodType ref = (TMethodType) ScalaSignature.MethodType.class.getConstructors()[0] + .newInstance(sig, namedType(sig, "scala.Boolean"), JavaConversions.asScalaBuffer(parameters).toList()); + assertEquals("(IJLscala/Char;Ljava/lang/String;)Z", ref.jDesc()); + } + + @Test + void readsParameterInfoAndReturnTypesBeforeTheMethodReturnType() { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + TypeRef[] result = { descriptor(sig, () -> "old") }; + List parameters = new ArrayList<>(); + for (int index = 0; index < 2; index++) { + final int i = index; + TypeRef type = descriptor(sig, () -> { + calls.add(i + ".jDesc"); + result[0] = descriptor(sig, () -> { + calls.add("result.jDesc"); + return "R"; + }); + return i == 0 ? "I" : "J"; + }); + TMethodType info = method( + sig, + () -> { throw new AssertionError("Parameter params must not be read"); }, + () -> { + calls.add(i + ".returnType"); + return type; + }); + parameters.add(parameter(sig, () -> { + calls.add(i + ".info"); + return info; + })); + } + TMethodType ref = method(sig, () -> { + calls.add("params"); + return JavaConversions.asScalaBuffer(parameters).toList(); + }, () -> { + calls.add("returnType"); + return result[0]; + }); + assertEquals("(IJ)R", ref.jDesc()); + assertEquals( + Arrays.asList( + "params", + "0.info", + "0.returnType", + "0.jDesc", + "1.info", + "1.returnType", + "1.jDesc", + "returnType", + "result.jDesc"), + calls); + } + + @Test + void repeatedParametersAndQueriesRereadVirtualInfoWithoutCaching() { + ScalaSignature sig = signature(); + int[] reads = { 0 }; + MethodSymbol param = parameter(sig, () -> { + String value = Integer.toString(++reads[0]); + return sig.new ParameterlessType(descriptor(sig, () -> value)); + }); + TMethodType ref = method(sig, () -> scalaList(param, param), () -> descriptor(sig, () -> "V")); + assertEquals("(12)V", ref.jDesc()); + assertEquals("(34)V", ref.jDesc()); + assertEquals(4, reads[0]); + } + + @Test + void nullAndUnvalidatedDescriptorsAreConcatenatedLiterally() { + ScalaSignature sig = signature(); + MethodSymbol missingArray = parameter(sig, () -> sig.new ParameterlessType(namedType(sig, "scala.Array"))); + MethodSymbol literal = parameter(sig, () -> sig.new ParameterlessType(descriptor(sig, () -> ")invalid("))); + TMethodType ref = method(sig, () -> scalaList(missingArray, literal), () -> descriptor(sig, () -> null)); + assertEquals("(null)invalid()null", ref.jDesc()); + assertEquals("()null", sig.new ParameterlessType(descriptor(sig, () -> null)).jDesc()); + } + + @Test + void propagatesEachGetterFailureWithoutReadingLaterGetters() { + ScalaSignature sig = signature(); + List order = Arrays + .asList("params", "info", "parameterReturn", "parameterDescriptor", "returnType", "returnDescriptor"); + RuntimeException failure = new IllegalStateException("method descriptor getter"); + for (String failing : order) { + List calls = new ArrayList<>(); + TypeRef argument = descriptor(sig, () -> read(calls, "parameterDescriptor", "I", failing, failure)); + TMethodType info = method( + sig, + () -> { throw new AssertionError("Unexpected parameter params"); }, + () -> read(calls, "parameterReturn", argument, failing, failure)); + MethodSymbol parameter = parameter(sig, () -> read(calls, "info", info, failing, failure)); + TypeRef result = descriptor(sig, () -> read(calls, "returnDescriptor", "V", failing, failure)); + TMethodType ref = method( + sig, + () -> read(calls, "params", scalaList(parameter), failing, failure), + () -> read(calls, "returnType", result, failing, failure)); + assertSame(failure, assertThrows(RuntimeException.class, ref::jDesc)); + assertEquals(order.subList(0, order.indexOf(failing) + 1), calls); + } + } + + @Test + void nullParameterChainsFailBeforeReadingTheMethodReturnType() { + ScalaSignature sig = signature(); + List> cases = Arrays.asList( + null, + scalaList((MethodSymbol) null), + scalaList(parameter(sig, () -> null)), + scalaList(parameter(sig, () -> sig.new ParameterlessType(null)))); + for (scala.collection.immutable.List params : cases) { + TMethodType ref = method( + sig, + () -> params, + () -> { throw new AssertionError("Return type read too soon"); }); + assertThrows(NullPointerException.class, ref::jDesc); + } + assertThrows(NullPointerException.class, () -> sig.new ParameterlessType(null).jDesc()); + } + + @Test + void legacyStaticTraitBridgeUsesVirtualMembersWithoutAnOuterInstance() throws Throwable { + ScalaSignature sig = signature(); + MethodHandle bridge = MethodHandles.lookup().findStatic( + Class.forName("codechicken.multipart.asm.ScalaSignature$TMethodType$class"), + "jDesc", + MethodType.methodType(String.class, TMethodType.class)); + List calls = new ArrayList<>(); + TMethodType ref = (TMethodType) Proxy.newProxyInstance( + TMethodType.class.getClassLoader(), + new Class[] { TMethodType.class }, + (proxy, method, args) -> { + calls.add(method.getName()); + if (method.getName().equals("params")) + return scalaList(parameter(sig, () -> sig.new ParameterlessType(namedType(sig, "scala.Int")))); + assertEquals("returnType", method.getName()); + return namedType(sig, "scala.Unit"); + }); + assertEquals("(I)V", (String) bridge.invokeExact(ref)); + assertEquals(Arrays.asList("params", "returnType"), calls); + assertThrows(NullPointerException.class, () -> bridge.invokeWithArguments(new Object[] { null })); + } + + private static T read(List calls, String name, T value, String failing, RuntimeException failure) { + calls.add(name); + if (name.equals(failing)) throw failure; + return value; + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static TMethodType method(ScalaSignature sig, + Supplier> params, Supplier result) { + return sig.new ParameterlessType(null) { + + @Override + public scala.collection.immutable.List params() { + return params.get(); + } + + @Override + public TypeRef returnType() { + return result.get(); + } + }; + } + + private static MethodSymbol parameter(ScalaSignature sig, Supplier info) { + return sig.new MethodSymbol("unused", null, 0, -1) { + + @Override + public TMethodType info() { + return info.get(); + } + + @Override + public String jDesc() { + throw new AssertionError("Parameter jDesc must not be used"); + } + }; + } + + private static TypeRef descriptor(ScalaSignature sig, Supplier value) { + return sig.new ThisType(null) { + + @Override + public String jDesc() { + return value.get(); + } + }; + } + + private static TypeRef namedType(ScalaSignature sig, String name) { + return sig.new ThisType(sig.new ExternalSymbol(name)); + } + + @SafeVarargs + private static scala.collection.immutable.List scalaList(T... values) { + return JavaConversions.asScalaBuffer(Arrays.asList(values)).toList(); + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolDescriptorTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolDescriptorTest.java new file mode 100644 index 0000000..8156994 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolDescriptorTest.java @@ -0,0 +1,192 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Proxy; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; +import java.util.function.Supplier; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.MethodSymbol; +import codechicken.multipart.asm.ScalaSignature.SymbolRef; +import codechicken.multipart.asm.ScalaSignature.TMethodType; + +class ScalaSignatureMethodSymbolDescriptorTest { + + private static final Fixture FIXTURE = new Fixture(); + + @Test + void returnsMethodDescriptorsLiterally() throws Throwable { + ScalaSignature sig = signature(); + for (String value : new String[] { "()V", "(IJ)Ljava/lang/String;", "", "invalid" }) { + assertEquals(value, descriptor(ref(sig, () -> method(() -> value)))); + } + assertNull(descriptor(ref(sig, () -> method(() -> null)))); + } + + @Test + void frozenScalaBridgeReadsInfoThenDescriptorOnEveryQuery() throws Throwable { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + int[] query = { 0 }; + TMethodType info = method(() -> { + calls.add("jDesc"); + return "descriptor" + query[0]++; + }); + MethodSymbol ref = ref(sig, () -> { + calls.add("info"); + return info; + }); + assertEquals("descriptor0", descriptor(ref)); + assertEquals("descriptor1", descriptor(ref)); + assertEquals(Arrays.asList("info", "jDesc", "info", "jDesc"), calls); + } + + @Test + void changingInfoResultsAreNotCached() throws Throwable { + ScalaSignature sig = signature(); + int[] query = { 0 }; + MethodSymbol ref = ref(sig, () -> { + int value = query[0]++; + return method(() -> Integer.toString(value)); + }); + assertEquals("0", descriptor(ref)); + assertEquals("1", descriptor(ref)); + assertEquals(2, query[0]); + } + + @Test + void nullInfoKeepsItsNullPointerFailure() throws Throwable { + ScalaSignature sig = signature(); + assertThrows(NullPointerException.class, () -> descriptor(ref(sig, () -> null))); + } + + @Test + void failuresStopAtInfoOrDescriptorRead() throws Throwable { + ScalaSignature sig = signature(); + RuntimeException failure = new IllegalStateException("method descriptor getter"); + List calls = new ArrayList<>(); + MethodSymbol infoFailure = ref(sig, () -> { + calls.add("info"); + throw failure; + }); + assertSame(failure, assertThrows(RuntimeException.class, () -> descriptor(infoFailure))); + assertEquals(Arrays.asList("info"), calls); + + calls.clear(); + MethodSymbol descriptorFailure = ref(sig, () -> { + calls.add("info"); + return method(() -> { + calls.add("jDesc"); + throw failure; + }); + }); + assertSame(failure, assertThrows(RuntimeException.class, () -> descriptor(descriptorFailure))); + assertEquals(Arrays.asList("info", "jDesc"), calls); + } + + @Test + void descriptorDoesNotReadMethodTypeShapeOrSymbolFields() { + ScalaSignature sig = signature(); + TMethodType info = method(() -> "()V"); + MethodSymbol ref = sig.new MethodSymbol(null, null, 0, 0) { + + @Override + public TMethodType info() { + return info; + } + + @Override + public String name() { + throw new AssertionError("name"); + } + + @Override + public SymbolRef owner() { + throw new AssertionError("owner"); + } + + @Override + public int flags() { + throw new AssertionError("flags"); + } + + @Override + public int infoId() { + throw new AssertionError("infoId"); + } + }; + assertEquals("()V", ref.jDesc()); + } + + @Test + void frozenScalaCallerKeepsItsDescriptorAndNullReceiverFailure() throws Throwable { + ScalaSignature sig = signature(); + MethodSymbol ref = ref(sig, () -> method(() -> "()I")); + assertEquals("()I", descriptor(ref)); + assertThrows(NullPointerException.class, () -> descriptor(null)); + } + + private static TMethodType method(Supplier descriptors) { + return (TMethodType) Proxy.newProxyInstance( + TMethodType.class.getClassLoader(), + new Class[] { TMethodType.class }, + (proxy, method, args) -> { + if (method.getName().equals("jDesc")) return descriptors.get(); + throw new AssertionError(method.getName()); + }); + } + + private static MethodSymbol ref(ScalaSignature sig, Supplier infos) throws Throwable { + return (MethodSymbol) FIXTURE.ref.invoke(sig, infos); + } + + private static String descriptor(MethodSymbol ref) throws Throwable { + return (String) FIXTURE.descriptor.invoke(ref); + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } + + private static final class Fixture extends ClassLoader { + + final MethodHandle ref; + final MethodHandle descriptor; + + Fixture() { + super(ScalaSignatureMethodSymbolDescriptorTest.class.getClassLoader()); + try { + String base = "ReferenceScalaMethodSymbolDescriptor"; + for (String suffix : new String[] { "", "$$anon$1" }) { + byte[] bytes; + try (InputStream stream = Objects + .requireNonNull(getResourceAsStream("compat/" + base + suffix + ".class.b64")); + Scanner scanner = new Scanner(stream, StandardCharsets.UTF_8.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + } + Class type = loadClass("codechicken.multipart.compat." + base); + Object instance = type.getConstructor().newInstance(); + ref = MethodHandles.publicLookup() + .unreflect(type.getMethod("ref", ScalaSignature.class, Supplier.class)).bindTo(instance); + descriptor = MethodHandles.publicLookup().unreflect(type.getMethod("descriptor", MethodSymbol.class)) + .bindTo(instance); + } catch (ReflectiveOperationException | java.io.IOException e) { + throw new AssertionError(e); + } + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolFullTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolFullTest.java new file mode 100644 index 0000000..430a692 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolFullTest.java @@ -0,0 +1,213 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; +import java.util.function.Supplier; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.MethodSymbol; +import codechicken.multipart.asm.ScalaSignature.SymbolRef; +import codechicken.multipart.asm.ScalaSignature.TMethodType; + +class ScalaSignatureMethodSymbolFullTest { + + private static final Fixture FIXTURE = new Fixture(); + + @Test + void methodSymbolsJoinTheirOwnerAndName() { + ScalaSignature sig = signature(); + assertEquals( + "pkg.Owner.method", + sig.new MethodSymbol("method", sig.new ExternalSymbol("pkg.Owner"), 0, 0).full()); + assertEquals(".", sig.new MethodSymbol("", sig.NoSymbol(), 0, 0).full()); + assertEquals("..a,b(c)", sig.new MethodSymbol("a,b(c)", sig.new ExternalSymbol("."), 0, 0).full()); + } + + @Test + void nullFullNameAndNameAreFormattedLiterally() { + ScalaSignature sig = signature(); + SymbolRef nullFull = sig.new ExternalSymbol("unused") { + + @Override + public String full() { + return null; + } + }; + assertEquals("null.method", sig.new MethodSymbol("method", nullFull, 0, 0).full()); + assertEquals("pkg.Owner.null", sig.new MethodSymbol(null, sig.new ExternalSymbol("pkg.Owner"), 0, 0).full()); + } + + @Test + void virtualOwnerFullAndNameAreReadInOrderOnEveryFrozenCallerQuery() throws Throwable { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + int[] query = { 0 }; + SymbolRef owner = sig.new ExternalSymbol("unused") { + + @Override + public String full() { + calls.add("owner.full"); + return "Owner" + query[0]; + } + }; + MethodSymbol ref = ref(sig, () -> { + calls.add("owner"); + return owner; + }, () -> { + calls.add("name"); + return "method" + query[0]++; + }); + assertEquals("Owner0.method0", full(ref)); + assertEquals("Owner1.method1", full(ref)); + assertEquals(Arrays.asList("owner", "owner.full", "name", "owner", "owner.full", "name"), calls); + } + + @Test + void failuresStopAtTheSelectedOwnerOrNameRead() throws Throwable { + ScalaSignature sig = signature(); + List order = Arrays.asList("owner", "owner.full", "name"); + RuntimeException failure = new IllegalStateException("method symbol full getter"); + for (String failing : order) { + List calls = new ArrayList<>(); + SymbolRef owner = sig.new ExternalSymbol("unused") { + + @Override + public String full() { + return read(calls, "owner.full", "Owner", failing, failure); + } + }; + MethodSymbol ref = ref( + sig, + () -> read(calls, "owner", owner, failing, failure), + () -> read(calls, "name", "method", failing, failure)); + assertSame(failure, assertThrows(RuntimeException.class, () -> full(ref))); + assertEquals(order.subList(0, order.indexOf(failing) + 1), calls); + } + } + + @Test + void nullOwnerFailsBeforeReadingTheName() throws Throwable { + ScalaSignature sig = signature(); + int[] nameReads = { 0 }; + MethodSymbol ref = ref(sig, () -> null, () -> { + nameReads[0]++; + return "method"; + }); + assertThrows(NullPointerException.class, () -> full(ref)); + assertEquals(0, nameReads[0]); + } + + @Test + void fullDoesNotReadOwnerStringOrDerivedMethodMembers() { + ScalaSignature sig = signature(); + SymbolRef owner = sig.new ExternalSymbol("Owner") { + + @Override + public String toString() { + throw new AssertionError("owner.toString"); + } + }; + MethodSymbol ref = sig.new MethodSymbol("method", owner, 0, 0) { + + @Override + public int flags() { + throw new AssertionError("flags"); + } + + @Override + public int infoId() { + throw new AssertionError("infoId"); + } + + @Override + public TMethodType info() { + throw new AssertionError("info"); + } + + @Override + public String jDesc() { + throw new AssertionError("jDesc"); + } + + @Override + public String toString() { + throw new AssertionError("toString"); + } + }; + assertEquals("Owner.method", ref.full()); + } + + @Test + void frozenScalaCallerKeepsItsDescriptorAndNullReceiverFailure() throws Throwable { + ScalaSignature sig = signature(); + MethodSymbol ref = sig.new MethodSymbol("method", sig.new ExternalSymbol("Owner"), 0, 0); + assertEquals("Owner.method", full(ref)); + assertThrows(NullPointerException.class, () -> full(null)); + } + + private static T read(List calls, String name, T value, String failing, RuntimeException failure) { + calls.add(name); + if (name.equals(failing)) throw failure; + return value; + } + + private static MethodSymbol ref(ScalaSignature sig, Supplier owners, Supplier names) + throws Throwable { + return sig.new MethodSymbol(null, null, 0, 0) { + + @Override + public String name() { + return names.get(); + } + + @Override + public SymbolRef owner() { + return owners.get(); + } + }; + } + + private static String full(MethodSymbol ref) throws Throwable { + return (String) FIXTURE.full.invoke(ref); + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } + + private static final class Fixture extends ClassLoader { + + final MethodHandle full; + + Fixture() { + super(ScalaSignatureMethodSymbolFullTest.class.getClassLoader()); + try { + String base = "ReferenceScalaMethodSymbolFull"; + byte[] bytes; + try (InputStream stream = Objects.requireNonNull(getResourceAsStream("compat/" + base + ".class.b64")); + Scanner scanner = new Scanner(stream, StandardCharsets.UTF_8.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + defineClass(null, bytes, 0, bytes.length); + Class type = loadClass("codechicken.multipart.compat." + base); + Object instance = type.getConstructor().newInstance(); + full = MethodHandles.publicLookup().unreflect(type.getMethod("full", MethodSymbol.class)) + .bindTo(instance); + } catch (ReflectiveOperationException | java.io.IOException e) { + throw new AssertionError(e); + } + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolInfoTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolInfoTest.java new file mode 100644 index 0000000..b350c0f --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolInfoTest.java @@ -0,0 +1,209 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.InputStream; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; +import java.util.function.IntFunction; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.MethodSymbol; +import codechicken.multipart.asm.ScalaSignature.SymbolRef; +import codechicken.multipart.asm.ScalaSignature.TMethodType; + +class ScalaSignatureMethodSymbolInfoTest { + + private static final Fixture FIXTURE = new Fixture(); + + @Test + void returnsEvaluatedMethodTypeAndNullLiterally() throws Throwable { + TMethodType expected = method(); + ProbeSignature sig = signature(index -> index == 37 ? expected : null, new ArrayList<>()); + assertSame(expected, info(sig.new MethodSymbol(null, null, 0, 37))); + assertNull(info(sig.new MethodSymbol(null, null, 0, -1))); + } + + @Test + void readsInfoIdThenEvalOnEveryQuery() throws Throwable { + List calls = new ArrayList<>(); + TMethodType expected = method(); + ProbeSignature sig = signature(index -> expected, calls); + MethodSymbol ref = sig.new MethodSymbol(null, null, 0, 0) { + + @Override + public int infoId() { + calls.add("infoId"); + return 19; + } + }; + assertSame(expected, info(ref)); + assertSame(expected, info(ref)); + assertEquals(Arrays.asList("infoId", "eval:19", "infoId", "eval:19"), calls); + } + + @Test + void changingInfoIdsAndResultsAreNotCached() throws Throwable { + TMethodType first = method(); + TMethodType second = method(); + int[] query = { 0 }; + ProbeSignature sig = signature(index -> index == 4 ? first : second, new ArrayList<>()); + MethodSymbol ref = sig.new MethodSymbol(null, null, 0, 0) { + + @Override + public int infoId() { + return query[0]++ == 0 ? 4 : 9; + } + }; + assertSame(first, info(ref)); + assertSame(second, info(ref)); + assertEquals(2, query[0]); + } + + @Test + void rejectsAnEvaluatedNonMethodType() { + ProbeSignature sig = signature(index -> "not a method type", new ArrayList<>()); + assertThrows(ClassCastException.class, () -> info(sig.new MethodSymbol(null, null, 0, 0))); + } + + @Test + void failuresStopAtInfoIdOrEval() { + RuntimeException failure = new IllegalStateException("method info lookup"); + List calls = new ArrayList<>(); + ProbeSignature sig = signature(index -> { + calls.add("value"); + throw failure; + }, calls); + + MethodSymbol idFailure = sig.new MethodSymbol(null, null, 0, 0) { + + @Override + public int infoId() { + calls.add("infoId"); + throw failure; + } + }; + assertSame(failure, assertThrows(RuntimeException.class, () -> info(idFailure))); + assertEquals(Arrays.asList("infoId"), calls); + + calls.clear(); + MethodSymbol evalFailure = sig.new MethodSymbol(null, null, 0, 8) { + + @Override + public int infoId() { + calls.add("infoId"); + return 8; + } + }; + assertSame(failure, assertThrows(RuntimeException.class, () -> info(evalFailure))); + assertEquals(Arrays.asList("infoId", "eval:8", "value"), calls); + } + + @Test + void infoDoesNotReadOtherSymbolOrMethodTypeMembers() throws Throwable { + TMethodType expected = method(); + ProbeSignature sig = signature(index -> expected, new ArrayList<>()); + MethodSymbol ref = sig.new MethodSymbol(null, null, 0, 3) { + + @Override + public String name() { + throw new AssertionError("name"); + } + + @Override + public SymbolRef owner() { + throw new AssertionError("owner"); + } + + @Override + public int flags() { + throw new AssertionError("flags"); + } + + @Override + public String full() { + throw new AssertionError("full"); + } + + @Override + public String jDesc() { + throw new AssertionError("jDesc"); + } + }; + assertSame(expected, info(ref)); + } + + @Test + void frozenScalaCallerKeepsItsReturnDescriptorAndNullReceiverFailure() throws Throwable { + assertEquals(TMethodType.class, FIXTURE.returnType); + assertThrows(NullPointerException.class, () -> info(null)); + } + + private static TMethodType method() { + return (TMethodType) java.lang.reflect.Proxy.newProxyInstance( + TMethodType.class.getClassLoader(), + new Class[] { TMethodType.class }, + (proxy, method, args) -> { throw new AssertionError(method.getName()); }); + } + + private static TMethodType info(MethodSymbol ref) throws Throwable { + return (TMethodType) FIXTURE.info.invoke(ref); + } + + private static ProbeSignature signature(IntFunction values, List calls) { + return new ProbeSignature(values, calls); + } + + private static final class ProbeSignature extends ScalaSignature { + + private final IntFunction values; + private final List calls; + + ProbeSignature(IntFunction values, List calls) { + super(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + this.values = values; + this.calls = calls; + } + + @Override + @SuppressWarnings("unchecked") + public T evalT(int index) { + calls.add("eval:" + index); + return (T) values.apply(index); + } + } + + private static final class Fixture extends ClassLoader { + + final MethodHandle info; + final Class returnType; + + Fixture() { + super(ScalaSignatureMethodSymbolInfoTest.class.getClassLoader()); + try { + String base = "ReferenceScalaMethodSymbolInfo"; + byte[] bytes; + try (InputStream stream = Objects.requireNonNull(getResourceAsStream("compat/" + base + ".class.b64")); + Scanner scanner = new Scanner(stream, StandardCharsets.UTF_8.name()).useDelimiter("\\A")) { + bytes = Base64.getMimeDecoder().decode(scanner.next()); + } + Class type = defineClass(null, bytes, 0, bytes.length); + Object instance = type.getConstructor().newInstance(); + java.lang.reflect.Method method = type.getMethod("info", MethodSymbol.class); + returnType = method.getReturnType(); + info = MethodHandles.publicLookup().unreflect(method).bindTo(instance); + } catch (ReflectiveOperationException | java.io.IOException e) { + throw new AssertionError(e); + } + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolStringTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolStringTest.java new file mode 100644 index 0000000..02b4587 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureMethodSymbolStringTest.java @@ -0,0 +1,190 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.SymbolRef; +import codechicken.multipart.asm.ScalaSignature.TMethodType; + +class ScalaSignatureMethodSymbolStringTest { + + @Test + void formatsConcreteMethodSymbolsWithTheFixedProductName() { + ScalaSignature sig = signature(); + SymbolRef owner = sig.new ExternalSymbol("pkg.Owner"); + assertEquals("MethodSymbol(run,pkg.Owner,200,7)", sig.new MethodSymbol("run", owner, 0x200, 7).toString()); + } + + @Test + void formatsValuesLiterallyWithLowercaseTwosComplementHexadecimalFlags() { + ScalaSignature sig = signature(); + Object[][] cases = { { "a,b(c)", null, 15, -12, "MethodSymbol(a,b(c),null,f,-12)" }, + { null, sig.NoSymbol(), -1, Integer.MIN_VALUE, "MethodSymbol(null,NoSymbol,ffffffff,-2147483648)" }, + { "", sig.new ExternalSymbol(""), Integer.MIN_VALUE, Integer.MAX_VALUE, + "MethodSymbol(,,80000000,2147483647)" } }; + for (Object[] c : cases) { + assertEquals( + c[4], + sig.new MethodSymbol((String) c[0], (SymbolRef) c[1], (Integer) c[2], (Integer) c[3]).toString()); + } + } + + @Test + void anonymousSubclassesStillUseTheFixedMethodSymbolPrefix() { + ScalaSignature sig = signature(); + ScalaSignature.MethodSymbol symbol = sig.new MethodSymbol("Name", null, 0, 0) {}; + assertFalse(symbol.getClass().getName().endsWith("$MethodSymbol")); + assertEquals("MethodSymbol(Name,null,0,0)", symbol.toString()); + } + + @Test + void readsVirtualFieldsOnceInTheirOriginalOrderOnEveryQuery() { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + int[] query = { 0 }; + ScalaSignature.MethodSymbol symbol = sig.new MethodSymbol(null, null, 0, 0) { + + @Override + public String name() { + calls.add("name"); + return "Name" + query[0]; + } + + @Override + public SymbolRef owner() { + calls.add("owner"); + return sig.new ExternalSymbol("Owner" + query[0]); + } + + @Override + public int flags() { + calls.add("flags"); + return query[0]; + } + + @Override + public int infoId() { + calls.add("infoId"); + return query[0]++; + } + }; + assertEquals("MethodSymbol(Name0,Owner0,0,0)", symbol.toString()); + assertEquals("MethodSymbol(Name1,Owner1,1,1)", symbol.toString()); + assertEquals(Arrays.asList("name", "owner", "flags", "infoId", "name", "owner", "flags", "infoId"), calls); + } + + @Test + void ownerFormattingHappensAfterTheOwnerGetterAndAcceptsANullResult() { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + SymbolRef owner = sig.new ExternalSymbol("unused") { + + @Override + public String toString() { + calls.add("owner.toString"); + return null; + } + }; + ScalaSignature.MethodSymbol symbol = sig.new MethodSymbol("Name", null, 0, 1) { + + @Override + public SymbolRef owner() { + calls.add("owner"); + return owner; + } + + @Override + public int flags() { + calls.add("flags"); + return 0; + } + }; + assertEquals("MethodSymbol(Name,null,0,1)", symbol.toString()); + assertEquals(Arrays.asList("owner", "owner.toString", "flags"), calls); + } + + @Test + void failuresPropagateAtEachGetterAndDuringOwnerFormattingWithoutLaterReads() { + ScalaSignature sig = signature(); + List order = Arrays.asList("name", "owner", "owner.toString", "flags", "infoId"); + RuntimeException failure = new IllegalStateException("method symbol string getter"); + for (String failing : order) { + List calls = new ArrayList<>(); + SymbolRef owner = sig.new ExternalSymbol("unused") { + + @Override + public String toString() { + return read(calls, "owner.toString", "Owner", failing, failure); + } + }; + ScalaSignature.MethodSymbol symbol = sig.new MethodSymbol(null, null, 0, 0) { + + @Override + public String name() { + return read(calls, "name", "Name", failing, failure); + } + + @Override + public SymbolRef owner() { + return read(calls, "owner", owner, failing, failure); + } + + @Override + public int flags() { + return read(calls, "flags", 15, failing, failure); + } + + @Override + public int infoId() { + return read(calls, "infoId", 4, failing, failure); + } + }; + assertSame(failure, assertThrows(RuntimeException.class, symbol::toString)); + assertEquals(order.subList(0, order.indexOf(failing) + 1), calls); + } + } + + @Test + void formattingDoesNotReadDerivedSymbolOrMethodInformation() { + ScalaSignature sig = signature(); + ScalaSignature.MethodSymbol symbol = sig.new MethodSymbol("Name", null, 0, -1) { + + @Override + public String full() { + throw new AssertionError("full"); + } + + @Override + public TMethodType info() { + throw new AssertionError("info"); + } + + @Override + public String jDesc() { + throw new AssertionError("jDesc"); + } + + @Override + public boolean hasFlag(int flag) { + throw new AssertionError("hasFlag"); + } + }; + assertEquals("MethodSymbol(Name,null,0,-1)", symbol.toString()); + } + + private static T read(List calls, String name, T value, String failing, RuntimeException failure) { + calls.add(name); + if (name.equals(failing)) throw failure; + return value; + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureParserCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureParserCharacterizationTest.java new file mode 100644 index 0000000..19f502b --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureParserCharacterizationTest.java @@ -0,0 +1,199 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.tree.ClassNode; + +import codechicken.multipart.asm.ScalaSignature.Bytes$; +import codechicken.multipart.asm.ScalaSignature.ClassSymbol; +import codechicken.multipart.asm.ScalaSignature.MethodSymbol; +import codechicken.multipart.asm.ScalaSignature.SigEntry; +import scala.collection.Iterator; +import scala.collection.immutable.IndexedSeq; + +/** Drives the parser through the retained Scala shell, which is the only surface the compiler uses. */ +class ScalaSignatureParserCharacterizationTest { + + private static final String FIXTURE = "codechicken.multipart.compat.ReferenceScalaEdgePart"; + + @Test + void readsTheTableHeaderAndEntryLayoutOfAFrozenScalaClass() { + ScalaSignature sig = fixtureSignature(); + + assertEquals(5, sig.major()); + assertEquals(0, sig.minor()); + assertEquals(42, sig.table().length); + assertEquals("SigEntry(0,6,4 bytes)", sig.table()[0].toString()); + assertEquals(6, sig.table()[0].id()); + assertEquals(0, sig.table()[0].index()); + for (int i = 0; i < sig.table().length; i++) { + assertEquals(i, sig.table()[i].index()); + assertTrue(sig.table()[i].bytes().pos() > sig.table()[i].start()); + } + } + + @Test + void evaluatesNamesSymbolsAndTheClassHierarchy() { + ScalaSignature sig = fixtureSignature(); + + assertEquals("ReferenceScalaEdgePart", sig.evalS(1)); + assertEquals("codechicken.multipart.compat", sig.evalS(2)); + assertEquals("", sig.evalS(8)); + assertEquals("NoSymbol", sig.eval(8).toString()); + assertSame(sig.NoSymbol(), sig.eval(8)); + + ClassSymbol symbol = sig.findClass(FIXTURE).get(); + assertEquals("ClassSymbol(ReferenceScalaEdgePart,codechicken.multipart.compat,0,9)", symbol.toString()); + assertEquals(FIXTURE, symbol.full()); + assertEquals(0, symbol.flags()); + assertFalse(symbol.isTrait()); + assertFalse(symbol.isModule()); + assertFalse(symbol.isObject()); + assertEquals("codechicken/multipart/TMultiPart", symbol.jParent()); + assertEquals("List(codechicken/multipart/TEdgePart)", symbol.jInterfaces().toString()); + + assertFalse(sig.findClass("codechicken.multipart.compat.Missing").isDefined()); + assertFalse(sig.findObject(FIXTURE).isDefined()); + assertEquals(1, sig.collect(6).size()); + assertEquals(0, sig.collect(7).size()); + } + + @Test + void collectsMethodSymbolsInTableOrderWithJavaDescriptors() { + ScalaSignature sig = fixtureSignature(); + + IndexedSeq methods = sig.collect(8); + assertEquals(3, methods.size()); + List actual = new ArrayList<>(); + Iterator iterator = methods.iterator(); + while (iterator.hasNext()) { + MethodSymbol method = iterator.next(); + assertTrue(method.isMethod()); + assertFalse(method.isPrivate()); + actual.add(method.full() + method.jDesc()); + } + assertEquals( + Arrays.asList( + FIXTURE + ".()Lcodechicken/multipart/compat/ReferenceScalaEdgePart;", + FIXTURE + ".getType()Ljava/lang/String;", + FIXTURE + ".getSlotMask()I"), + actual); + } + + @Test + void deletingAnEntryRewritesItsTagInPlace() { + ScalaSignature sig = fixtureSignature(); + SigEntry entry = sig.table()[22]; + assertEquals(8, entry.id()); + + entry.delete(); + + assertEquals(3, entry.id()); + assertSame(sig.NoSymbol(), sig.eval(22)); + assertEquals(2, sig.collect(8).size()); + // The rewrite lands in the shared array the signature re-encodes from. + assertEquals(3, sig.bytes().arr()[entry.start()]); + } + + @Test + void evaluatesLiteralsAndUnknownTagsFromASyntheticTable() { + ScalaSignature sig = new ScalaSignature( + Bytes$.MODULE$.apply( + table( + entry(25, 0), + entry(25, 1), + entry(26, 0x01, 0x02), + entry(27, 0x01, 0x00, 0x00), + entry(28, 0x00, 0x41), + entry(29, 0xff, 0xff, 0xff, 0xff), + entry(30, 0x01, 0x00), + entry(31, 0x3f, 0xc0, 0x00, 0x00), + entry(32, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00), + entry(34), + entry(11), + entry(12), + entry(99)))); + + assertEquals(5, sig.major()); + assertEquals(0, sig.minor()); + assertEquals(13, sig.table().length); + + assertEquals("BooleanLiteral(false)", sig.eval(0).toString()); + assertEquals("BooleanLiteral(true)", sig.eval(1).toString()); + assertEquals("ByteLiteral(2)", sig.eval(2).toString()); + assertEquals("ShortLiteral(0)", sig.eval(3).toString()); + assertEquals("CharLiteral(A)", sig.eval(4).toString()); + assertEquals("IntLiteral(-1)", sig.eval(5).toString()); + assertEquals("LongLiteral(256)", sig.eval(6).toString()); + assertEquals("FloatLiteral(1.5)", sig.eval(7).toString()); + assertEquals("DoubleLiteral(2.5)", sig.eval(8).toString()); + assertEquals("NullLiteral", sig.eval(9).toString()); + + // 12 is a bounded super type read as NoType, like the reference. + assertSame(sig.NoType(), sig.eval(10)); + assertSame(sig.NoType(), sig.eval(11)); + assertEquals("", sig.NoType().name()); + + // An unrecognised tag evaluates to its own table entry. + assertSame(sig.table()[12], sig.eval(12)); + assertEquals("SigEntry(12,99,0 bytes)", sig.eval(12).toString()); + } + + @Test + void reportsAnUnreadableTagRatherThanGuessing() { + ScalaSignature sig = new ScalaSignature(Bytes$.MODULE$.apply(table(entry(99)))); + assertThrows(scala.MatchError.class, () -> sig.evalS(0)); + } + + private static ScalaSignature fixtureSignature() { + ClassNode cnode = new ClassNode(); + new ClassReader(fixture()).accept(cnode, 0); + return ScalaSigReader.read(ScalaSigReader.ann(cnode).get()); + } + + private static byte[] entry(int id, int... payload) { + byte[] bytes = new byte[payload.length + 2]; + bytes[0] = (byte) id; + bytes[1] = (byte) payload.length; + for (int i = 0; i < payload.length; i++) { + bytes[i + 2] = (byte) payload[i]; + } + return bytes; + } + + private static byte[] table(byte[]... entries) { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + out.write(5); + out.write(0); + out.write(entries.length); + for (byte[] entry : entries) { + out.write(entry, 0, entry.length); + } + return out.toByteArray(); + } + + private static byte[] fixture() { + InputStream input = Objects.requireNonNull( + ScalaSignatureParserCharacterizationTest.class + .getResourceAsStream("/compat/ReferenceScalaEdgePart.class.b64")); + try (Scanner scanner = new Scanner(input, StandardCharsets.US_ASCII.name()).useDelimiter("\\A")) { + return Base64.getMimeDecoder().decode(scanner.next()); + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureTypeDescriptorTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureTypeDescriptorTest.java new file mode 100644 index 0000000..8d3ce36 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureTypeDescriptorTest.java @@ -0,0 +1,193 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.SymbolRef; +import codechicken.multipart.asm.ScalaSignature.TypeRef; +import codechicken.multipart.asm.ScalaSignature.TypeRefType; +import scala.collection.JavaConversions; + +class ScalaSignatureTypeDescriptorTest { + + @Test + void exactPrimitiveAndArrayNamesBypassVirtualJavaName() { + String[][] cases = { { "scala.Array", null }, { "scala.Long", "J" }, { "scala.Int", "I" }, + { "scala.Short", "S" }, { "scala.Byte", "B" }, { "scala.Double", "D" }, { "scala.Float", "F" }, + { "scala.Boolean", "Z" }, { "scala.Unit", "V" } }; + ScalaSignature sig = signature(); + for (String[] c : cases) { + int[] reads = { 0 }; + TypeRef ref = sig.new ThisType(null) { + + @Override + public String name() { + reads[0]++; + return new String(c[0]); + } + + @Override + public String jName() { + throw new AssertionError("Matched names must not read jName"); + } + }; + assertSame(c[1], ref.jDesc()); + assertEquals(1, reads[0]); + } + } + + @Test + void unmatchedNamesKeepLegacyReferenceDescriptorsIncludingChar() { + String[][] cases = { { "scala.Char", "Lscala/Char;" }, { "scala.Nothing", "Lscala/Nothing;" }, + { "scala.Any", "Ljava/lang/Object;" }, { "scala.AnyRef", "Ljava/lang/Object;" }, + { "scala.Predef.String", "Lscala/Predef/String;" }, { "scala/Int", "Lscala/Int;" }, + { "scala/Array", "Lscala/Array;" }, { "scala.int", "Lscala/int;" }, { "", "L;" }, { "[I", "L[I;" }, + { "java.lang.String", "Ljava/lang/String;" } }; + ScalaSignature sig = signature(); + for (String[] c : cases) assertEquals(c[1], type(sig, c[0]).jDesc()); + assertEquals("L;", sig.NoType().jDesc()); + assertEquals("Lpkg/Module$;", sig.new SingleType(null, sig.new ExternalSymbol("pkg.Module")).jDesc()); + } + + @Test + void fallbackUsesVirtualJavaNameOnceEvenForNullNamesAndResults() { + ScalaSignature sig = signature(); + for (String name : new String[] { "pkg.Name", null }) { + for (String javaName : new String[] { "custom/Name$", null }) { + List calls = new ArrayList<>(); + TypeRef ref = sig.new ThisType(null) { + + @Override + public String name() { + calls.add("name"); + return name; + } + + @Override + public String jName() { + calls.add("jName"); + return javaName; + } + }; + assertEquals("L" + javaName + ";", ref.jDesc()); + assertEquals(Arrays.asList("name", "jName"), calls); + } + } + } + + @Test + void defaultFallbackRereadsNameAndSymbolInsteadOfReusingTheMatchedValue() { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + String[] names = { "pkg.First", "scala.AnyRef", "scala.Int" }; + int[] reads = { 0 }; + SymbolRef symbol = sig.new ExternalSymbol(null) { + + @Override + public String full() { + calls.add("full"); + return names[reads[0]++]; + } + }; + TypeRef ref = sig.new ThisType(null) { + + @Override + public SymbolRef sym() { + calls.add("sym"); + return symbol; + } + }; + assertEquals("Ljava/lang/Object;", ref.jDesc()); + assertEquals("I", ref.jDesc()); + assertEquals(Arrays.asList("sym", "full", "sym", "full", "sym", "full"), calls); + } + + @Test + void failuresPropagateAtTheFirstGetterWithoutRetrying() { + ScalaSignature sig = signature(); + RuntimeException failure = new IllegalStateException("descriptor getter"); + for (boolean failName : new boolean[] { true, false }) { + List calls = new ArrayList<>(); + TypeRef ref = sig.new ThisType(null) { + + @Override + public String name() { + calls.add("name"); + if (failName) throw failure; + return "pkg.Name"; + } + + @Override + public String jName() { + calls.add("jName"); + throw failure; + } + }; + assertSame(failure, assertThrows(RuntimeException.class, ref::jDesc)); + assertEquals(failName ? Arrays.asList("name") : Arrays.asList("name", "jName"), calls); + } + assertThrows(NullPointerException.class, () -> sig.new ThisType(null).jDesc()); + assertThrows(NullPointerException.class, () -> type(sig, null).jDesc()); + } + + @Test + void retainedArrayOverrideUsesOnlyTheFirstArgumentAndPreservesFailures() throws Exception { + ScalaSignature sig = signature(); + TypeRef integer = type(sig, "scala.Int"); + TypeRef array = array(sig, integer, null); + assertEquals("[I", array.jDesc()); + assertEquals("[[I", array(sig, array).jDesc()); + assertEquals("[null", array(sig, type(sig, "scala.Array")).jDesc()); + assertThrows(IndexOutOfBoundsException.class, () -> array(sig).jDesc()); + assertThrows(NullPointerException.class, () -> array(sig, (TypeRef) null).jDesc()); + } + + @Test + void legacyStaticTraitBridgeNeedsOnlyNameAndFallbackJavaName() throws Throwable { + MethodHandle bridge = MethodHandles.lookup().findStatic( + Class.forName("codechicken.multipart.asm.ScalaSignature$TypeRef$class"), + "jDesc", + MethodType.methodType(String.class, TypeRef.class)); + for (String name : new String[] { "scala.Int", "pkg.Name", null }) { + List calls = new ArrayList<>(); + TypeRef ref = (TypeRef) Proxy.newProxyInstance( + TypeRef.class.getClassLoader(), + new Class[] { TypeRef.class }, + (proxy, method, args) -> { + calls.add(method.getName()); + if (method.getName().equals("name")) return name; + assertEquals("jName", method.getName()); + return "override/Name"; + }); + assertEquals("scala.Int".equals(name) ? "I" : "Loverride/Name;", (String) bridge.invokeExact(ref)); + assertEquals("scala.Int".equals(name) ? Arrays.asList("name") : Arrays.asList("name", "jName"), calls); + } + assertThrows(NullPointerException.class, () -> bridge.invokeWithArguments(new Object[] { null })); + } + + private static TypeRef array(ScalaSignature sig, TypeRef... arguments) throws Exception { + return (TypeRef) TypeRefType.class.getConstructors()[0].newInstance( + sig, + null, + sig.new ExternalSymbol("scala.Array"), + JavaConversions.asScalaBuffer(Arrays.asList(arguments)).toList()); + } + + private static TypeRef type(ScalaSignature sig, String name) { + return sig.new ThisType(sig.new ExternalSymbol(name)); + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScalaSignatureTypeNameTest.java b/src/test/java/codechicken/multipart/asm/ScalaSignatureTypeNameTest.java new file mode 100644 index 0000000..952d112 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScalaSignatureTypeNameTest.java @@ -0,0 +1,183 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import codechicken.multipart.asm.ScalaSignature.Bytes; +import codechicken.multipart.asm.ScalaSignature.SymbolRef; +import codechicken.multipart.asm.ScalaSignature.TypeRef; + +class ScalaSignatureTypeNameTest { + + @Test + void replacesOnlyDotsWithoutInterpretingDescriptorsOrPrimitiveNames() { + ScalaSignature sig = signature(); + String[][] cases = { { "java.lang.String", "java/lang/String" }, { "pkg.Name$Inner", "pkg/Name$Inner" }, + { ".pkg..Name.", "/pkg//Name/" }, { "pkg/Name", "pkg/Name" }, { "", "" }, { "pkg\\Name", "pkg\\Name" }, + { "[Ljava.lang.String;", "[Ljava/lang/String;" }, { "scala.Int", "scala/Int" }, + { "scala.Unit", "scala/Unit" }, { "scala.Array", "scala/Array" }, + { "caf\u00e9.Name", "caf\u00e9/Name" }, { "scala.Predef.String", "scala/Predef/String" } }; + for (String[] c : cases) assertEquals(c[1], type(sig, c[0]).jName()); + } + + @Test + void mapsOnlyExactNormalizedAnyAliasesAndPreservesOtherStringIdentities() { + ScalaSignature sig = signature(); + for (String name : new String[] { "scala.Any", "scala/Any", "scala.AnyRef", "scala/AnyRef" }) { + assertSame("java/lang/Object", type(sig, name).jName()); + } + for (String value : new String[] { "scala/any", "scala/Anyref", "scala/AnyRef$", "scala/Any/", "Any", + "java/lang/Object", "scala/Nothing", "" }) { + String name = new String(value); + assertSame(name, type(sig, name).jName()); + } + } + + @Test + void readsVirtualNameOncePerQueryWithoutAccessingTheSymbol() { + ScalaSignature sig = signature(); + String[] names = { "scala.Any", "pkg.Name", "other/Name" }; + int[] reads = { 0 }; + TypeRef ref = sig.new ThisType(null) { + + @Override + public String name() { + return names[reads[0]++]; + } + + @Override + public SymbolRef sym() { + throw new AssertionError("An overridden name must bypass symbol lookup"); + } + }; + assertEquals("java/lang/Object", ref.jName()); + assertEquals(1, reads[0]); + assertEquals("pkg/Name", ref.jName()); + assertEquals(2, reads[0]); + assertSame(names[2], ref.jName()); + assertEquals(3, reads[0]); + } + + @Test + void defaultNameReadsVirtualSymbolAndFullOnceInOrder() { + ScalaSignature sig = signature(); + List calls = new ArrayList<>(); + int[] reads = { 0 }; + SymbolRef symbol = sig.new ExternalSymbol("stored") { + + @Override + public String full() { + calls.add("full"); + return ++reads[0] == 1 ? "scala.AnyRef" : "pkg.Name"; + } + }; + TypeRef ref = sig.new ThisType(null) { + + @Override + public SymbolRef sym() { + calls.add("sym"); + return symbol; + } + }; + assertEquals("java/lang/Object", ref.jName()); + assertEquals("pkg/Name", ref.jName()); + assertEquals(Arrays.asList("sym", "full", "sym", "full"), calls); + } + + @Test + void propagatesNullsAndGetterFailuresWithoutWrappingOrRetrying() { + ScalaSignature sig = signature(); + assertThrows(NullPointerException.class, () -> sig.new ThisType(null).jName()); + assertThrows(NullPointerException.class, () -> type(sig, null).jName()); + RuntimeException failure = new IllegalStateException("getter"); + int[] reads = { 0 }; + TypeRef badName = sig.new ThisType(null) { + + @Override + public String name() { + reads[0]++; + throw failure; + } + }; + TypeRef badSymbol = sig.new ThisType(null) { + + @Override + public SymbolRef sym() { + reads[0]++; + throw failure; + } + }; + TypeRef badFull = sig.new ThisType(sig.new ExternalSymbol(null) { + + @Override + public String full() { + reads[0]++; + throw failure; + } + }); + for (TypeRef ref : new TypeRef[] { badName, badSymbol, badFull }) { + assertSame(failure, assertThrows(RuntimeException.class, ref::jName)); + } + assertEquals(3, reads[0]); + } + + @Test + void singleTypeSuperCallsAndNoTypeKeepTheirExistingNamesAndDescriptorRouting() { + ScalaSignature sig = signature(); + for (String name : new String[] { "scala.AnyRef", "pkg.Name", "pkg.Name$" }) { + String expected = name.equals("scala.AnyRef") ? "java/lang/Object$" : name.replace('.', '/') + "$"; + int[] reads = { 0 }; + TypeRef ref = sig.new SingleType(null, null) { + + @Override + public String name() { + reads[0]++; + return name; + } + }; + assertEquals(expected, ref.jName()); + assertEquals(1, reads[0]); + assertEquals("L" + expected + ";", ref.jDesc()); + assertEquals(3, reads[0]); + } + assertEquals("", sig.NoType().jName()); + assertEquals("L;", sig.NoType().jDesc()); + } + + @Test + void legacyStaticTraitBridgeUsesOnlyVirtualNameAndNeedsNoOuterInstance() throws Throwable { + MethodHandle bridge = MethodHandles.lookup().findStatic( + Class.forName("codechicken.multipart.asm.ScalaSignature$TypeRef$class"), + "jName", + MethodType.methodType(String.class, TypeRef.class)); + List calls = new ArrayList<>(); + TypeRef ref = (TypeRef) Proxy.newProxyInstance( + TypeRef.class.getClassLoader(), + new Class[] { TypeRef.class }, + (proxy, method, args) -> { + calls.add(method.getName()); + assertEquals("name", method.getName()); + return "pkg.Name"; + }); + assertEquals("pkg/Name", (String) bridge.invokeExact(ref)); + assertEquals(Arrays.asList("name"), calls); + assertThrows(NullPointerException.class, () -> bridge.invokeWithArguments(new Object[] { null })); + } + + private static TypeRef type(ScalaSignature sig, String name) { + return sig.new ThisType(sig.new ExternalSymbol(name)); + } + + private static ScalaSignature signature() { + return new ScalaSignature(new Bytes(new byte[] { 5, 0, 0 }, 0, 3)); + } +} diff --git a/src/test/java/codechicken/multipart/asm/ScratchBitSetCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/ScratchBitSetCharacterizationTest.java new file mode 100644 index 0000000..1e331fb --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/ScratchBitSetCharacterizationTest.java @@ -0,0 +1,177 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.BitSet; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +class ScratchBitSetCharacterizationTest { + + @Test + void keepsExactInterfaceAndStaticHelperSurface() { + assertEquals(Modifier.PUBLIC | Modifier.INTERFACE | Modifier.ABSTRACT, ScratchBitSet.class.getModifiers()); + assertEquals(Modifier.PUBLIC | Modifier.ABSTRACT, ScratchBitSet$class.class.getModifiers()); + assertSame(Object.class, ScratchBitSet$class.class.getSuperclass()); + for (Class type : new Class[] { ScratchBitSet.class, ScratchBitSet$class.class }) { + assertEquals(0, type.getDeclaredFields().length); + assertEquals(0, type.getInterfaces().length); + } + assertEquals( + signatures( + "codechicken$multipart$asm$ScratchBitSet$$bitSets()Ljava/lang/ThreadLocal;", + "codechicken$multipart$asm$ScratchBitSet$_setter_$" + + "codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq(Ljava/lang/ThreadLocal;)V", + "getBitSet()Ljava/util/BitSet;", + "freshBitSet()Ljava/util/BitSet;"), + methods(ScratchBitSet.class, Modifier.PUBLIC | Modifier.ABSTRACT)); + assertEquals( + signatures( + "$init$(Lcodechicken/multipart/asm/ScratchBitSet;)V", + "getBitSet(Lcodechicken/multipart/asm/ScratchBitSet;)Ljava/util/BitSet;", + "freshBitSet(Lcodechicken/multipart/asm/ScratchBitSet;)Ljava/util/BitSet;"), + methods(ScratchBitSet$class.class, Modifier.PUBLIC | Modifier.STATIC)); + } + + @Test + void lazilyAllocatesReusesAndReplacesPerOwnerStorage() { + Scratch owner = new Scratch(); + Scratch other = new Scratch(); + ThreadLocal original = owner.storage; + assertEquals(1, owner.setterCalls); + assertNull(original.get()); + assertNotSame(original, other.storage); + + BitSet first = owner.getBitSet(); + assertEquals(2, owner.getterCalls, "The empty path re-reads the accessor before storing the new set"); + assertSame(first, original.get()); + first.set(4096); + assertSame(first, owner.getBitSet()); + assertEquals(3, owner.getterCalls); + assertTrue(first.get(4096), "Reading must not clear existing bits"); + assertNotSame(first, other.getBitSet()); + assertSame(first, owner.freshBitSet()); + assertTrue(first.isEmpty()); + + BitSet supplied = new BitSet(); + supplied.set(7); + ThreadLocal replacement = new ThreadLocal<>(); + replacement.set(supplied); + owner.codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq( + replacement); + assertSame(supplied, owner.getBitSet()); + assertSame(supplied, owner.freshBitSet()); + assertTrue(supplied.isEmpty()); + assertSame(first, original.get()); + + ScratchBitSet$class.$init$(owner); + assertEquals(3, owner.setterCalls); + assertNotSame(replacement, owner.storage); + assertNull(owner.storage.get(), "Reinitialization replaces storage without eagerly allocating a BitSet"); + assertNotSame(supplied, owner.getBitSet()); + } + + @Test + void isolatesThreadsWithoutClearingAnotherThreadsBits() throws Exception { + Scratch owner = new Scratch(); + BitSet main = owner.getBitSet(); + main.set(13); + ExecutorService executor = Executors.newSingleThreadExecutor(); + try { + Future result = executor.submit(() -> { + assertNull(owner.storage.get(), "Scratch state is not inherited by another thread"); + BitSet worker = owner.getBitSet(); + assertTrue(worker.isEmpty()); + worker.set(17); + assertSame(worker, owner.getBitSet()); + assertSame(worker, owner.freshBitSet()); + assertTrue(worker.isEmpty()); + return worker; + }); + assertNotSame(main, result.get(10, TimeUnit.SECONDS)); + assertSame(main, owner.getBitSet()); + assertEquals(1, main.cardinality()); + assertTrue(main.get(13)); + } finally { + executor.shutdownNow(); + } + } + + @Test + void freshHelperDispatchesThroughTheOwnersGetOverride() { + BitSet supplied = new BitSet(); + supplied.set(23); + Scratch owner = new Scratch() { + + @Override + public BitSet getBitSet() { + return supplied; + } + }; + assertSame(supplied, ScratchBitSet$class.freshBitSet(owner)); + assertTrue(supplied.isEmpty()); + assertNull(owner.storage.get()); + assertEquals(0, owner.getterCalls, "freshBitSet must not bypass the public getBitSet override"); + } + + private static Set signatures(String... values) { + return new TreeSet<>(Arrays.asList(values)); + } + + private static Set methods(Class type, int modifiers) { + Set result = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + assertEquals(modifiers, method.getModifiers()); + result.add(method.getName() + Type.getMethodDescriptor(method)); + } + return result; + } + + private static class Scratch implements ScratchBitSet { + + private ThreadLocal storage; + private int getterCalls; + private int setterCalls; + + private Scratch() { + ScratchBitSet$class.$init$(this); + } + + @Override + public ThreadLocal codechicken$multipart$asm$ScratchBitSet$$bitSets() { + getterCalls++; + return storage; + } + + @Override + public void codechicken$multipart$asm$ScratchBitSet$_setter_$codechicken$multipart$asm$ScratchBitSet$$bitSets_$eq( + ThreadLocal value) { + setterCalls++; + storage = value; + } + + @Override + public BitSet getBitSet() { + return ScratchBitSet$class.getBitSet(this); + } + + @Override + public BitSet freshBitSet() { + return ScratchBitSet$class.freshBitSet(this); + } + } +} diff --git a/src/test/java/codechicken/multipart/asm/StackAnalyserCharacterizationTest.java b/src/test/java/codechicken/multipart/asm/StackAnalyserCharacterizationTest.java new file mode 100644 index 0000000..64b4401 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/StackAnalyserCharacterizationTest.java @@ -0,0 +1,532 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.FrameNode; +import org.objectweb.asm.tree.IincInsnNode; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.IntInsnNode; +import org.objectweb.asm.tree.InvokeDynamicInsnNode; +import org.objectweb.asm.tree.JumpInsnNode; +import org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.LdcInsnNode; +import org.objectweb.asm.tree.LineNumberNode; +import org.objectweb.asm.tree.LookupSwitchInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.MultiANewArrayInsnNode; +import org.objectweb.asm.tree.TableSwitchInsnNode; +import org.objectweb.asm.tree.TryCatchBlockNode; +import org.objectweb.asm.tree.TypeInsnNode; +import org.objectweb.asm.tree.VarInsnNode; + +import codechicken.multipart.asm.StackAnalyser.ArrayLength; +import codechicken.multipart.asm.StackAnalyser.ArrayLoad; +import codechicken.multipart.asm.StackAnalyser.BinaryOp; +import codechicken.multipart.asm.StackAnalyser.Cast; +import codechicken.multipart.asm.StackAnalyser.CaughtException; +import codechicken.multipart.asm.StackAnalyser.Const; +import codechicken.multipart.asm.StackAnalyser.Const$; +import codechicken.multipart.asm.StackAnalyser.GetField; +import codechicken.multipart.asm.StackAnalyser.Invoke; +import codechicken.multipart.asm.StackAnalyser.Load; +import codechicken.multipart.asm.StackAnalyser.LocalEntry; +import codechicken.multipart.asm.StackAnalyser.New; +import codechicken.multipart.asm.StackAnalyser.NewArray; +import codechicken.multipart.asm.StackAnalyser.NewMultiArray; +import codechicken.multipart.asm.StackAnalyser.Param; +import codechicken.multipart.asm.StackAnalyser.PrimitiveCast; +import codechicken.multipart.asm.StackAnalyser.ReturnAddress; +import codechicken.multipart.asm.StackAnalyser.StackEntry; +import codechicken.multipart.asm.StackAnalyser.Store; +import codechicken.multipart.asm.StackAnalyser.This; +import codechicken.multipart.asm.StackAnalyser.UnaryOp; +import scala.collection.mutable.ListBuffer; + +class StackAnalyserCharacterizationTest { + + private static final Type OWNER = Type.getObjectType("test/Owner"); + + @Test + void initializesReceiverParametersAndWideLocalAliases() { + StackAnalyser a = analyser(0, "(IJD[Ljava/lang/String;)V"); + assertEquals(7, a.locals().size()); + assertEquals(OWNER, ((This) a.locals().apply(0)).owner()); + assertEquals(0, ((Param) a.locals().apply(1)).i()); + assertEquals(1, ((Param) a.locals().apply(2)).i()); + assertSame(a.locals().apply(2), a.locals().apply(3)); + assertSame(a.locals().apply(4), a.locals().apply(5)); + assertEquals(Type.getType("[Ljava/lang/String;"), a.locals().apply(6).getType()); + assertTrue(a.stack().isEmpty()); + assertEquals(0, analyser(ACC_STATIC, "()V").locals().size()); + assertSame(OWNER, a.owner()); + assertEquals("(IJD[Ljava/lang/String;)V", a.m().desc); + + Param wide = new Param(8, Type.LONG_TYPE); + a.setL(9, wide); + assertNull(a.locals().apply(7)); + assertNull(a.locals().apply(8)); + assertSame(wide, a.locals().apply(9)); + assertSame(wide, a.locals().apply(10)); + Param narrow = new Param(9, Type.INT_TYPE); + a.setL(9, narrow); + assertSame(narrow, a.locals().apply(9)); + assertSame(wide, a.locals().apply(10)); // A narrow overwrite leaves the second wide slot intact. + } + + @Test + void measuresWidthsThroughBothFacadeAndCompanion() { + ListBuffer types = new ListBuffer<>(); + for (Type t : new Type[] { Type.VOID_TYPE, Type.INT_TYPE, Type.LONG_TYPE, OWNER, Type.DOUBLE_TYPE }) { + types.$plus$eq(t); + assertEquals(t.getSize(), StackAnalyser.width(t)); + assertEquals(t.getSize(), StackAnalyser$.MODULE$.width(t.getDescriptor())); + } + assertEquals(6, StackAnalyser.width(types)); + assertEquals(6, StackAnalyser$.MODULE$.width(types)); + assertEquals(0, StackAnalyser.width(new ListBuffer())); + } + + @Test + void keepsSlotBasedStackMutationAndPartialFailures() { + StackAnalyser a = empty(); + Const one = constant(1), wide = constant(2L); + a.push(one); + a.push(wide); + assertSlots(a, one, wide, wide); + assertSame(wide, a.pop(0)); + assertSame(one, a.peek(0)); + a.push(new New(Type.VOID_TYPE, null)); + assertSlots(a, one); + a.insert(1, wide); + assertSlots(a, wide, wide, one); + assertSame(wide, a.pop(1)); + assertSame(one, a._pop(0)); + assertThrows(IndexOutOfBoundsException.class, () -> a.pop(0)); + + a.stack().$plus$eq(one); + a.stack().$plus$eq(wide); + IllegalStateException error = assertThrows(IllegalStateException.class, () -> a.pop(0)); + assertEquals("Wide stack entry elems don't match (Const(2),Const(1)", error.getMessage()); + assertSlots(a, one); // The first slot was removed before validation failed. + + a.stack().clear(); + Const equalWide = new Const(2L, new InsnNode(NOP)); + a.stack().$plus$eq(equalWide); + a.stack().$plus$eq(wide); + assertSame(wide, a.pop(0)); // Pair validation uses Scala equality, not identity. + assertTrue(a.stack().isEmpty()); + } + + @Test + void freezesEveryDuplicationOpcodeIncludingWideSlotQuirks() { + int[] ops = { POP, POP2, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1, DUP2_X2, SWAP }; + String[] expected = { "123", "12", "12344", "12434", "14234", "123434", "134234", "341234", "1243" }; + for (int i = 0; i < ops.length; i++) { + StackAnalyser a = empty(); + for (int n = 1; n <= 4; n++) a.push(constant(n)); + a.visitInsn(new InsnNode(ops[i])); + assertEquals(expected[i], values(a), "opcode " + ops[i]); + } + StackAnalyser a = empty(); + Const wide = constant(7L); + a.push(wide); + a.visitInsn(new InsnNode(DUP2)); + assertSlots(a, wide, wide, wide, wide, wide, wide); + a.visitInsn(new InsnNode(POP2)); + assertSlots(a, wide, wide, wide, wide); + } + + @Test + void recordsConstantValuesTypesAndInstructionIdentity() { + Object[] values = { null, -1, 0, 1, 2, 3, 4, 5, 0L, 1L, 0f, 1f, 2f, 0d, 1d }; + for (int i = 0; i < values.length; i++) { + StackAnalyser a = empty(); + InsnNode insn = new InsnNode(ACONST_NULL + i); + a.visitInsn(insn); + Const value = (Const) a.pop(0); + assertEquals(values[i], value.c()); + assertSame(insn, value.insn()); + assertTrue(a.stack().isEmpty()); + } + StackAnalyser a = empty(); + a.visitInsn(new IntInsnNode(BIPUSH, 255)); + assertEquals((byte) -1, ((Const) a.peek(0)).c()); + assertEquals(Type.BYTE_TYPE, a.pop(0).getType()); + a.visitInsn(new IntInsnNode(SIPUSH, 65535)); + assertEquals((short) -1, ((Const) a.peek(0)).c()); + assertEquals(Type.SHORT_TYPE, a.pop(0).getType()); + LdcInsnNode ldc = new LdcInsnNode("text"); + a.visitInsn(ldc); + assertSame(ldc, a.peek(0).insn()); + assertEquals(Type.getObjectType("java/lang/String"), a.pop(0).getType()); + Object[] extra = { (byte) 1, (short) 2, 'c', true }; + Type[] types = { Type.BYTE_TYPE, Type.SHORT_TYPE, Type.CHAR_TYPE, Type.BOOLEAN_TYPE }; + for (int i = 0; i < extra.length; i++) assertEquals(types[i], constant(extra[i]).getType()); + assertThrows(IllegalArgumentException.class, () -> a.visitInsn(new LdcInsnNode(OWNER))); + assertTrue(a.stack().isEmpty()); + } + + @Test + void retainsCaseClassEqualityCopyProductsAndImplicitInstructionBinding() { + InsnNode first = new InsnNode(NOP), second = new InsnNode(RETURN); + Const c = new Const(12, first); + Const copy = c.copy(c.copy$default$1(), second); + assertEquals(c, copy); + assertEquals(c.hashCode(), copy.hashCode()); + assertSame(first, c.insn()); + assertSame(second, copy.insn()); + assertEquals("Const(12)", copy.toString()); + assertEquals(1, copy.productArity()); + assertEquals(12, copy.productElement(0)); + assertThrows(IndexOutOfBoundsException.class, () -> copy.productElement(1)); + assertEquals(12, Const$.MODULE$.unapply(copy).get()); + assertFalse(Const$.MODULE$.unapply(null).isDefined()); + assertEquals(c, Const$.MODULE$.apply(12, second)); + assertEquals(new ReturnAddress(first), new ReturnAddress(second)); + assertEquals(Type.INT_TYPE, new ReturnAddress(first).getType()); + } + + @Test + void loadsStoresAndIncrementsPreserveExpressionTrees() { + StackAnalyser a = analyser(0, "(J)V"); + LocalEntry receiver = a.locals().apply(0); + VarInsnNode load = new VarInsnNode(ALOAD, 0); + a.visitInsn(load); + assertSame(receiver, ((Load) a.peek(0)).e()); + assertSame(load, a.peek(0).insn()); + VarInsnNode store = new VarInsnNode(ASTORE, 5); + StackEntry loaded = a.peek(0); + a.visitInsn(store); + Store stored = (Store) a.locals().apply(5); + assertSame(loaded, stored.e()); + assertSame(store, stored.insn()); + assertEquals(OWNER, stored.getType()); + a.setL(3, new Param(2, Type.INT_TYPE)); + LocalEntry before = a.locals().apply(3); + IincInsnNode inc = new IincInsnNode(3, -4); + a.visitInsn(inc); + Store incremented = (Store) a.locals().apply(3); + BinaryOp sum = (BinaryOp) incremented.e(); + assertEquals(IINC, sum.op()); + assertEquals(-4, ((Const) sum.e2()).c()); + assertSame(before, ((Load) sum.e1()).e()); + for (StackEntry e : new StackEntry[] { sum, sum.e1(), sum.e2() }) assertSame(inc, e.insn()); + assertSame(inc, incremented.insn()); + assertTrue(a.stack().isEmpty()); + } + + @Test + void arithmeticRetainsOperandOrderAndCurrentResultTypes() { + for (int op = IADD; op <= DCMPG; op++) { + if (op == IINC) continue; // IINC has its own instruction node, covered by the local-store test. + StackAnalyser a = empty(); + Const left = constant(3), right = constant(5); + a.push(left); + InsnNode insn = new InsnNode(op); + if (op <= DREM || op >= ISHL && op <= LXOR || op >= LCMP) { + a.push(right); + a.visitInsn(insn); + BinaryOp result = (BinaryOp) a.peek(0); + assertSame(left, result.e1()); + assertSame(right, result.e2()); + assertEquals(op, result.op()); + assertEquals(Type.INT_TYPE, result.getType()); + } else if (op <= DNEG) { + a.visitInsn(insn); + UnaryOp result = (UnaryOp) a.peek(0); + assertSame(left, result.e()); + assertEquals(op, result.op()); + } else { + a.visitInsn(insn); + PrimitiveCast result = (PrimitiveCast) a.peek(0); + assertSame(left, result.e()); + Type expected = Type.DOUBLE_TYPE; + if (op == I2L || op == F2L || op == D2L) expected = Type.LONG_TYPE; + if (op == I2F || op == L2F || op == D2F) expected = Type.FLOAT_TYPE; + if (op == I2B) expected = Type.BYTE_TYPE; + if (op == I2C) expected = Type.CHAR_TYPE; + if (op == I2S) expected = Type.SHORT_TYPE; + assertEquals(expected, result.getType(), "opcode " + op); + assertEquals(expected.getSize(), a.stack().size()); + } + assertSame(insn, a.peek(0).insn()); + } + StackAnalyser a = empty(); + a.push(constant(1L)); + a.push(constant(2L)); + a.visitInsn(new InsnNode(LCMP)); + assertEquals(Type.LONG_TYPE, a.peek(0).getType()); + assertEquals(2, a.stack().size()); + } + + @Test + void arrayOperationsKeepExistingTypesAndDimensionOrder() { + StackAnalyser a = empty(); + StackEntry array = new New(Type.getType("[I"), null), index = constant(2), value = constant(9); + for (int op = IALOAD; op <= SALOAD; op++) { + a.push(array); + a.push(index); + a.visitInsn(new InsnNode(op)); + ArrayLoad result = (ArrayLoad) a.pop(0); + assertSame(array, result.e()); + assertSame(index, result.index()); + assertEquals(Type.INT_TYPE, result.getType()); + } + for (int op = IASTORE; op <= SASTORE; op++) { + a.push(array); + a.push(index); + a.push(value); + a.visitInsn(new InsnNode(op)); + assertTrue(a.stack().isEmpty()); + } + a.push(array); + a.visitInsn(new InsnNode(ARRAYLENGTH)); + assertSame(array, ((ArrayLength) a.pop(0)).array()); + a.push(index); + a.visitInsn(new TypeInsnNode(ANEWARRAY, "java/lang/String")); + NewArray created = (NewArray) a.pop(0); + assertSame(index, created.len()); + assertEquals("[java/lang/String", created.getType().getDescriptor()); + a.push(index); + a.push(value); + MultiANewArrayInsnNode multi = new MultiANewArrayInsnNode("[[I", 2); + a.visitInsn(multi); + NewMultiArray result = (NewMultiArray) a.pop(0); + assertArrayEquals(new StackEntry[] { value, index }, result.sizes()); + assertSame(multi, result.insn()); + assertEquals(Type.getType("[[I"), result.getType()); + } + + @Test + void objectAndFieldOperationsPreserveReceiversAndProvenance() { + StackAnalyser a = empty(); + a.visitInsn(new TypeInsnNode(NEW, "test/Owner")); + New obj = (New) a.pop(0); + assertEquals(OWNER, obj.getType()); + a.push(obj); + a.visitInsn(new TypeInsnNode(CHECKCAST, "test/Other")); + Cast cast = (Cast) a.pop(0); + assertSame(obj, cast.obj()); + assertEquals(Type.getObjectType("test/Other"), cast.getType()); + a.push(obj); + a.visitInsn(new TypeInsnNode(INSTANCEOF, "test/Other")); + UnaryOp check = (UnaryOp) a.pop(0); + assertSame(obj, check.e()); + assertEquals(OWNER, check.getType()); // Existing analysis reports the input type. + for (int op : new int[] { GETSTATIC, GETFIELD }) { + if (op == GETFIELD) a.push(obj); + FieldInsnNode field = new FieldInsnNode(op, "test/Owner", "value", "J"); + a.visitInsn(field); + GetField result = (GetField) a.pop(0); + assertSame(op == GETFIELD ? obj : null, result.obj()); + assertSame(field, result.field()); + assertSame(field, result.insn()); + assertEquals(Type.LONG_TYPE, result.getType()); + } + for (int op : new int[] { PUTSTATIC, PUTFIELD }) { + if (op == PUTFIELD) a.push(obj); + a.push(constant(3L)); + a.visitInsn(new FieldInsnNode(op, "test/Owner", "value", "J")); + assertTrue(a.stack().isEmpty()); + } + } + + @Test + void callsPopArgumentsInDeclarationOrderAndDiscardVoidResults() { + for (int op : new int[] { INVOKEVIRTUAL, INVOKESPECIAL, INVOKEINTERFACE, INVOKESTATIC }) { + StackAnalyser a = empty(); + Const obj = constant("receiver"), first = constant(2), last = constant(3L); + if (op != INVOKESTATIC) a.push(obj); + a.push(first); + a.push(last); + MethodInsnNode call = new MethodInsnNode(op, "test/Owner", "call", "(IJ)D", op == INVOKEINTERFACE); + a.visitInsn(call); + Invoke result = (Invoke) a.pop(0); + assertArrayEquals(new StackEntry[] { first, last }, result.params()); + assertSame(op == INVOKESTATIC ? null : obj, result.obj()); + assertSame(call, result.method()); + assertSame(call, result.insn()); + assertEquals(op, result.op()); + assertEquals(Type.DOUBLE_TYPE, result.getType()); + assertTrue(a.stack().isEmpty()); + a.visitInsn(new MethodInsnNode(INVOKESTATIC, "test/Owner", "nothing", "()V", false)); + assertTrue(a.stack().isEmpty()); + } + StackAnalyser a = empty(); + Const first = constant(2), last = constant(3L); + a.push(first); + a.push(last); + assertArrayEquals(new StackEntry[] { first, last }, a.popArgs("(IJ)V")); + } + + @Test + void branchesReturnsAndSwitchesConsumeOnlyTheirCurrentOperands() { + for (int op = IFEQ; op <= IF_ACMPNE; op++) { + StackAnalyser a = empty(); + Const bottom = constant(1); + a.push(bottom); + a.push(constant(2)); + if (op >= IF_ICMPEQ) a.push(constant(3)); + a.visitInsn(new JumpInsnNode(op, new LabelNode())); + assertSlots(a, bottom); + } + for (int op : new int[] { IFNULL, IFNONNULL, IRETURN, LRETURN, FRETURN, DRETURN, ARETURN, ATHROW, MONITORENTER, + MONITOREXIT }) { + StackAnalyser a = empty(); + a.push(constant(4L)); + a.visitInsn(op == IFNULL || op == IFNONNULL ? new JumpInsnNode(op, new LabelNode()) : new InsnNode(op)); + assertTrue(a.stack().isEmpty()); + } + StackAnalyser a = empty(); + a.push(constant(2)); + a.visitInsn(new TableSwitchInsnNode(0, 0, new LabelNode(), new LabelNode())); + a.push(constant(3)); + a.visitInsn(new LookupSwitchInsnNode(new LabelNode(), new int[] { 1 }, new LabelNode[] { new LabelNode() })); + assertTrue(a.stack().isEmpty()); + JumpInsnNode jsr = new JumpInsnNode(JSR, new LabelNode()); + a.visitInsn(jsr); + assertSame(jsr, ((ReturnAddress) a.peek(0)).insn()); + a.visitInsn(new JumpInsnNode(GOTO, new LabelNode())); + a.visitInsn(new InsnNode(RETURN)); + assertEquals(1, a.stack().size()); + } + + @Test + void handlerLabelsUseLastRegistrationAndDoNotResetExistingStack() { + MethodNode m = method(ACC_STATIC, "()V"); + LabelNode handler = new LabelNode(); + TryCatchBlockNode first = new TryCatchBlockNode( + new LabelNode(), + new LabelNode(), + handler, + "Ljava/lang/Exception;"); + TryCatchBlockNode last = new TryCatchBlockNode( + new LabelNode(), + new LabelNode(), + handler, + "Ljava/lang/Throwable;"); + m.tryCatchBlocks.add(first); + m.tryCatchBlocks.add(last); + StackAnalyser a = new StackAnalyser(OWNER, m); + assertSame(last, a.codechicken$multipart$asm$StackAnalyser$$catchHandlers().apply(handler)); + Const bottom = constant(4); + a.push(bottom); + a.visitInsn(new LabelNode()); + assertSlots(a, bottom); + a.visitInsn(handler); + CaughtException caught = (CaughtException) a.pop(0); + assertEquals(Type.getObjectType("java/lang/Throwable"), caught.getType()); + assertSame(handler, caught.insn()); + assertSlots(a, bottom); + last.type = null; + assertThrows(NullPointerException.class, () -> a.visitInsn(handler)); + assertSlots(a, bottom); + } + + @Test + void unsupportedOpcodesRetainFailureAndNoOpBoundaries() { + StackAnalyser a = empty(); + Const count = constant(5); + a.push(count); + scala.MatchError error = assertThrows( + scala.MatchError.class, + () -> a.visitInsn(new IntInsnNode(NEWARRAY, T_INT))); + assertEquals("188 (of class java.lang.Integer)", error.getMessage()); + assertSlots(a, count); + assertThrows(scala.MatchError.class, () -> a.visitInsn(new VarInsnNode(RET, 0))); + for (AbstractInsnNode ignored : new AbstractInsnNode[] { new InsnNode(NOP), new InsnNode(255), + new FrameNode(F_SAME, 0, null, 0, null), new LineNumberNode(12, new LabelNode()), + new InvokeDynamicInsnNode("call", "()V", null), null }) { + a.visitInsn(ignored); + assertSlots(a, count); + } + // The unreachable TypeInsnNode spelling of NEWARRAY is nevertheless part of current dispatch. + a.visitInsn(new TypeInsnNode(NEWARRAY, "[I")); + NewArray result = (NewArray) a.pop(0); + assertSame(count, result.len()); + assertEquals(Type.getType("[I"), result.getType()); + } + + @Test + void internalCallsStillDispatchThroughOverridesAndDefaultArgumentMethods() { + List calls = new ArrayList<>(); + StackAnalyser a = new StackAnalyser(OWNER, method(ACC_STATIC, "()V")) { + + @Override + public void insert(int i, StackEntry e) { + calls.add("insert:" + i); + super.insert(i, e); + } + + @Override + public int pop$default$1() { + calls.add("default"); + return 1; + } + + @Override + public StackEntry pop(int i) { + calls.add("pop:" + i); + return super.pop(i); + } + + @Override + public StackEntry _pop(int i) { + calls.add("raw:" + i); + return super._pop(i); + } + + @Override + public void setL(int i, LocalEntry e) { + calls.add("local:" + i); + super.setL(i, e); + } + }; + Const one = constant(1), two = constant(2); + a.push(one); + a.push(two); + a.visitInsn(new VarInsnNode(ISTORE, 0)); + assertSame(one, ((Store) a.locals().apply(0)).e()); + assertSlots(a, two); + assertEquals(Arrays.asList("insert:0", "insert:0", "default", "pop:1", "raw:1", "local:0"), calls); + assertEquals(0, a._pop$default$1()); + assertEquals(0, a.peek$default$1()); + } + + private static StackAnalyser empty() { + return analyser(ACC_STATIC, "()V"); + } + + private static StackAnalyser analyser(int access, String desc) { + return new StackAnalyser(OWNER, method(access, desc)); + } + + private static MethodNode method(int access, String desc) { + return new MethodNode(ASM5, access, "test", desc, null, null); + } + + private static Const constant(Object value) { + return new Const(value, null); + } + + private static void assertSlots(StackAnalyser a, StackEntry... expected) { + assertEquals(expected.length, a.stack().size()); + for (int i = 0; i < expected.length; i++) assertSame(expected[i], a.stack().apply(i), "slot " + i); + } + + private static String values(StackAnalyser a) { + StringBuilder result = new StringBuilder(); + for (int i = 0; i < a.stack().size(); i++) result.append(((Const) a.stack().apply(i)).c()); + return result.toString(); + } +} diff --git a/src/test/java/codechicken/multipart/asm/StackAnalyserConstTest.java b/src/test/java/codechicken/multipart/asm/StackAnalyserConstTest.java new file mode 100644 index 0000000..9799980 --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/StackAnalyserConstTest.java @@ -0,0 +1,166 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.multipart.asm.StackAnalyser.Const; +import scala.runtime.BoxedUnit; + +class StackAnalyserConstTest { + + @Test + void classifiesEveryBoxedPrimitiveWithoutNumericCoercion() { + Object[][] values = { { Byte.MIN_VALUE, (byte) 0, Byte.MAX_VALUE }, + { Short.MIN_VALUE, (short) 0, Short.MAX_VALUE }, { Integer.MIN_VALUE, 0, Integer.MAX_VALUE }, + { Long.MIN_VALUE, 0L, Long.MAX_VALUE }, { -0.0f, Float.NaN, Float.POSITIVE_INFINITY }, + { -0.0d, Double.NaN, Double.NEGATIVE_INFINITY }, { Character.MIN_VALUE, 'x', Character.MAX_VALUE }, + { false, true } }; + Type[] types = { Type.BYTE_TYPE, Type.SHORT_TYPE, Type.INT_TYPE, Type.LONG_TYPE, Type.FLOAT_TYPE, + Type.DOUBLE_TYPE, Type.CHAR_TYPE, Type.BOOLEAN_TYPE }; + for (int i = 0; i < values.length; i++) { + for (Object value : values[i]) assertSame(types[i], new Const(value, null).getType()); + } + } + + @Test + void nullAndStringsProduceFreshObjectTypes() { + for (Object value : new Object[] { null, "", "text", "[I" }) { + Const constant = new Const(value, null); + Type first = constant.getType(); + Type second = constant.getType(); + assertEquals(Type.getObjectType(value == null ? "java/lang/Object" : "java/lang/String"), first); + assertEquals(first, second); + assertNotSame(first, second); + } + } + + @Test + void rejectsOtherNumbersTypesUnitsArraysAndStringLikeObjects() { + for (Object value : new Object[] { BigInteger.ONE, Type.INT_TYPE, BoxedUnit.UNIT, new int[] { 1, 2 }, + new char[] { 'x' }, new Object[] { "text" }, new StringBuilder("text") }) { + IllegalArgumentException error = assertThrows( + IllegalArgumentException.class, + () -> new Const(value, null).getType()); + assertEquals("Unknown const " + value, error.getMessage()); + } + } + + @Test + void successfulQueriesReadVirtualConstantOnceAndNeverCacheIt() { + Object[] values = { (byte) 1, (short) 2, 3, 4L, 5f, 6d, 'c', true, "text", null }; + Type[] types = { Type.BYTE_TYPE, Type.SHORT_TYPE, Type.INT_TYPE, Type.LONG_TYPE, Type.FLOAT_TYPE, + Type.DOUBLE_TYPE, Type.CHAR_TYPE, Type.BOOLEAN_TYPE, Type.getObjectType("java/lang/String"), + Type.getObjectType("java/lang/Object") }; + int[] reads = { 0 }; + Const constant = new Const(new Object(), null) { + + @Override + public Object c() { + return values[reads[0]++]; + } + }; + for (int i = 0; i < types.length; i++) { + assertEquals(types[i], constant.getType()); + assertEquals(i + 1, reads[0]); + } + } + + @Test + void unsupportedQueriesRereadVirtualConstantForTheMessageWithoutReclassifying() { + for (Object replacement : new Object[] { "replacement", null, 42 }) { + int[] reads = { 0 }; + Const constant = new Const("unused", null) { + + @Override + public Object c() { + return reads[0]++ == 0 ? new Object() : replacement; + } + }; + IllegalArgumentException error = assertThrows(IllegalArgumentException.class, constant::getType); + assertEquals("Unknown const " + replacement, error.getMessage()); + assertEquals(2, reads[0]); + } + } + + @Test + void formatsOnlyTheSecondValueOnceEvenWhenItsToStringReturnsNull() { + for (String text : new String[] { "rendered", null }) { + List calls = new ArrayList<>(); + Object first = new Object() { + + @Override + public String toString() { + throw new AssertionError("The matched value must not be formatted"); + } + }; + Object second = new Object() { + + @Override + public String toString() { + calls.add("format"); + return text; + } + }; + Const constant = new Const(null, null) { + + @Override + public Object c() { + calls.add("read"); + return calls.size() == 1 ? first : second; + } + }; + IllegalArgumentException error = assertThrows(IllegalArgumentException.class, constant::getType); + assertEquals("Unknown const " + text, error.getMessage()); + assertEquals(Arrays.asList("read", "read", "format"), calls); + } + } + + @Test + void propagatesFirstAndSecondAccessorFailuresWithoutWrappingOrRetrying() { + for (int failAt : new int[] { 1, 2 }) { + RuntimeException failure = new IllegalStateException("accessor"); + int[] reads = { 0 }; + Const constant = new Const(1, null) { + + @Override + public Object c() { + if (++reads[0] == failAt) throw failure; + return new Object(); + } + }; + assertSame(failure, assertThrows(RuntimeException.class, constant::getType)); + assertEquals(failAt, reads[0]); + } + } + + @Test + void propagatesFormattingFailureAfterBothAccessorReads() { + RuntimeException failure = new IllegalStateException("format"); + List calls = new ArrayList<>(); + Object value = new Object() { + + @Override + public String toString() { + calls.add("format"); + throw failure; + } + }; + Const constant = new Const(1, null) { + + @Override + public Object c() { + calls.add("read"); + return value; + } + }; + assertSame(failure, assertThrows(RuntimeException.class, constant::getType)); + assertEquals(Arrays.asList("read", "read", "format"), calls); + } +} diff --git a/src/test/java/codechicken/multipart/asm/StackAnalyserInitializationTest.java b/src/test/java/codechicken/multipart/asm/StackAnalyserInitializationTest.java new file mode 100644 index 0000000..6a3facd --- /dev/null +++ b/src/test/java/codechicken/multipart/asm/StackAnalyserInitializationTest.java @@ -0,0 +1,261 @@ +package codechicken.multipart.asm; + +import static org.junit.jupiter.api.Assertions.*; +import static org.objectweb.asm.Opcodes.*; + +import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TryCatchBlockNode; + +import codechicken.multipart.asm.StackAnalyser.LocalEntry; +import codechicken.multipart.asm.StackAnalyser.Param; +import codechicken.multipart.asm.StackAnalyser.This; +import scala.collection.JavaConversions; +import scala.collection.mutable.ArrayBuffer; +import scala.collection.mutable.Buffer; +import scala.collection.mutable.HashMap; +import scala.collection.mutable.Map; + +class StackAnalyserInitializationTest { + + private static final Type OWNER = Type.getObjectType("test/Owner"); + + @Test + void usesConstructorArgumentsAndVirtualPushesWithDescriptorReadBetweenReceiverAndParameters() { + MethodNode method = method(0, "()V"); + TryCatchBlockNode handler = handler(new LabelNode()); + List calls = new ArrayList<>(); + StackAnalyser analyser = new StackAnalyser(OWNER, method) { + + @Override + public Type owner() { + throw new AssertionError("Constructor must use its owner argument"); + } + + @Override + public MethodNode m() { + throw new AssertionError("Constructor must use its method argument"); + } + + @Override + public void pushL(LocalEntry entry) { + assertTrue(stack().isEmpty()); + assertTrue(codechicken$multipart$asm$StackAnalyser$$catchHandlers().isEmpty()); + calls.add("push:" + entry.getType().getDescriptor()); + if (entry instanceof This) { + assertSame(OWNER, ((This) entry).owner()); + method.desc = "(JD[Ljava/lang/String;)V"; + } else { + // Parsing is complete before the first parameter callback. Handlers are read afterwards. + method.desc = null; + method.tryCatchBlocks = Arrays.asList(handler); + } + super.pushL(entry); + } + + @Override + public void setL(int slot, LocalEntry entry) { + calls.add("set:" + slot); + super.setL(slot, entry); + } + }; + assertEquals( + Arrays.asList( + "push:Ltest/Owner;", + "set:0", + "push:J", + "set:1", + "push:D", + "set:3", + "push:[Ljava/lang/String;", + "set:5"), + calls); + assertEquals(6, analyser.locals().size()); + assertSame(analyser.locals().apply(1), analyser.locals().apply(2)); + assertSame(analyser.locals().apply(3), analyser.locals().apply(4)); + assertSame(handler, analyser.codechicken$multipart$asm$StackAnalyser$$catchHandlers().apply(handler.handler)); + } + + @Test + void staticParametersUseFormalIndicesAndWideSlotsWithoutAReceiver() { + StackAnalyser analyser = new StackAnalyser(null, method(ACC_STATIC, "(JDI[[J)V")); + assertEquals(6, analyser.locals().size()); + int[] slots = { 0, 2, 4, 5 }; + Type[] types = { Type.LONG_TYPE, Type.DOUBLE_TYPE, Type.INT_TYPE, Type.getType("[[J") }; + for (int i = 0; i < slots.length; i++) { + Param parameter = (Param) analyser.locals().apply(slots[i]); + assertEquals(i, parameter.i()); + assertEquals(types[i], parameter.t()); + } + assertSame(analyser.locals().apply(0), analyser.locals().apply(1)); + assertSame(analyser.locals().apply(2), analyser.locals().apply(3)); + assertNull(analyser.owner()); + } + + @Test + void malformedDescriptorsFailAfterTheReceiverButBeforeAnyParameterOrHandler() { + for (String descriptor : new String[] { null, "(I", "(ILjava/lang/String;" }) { + for (int access : new int[] { 0, ACC_STATIC }) { + MethodNode method = method(access, descriptor); + method.tryCatchBlocks = null; + List receivers = new ArrayList<>(); + RuntimeException failure = assertThrows(RuntimeException.class, () -> new StackAnalyser(OWNER, method) { + + @Override + public void pushL(LocalEntry entry) { + assertInstanceOf(This.class, entry); + receivers.add(this); + super.pushL(entry); + } + }); + assertEquals( + descriptor == null ? NullPointerException.class : ArrayIndexOutOfBoundsException.class, + failure.getClass()); + assertEquals(access == 0 ? 1 : 0, receivers.size()); + if (access == 0) { + assertEquals(1, receivers.get(0).locals().size()); + assertTrue(receivers.get(0).codechicken$multipart$asm$StackAnalyser$$catchHandlers().isEmpty()); + } + } + } + } + + @Test + void receiverCallbackFailurePrecedesDescriptorParsing() { + RuntimeException sentinel = new RuntimeException("receiver"); + List receivers = new ArrayList<>(); + assertSame(sentinel, assertThrows(RuntimeException.class, () -> new StackAnalyser(OWNER, method(0, null)) { + + @Override + public void pushL(LocalEntry entry) { + receivers.add(this); + super.pushL(entry); + throw sentinel; + } + })); + assertEquals(1, receivers.size()); + assertEquals(1, receivers.get(0).locals().size()); + assertTrue(receivers.get(0).stack().isEmpty()); + assertTrue(receivers.get(0).codechicken$multipart$asm$StackAnalyser$$catchHandlers().isEmpty()); + } + + @Test + void parameterCallbackFailureKeepsPublishedWideSlotsAndDefersHandlers() { + MethodNode method = method(ACC_STATIC, "(IJD)V"); + method.tryCatchBlocks.add(handler(new LabelNode())); + RuntimeException sentinel = new RuntimeException("parameter"); + List captured = new ArrayList<>(); + assertSame(sentinel, assertThrows(RuntimeException.class, () -> new StackAnalyser(OWNER, method) { + + @Override + public void pushL(LocalEntry entry) { + super.pushL(entry); + if (((Param) entry).i() == 1) { + captured.add(this); + throw sentinel; + } + } + })); + StackAnalyser analyser = captured.get(0); + assertEquals(3, analyser.locals().size()); + assertSame(analyser.locals().apply(1), analyser.locals().apply(2)); + assertTrue(analyser.codechicken$multipart$asm$StackAnalyser$$catchHandlers().isEmpty()); + } + + @Test + void handlersUseLastDuplicateIncludingNullKeysAndRetainTheOriginalNodes() { + LabelNode label = new LabelNode(); + TryCatchBlockNode first = handler(label), last = handler(label); + TryCatchBlockNode nullFirst = handler(null), nullLast = handler(null); + MethodNode method = method(ACC_STATIC, "()V"); + method.tryCatchBlocks = new ArrayList<>(Arrays.asList(first, nullFirst, last, nullLast)); + StackAnalyser analyser = new StackAnalyser(OWNER, method); + Map handlers = analyser.codechicken$multipart$asm$StackAnalyser$$catchHandlers(); + assertEquals(2, handlers.size()); + assertSame(last, handlers.apply(label)); + assertSame(nullLast, handlers.apply(null)); + last.handler = new LabelNode(); + last.type = "changed"; + method.tryCatchBlocks.clear(); + assertSame(last, handlers.apply(label)); + assertEquals("changed", handlers.apply(label).type); + assertFalse(handlers.contains(last.handler)); + } + + @Test + void eachHandlerReadsTheVirtualMapBeforeItsKeyAndFailureKeepsEarlierEntries() { + TryCatchBlockNode first = handler(new LabelNode()), second = handler(new LabelNode()); + MethodNode method = method(ACC_STATIC, "()V"); + method.tryCatchBlocks = Arrays.asList(first, second, null); + Map firstMap = new HashMap<>(), secondMap = new HashMap<>(); + List reads = new ArrayList<>(); + assertThrows(NullPointerException.class, () -> new StackAnalyser(OWNER, method) { + + @Override + public Map codechicken$multipart$asm$StackAnalyser$$catchHandlers() { + reads.add(reads.size()); + return reads.size() == 1 ? firstMap : secondMap; + } + }); + assertEquals(Arrays.asList(0, 1, 2), reads); + assertEquals(1, firstMap.size()); + assertEquals(1, secondMap.size()); + assertSame(first, firstMap.apply(first.handler)); + assertSame(second, secondMap.apply(second.handler)); + } + + @Test + void nullHandlerListFailsAfterAllLocalsArePublished() { + MethodNode method = method(0, "(J)V"); + method.tryCatchBlocks = null; + List captured = new ArrayList<>(); + assertThrows(NullPointerException.class, () -> new StackAnalyser(OWNER, method) { + + @Override + public void pushL(LocalEntry entry) { + captured.add(this); + super.pushL(entry); + } + }); + assertEquals(2, captured.size()); + assertSame(captured.get(0), captured.get(1)); + assertEquals(3, captured.get(0).locals().size()); + assertTrue(captured.get(0).codechicken$multipart$asm$StackAnalyser$$catchHandlers().isEmpty()); + } + + @Test + @SuppressWarnings("unchecked") + void scalaBackedHandlerListsRetainTheirForeachDispatch() { + List calls = new ArrayList<>(); + ArrayBuffer entries = new ArrayBuffer<>(); + Buffer buffer = (Buffer) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class[] { Buffer.class }, + (proxy, called, arguments) -> { + if (called.getName().equals("foreach")) calls.add("foreach"); + return called.invoke(entries, arguments); + }); + TryCatchBlockNode handler = handler(new LabelNode()); + entries.$plus$eq(handler); + MethodNode method = method(ACC_STATIC, "()V"); + method.tryCatchBlocks = JavaConversions.bufferAsJavaList(buffer); + StackAnalyser analyser = new StackAnalyser(OWNER, method); + assertEquals(Arrays.asList("foreach"), calls); + assertSame(handler, analyser.codechicken$multipart$asm$StackAnalyser$$catchHandlers().apply(handler.handler)); + } + + private static MethodNode method(int access, String descriptor) { + return new MethodNode(ASM5, access, "test", descriptor, null, null); + } + + private static TryCatchBlockNode handler(LabelNode label) { + return new TryCatchBlockNode(new LabelNode(), new LabelNode(), label, "Ljava/lang/Exception;"); + } +} diff --git a/src/test/java/codechicken/multipart/examples/BoxOcclusionExample.java b/src/test/java/codechicken/multipart/examples/BoxOcclusionExample.java new file mode 100644 index 0000000..08f6c67 --- /dev/null +++ b/src/test/java/codechicken/multipart/examples/BoxOcclusionExample.java @@ -0,0 +1,16 @@ +package codechicken.multipart.examples; + +import java.util.Collections; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.NormalOcclusionTest; + +/** Compiling example for docs/api/OCCLUSION.md; supplied bounds do not imply full placement approval. */ +public final class BoxOcclusionExample { + + private BoxOcclusionExample() {} + + public static boolean fitsBounds(Iterable occupied, Cuboid6 candidate) { + return NormalOcclusionTest.testBoxes(occupied, Collections.singletonList(candidate)); + } +} diff --git a/src/test/java/codechicken/multipart/examples/HitPartExample.java b/src/test/java/codechicken/multipart/examples/HitPartExample.java new file mode 100644 index 0000000..a9deab3 --- /dev/null +++ b/src/test/java/codechicken/multipart/examples/HitPartExample.java @@ -0,0 +1,22 @@ +package codechicken.multipart.examples; + +import java.util.List; + +import net.minecraft.util.MovingObjectPosition; + +import codechicken.multipart.BlockMultipart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Compiling example for docs/api/HIT_PART.md. */ +public final class HitPartExample { + + private HitPartExample() {} + + /** Returns the part a ray trace struck in this tile, or null if the hit does not select one of its parts. */ + public static TMultiPart struckPart(TileMultipart tile, MovingObjectPosition hit) { + int index = BlockMultipart.hitPartIndex(hit); + List parts = tile.jPartList(); + return index >= 0 && index < parts.size() ? parts.get(index) : null; + } +} diff --git a/src/test/java/codechicken/multipart/examples/OcclusionExample.java b/src/test/java/codechicken/multipart/examples/OcclusionExample.java new file mode 100644 index 0000000..4b77335 --- /dev/null +++ b/src/test/java/codechicken/multipart/examples/OcclusionExample.java @@ -0,0 +1,18 @@ +package codechicken.multipart.examples; + +import java.util.Collection; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.NormallyOccludedPart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Compiling example for docs/api/OCCLUSION.md; this checks geometry, not full placement validity. */ +public final class OcclusionExample { + + private OcclusionExample() {} + + public static boolean fitsShape(TileMultipart tile, Collection parts, Cuboid6 bounds) { + return tile.testOcclusion(parts, new NormallyOccludedPart(bounds)); + } +} diff --git a/src/test/java/codechicken/multipart/examples/PartLoadingExample.java b/src/test/java/codechicken/multipart/examples/PartLoadingExample.java new file mode 100644 index 0000000..339999e --- /dev/null +++ b/src/test/java/codechicken/multipart/examples/PartLoadingExample.java @@ -0,0 +1,26 @@ +package codechicken.multipart.examples; + +import java.util.ArrayList; +import java.util.List; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Compiling examples for docs/api/PART_LOADING.md; these are reconstruction operations, not placement/removal. */ +public final class PartLoadingExample { + + private PartLoadingExample() {} + + /** Captures the existing parts before clearing/rebuilding the prepared tile's caches and bindings. */ + public static void reloadParts(TileMultipart tile) { + List parts = new ArrayList<>(tile.jPartList()); + tile.loadPartList(parts); + } + + /** + * Stages a copy of the list only; bindings, ticking, caches and notifications remain the caller's responsibility. + */ + public static void stageParts(TileMultipart tile, List parts) { + tile.setPartList(parts); + } +} diff --git a/src/test/java/codechicken/multipart/examples/PartTraversalExample.java b/src/test/java/codechicken/multipart/examples/PartTraversalExample.java new file mode 100644 index 0000000..72e656c --- /dev/null +++ b/src/test/java/codechicken/multipart/examples/PartTraversalExample.java @@ -0,0 +1,27 @@ +package codechicken.multipart.examples; + +import java.util.ArrayList; +import java.util.List; + +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +/** Compiling examples for docs/api/PART_TRAVERSAL.md; call on the game thread. */ +public final class PartTraversalExample { + + private PartTraversalExample() {} + + public static List partTypes(TileMultipart tile) { + List types = new ArrayList<>(); + for (TMultiPart part : tile.jPartList()) { + types.add(part.getType()); + } + return types; + } + + public static List boundPartTypes(TileMultipart tile) { + List types = new ArrayList<>(); + tile.forEachPart(part -> types.add(part.getType())); + return types; + } +} diff --git a/src/test/java/codechicken/multipart/examples/RenderIdExample.java b/src/test/java/codechicken/multipart/examples/RenderIdExample.java new file mode 100644 index 0000000..fd86a63 --- /dev/null +++ b/src/test/java/codechicken/multipart/examples/RenderIdExample.java @@ -0,0 +1,13 @@ +package codechicken.multipart.examples; + +import codechicken.multipart.TileMultipart; + +/** Compiling example for docs/api/RENDER_ID.md; does not initialize the client renderer. */ +public final class RenderIdExample { + + private RenderIdExample() {} + + public static int multipartRenderType() { + return TileMultipart.getRenderID(); + } +} diff --git a/src/test/java/codechicken/multipart/handler/MultipartCompatiblityCharacterizationTest.java b/src/test/java/codechicken/multipart/handler/MultipartCompatiblityCharacterizationTest.java new file mode 100644 index 0000000..a6262eb --- /dev/null +++ b/src/test/java/codechicken/multipart/handler/MultipartCompatiblityCharacterizationTest.java @@ -0,0 +1,103 @@ +package codechicken.multipart.handler; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.world.World; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import scala.Function4; +import scala.runtime.AbstractFunction4; + +class MultipartCompatiblityCharacterizationTest { + + @Test + void keepsTheTwoStaticFacadesAndCompanionSingletons() throws Exception { + assertFacade( + MultipartCompatiblity.class, + "canAddPart()Lscala/Function4;", + "canAddPart_$eq(Lscala/Function4;)V", + "load()V"); + assertCompanion( + MultipartCompatiblity$.class, + "canAddPart()Lscala/Function4;", + "canAddPart_$eq(Lscala/Function4;)V", + "load()V"); + assertFacade(MCPCCompatModule.class, "load()V"); + assertCompanion(MCPCCompatModule$.class, "load()V"); + + Field callback = MultipartCompatiblity$.class.getDeclaredField("canAddPart"); + assertEquals(Function4.class, callback.getType()); + assertTrue(Modifier.isPrivate(callback.getModifiers())); + } + + @Test + void defaultPlacementCallbackAlwaysAllows() { + assertEquals(Boolean.TRUE, MultipartCompatiblity.canAddPart().apply(null, -1, 0, 1)); + } + + @Test + void facadeAndCompanionShareTheMutableCallback() { + Function4 original = MultipartCompatiblity.canAddPart(); + Function4 replacement = new PlacementCallback(); + try { + MultipartCompatiblity.canAddPart_$eq(replacement); + assertSame(replacement, MultipartCompatiblity.canAddPart()); + assertSame(replacement, MultipartCompatiblity$.MODULE$.canAddPart()); + assertEquals(Boolean.TRUE, replacement.apply(null, 4, 5, 6)); + assertEquals(Boolean.FALSE, replacement.apply(null, 4, 5, 7)); + + MultipartCompatiblity$.MODULE$.canAddPart_$eq(original); + assertSame(original, MultipartCompatiblity.canAddPart()); + } finally { + MultipartCompatiblity.canAddPart_$eq(original); + } + } + + private static void assertFacade(Class type, String... expectedMethods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertEquals(new TreeSet<>(Arrays.asList(expectedMethods)), publicMethodSignatures(type)); + assertEquals(0, type.getFields().length); + } + + private static void assertCompanion(Class type, String... expectedMethods) throws Exception { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertEquals(new TreeSet<>(Arrays.asList(expectedMethods)), publicMethodSignatures(type)); + + Field module = type.getField("MODULE$"); + assertSame(type, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(module.get(null), module.get(null)); + } + + private static Set publicMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } + + private static final class PlacementCallback extends AbstractFunction4 { + + @Override + public Object apply(World world, Object x, Object y, Object z) { + return ((Integer) x) + ((Integer) y) + ((Integer) z) == 15; + } + } +} diff --git a/src/test/java/codechicken/multipart/handler/MultipartEventHandlerCharacterizationTest.java b/src/test/java/codechicken/multipart/handler/MultipartEventHandlerCharacterizationTest.java new file mode 100644 index 0000000..87f6ec5 --- /dev/null +++ b/src/test/java/codechicken/multipart/handler/MultipartEventHandlerCharacterizationTest.java @@ -0,0 +1,102 @@ +package codechicken.multipart.handler; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +class MultipartEventHandlerCharacterizationTest { + + private static final Set EVENT_METHODS = new TreeSet<>( + Arrays.asList( + "playerLoggedOut(Lcpw/mods/fml/common/gameevent/PlayerEvent$PlayerLoggedOutEvent;)V", + "playerCloned(Lnet/minecraftforge/event/entity/player/PlayerEvent$Clone;)V", + "chunkUnWatch(Lnet/minecraftforge/event/world/ChunkWatchEvent$UnWatch;)V", + "chunkWatch(Lnet/minecraftforge/event/world/ChunkWatchEvent$Watch;)V", + "drawBlockHighlight(Lnet/minecraftforge/client/event/DrawBlockHighlightEvent;)V", + "serverTick(Lcpw/mods/fml/common/gameevent/TickEvent$ServerTickEvent;)V", + "tileEntityLoad(Lnet/minecraftforge/event/world/ChunkDataEvent$Load;)V", + "worldUnLoad(Lnet/minecraftforge/event/world/WorldEvent$Unload;)V")); + + @Test + void keepsBothSingletonTypesAndEventDescriptors() throws Exception { + assertHandlerType(MultipartEventHandler.class, true); + assertHandlerType(MultipartEventHandler$.class, false); + + assertEquals(0, MultipartEventHandler.class.getFields().length); + Field module = MultipartEventHandler$.class.getField("MODULE$"); + assertSame(MultipartEventHandler$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(MultipartEventHandler$.MODULE$, module.get(null)); + } + + @Test + void keepsEventPrioritiesAndClientOnlyHighlight() { + assertEventAnnotations(MultipartEventHandler.class); + assertEventAnnotations(MultipartEventHandler$.class); + } + + private static void assertHandlerType(Class type, boolean staticMethods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertEquals(EVENT_METHODS, publicMethodSignatures(type)); + + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertEquals(staticMethods, Modifier.isStatic(method.getModifiers())); + } + } + } + + private static void assertEventAnnotations(Class type) { + for (Method method : type.getDeclaredMethods()) { + if (!Modifier.isPublic(method.getModifiers())) { + continue; + } + + SubscribeEvent subscribe = method.getAnnotation(SubscribeEvent.class); + assertNotNull(subscribe, method.toString()); + assertEquals( + method.getName().equals("tileEntityLoad") ? EventPriority.HIGHEST : EventPriority.NORMAL, + subscribe.priority(), + method.toString()); + assertFalse(subscribe.receiveCanceled(), method.toString()); + + SideOnly sideOnly = method.getAnnotation(SideOnly.class); + if (method.getName().equals("drawBlockHighlight")) { + assertNotNull(sideOnly, method.toString()); + assertEquals(Side.CLIENT, sideOnly.value()); + } else { + assertNull(sideOnly, method.toString()); + } + } + } + + private static Set publicMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/multipart/handler/MultipartModCharacterizationTest.java b/src/test/java/codechicken/multipart/handler/MultipartModCharacterizationTest.java new file mode 100644 index 0000000..b0f9fdd --- /dev/null +++ b/src/test/java/codechicken/multipart/handler/MultipartModCharacterizationTest.java @@ -0,0 +1,79 @@ +package codechicken.multipart.handler; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.multipart.Tags; +import cpw.mods.fml.common.Mod; + +class MultipartModCharacterizationTest { + + private static final Set EVENT_METHODS = new TreeSet<>( + Arrays.asList( + "beforeServerStart(Lcpw/mods/fml/common/event/FMLServerAboutToStartEvent;)V", + "init(Lcpw/mods/fml/common/event/FMLInitializationEvent;)V", + "postInit(Lcpw/mods/fml/common/event/FMLPostInitializationEvent;)V", + "preInit(Lcpw/mods/fml/common/event/FMLPreInitializationEvent;)V", + "serverStopped(Lcpw/mods/fml/common/event/FMLServerStoppedEvent;)V")); + + @Test + void keepsBothAnnotatedSingletonTypesAndLifecycleMethods() throws Exception { + assertModType(MultipartMod.class, true); + assertModType(MultipartMod$.class, false); + + assertEquals(0, MultipartMod.class.getFields().length); + Field module = MultipartMod$.class.getField("MODULE$"); + assertSame(MultipartMod$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(MultipartMod$.MODULE$, module.get(null)); + } + + @Test + void packetHandlerChannelUsesTheModCompanionIdentity() throws Exception { + assertSame(MultipartMod$.MODULE$, new MultipartPH().channel()); + assertSame(MultipartMod$.class, MultipartPH.class.getDeclaredMethod("channel").getReturnType()); + assertSame(MultipartMod$.class, MultipartPH.class.getDeclaredField("channel").getType()); + } + + private static void assertModType(Class type, boolean staticMethods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertEquals(EVENT_METHODS, publicMethodSignatures(type)); + + Mod mod = type.getAnnotation(Mod.class); + assertEquals("ForgeMultipart", mod.modid()); + assertEquals("Forge Multipart", mod.name()); + assertEquals("[1.7.10]", mod.acceptedMinecraftVersions()); + assertEquals(Tags.VERSION, mod.version()); + assertEquals("scala", mod.modLanguage()); + + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertTrue(method.isAnnotationPresent(Mod.EventHandler.class)); + assertEquals(staticMethods, Modifier.isStatic(method.getModifiers())); + } + } + } + + private static Set publicMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/multipart/handler/MultipartPacketHandlerBehaviorTest.java b/src/test/java/codechicken/multipart/handler/MultipartPacketHandlerBehaviorTest.java new file mode 100644 index 0000000..0d8b45c --- /dev/null +++ b/src/test/java/codechicken/multipart/handler/MultipartPacketHandlerBehaviorTest.java @@ -0,0 +1,212 @@ +package codechicken.multipart.handler; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Proxy; +import java.util.concurrent.atomic.AtomicReference; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.network.NetHandlerPlayClient; +import net.minecraft.entity.Entity; +import net.minecraft.network.play.INetHandlerPlayClient; +import net.minecraft.network.play.server.S40PacketDisconnect; +import net.minecraft.profiler.Profiler; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.WorldSettings; +import net.minecraft.world.chunk.IChunkProvider; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.ControlKeyModifer; +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.TileCache; +import io.netty.buffer.ByteBuf; +import scala.MatchError; + +class MultipartPacketHandlerBehaviorTest { + + @Test + void reportsEveryMissingServerPartInOrder() { + AtomicReference disconnect = new AtomicReference<>(); + PacketCustom packet = new PacketCustom("test", 1).writeInt(2).writeString("server:missing-one") + .writeString("server:missing-two"); + try { + MultipartCPH.handlePartRegistration(incoming(packet), clientHandler(disconnect)); + } finally { + MultiPartRegistry.beforeServerStart(); + } + + S40PacketDisconnect disconnectPacket = disconnect.get(); + assertNotNull(disconnectPacket); + ChatComponentTranslation reason = (ChatComponentTranslation) disconnectPacket.func_149165_c(); + assertEquals("multipart.missing", reason.getKey()); + assertArrayEquals(new Object[] { "server:missing-one, server:missing-two" }, reason.getFormatArgs()); + } + + @Test + void turnsClientDesyncErrorsIntoAPlainDisconnectReason() throws Exception { + TileCache.clear(); + EmptyWorldClient world = allocateInstance(EmptyWorldClient.class); + world.isRemote = true; + Minecraft minecraft = allocateInstance(Minecraft.class); + minecraft.theWorld = world; + AtomicReference disconnect = new AtomicReference<>(); + PacketCustom packet = new PacketCustom("test", 3).writeInt(4).writeInt(5).writeInt(6).writeByte(0); + + MultipartCPH.handlePacket(incoming(packet), minecraft, clientHandler(disconnect)); + + S40PacketDisconnect disconnectPacket = disconnect.get(); + assertNotNull(disconnectPacket); + ChatComponentText reason = (ChatComponentText) disconnectPacket.func_149165_c(); + String text = reason.getUnformattedText(); + assertTrue(text.startsWith("Client multipart @")); + assertTrue(text.endsWith(" not found")); + assertFalse(text.startsWith("DC: ")); + } + + @Test + void keepsBothCompressedPacketTerminators() { + PacketCustom description = incoming(new PacketCustom("test", 2).writeInt(-3).writeInt(7).writeShort(0)); + PacketCustom updates = incoming( + new PacketCustom("test", 3).writeInt(16).writeInt(64).writeInt(32).writeByte(255) + .writeInt(Integer.MAX_VALUE)); + + assertDoesNotThrow(() -> MultipartCPH.handleCompressedTileDesc(description, null)); + assertDoesNotThrow(() -> MultipartCPH.handleCompressedTileData(updates, null)); + assertFullyRead(description); + assertFullyRead(updates); + } + + @Test + void rejectsUnknownPacketTypesLikeTheScalaMatches() { + assertThrows( + MatchError.class, + () -> MultipartCPH.handlePacket(incoming(new PacketCustom("test", 4)), null, clientHandler(null))); + assertThrows( + MatchError.class, + () -> MultipartSPH.handlePacket(incoming(new PacketCustom("test", 2)), null, null)); + } + + @Test + void serverPacketOneUpdatesTheControlKeyState() { + ControlKeyModifer.map().remove(null); + try { + MultipartSPH.handlePacket(incoming(new PacketCustom("test", 1).writeBoolean(true)), null, null); + assertEquals(Boolean.TRUE, ControlKeyModifer.map().get(null)); + + MultipartSPH$.MODULE$.handlePacket(incoming(new PacketCustom("test", 1).writeBoolean(false)), null, null); + assertEquals(Boolean.FALSE, ControlKeyModifer.map().get(null)); + } finally { + ControlKeyModifer.map().remove(null); + } + } + + @Test + @SuppressWarnings({ "rawtypes", "unchecked" }) + void tileStreamsAreCachedPerPositionAndStartWithTheCoordinate() throws Exception { + EmptyWorldClient world = allocateInstance(EmptyWorldClient.class); + world.isRemote = false; + BlockCoord position = new BlockCoord(0x01020304, -2, 0x0A0B0C0D); + scala.collection.mutable.Map updates = MultipartSPH$.MODULE$ + .codechicken$multipart$handler$MultipartSPH$$updateMap(); + updates.remove(world); + try { + MultipartSPH.MCByteStream stream = MultipartSPH.getTileStream(world, position); + assertSame(stream, MultipartSPH$.MODULE$.getTileStream(world, position)); + stream.writeByte(0x7F); + assertArrayEquals(new byte[] { 1, 2, 3, 4, -1, -1, -1, -2, 10, 11, 12, 13, 127 }, stream.getBytes()); + } finally { + updates.remove(world); + } + } + + @Test + @SuppressWarnings({ "rawtypes", "unchecked" }) + void tileStreamsRejectClientWorldsBeforeCreatingState() throws Exception { + EmptyWorldClient world = allocateInstance(EmptyWorldClient.class); + world.isRemote = true; + scala.collection.mutable.Map updates = MultipartSPH$.MODULE$ + .codechicken$multipart$handler$MultipartSPH$$updateMap(); + updates.remove(world); + + IllegalArgumentException error = assertThrows( + IllegalArgumentException.class, + () -> MultipartSPH.getTileStream(world, new BlockCoord(1, 2, 3))); + + assertEquals("Cannot use MultipartSPH on a client world", error.getMessage()); + assertFalse(updates.contains(world)); + } + + private static PacketCustom incoming(PacketCustom packet) { + return new PacketCustom(packet.getByteBuf().copy()); + } + + private static void assertFullyRead(PacketCustom packet) { + ByteBuf buffer = packet.getByteBuf(); + assertEquals(buffer.writerIndex(), buffer.readerIndex()); + } + + private static INetHandlerPlayClient clientHandler(AtomicReference disconnect) { + return (INetHandlerPlayClient) Proxy.newProxyInstance( + INetHandlerPlayClient.class.getClassLoader(), + new Class[] { INetHandlerPlayClient.class }, + (proxy, method, arguments) -> { + if ("handleDisconnect".equals(method.getName())) { + if (disconnect != null) { + disconnect.set((S40PacketDisconnect) arguments[0]); + } + return null; + } + throw new AssertionError("Unexpected client callback: " + method.getName()); + }); + } + + @SuppressWarnings("unchecked") + private static T allocateInstance(Class type) throws Exception { + Class unsafe = Class.forName("sun.misc.Unsafe"); + Field field = unsafe.getDeclaredField("theUnsafe"); + field.setAccessible(true); + return (T) unsafe.getMethod("allocateInstance", Class.class).invoke(field.get(null), type); + } + + private static final class EmptyWorldClient extends WorldClient { + + private EmptyWorldClient() { + super((NetHandlerPlayClient) null, (WorldSettings) null, 0, (EnumDifficulty) null, (Profiler) null); + } + + @Override + protected IChunkProvider createChunkProvider() { + return null; + } + + @Override + protected int func_152379_p() { + return 0; + } + + @Override + public Entity getEntityByID(int id) { + return null; + } + + @Override + public TileEntity getTileEntity(int x, int y, int z) { + return null; + } + } +} diff --git a/src/test/java/codechicken/multipart/handler/MultipartPacketHandlerCharacterizationTest.java b/src/test/java/codechicken/multipart/handler/MultipartPacketHandlerCharacterizationTest.java new file mode 100644 index 0000000..f6992a6 --- /dev/null +++ b/src/test/java/codechicken/multipart/handler/MultipartPacketHandlerCharacterizationTest.java @@ -0,0 +1,177 @@ +package codechicken.multipart.handler; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayOutputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.data.MCDataOutputWrapper; +import codechicken.lib.packet.PacketCustom.IClientPacketHandler; +import codechicken.lib.packet.PacketCustom.IHandshakeHandler; +import codechicken.lib.packet.PacketCustom.IServerPacketHandler; +import scala.collection.mutable.HashMap; +import scala.collection.mutable.Map; + +class MultipartPacketHandlerCharacterizationTest { + + private static final Set CLIENT_METHODS = new TreeSet<>( + Arrays.asList( + "handleCompressedTileData(Lcodechicken/lib/packet/PacketCustom;Lnet/minecraft/world/World;)V", + "handleCompressedTileDesc(Lcodechicken/lib/packet/PacketCustom;Lnet/minecraft/world/World;)V", + "handlePartRegistration(Lcodechicken/lib/packet/PacketCustom;Lnet/minecraft/network/play/INetHandlerPlayClient;)V", + "handlePacket(Lcodechicken/lib/packet/PacketCustom;Lnet/minecraft/client/Minecraft;Lnet/minecraft/network/play/INetHandlerPlayClient;)V")); + private static final Set SERVER_METHODS = new TreeSet<>( + Arrays.asList( + "codechicken$multipart$handler$MultipartSPH$$chunkWatchers()Lscala/collection/mutable/HashMap;", + "codechicken$multipart$handler$MultipartSPH$$newWatchers()Lscala/collection/mutable/Map;", + "codechicken$multipart$handler$MultipartSPH$$updateMap()Lscala/collection/mutable/Map;", + "getDescPacket(Lnet/minecraft/world/chunk/Chunk;Ljava/util/Iterator;)Lcodechicken/lib/packet/PacketCustom;", + "getTileStream(Lnet/minecraft/world/World;Lcodechicken/lib/vec/BlockCoord;)Lcodechicken/multipart/handler/MultipartSPH$MCByteStream;", + "handlePacket(Lcodechicken/lib/packet/PacketCustom;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/play/INetHandlerPlayServer;)V", + "handshakeRecieved(Lnet/minecraft/network/NetHandlerPlayServer;)V", + "onChunkUnWatch(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/ChunkCoordIntPair;)V", + "onChunkWatch(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/ChunkCoordIntPair;)V", + "onTickEnd(Lscala/collection/Seq;)V", + "onWorldUnload(Lnet/minecraft/world/World;)V")); + + @Test + void keepsTheSharedPacketHandlerBase() throws Exception { + assertTrue(Modifier.isPublic(MultipartPH.class.getModifiers())); + assertFalse(Modifier.isFinal(MultipartPH.class.getModifiers())); + assertArrayEquals(new Class[0], MultipartPH.class.getInterfaces()); + assertEquals( + new TreeSet<>( + Arrays.asList( + "channel()Lcodechicken/multipart/handler/MultipartMod$;", + "registryChannel()Ljava/lang/String;")), + publicMethodSignatures(MultipartPH.class)); + + assertPrivateFinalField(MultipartPH.class, "channel", MultipartMod$.class); + assertPrivateFinalField(MultipartPH.class, "registryChannel", String.class); + MultipartPH handler = new MultipartPH(); + assertSame(MultipartMod$.MODULE$, handler.channel()); + assertEquals("ForgeMultipart", handler.registryChannel()); + } + + @Test + void keepsTheClientFacadeAndCompanion() throws Exception { + assertFacade(MultipartCPH.class, withSharedChannels(CLIENT_METHODS)); + assertCompanion(MultipartCPH$.class, new Class[] { IClientPacketHandler.class }, CLIENT_METHODS); + assertSame(MultipartCPH$.class, MultipartCPH$.class.getField("MODULE$").getType()); + assertSame(MultipartCPH$.MODULE$, MultipartCPH$.class.getField("MODULE$").get(null)); + assertSame(MultipartMod$.MODULE$, MultipartCPH.channel()); + assertEquals("ForgeMultipart", MultipartCPH.registryChannel()); + } + + @Test + void keepsTheServerFacadeCompanionAndStateAccessors() throws Exception { + Set facadeMethods = withSharedChannels(SERVER_METHODS); + facadeMethods.remove( + "codechicken$multipart$handler$MultipartSPH$$chunkWatchers()Lscala/collection/mutable/HashMap;"); + facadeMethods.remove("codechicken$multipart$handler$MultipartSPH$$newWatchers()Lscala/collection/mutable/Map;"); + facadeMethods.remove("codechicken$multipart$handler$MultipartSPH$$updateMap()Lscala/collection/mutable/Map;"); + assertFacade(MultipartSPH.class, facadeMethods); + assertCompanion( + MultipartSPH$.class, + new Class[] { IServerPacketHandler.class, IHandshakeHandler.class }, + SERVER_METHODS); + assertSame(MultipartSPH$.class, MultipartSPH$.class.getField("MODULE$").getType()); + assertSame(MultipartSPH$.MODULE$, MultipartSPH$.class.getField("MODULE$").get(null)); + + assertPrivateFinalField( + MultipartSPH$.class, + "codechicken$multipart$handler$MultipartSPH$$updateMap", + Map.class); + assertPrivateFinalField( + MultipartSPH$.class, + "codechicken$multipart$handler$MultipartSPH$$chunkWatchers", + HashMap.class); + assertPrivateFinalField( + MultipartSPH$.class, + "codechicken$multipart$handler$MultipartSPH$$newWatchers", + Map.class); + assertSame(MultipartMod$.MODULE$, MultipartSPH.channel()); + assertEquals("ForgeMultipart", MultipartSPH.registryChannel()); + } + + @Test + void keepsTheNestedByteStreamShape() throws Exception { + Class type = MultipartSPH.MCByteStream.class; + assertSame(MultipartSPH.class, type.getDeclaringClass()); + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isStatic(type.getModifiers())); + assertFalse(Modifier.isFinal(type.getModifiers())); + assertSame(MCDataOutputWrapper.class, type.getSuperclass()); + assertArrayEquals(new Class[0], type.getInterfaces()); + assertEquals(new TreeSet<>(Arrays.asList("getBytes()[B")), publicMethodSignatures(type)); + assertPrivateFinalField(type, "bout", ByteArrayOutputStream.class); + assertSame(type, type.getConstructor(ByteArrayOutputStream.class).getDeclaringClass()); + } + + private static void assertFacade(Class type, Set methods) { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertArrayEquals(new Class[0], type.getInterfaces()); + assertEquals(methods, publicMethodSignatures(type)); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertTrue(Modifier.isStatic(method.getModifiers()), method.toString()); + } + } + } + + private static void assertCompanion(Class type, Class[] packetInterfaces, Set methods) + throws Exception { + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isFinal(type.getModifiers())); + assertSame(MultipartPH.class, type.getSuperclass()); + assertArrayEquals(packetInterfaces, type.getInterfaces()); + assertEquals(methods, publicMethodSignatures(type)); + + Field module = type.getField("MODULE$"); + assertTrue(Modifier.isPublic(module.getModifiers())); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertFalse(Modifier.isStatic(method.getModifiers()), method.toString()); + } + } + } + + private static void assertPrivateFinalField(Class owner, String name, Class type) throws Exception { + Field field = owner.getDeclaredField(name); + assertSame(type, field.getType()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + assertTrue(Modifier.isFinal(field.getModifiers())); + } + + private static Set withSharedChannels(Set methods) { + Set result = new TreeSet<>(methods); + result.add("channel()Lcodechicken/multipart/handler/MultipartMod$;"); + result.add("registryChannel()Ljava/lang/String;"); + return result; + } + + private static Set publicMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/multipart/handler/MultipartProxyCharacterizationTest.java b/src/test/java/codechicken/multipart/handler/MultipartProxyCharacterizationTest.java new file mode 100644 index 0000000..2a7aaf1 --- /dev/null +++ b/src/test/java/codechicken/multipart/handler/MultipartProxyCharacterizationTest.java @@ -0,0 +1,177 @@ +package codechicken.multipart.handler; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.world.ChunkCoordIntPair; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +import codechicken.lib.config.ConfigFile; +import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.BlockMultipart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +class MultipartProxyCharacterizationTest { + + private static final Set SERVER_METHODS = new TreeSet<>( + Arrays.asList( + "block()Lcodechicken/multipart/BlockMultipart;", + "block_$eq(Lcodechicken/multipart/BlockMultipart;)V", + "config()Lcodechicken/lib/config/ConfigFile;", + "config_$eq(Lcodechicken/lib/config/ConfigFile;)V", + "init()V", + "logger()Lorg/apache/logging/log4j/Logger;", + "logger_$eq(Lorg/apache/logging/log4j/Logger;)V", + "onTileClassBuilt(Ljava/lang/Class;)V", + "postInit()V", + "preInit(Ljava/io/File;Lorg/apache/logging/log4j/Logger;)V")); + private static final Set CLIENT_METHODS = new TreeSet<>( + Arrays.asList("onTileClassBuilt(Ljava/lang/Class;)V", "postInit()V")); + private static final Set FACADE_METHODS = new TreeSet<>(); + private static final Set COMPANION_METHODS = new TreeSet<>( + Arrays.asList( + "indexInChunk(Lcodechicken/lib/vec/BlockCoord;)I", + "indexInChunk(Lnet/minecraft/world/ChunkCoordIntPair;I)Lcodechicken/lib/vec/BlockCoord;")); + + static { + FACADE_METHODS.addAll(SERVER_METHODS); + FACADE_METHODS.addAll(COMPANION_METHODS); + } + + @Test + void keepsTheFourTypeHierarchyAndPublicSurfaces() throws Exception { + assertEquals(Object.class, MultipartProxy_serverImpl.class.getSuperclass()); + assertEquals(MultipartProxy_serverImpl.class, MultipartProxy_clientImpl.class.getSuperclass()); + assertEquals(Object.class, MultipartProxy.class.getSuperclass()); + assertEquals(MultipartProxy_clientImpl.class, MultipartProxy$.class.getSuperclass()); + assertFalse(Modifier.isFinal(MultipartProxy_serverImpl.class.getModifiers())); + assertFalse(Modifier.isFinal(MultipartProxy_clientImpl.class.getModifiers())); + assertTrue(Modifier.isFinal(MultipartProxy.class.getModifiers())); + assertTrue(Modifier.isFinal(MultipartProxy$.class.getModifiers())); + + assertEquals(SERVER_METHODS, publicDeclaredMethodSignatures(MultipartProxy_serverImpl.class)); + assertEquals(CLIENT_METHODS, publicDeclaredMethodSignatures(MultipartProxy_clientImpl.class)); + assertEquals(FACADE_METHODS, publicDeclaredMethodSignatures(MultipartProxy.class)); + assertEquals(COMPANION_METHODS, publicDeclaredMethodSignatures(MultipartProxy$.class)); + + for (Method method : MultipartProxy.class.getDeclaredMethods()) { + assertTrue(Modifier.isStatic(method.getModifiers()), method.toString()); + } + for (Method method : MultipartProxy$.class.getDeclaredMethods()) { + assertFalse(Modifier.isStatic(method.getModifiers()), method.toString()); + } + + assertEquals(3, MultipartProxy_serverImpl.class.getDeclaredFields().length); + assertPrivateField(MultipartProxy_serverImpl.class, "block", BlockMultipart.class); + assertPrivateField(MultipartProxy_serverImpl.class, "config", ConfigFile.class); + assertPrivateField(MultipartProxy_serverImpl.class, "logger", Logger.class); + assertEquals(0, MultipartProxy_clientImpl.class.getDeclaredFields().length); + assertEquals(0, MultipartProxy.class.getDeclaredFields().length); + + Field module = MultipartProxy$.class.getField("MODULE$"); + assertSame(MultipartProxy$.class, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + assertSame(MultipartProxy$.MODULE$, module.get(null)); + } + + @Test + void keepsOnlyTheClientOverridesAndTheirStaticForwardersSideOnly() { + assertSideOnlyMethods(MultipartProxy_serverImpl.class, new TreeSet()); + assertSideOnlyMethods(MultipartProxy_clientImpl.class, CLIENT_METHODS); + assertSideOnlyMethods(MultipartProxy.class, CLIENT_METHODS); + assertSideOnlyMethods(MultipartProxy$.class, new TreeSet()); + + assertNull(MultipartProxy_serverImpl.class.getAnnotation(SideOnly.class)); + assertNull(MultipartProxy_clientImpl.class.getAnnotation(SideOnly.class)); + assertNull(MultipartProxy.class.getAnnotation(SideOnly.class)); + assertNull(MultipartProxy$.class.getAnnotation(SideOnly.class)); + } + + @Test + void facadeAndCompanionShareMutableSingletonState() { + Logger original = MultipartProxy.logger(); + Logger marker = LogManager.getLogger("MultipartProxyCharacterizationTest.marker"); + try { + MultipartProxy.logger_$eq(marker); + assertSame(marker, MultipartProxy.logger()); + assertSame(marker, MultipartProxy$.MODULE$.logger()); + + MultipartProxy$.MODULE$.logger_$eq(original); + assertSame(original, MultipartProxy.logger()); + } finally { + MultipartProxy$.MODULE$.logger_$eq(original); + } + + MultipartProxy_serverImpl independent = new MultipartProxy_serverImpl(); + independent.logger_$eq(marker); + assertSame(marker, independent.logger()); + assertSame(original, MultipartProxy.logger()); + } + + @Test + void chunkIndicesKeepTheirExactLocalCoordinatePacking() { + ChunkCoordIntPair chunk = new ChunkCoordIntPair(-2, 3); + int index = 0xABCD; + + BlockCoord staticPosition = MultipartProxy.indexInChunk(chunk, index); + BlockCoord companionPosition = MultipartProxy$.MODULE$.indexInChunk(chunk, index); + assertCoordinates(staticPosition, -19, 0xAB, 60); + assertCoordinates(companionPosition, -19, 0xAB, 60); + assertEquals(index, MultipartProxy.indexInChunk(staticPosition)); + assertEquals(index, MultipartProxy$.MODULE$.indexInChunk(companionPosition)); + + BlockCoord signedShort = MultipartProxy.indexInChunk(chunk, -1); + assertCoordinates(signedShort, -17, 255, 63); + assertEquals(0xFFFF, MultipartProxy.indexInChunk(signedShort)); + } + + private static void assertPrivateField(Class owner, String name, Class type) throws Exception { + Field field = owner.getDeclaredField(name); + assertSame(type, field.getType()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + } + + private static void assertSideOnlyMethods(Class type, Set expected) { + Set actual = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + SideOnly annotation = method.getAnnotation(SideOnly.class); + if (annotation != null) { + assertEquals(Side.CLIENT, annotation.value(), method.toString()); + actual.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + assertEquals(expected, actual); + } + + private static void assertCoordinates(BlockCoord position, int x, int y, int z) { + assertEquals(x, position.x); + assertEquals(y, position.y); + assertEquals(z, position.z); + } + + private static Set publicDeclaredMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/multipart/handler/MultipartSaveLoadCharacterizationTest.java b/src/test/java/codechicken/multipart/handler/MultipartSaveLoadCharacterizationTest.java new file mode 100644 index 0000000..a17738d --- /dev/null +++ b/src/test/java/codechicken/multipart/handler/MultipartSaveLoadCharacterizationTest.java @@ -0,0 +1,130 @@ +package codechicken.multipart.handler; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + +import org.junit.jupiter.api.Test; +import org.objectweb.asm.Type; + +class MultipartSaveLoadCharacterizationTest { + + private static final Set METHODS = new TreeSet<>( + Arrays.asList( + "converters()Lscala/collection/mutable/MutableList;", + "getClassToNameMap()Ljava/util/Map;", + "hookLoader()V", + "loadTiles(Lnet/minecraft/world/chunk/Chunk;)V", + "loadTiles(Lnet/minecraft/world/World;Ljava/util/Map;)V", + "loadingWorld()Lnet/minecraft/world/World;", + "loadingWorld_$eq(Lnet/minecraft/world/World;)V", + "registerTileClass(Ljava/lang/Class;)V")); + + @Test + void keepsTheStaticFacadeAndLoadBearingCompanion() throws Exception { + Class facade = load("codechicken.multipart.handler.MultipartSaveLoad"); + Class companion = load("codechicken.multipart.handler.MultipartSaveLoad$"); + + assertTrue(Modifier.isPublic(facade.getModifiers())); + assertTrue(Modifier.isFinal(facade.getModifiers())); + assertEquals(METHODS, publicMethodSignatures(facade)); + for (Method method : facade.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertTrue(Modifier.isStatic(method.getModifiers()), method.toString()); + } + } + + assertTrue(Modifier.isPublic(companion.getModifiers())); + assertTrue(Modifier.isFinal(companion.getModifiers())); + assertSame(Object.class, companion.getSuperclass()); + assertArrayEquals(new Class[0], companion.getInterfaces()); + assertEquals(METHODS, publicMethodSignatures(companion)); + for (Method method : companion.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + assertFalse(Modifier.isStatic(method.getModifiers()), method.toString()); + } + } + + Field module = companion.getField("MODULE$"); + assertSame(companion, module.getType()); + assertTrue(Modifier.isStatic(module.getModifiers())); + assertTrue(Modifier.isFinal(module.getModifiers())); + } + + @Test + void keepsTheCompanionStateFields() throws Exception { + Class companion = load("codechicken.multipart.handler.MultipartSaveLoad$"); + + assertField(companion, "converters", "scala.collection.mutable.MutableList", true); + assertField(companion, "loadingWorld", "net.minecraft.world.World", false); + assertField(companion, "classToNameMap", "java.util.Map", true); + } + + @Test + void keepsTheNbtContainerShapeAndReadBehavior() throws Exception { + Class type = load("codechicken.multipart.handler.MultipartSaveLoad$TileNBTContainer"); + assertTrue(Modifier.isPublic(type.getModifiers())); + assertTrue(Modifier.isStatic(type.getModifiers())); + assertFalse(Modifier.isFinal(type.getModifiers())); + assertSame(load("codechicken.multipart.handler.MultipartSaveLoad"), type.getEnclosingClass()); + assertSame(TileEntity.class, type.getSuperclass()); + assertArrayEquals(new Class[0], type.getInterfaces()); + assertEquals( + new TreeSet<>( + Arrays.asList( + "readFromNBT(Lnet/minecraft/nbt/NBTTagCompound;)V", + "tag()Lnet/minecraft/nbt/NBTTagCompound;", + "tag_$eq(Lnet/minecraft/nbt/NBTTagCompound;)V")), + publicMethodSignatures(type)); + + Field field = type.getDeclaredField("tag"); + assertSame(NBTTagCompound.class, field.getType()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + assertFalse(Modifier.isFinal(field.getModifiers())); + + TileEntity tile = (TileEntity) type.getDeclaredConstructor().newInstance(); + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("x", 12); + tag.setInteger("y", 34); + tag.setInteger("z", 56); + type.getMethod("readFromNBT", NBTTagCompound.class).invoke(tile, tag); + + assertEquals(12, tile.xCoord); + assertEquals(34, tile.yCoord); + assertEquals(56, tile.zCoord); + assertSame(tag, type.getMethod("tag").invoke(tile)); + } + + private static Class load(String name) throws ClassNotFoundException { + return Class.forName(name, false, MultipartSaveLoadCharacterizationTest.class.getClassLoader()); + } + + private static void assertField(Class owner, String name, String typeName, boolean isFinal) throws Exception { + Field field = owner.getDeclaredField(name); + assertEquals(typeName, field.getType().getName()); + assertTrue(Modifier.isPrivate(field.getModifiers())); + assertEquals(isFinal, Modifier.isFinal(field.getModifiers())); + } + + private static Set publicMethodSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(method.getName() + Type.getMethodDescriptor(method)); + } + } + return signatures; + } +} diff --git a/src/test/java/codechicken/multipart/scalatraits/TPartialOcclusionTileCharacterizationTest.java b/src/test/java/codechicken/multipart/scalatraits/TPartialOcclusionTileCharacterizationTest.java new file mode 100644 index 0000000..54426c8 --- /dev/null +++ b/src/test/java/codechicken/multipart/scalatraits/TPartialOcclusionTileCharacterizationTest.java @@ -0,0 +1,169 @@ +package codechicken.multipart.scalatraits; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Collections; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.jupiter.api.Test; + +import codechicken.lib.vec.Cuboid6; +import codechicken.multipart.JPartialOcclusion; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import scala.collection.JavaConversions; +import scala.collection.Seq; + +class TPartialOcclusionTileCharacterizationTest { + + @Test + void keepsTheExactConcreteClassShapeConsumedByTheGenerator() { + Class type = TPartialOcclusionTile.class; + assertEquals(TileMultipart.class, type.getSuperclass()); + assertArrayEquals(new Class[0], type.getInterfaces()); + assertFalse(type.isInterface()); + assertFalse(Modifier.isAbstract(type.getModifiers())); + assertFalse(Modifier.isFinal(type.getModifiers())); + assertEquals(0, type.getDeclaredFields().length); + + Constructor[] constructors = type.getDeclaredConstructors(); + assertEquals(1, constructors.length); + assertEquals(0, constructors[0].getParameterTypes().length); + assertTrue(Modifier.isPublic(constructors[0].getModifiers())); + + assertEquals( + new TreeSet<>( + Arrays.asList( + "occlusionTest(scala.collection.Seq,codechicken.multipart.TMultiPart)boolean", + "partialOcclusionTest(scala.collection.Seq)boolean")), + publicSignatures(type)); + } + + @Test + void partialTestIgnoresNormalPartsAndRequiresExclusiveVoxels() { + TPartialOcclusionTile tile = new TPartialOcclusionTile(); + + assertTrue(tile.partialOcclusionTest(parts(new TestPart(true), new PartialPart(true, voxel(0))))); + assertFalse(tile.partialOcclusionTest(parts(new PartialPart(true)))); + assertTrue(tile.partialOcclusionTest(parts(new PartialPart(true, true)))); + assertTrue(tile.partialOcclusionTest(parts(new PartialPart(true, voxel(0)), new PartialPart(true, voxel(1))))); + assertFalse(tile.partialOcclusionTest(parts(new PartialPart(true, voxel(0)), new PartialPart(true, voxel(0))))); + } + + @Test + void partialCandidateIsCheckedBeforeTheNormalSuperChain() { + TPartialOcclusionTile tile = new TPartialOcclusionTile(); + PartialPart existing = new PartialPart(true, voxel(0)); + PartialPart overlapping = new PartialPart(true, voxel(0)); + + assertFalse(tile.occlusionTest(parts(existing), overlapping)); + assertEquals(0, calls(existing)); + assertEquals(0, calls(overlapping)); + + PartialPart rejecting = new PartialPart(false, voxel(0)); + PartialPart disjoint = new PartialPart(true, voxel(1)); + assertFalse(tile.occlusionTest(parts(rejecting), disjoint)); + assertEquals(1, calls(rejecting)); + assertEquals(0, calls(disjoint)); + } + + @Test + void nonPartialCandidateUsesTheNormalSuperChainDirectly() { + TPartialOcclusionTile tile = new TPartialOcclusionTile(); + TestPart existing = new TestPart(true); + TestPart candidate = new TestPart(false); + + assertFalse(tile.occlusionTest(parts(existing), candidate)); + assertEquals(1, existing.occlusionCalls); + assertEquals(1, candidate.occlusionCalls); + } + + private static Set publicSignatures(Class type) { + Set signatures = new TreeSet<>(); + for (Method method : type.getDeclaredMethods()) { + if (Modifier.isPublic(method.getModifiers())) { + signatures.add(signature(method)); + } + } + return signatures; + } + + private static String signature(Method method) { + StringBuilder out = new StringBuilder(method.getName()).append('('); + Class[] parameters = method.getParameterTypes(); + for (int i = 0; i < parameters.length; i++) { + if (i > 0) { + out.append(','); + } + out.append(parameters[i].getName()); + } + return out.append(')').append(method.getReturnType().getName()).toString(); + } + + private static Seq parts(TMultiPart... parts) { + return JavaConversions.asScalaBuffer(Arrays.asList(parts)).toSeq(); + } + + private static int calls(TestPart part) { + return part.occlusionCalls; + } + + private static Cuboid6 voxel(int x) { + return new Cuboid6(x / 8d, 0, 0, (x + 1) / 8d, 1 / 8d, 1 / 8d); + } + + private static class TestPart extends TMultiPart { + + private final boolean occlusionResult; + private int occlusionCalls; + + private TestPart(boolean occlusionResult) { + this.occlusionResult = occlusionResult; + } + + @Override + public String getType() { + return "test:occlusion"; + } + + @Override + public boolean occlusionTest(TMultiPart part) { + occlusionCalls++; + return occlusionResult; + } + } + + private static final class PartialPart extends TestPart implements JPartialOcclusion { + + private final boolean allowCompleteOcclusion; + private final Iterable boxes; + + private PartialPart(boolean occlusionResult, Cuboid6... boxes) { + this(occlusionResult, false, boxes); + } + + private PartialPart(boolean occlusionResult, boolean allowCompleteOcclusion, Cuboid6... boxes) { + super(occlusionResult); + this.allowCompleteOcclusion = allowCompleteOcclusion; + this.boxes = Collections.unmodifiableList(Arrays.asList(boxes)); + } + + @Override + public Iterable getPartialOcclusionBoxes() { + return boxes; + } + + @Override + public boolean allowCompleteOcclusion() { + return allowCompleteOcclusion; + } + } +} diff --git a/src/test/resources/compat/ReferenceHollowClientBase.class.b64 b/src/test/resources/compat/ReferenceHollowClientBase.class.b64 new file mode 100644 index 0000000..4be5afa --- /dev/null +++ b/src/test/resources/compat/ReferenceHollowClientBase.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQA2wEANmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlSG9sbG93Q2xpZW50QmFzZQcAAQEAIWNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9jawcAAwEALWNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9ja0NsaWVudAcABQEAKlJlZmVyZW5jZVNjYWxhSG9sbG93TWljcm9ibG9ja0NsaWVudC5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxhU2lnbmF0dXJlOwEABWJ5dGVzAQKPBgFJM1EhAQICAiUREURVM2dLSixnblkzSV8yZHduXiJtUxZ0R09RMXRLKhExAUIBB0c+bAcvGTsLBRUxESFDN3ZZUkwHLxk6dRUFORFhQzJwSRYcBy5bMmxLOhwBYUUCARVBASJhAwgOAzFRISEEBAIVNUw3TV04Y1k+HDcuAwIQGQlRUSpbMnNfCmR3blk2EQUtCRJCAQoNBVkZdS5cN3BdNks3TV04Y1k+HDduETdqSzokCCICCwEJAykSQQIfal0mJGgIRgEXIQk5AiFEAQMRHUkCATFBBQJpCWEhGjxmXVIcWCNBDhEHcQkzJUQBHhUJcXIkAQN2aSZkJyIBEQIJKQxnL1kFA0V1EUEBVDV0aUIRQUULCANLIWoRQQoGAk8FKTFvWTFtQyYREUZKAQchSixHLRo0CgUtYiNBQip1ZSZ0d00DAipNITlhBgFhAQoDeRNBQzN3SzokOG8YE2ZjUhEBZw0JA0tFSiFBDRQDCVVzFw4eBQhpNQoJETEBHAMNQUglDQUHbQEBCxVCDgIPFTRYTRw7dEEhOQEIAWEBCgNJFCEDNGJTMhxWD10zcysFUQRDQRM8EwlhZEVBBENfPmRXLRk4CQ95AgEZIUMBfwVpYS1ZNW0nVgRYTV0wJUtGJCIBDSEJD1FqFBEhYQF1ITEhCQFRIQppCiFCWjFqWU4rCC8aOiERHSEFATFBBQIVCxFiXTtxS0psFW1dNhYDGQMiIUokCgUhMyNhQSVvaSI5IQoBYQEKA1kVIUQ6dmEWFFgqWTpsPxIqFw8GAjEZIjlBJ1NBAQIEMQVCAigBQQMmYSkBBnRrQiwnL1QxdFcCQlEBFQEFQkULQUJdM2RDMhwnaVw7b0lOJBIBDQEABmV2ZW50cwEAEExqYXZhL3V0aWwvTGlzdDsBACRMamF2YS91dGlsL0xpc3Q8TGphdmEvbGFuZy9TdHJpbmc7PjsBAAlmYWlsU3VwZXIBAAFaAQAJc3VwZXJNYXNrAQABSQEADHJlbmRlckJvdW5kcwEAHUxjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7AQAKcmVuZGVyTWFzawEABnJlbmRlcgEAIShMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpVgEAM2NvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9ja0NsaWVudCRjbGFzcwcAFwEAUChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrQ2xpZW50O0xjb2RlY2hpY2tlbi9saWIvdmVjL1ZlY3RvcjM7SSlWDAAVABkKABgAGgEABHRoaXMBADhMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VIb2xsb3dDbGllbnRCYXNlOwEAA3BvcwEAHUxjb2RlY2hpY2tlbi9saWIvdmVjL1ZlY3RvcjM7AQAEcGFzcwEAHygpTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjsMABIAEwkAAgAiAQAQcmVuZGVyQm91bmRzXyRlcQEAIChMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OylWAQADeCQxAQADKClJDAAUABEJAAIAKAEADnJlbmRlck1hc2tfJGVxAQAEKEkpVgEAQWNvZGVjaGlja2VuJG1pY3JvYmxvY2skVE1pY3JvT2NjbHVzaW9uQ2xpZW50JCRzdXBlciRvblBhcnRDaGFuZ2VkAQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspVgEAIGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0BwAuAQANb25QYXJ0Q2hhbmdlZAwAMAAtCgAvADEBAARwYXJ0AQAiTGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OwEAO2NvZGVjaGlja2VuJG1pY3JvYmxvY2skVE1pY3JvT2NjbHVzaW9uQ2xpZW50JCRzdXBlciRvbkFkZGVkAQADKClWAQAHb25BZGRlZAwANwA2CgAvADgBADhjb2RlY2hpY2tlbiRtaWNyb2Jsb2NrJFRNaWNyb09jY2x1c2lvbkNsaWVudCQkc3VwZXIkcmVhZAEAJShMY29kZWNoaWNrZW4vbGliL2RhdGEvTUNEYXRhSW5wdXQ7KVYBAARyZWFkDAA8ADsKAAQAPQEABnBhY2tldAEAIkxjb2RlY2hpY2tlbi9saWIvZGF0YS9NQ0RhdGFJbnB1dDsBADJjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbkNsaWVudCRjbGFzcwcAQQEAUyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb25DbGllbnQ7TGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OylWDAAwAEMKAEIARAEAMShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb25DbGllbnQ7KVYMADcARgoAQgBHAQBTKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbkNsaWVudDtMY29kZWNoaWNrZW4vbGliL2RhdGEvTUNEYXRhSW5wdXQ7KVYMADwASQoAQgBKAQAQZ2V0UHJpb3JpdHlDbGFzcwEAMShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb25DbGllbnQ7KUkMAEwATQoAQgBOAQANZ2V0QnJva2VuSWNvbgEAHShJKUxuZXQvbWluZWNyYWZ0L3V0aWwvSUljb247AQAtY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50JGNsYXNzBwBSAQBGKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGllbnQ7SSlMbmV0L21pbmVjcmFmdC91dGlsL0lJY29uOwwAUABUCgBTAFUBAARzaWRlAQANYWRkSGl0RWZmZWN0cwEAWihMbmV0L21pbmVjcmFmdC91dGlsL01vdmluZ09iamVjdFBvc2l0aW9uO0xuZXQvbWluZWNyYWZ0L2NsaWVudC9wYXJ0aWNsZS9FZmZlY3RSZW5kZXJlcjspVgEAgyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50O0xuZXQvbWluZWNyYWZ0L3V0aWwvTW92aW5nT2JqZWN0UG9zaXRpb247TG5ldC9taW5lY3JhZnQvY2xpZW50L3BhcnRpY2xlL0VmZmVjdFJlbmRlcmVyOylWDABYAFoKAFMAWwEAA2hpdAEAKUxuZXQvbWluZWNyYWZ0L3V0aWwvTW92aW5nT2JqZWN0UG9zaXRpb247AQAOZWZmZWN0UmVuZGVyZXIBAC5MbmV0L21pbmVjcmFmdC9jbGllbnQvcGFydGljbGUvRWZmZWN0UmVuZGVyZXI7AQARYWRkRGVzdHJveUVmZmVjdHMBADEoTG5ldC9taW5lY3JhZnQvY2xpZW50L3BhcnRpY2xlL0VmZmVjdFJlbmRlcmVyOylWAQBaKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGllbnQ7TG5ldC9taW5lY3JhZnQvY2xpZW50L3BhcnRpY2xlL0VmZmVjdFJlbmRlcmVyOylWDABhAGMKAFMAZAEADHJlbmRlclN0YXRpYwEAIShMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpWgEASihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50O0xjb2RlY2hpY2tlbi9saWIvdmVjL1ZlY3RvcjM7SSlaDABmAGgKAFMAaQEAD2dldFJlbmRlckJvdW5kcwEASChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50OylMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwAawBsCgBTAG0BAAdnZXRTbG90AQAtY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrJGNsYXNzBwBwAQAsKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2s7KUkMAG8AcgoAcQBzAQALZ2V0U2xvdE1hc2sMAHUAcgoAcQB2AQAYZ2V0UGFydGlhbE9jY2x1c2lvbkJveGVzAQASKClMamF2YS91dGlsL0xpc3Q7AQA7KExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2s7KUxqYXZhL3V0aWwvTGlzdDsMAHgAegoAcQB7AQALaXRlbUNsYXNzSUQMAH0AcgoAcQB+AQA7Y29kZWNoaWNrZW4kbWljcm9ibG9jayRUTWljcm9PY2NsdXNpb24kJHN1cGVyJG9jY2x1c2lvblRlc3QBACUoTGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OylaAQANb2NjbHVzaW9uVGVzdAwAggCBCgAvAIMBAAVucGFydAEALGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uJGNsYXNzBwCGAQBNKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoMAIIAiAoAhwCJAQAXZWRnZUNvcm5lck9jY2x1c2lvblRlc3QBAFMoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspWgEAeyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspWgwAiwCNCgCHAI4BAARlZGdlAQAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOwEABmNvcm5lcgwACwAMCQACAJMBAApldmVudHNfJGVxAQATKExqYXZhL3V0aWwvTGlzdDspVgEAAygpWgwADgAPCQACAJgBAA1mYWlsU3VwZXJfJGVxAQAEKFopVgwAEAARCQACAJwBAA1zdXBlck1hc2tfJGVxAQAMcmVjYWxjQm91bmRzDAALAHkKAAIAoAEABXN1cGVyCACiAQAOamF2YS91dGlsL0xpc3QHAKQBAANhZGQBABUoTGphdmEvbGFuZy9PYmplY3Q7KVoMAKYApwsApQCoDAAQACcKAAIAqgwAKgArCgACAKwMAA4AlwoAAgCuAQAfamF2YS9sYW5nL0lsbGVnYWxTdGF0ZUV4Y2VwdGlvbgcAsAEABjxpbml0PgEAFShMamF2YS9sYW5nL1N0cmluZzspVgwAsgCzCgCxALQBABYoKUxqYXZhL2xhbmcvSXRlcmFibGU7DAB4AHkKAAIAtwwAsgArCgAEALkBAAYkaW5pdCQBACsoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOylWDAC7ALwKAIcAvQEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrOylWDAC7AL8KAHEAwAEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50OylWDAC7AMIKAFMAwwwAuwBGCgBCAMUBADIoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9ja0NsaWVudDspVgwAuwDHCgAYAMgBABNqYXZhL3V0aWwvQXJyYXlMaXN0BwDKDACyADYKAMsAzAMSNFZlAwASNAEBAAlTaWduYXR1cmUBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQAxKClMamF2YS91dGlsL0xpc3Q8TGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjs+OwEAJigpTGphdmEvdXRpbC9MaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47AQAnKExqYXZhL3V0aWwvTGlzdDxMamF2YS9sYW5nL1N0cmluZzs+OylWAQANU3RhY2tNYXBUYWJsZQEAClNvdXJjZUZpbGUBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcEIQACAAQAAQAGAAUAAgALAAwAAQDQAAAAAgANAAIADgAPAAAAAgAQABEAAAACABIAEwAAAAIAFAARAAAAIQABABUAFgABANEAAABFAAMAAwAAAAcqKxy4ABuxAAAAAgDSAAAAIAADAAAABwAcAB0AAAAAAAcAHgAfAAEAAAAHACAAEQACANMAAAAGAAEAAAAHAAEAEgAhAAEA0QAAAC8AAQABAAAABSq0ACOwAAAAAgDSAAAADAABAAAABQAcAB0AAADTAAAABgABAAAABwABACQAJQABANEAAAA6AAIAAgAAAAYqK7UAI7EAAAACANIAAAAWAAIAAAAGABwAHQAAAAAABgAmABMAAQDTAAAABgABAAAABwABABQAJwABANEAAAAvAAEAAQAAAAUqtAAprAAAAAIA0gAAAAwAAQAAAAUAHAAdAAAA0wAAAAYAAQAAAAcAAQAqACsAAQDRAAAAOgACAAIAAAAGKhu1ACmxAAAAAgDSAAAAFgACAAAABgAcAB0AAAAAAAYAJgARAAEA0wAAAAYAAQAAAAcQAQAsAC0AAQDRAAAAOgACAAIAAAAGKiu3ADKxAAAAAgDSAAAAFgACAAAABgAcAB0AAAAAAAYAMwA0AAEA0wAAAAYAAQAAAAcQAQA1ADYAAQDRAAAALwABAAEAAAAFKrcAObEAAAACANIAAAAMAAEAAAAFABwAHQAAANMAAAAGAAEAAAAHEAEAOgA7AAEA0QAAADoAAgACAAAABiortwA+sQAAAAIA0gAAABYAAgAAAAYAHAAdAAAAAAAGAD8AQAABANMAAAAGAAEAAAAHAAEAMAAtAAEA0QAAADoAAgACAAAABioruABFsQAAAAIA0gAAABYAAgAAAAYAHAAdAAAAAAAGADMANAABANMAAAAGAAEAAAAHAAEANwA2AAEA0QAAAC8AAQABAAAABSq4AEixAAAAAgDSAAAADAABAAAABQAcAB0AAADTAAAABgABAAAABwABADwAOwABANEAAAA6AAIAAgAAAAYqK7gAS7EAAAACANIAAAAWAAIAAAAGABwAHQAAAAAABgA/AEAAAQDTAAAABgABAAAABwABAEwAJwABANEAAAAvAAEAAQAAAAUquABPrAAAAAIA0gAAAAwAAQAAAAUAHAAdAAAA0wAAAAYAAQAAAAcAAQBQAFEAAQDRAAAAOgACAAIAAAAGKhu4AFawAAAAAgDSAAAAFgACAAAABgAcAB0AAAAAAAYAVwARAAEA0wAAAAYAAQAAAAcAAQBYAFkAAQDRAAAARQADAAMAAAAHKissuABcsQAAAAIA0gAAACAAAwAAAAcAHAAdAAAAAAAHAF0AXgABAAAABwBfAGAAAgDTAAAABgABAAAABwABAGEAYgABANEAAAA6AAIAAgAAAAYqK7gAZbEAAAACANIAAAAWAAIAAAAGABwAHQAAAAAABgBfAGAAAQDTAAAABgABAAAABwABAGYAZwABANEAAABFAAMAAwAAAAcqKxy4AGqsAAAAAgDSAAAAIAADAAAABwAcAB0AAAAAAAcAHgAfAAEAAAAHACAAEQACANMAAAAGAAEAAAAHAAEAawAhAAEA0QAAAC8AAQABAAAABSq4AG6wAAAAAgDSAAAADAABAAAABQAcAB0AAADTAAAABgABAAAABwABAG8AJwABANEAAAAvAAEAAQAAAAUquAB0rAAAAAIA0gAAAAwAAQAAAAUAHAAdAAAA0wAAAAYAAQAAAAcAAQB1ACcAAQDRAAAALwABAAEAAAAFKrgAd6wAAAACANIAAAAMAAEAAAAFABwAHQAAANMAAAAGAAEAAAAHAAEAeAB5AAIA0QAAAC8AAQABAAAABSq4AHywAAAAAgDSAAAADAABAAAABQAcAB0AAADTAAAABgABAAAABwDQAAAAAgDUAAEAfQAnAAEA0QAAAC8AAQABAAAABSq4AH+sAAAAAgDSAAAADAABAAAABQAcAB0AAADTAAAABgABAAAABxABAIAAgQABANEAAAA6AAIAAgAAAAYqK7cAhKwAAAACANIAAAAWAAIAAAAGABwAHQAAAAAABgCFADQAAQDTAAAABgABAAAABwABAIIAgQABANEAAAA6AAIAAgAAAAYqK7gAiqwAAAACANIAAAAWAAIAAAAGABwAHQAAAAAABgCFADQAAQDTAAAABgABAAAABwABAIsAjAABANEAAABFAAMAAwAAAAcqKyy4AI+sAAAAAgDSAAAAIAADAAAABwAcAB0AAAAAAAcAkACRAAEAAAAHAJIAkQACANMAAAAGAAEAAAAHAAEACwB5AAIA0QAAAC8AAQABAAAABSq0AJSwAAAAAgDSAAAADAABAAAABQAcAB0AAADTAAAABgABAAAACADQAAAAAgDVAAEAlQCWAAIA0QAAADoAAgACAAAABiortQCUsQAAAAIA0gAAABYAAgAAAAYAHAAdAAAAAAAGACYADAABANMAAAAGAAEAAAAIANAAAAACANYAAQAOAJcAAQDRAAAALwABAAEAAAAFKrQAmawAAAACANIAAAAMAAEAAAAFABwAHQAAANMAAAAGAAEAAAAJAAEAmgCbAAEA0QAAADoAAgACAAAABiobtQCZsQAAAAIA0gAAABYAAgAAAAYAHAAdAAAAAAAGACYADwABANMAAAAGAAEAAAAJAAEAEAAnAAEA0QAAAC8AAQABAAAABSq0AJ2sAAAAAgDSAAAADAABAAAABQAcAB0AAADTAAAABgABAAAACgABAJ4AKwABANEAAAA6AAIAAgAAAAYqG7UAnbEAAAACANIAAAAWAAIAAAAGABwAHQAAAAAABgAmABEAAQDTAAAABgABAAAACgABAJ8ANgABANEAAABlAAMAAQAAACYqtgChEqO5AKkCAFcqKrYAq7YArSq2AK+ZAA27ALFZEqO3ALW/sQAAAAMA0gAAAAwAAQAAACYAHAAdAAAA0wAAABIABAAAAA0ADAAOABQADwAlAAwA1wAAAAMAASUQQQB4ALYAAQDRAAAALwABAAEAAAAFKrYAuLAAAAACANIAAAAMAAEAAAAFABwAHQAAANMAAAAGAAEAAAAHAAEAsgA2AAEA0QAAAHEAAwABAAAANyoQKbcAuiq4AL4quADBKrgAxCq4AMYquADJKrsAy1m3AM21AJQqA7UAmSoSzrUAnSoSz7YArbEAAAACANIAAAAMAAEAAAA3ABwAHQAAANMAAAAWAAUAAAAHABoACAAlAAkAKgAKADAACwADANgAAAACAAcA2QAAAAsAAQAIAAEACXMACgDaAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceHollowMicroblockBase.class.b64 b/src/test/resources/compat/ReferenceHollowMicroblockBase.class.b64 new file mode 100644 index 0000000..9e42e02 --- /dev/null +++ b/src/test/resources/compat/ReferenceHollowMicroblockBase.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQASwEAOmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlSG9sbG93TWljcm9ibG9ja0Jhc2UHAAEBACFjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2sHAAMBACRSZWZlcmVuY2VTY2FsYUhvbGxvd01pY3JvYmxvY2suc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVieXRlcwECmAYBRTNRIQECAgIlEVFEVTNnS0osZ25ZM0lfMmR3bl4nakdKfCcNXDhkVwoLNy8aBgMHEQlhYVk4bmEGJChCQQMHAyVpVw8cO2phBhRIT0MBCAMtGXcOWjNkUSYcNy4aOAQBTREBQQMJAxc5aREBBAYDGxkJISJcNWRlPhRHblwybBMJeUFCAQZOUw4UeE4ZN3BHLkRRIQUBBQJJCWEBUDVvU1J0RCNBChEFUQFRIgECCQ9ZAQEZIUMBLwUxUU1eM29pTiwSAQcJBDN5AVMiAQ4LBW1hEgFCO3VTMlQRIUgBBVUGNBgtAwIgNQkhQSpbOnUhCQlzRQQCI0s1CTFFQwElAxUZOC0ZN2ITCTEzJQEEUWUWJFdNWgUDUSUSYWEVO3NTOjwnQgEUJBEdWQMBMUEFAjEKISIaPGZdUhx4DEozcikJaQMHBQIjXSURcWYJAgUrOkxHD0MEMlUFBQkZAQ0CB2EkEwcDBDQBAQZLAUcBCEtaLGcOXjohER0pBAExQQUCWQoxYl07cUtKFFZtXTttaVYJcQcFAiNxJRERaAkCCAU+fEcuWjFvER1ZBAExQQUCcQpxYl07cUtKFFZtXTttaX4jUy0dCwNbdUJxIQ0eAgIDB3EHAwRAAQEGS2FOAQ1nVgRYTR0qZmdWZEcPCQUIAwIBDREiATcDMRlYD10zcw0GTEcuHjpmER0ZBQExQQUCEQsBY107cUtKNBUtGzd2ZRZ8RiVaORUFNSoFYkIZQwMDBQ1hDgUHDwIBCxVCHAIbTSwILxo6R0MmZFdPXTMhERVJBQEiEUsDNXk3bRk3dmcmfGcOVjN0aVIRcWcTBQYZIgMNIVQBBWEGFEgPBQJPHzYJQSEDAlEJCVFBK1Q7bWkmBBZNHTsBAAZldmVudHMBABBMamF2YS91dGlsL0xpc3Q7AQAkTGphdmEvdXRpbC9MaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47AQALc3VwZXJSZXN1bHQBAAFaAQAMc3VwZXJGYWlsdXJlAQASKClMamF2YS91dGlsL0xpc3Q7DAAJAAoJAAIAEAEABHRoaXMBADxMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VIb2xsb3dNaWNyb2Jsb2NrQmFzZTsBAApldmVudHNfJGVxAQATKExqYXZhL3V0aWwvTGlzdDspVgEAA3gkMQEAAygpWgwADAANCQACABgBAA9zdXBlclJlc3VsdF8kZXEBAAQoWilWDAAOAA0JAAIAHAEAEHN1cGVyRmFpbHVyZV8kZXEBAA1vY2NsdXNpb25UZXN0AQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgwACQAPCgACACEBAAVzdXBlcggAIwEADmphdmEvdXRpbC9MaXN0BwAlAQADYWRkAQAVKExqYXZhL2xhbmcvT2JqZWN0OylaDAAnACgLACYAKQwADgAXCgACACsBAB9qYXZhL2xhbmcvSWxsZWdhbFN0YXRlRXhjZXB0aW9uBwAtAQANc3VwZXIgZmFpbHVyZQgALwEABjxpbml0PgEAFShMamF2YS9sYW5nL1N0cmluZzspVgwAMQAyCgAuADMMAAwAFwoAAgA1AQAEcGFydAEAIkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDsBAAMoKVYBAAQoSSlWDAAxADoKAAQAOwEAE2phdmEvdXRpbC9BcnJheUxpc3QHAD0MADEAOQoAPgA/AQAJU2lnbmF0dXJlAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEAJigpTGphdmEvdXRpbC9MaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47AQAnKExqYXZhL3V0aWwvTGlzdDxMamF2YS9sYW5nL1N0cmluZzs+OylWAQANU3RhY2tNYXBUYWJsZQEAClNvdXJjZUZpbGUBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcEIQACAAQAAAADAAIACQAKAAEAQQAAAAIACwACAAwADQAAAAIADgANAAAACAABAAkADwACAEIAAAAvAAEAAQAAAAUqtAARsAAAAAIAQwAAAAwAAQAAAAUAEgATAAAARAAAAAYAAQAAAAgAQQAAAAIARQABABQAFQACAEIAAAA6AAIAAgAAAAYqK7UAEbEAAAACAEMAAAAWAAIAAAAGABIAEwAAAAAABgAWAAoAAQBEAAAABgABAAAACABBAAAAAgBGAAEADAAXAAEAQgAAAC8AAQABAAAABSq0ABmsAAAAAgBDAAAADAABAAAABQASABMAAABEAAAABgABAAAACQABABoAGwABAEIAAAA6AAIAAgAAAAYqG7UAGbEAAAACAEMAAAAWAAIAAAAGABIAEwAAAAAABgAWAA0AAQBEAAAABgABAAAACQABAA4AFwABAEIAAAAvAAEAAQAAAAUqtAAdrAAAAAIAQwAAAAwAAQAAAAUAEgATAAAARAAAAAYAAQAAAAoAAQAeABsAAQBCAAAAOgACAAIAAAAGKhu1AB2xAAAAAgBDAAAAFgACAAAABgASABMAAAAAAAYAFgANAAEARAAAAAYAAQAAAAoAAQAfACAAAQBCAAAAZwADAAIAAAAiKrYAIhIkuQAqAgBXKrYALJkADbsALlkSMLcANL8qtgA2rAAAAAMAQwAAABYAAgAAACIAEgATAAAAAAAiADcAOAABAEQAAAAOAAMAAAAMAAwADQAdAA4ARwAAAAMAAR0AAQAxADkAAQBCAAAAUQADAAEAAAAbKgO3ADwquwA+WbcAQLUAESoEtQAZKgO1AB2xAAAAAgBDAAAADAABAAAAGwASABMAAABEAAAAEgAEAAAABwAFAAgAEAAJABUACgADAEgAAAACAAUASQAAAAsAAQAGAAEAB3MACABKAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceMicroOcclusionBase.class.b64 b/src/test/resources/compat/ReferenceMicroOcclusionBase.class.b64 new file mode 100644 index 0000000..4bd27d4 --- /dev/null +++ b/src/test/resources/compat/ReferenceMicroOcclusionBase.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAXQEAOGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlTWljcm9PY2NsdXNpb25CYXNlBwABAQAgY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQHAAMBACNSZWZlcmVuY2VTY2FsYVRNaWNyb09jY2x1c2lvbi5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxhU2lnbmF0dXJlOwEABWJ5dGVzAQLQBgFlM1EhAQICAiURMURVM2dLSixnblkzTlMOFHhuVDJkWVYcGG4cOENDTiwnQkECBQMZGXcuHDliaSoRUUFCAQpbVmRHLxs5YmVSVBFhQgEMRz4kV20ZNWpHLixnbgEBFAUBUQFDQQYNGwUhEUJBBwUFKSFWKh43dVNCCycPHgUGHwEhCQFFAQd5JXQXDh4gFQNFASJBBQEOAwlBcQEGAUECEwVRIwEEZm0WdEdvXQsCLUEZcQMIEA4DYVEhIQcOAglVJBgOHAYCNwUhIS4ZPGITCWkCRAEDTVNOJAhDQRAmHQkBMyVEASIVBRETIUI6ZEMyDBdCARMiAxkBJi8aM2ZNJhFhZQoCBydSFBhOXDQLBREKA2JCFQEBBCUJQUsBC0taLGcOXjpgSRUMSENBFi8hCQFDJgMCLkMJIVFLXDV1ER15AyYhQUECWQkxAR8TMhEZCQQBKVEFLQU5UU1eM29pTgQDYkIaAQEEJQkBTgEGWQYUVw1cCwJrQRFhJ08HAm8pEQFIRwEFWQZ0dy0DAidvITkxCAFhAQoDYRQhAzdiRRZkdwxKM3IpCVlTCEMEMHUFBQkZQRsJDX0CARUpAzYDGWEXTVkzbUEhOREJAWEBCgMRFWFDOnZhFhQoK1o6dllSLBJhEQkDQRFLISFSEQMPCXt3DlwzYl0iOXEJAWEBCgNBFWFEOnZhFhQoK1o6dllSfEYlWjkVBS1KBWJCGEcDAwUNYREFBxcCAQsVQiICGU0sCC8aOlNLTixIDh4RCQ81AwEZIUMBBQZhMS8eOWZlGgsXDlw7c0siOXEKAWEBCgMBFgFFOnZhFhRoKVk1bWtKLHcMSjNyKQlZEwtDBDAdBgUJGUEiCQ1NAwEVKQNEAzUZWA9dM3MNBkxHLh46ZkEhKVELAUMhLQZpcW5ZMm1rTkx3ThwrZmdSJCJhUSwJC2EjBhkBBgILPSQILho6AQAGZXZlbnRzAQAQTGphdmEvdXRpbC9MaXN0OwEAJExqYXZhL3V0aWwvTGlzdDxMamF2YS9sYW5nL1N0cmluZzs+OwEABWxhYmVsAQASTGphdmEvbGFuZy9TdHJpbmc7AQALc3VwZXJSZXN1bHQBAAFaAQAMc3VwZXJGYWlsdXJlAQASKClMamF2YS91dGlsL0xpc3Q7DAAJAAoJAAIAEgEABHRoaXMBADpMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VNaWNyb09jY2x1c2lvbkJhc2U7AQAKZXZlbnRzXyRlcQEAEyhMamF2YS91dGlsL0xpc3Q7KVYBAAN4JDEBABQoKUxqYXZhL2xhbmcvU3RyaW5nOwwADAANCQACABoBAAlsYWJlbF8kZXEBABUoTGphdmEvbGFuZy9TdHJpbmc7KVYBAAMoKVoMAA4ADwkAAgAfAQAPc3VwZXJSZXN1bHRfJGVxAQAEKFopVgwAEAAPCQACACMBABBzdXBlckZhaWx1cmVfJGVxAQANb2NjbHVzaW9uVGVzdAEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoMAAkAEQoAAgAoAQAmc2NhbGEvY29sbGVjdGlvbi9tdXRhYmxlL1N0cmluZ0J1aWxkZXIHACoBAAY8aW5pdD4BAAMoKVYMACwALQoAKwAuAQAGc3VwZXI6CAAwAQAGYXBwZW5kAQA8KExqYXZhL2xhbmcvT2JqZWN0OylMc2NhbGEvY29sbGVjdGlvbi9tdXRhYmxlL1N0cmluZ0J1aWxkZXI7DAAyADMKACsANAwADAAZCgACADYBAAh0b1N0cmluZwwAOAAZCgArADkBAA5qYXZhL3V0aWwvTGlzdAcAOwEAA2FkZAEAFShMamF2YS9sYW5nL09iamVjdDspWgwAPQA+CwA8AD8MABAAHgoAAgBBAQAfamF2YS9sYW5nL0lsbGVnYWxTdGF0ZUV4Y2VwdGlvbgcAQwEABXN1cGVyCABFDAAsAB0KAEQARwwADgAeCgACAEkBAAVvdGhlcgEAIkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDsKAAQALgEAE2phdmEvdXRpbC9BcnJheUxpc3QHAE4KAE8ALgEABHNlbGYIAFEBAAlTaWduYXR1cmUBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQAmKClMamF2YS91dGlsL0xpc3Q8TGphdmEvbGFuZy9TdHJpbmc7PjsBACcoTGphdmEvdXRpbC9MaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47KVYBAA1TdGFja01hcFRhYmxlAQAKU291cmNlRmlsZQEAGVJ1bnRpbWVWaXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwQhAAIABAAAAAQAAgAJAAoAAQBTAAAAAgALAAIADAANAAAAAgAOAA8AAAACABAADwAAAAoAAQAJABEAAgBUAAAALwABAAEAAAAFKrQAE7AAAAACAFUAAAAMAAEAAAAFABQAFQAAAFYAAAAGAAEAAAAIAFMAAAACAFcAAQAWABcAAgBUAAAAOgACAAIAAAAGKiu1ABOxAAAAAgBVAAAAFgACAAAABgAUABUAAAAAAAYAGAAKAAEAVgAAAAYAAQAAAAgAUwAAAAIAWAABAAwAGQABAFQAAAAvAAEAAQAAAAUqtAAbsAAAAAIAVQAAAAwAAQAAAAUAFAAVAAAAVgAAAAYAAQAAAAkAAQAcAB0AAQBUAAAAOgACAAIAAAAGKiu1ABuxAAAAAgBVAAAAFgACAAAABgAUABUAAAAAAAYAGAANAAEAVgAAAAYAAQAAAAkAAQAOAB4AAQBUAAAALwABAAEAAAAFKrQAIKwAAAACAFUAAAAMAAEAAAAFABQAFQAAAFYAAAAGAAEAAAAKAAEAIQAiAAEAVAAAADoAAgACAAAABiobtQAgsQAAAAIAVQAAABYAAgAAAAYAFAAVAAAAAAAGABgADwABAFYAAAAGAAEAAAAKAAEAEAAeAAEAVAAAAC8AAQABAAAABSq0ACSsAAAAAgBVAAAADAABAAAABQAUABUAAABWAAAABgABAAAACwABACUAIgABAFQAAAA6AAIAAgAAAAYqG7UAJLEAAAACAFUAAAAWAAIAAAAGABQAFQAAAAAABgAYAA8AAQBWAAAABgABAAAACwABACYAJwABAFQAAAB7AAMAAgAAADYqtgApuwArWbcALxIxtgA1KrYAN7YANbYAOrkAQAIAVyq2AEKZAA27AERZEka3AEi/KrYASqwAAAADAFUAAAAWAAIAAAA2ABQAFQAAAAAANgBLAEwAAQBWAAAADgADAAAADQAgAA4AMQAPAFkAAAADAAExAAEALAAtAAEAVAAAAFoAAwABAAAAICq3AE0quwBPWbcAULUAEyoSUrUAGyoEtQAgKgO1ACSxAAAAAgBVAAAADAABAAAAIAAUABUAAABWAAAAFgAFAAAABwAEAAgADwAJABUACgAaAAsAAwBaAAAAAgAFAFsAAAALAAEABgABAAdzAAgAXAAAAAMFAAA= diff --git a/src/test/resources/compat/ReferenceMicroOcclusionClientBase.class.b64 b/src/test/resources/compat/ReferenceMicroOcclusionClientBase.class.b64 new file mode 100644 index 0000000..45fdc0d --- /dev/null +++ b/src/test/resources/compat/ReferenceMicroOcclusionClientBase.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAZwEAPmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlTWljcm9PY2NsdXNpb25DbGllbnRCYXNlBwABAQAgY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQHAAMBAClSZWZlcmVuY2VTY2FsYVRNaWNyb09jY2x1c2lvbkNsaWVudC5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxhU2lnbmF0dXJlOwEABWJ5dGVzAQQOBgEFFWEhQgEDAwNJISEJKmZNFhRYTVwyZhsmHCdvXChkRzIsOC9bOG8HMkxXTRw7Q0NOLCdCQQIFAxkZdy4cOWJpKhFRQUIBCltWZEcvGzliZVJUEWFCAQxHPiRXbRk1akcuLGduAQEUBQFRAUNBBg0bBSERQkEHBQUpIVYqHjd1U0ILJw8eBQYfASEJAUUBB3kldBcOHiAVA0UBIkEFAQ4DCUFxAQYBQQITBVEjAQRmbRZ0R29dCwItQRlxAwgQDgNhUSEhBw4CCVUkGA4cBgI3BSEhLhk8YhMJaQJEAQNNU04kCENBECYdCQEzJUQBIhUFERMhQjpkQzIMF0IBEyIDGQEmLxozZk0mEWFlCgIHJ1IUGE5cNAsFEQoDYkIVAQEEJQlBSwELS1osZw5eOmBJFQxIQ0EWLyEJAUMmAwIuQwkhUUtcNXURHXkDJiFBQQJZCTEBHxMyERkJBAEpUQUtBTlRTV4zb2lOBANiQhoBAQQlCQFOAQhNBkxHLh46ZisFKQRDARw/HQk5REgEAjl3NQkRSAMCOxEFMUFIXThwaXpKEUFJBQN7BQpxAV0xZFcGPFctAwJAAQoBIiseOHVTNixXCV8yZmFSTHdOHAYDewVCcUERAUECEwUxKUEGZ0MmZFdPXTNgSRUMSENBFkURHXkTKSFBQQJVQmFBEgEhQhMpFAEDNGJTMiwoLxoRCQ8hAwEZIUMBEwZRMS9aM28hBhw3Lho7FgMpAyJhEykOAzFTISEUKAIJEQxHLxkGAx8aCTEBXDVjEwkJRkpBBk4HEgtHL1klb2FWJAhiQioBAQQlCQFWAQ9nFixnDlUxZFcWJHgMSjNyKQlZUwtDBDAlBgUJGQEmCQ1dAwEVKQNLAy0ZWC0aOFFDDlxXDR4RCQ9lAwEZIUMBNQZBMS9aM28hBhRIL0YBCxEdYQYBMUEFAnULQWJdM2ZdQgsnD14wJUtGJCJhCzAJDz1aFhEhYQEVITEBDQFRIQopCRFiXTNmXUILJw8eEQkPCQQBGSFDAUcGURFNGjtmZU4rCC8aOhYDEQQiIRo1DgMZVCFhGg4CCTEMZ25aBQNTGhQBQlU7b10GFEcuGgUIVwIBDREiAW0DOQlnDV4zcydWBFhNXTAlS0YkImFLNwkPPVIXESFhAUkiMXEOAVEhChEMMSIZNHVLShxWD10zc0EhKREPAUMFZQZZAU9dM2VLDiw3b104cykJWTMPQwN1YQIHYSQBA29DNiwHIgI8AQkDOhhhQjhvAxIkVw0aCwJXISkREAFDIXUGaXFOHCliZVIcBS4ZOGhLEiQiYUs+CQtxRAgZAQYCCUEMJw8eBQZ9AiEJZWABBWUWDEcNRgIsAwNBYSFhAX4BBFEVQQI5YkcuLEcPAQAGZXZlbnRzAQAQTGphdmEvdXRpbC9MaXN0OwEAJExqYXZhL3V0aWwvTGlzdDxMamF2YS9sYW5nL1N0cmluZzs+OwEAB2ZhaWx1cmUBABxMamF2YS9sYW5nL1J1bnRpbWVFeGNlcHRpb247AQAKc2VlblBhY2tldAEAIkxjb2RlY2hpY2tlbi9saWIvZGF0YS9NQ0RhdGFJbnB1dDsBAAhzZWVuUGFydAEAIkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDsBAAphZnRlclN1cGVyAQAUTGphdmEvbGFuZy9SdW5uYWJsZTsBABIoKUxqYXZhL3V0aWwvTGlzdDsMAAkACgkAAgAVAQAEdGhpcwEAQExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZU1pY3JvT2NjbHVzaW9uQ2xpZW50QmFzZTsBAApldmVudHNfJGVxAQATKExqYXZhL3V0aWwvTGlzdDspVgEAA3gkMQEAHigpTGphdmEvbGFuZy9SdW50aW1lRXhjZXB0aW9uOwwADAANCQACAB0BAAtmYWlsdXJlXyRlcQEAHyhMamF2YS9sYW5nL1J1bnRpbWVFeGNlcHRpb247KVYBACQoKUxjb2RlY2hpY2tlbi9saWIvZGF0YS9NQ0RhdGFJbnB1dDsMAA4ADwkAAgAiAQAOc2VlblBhY2tldF8kZXEBACUoTGNvZGVjaGlja2VuL2xpYi9kYXRhL01DRGF0YUlucHV0OylWAQAkKClMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7DAAQABEJAAIAJwEADHNlZW5QYXJ0XyRlcQEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVYBABYoKUxqYXZhL2xhbmcvUnVubmFibGU7DAASABMJAAIALAEADmFmdGVyU3VwZXJfJGVxAQAXKExqYXZhL2xhbmcvUnVubmFibGU7KVYBAAtwcmVkZWNlc3NvcgEAFShMamF2YS9sYW5nL1N0cmluZzspVgwACQAUCgACADIBAA5qYXZhL3V0aWwvTGlzdAcANAEAA2FkZAEAFShMamF2YS9sYW5nL09iamVjdDspWgwANgA3CwA1ADgMAAwAHAoAAgA6DAASACsKAAIAPAEAEmphdmEvbGFuZy9SdW5uYWJsZQcAPgEAA3J1bgEAAygpVgwAQABBCwA/AEIBAARuYW1lAQASTGphdmEvbGFuZy9TdHJpbmc7AQAHb25BZGRlZAEACnN1cGVyQWRkZWQIAEcMADAAMQoAAgBJAQANb25QYXJ0Q2hhbmdlZAwAKQAqCgACAEwBAAxzdXBlckNoYW5nZWQIAE4BAARwYXJ0AQAEcmVhZAwAJAAlCgACAFIBAAlzdXBlclJlYWQIAFQBAAZwYWNrZXQBAAY8aW5pdD4MAFcAQQoABABYAQATamF2YS91dGlsL0FycmF5TGlzdAcAWgoAWwBYAQAJU2lnbmF0dXJlAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEAJigpTGphdmEvdXRpbC9MaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47AQAnKExqYXZhL3V0aWwvTGlzdDxMamF2YS9sYW5nL1N0cmluZzs+OylWAQANU3RhY2tNYXBUYWJsZQEAClNvdXJjZUZpbGUBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcEIQACAAQAAAAFAAIACQAKAAEAXQAAAAIACwACAAwADQAAAAIADgAPAAAAAgAQABEAAAACABIAEwAAAA8AAQAJABQAAgBeAAAALwABAAEAAAAFKrQAFrAAAAACAF8AAAAMAAEAAAAFABcAGAAAAGAAAAAGAAEAAAAJAF0AAAACAGEAAQAZABoAAgBeAAAAOgACAAIAAAAGKiu1ABaxAAAAAgBfAAAAFgACAAAABgAXABgAAAAAAAYAGwAKAAEAYAAAAAYAAQAAAAkAXQAAAAIAYgABAAwAHAABAF4AAAAvAAEAAQAAAAUqtAAesAAAAAIAXwAAAAwAAQAAAAUAFwAYAAAAYAAAAAYAAQAAAAoAAQAfACAAAQBeAAAAOgACAAIAAAAGKiu1AB6xAAAAAgBfAAAAFgACAAAABgAXABgAAAAAAAYAGwANAAEAYAAAAAYAAQAAAAoAAQAOACEAAQBeAAAALwABAAEAAAAFKrQAI7AAAAACAF8AAAAMAAEAAAAFABcAGAAAAGAAAAAGAAEAAAALAAEAJAAlAAEAXgAAADoAAgACAAAABiortQAjsQAAAAIAXwAAABYAAgAAAAYAFwAYAAAAAAAGABsADwABAGAAAAAGAAEAAAALAAEAEAAmAAEAXgAAAC8AAQABAAAABSq0ACiwAAAAAgBfAAAADAABAAAABQAXABgAAABgAAAABgABAAAADAABACkAKgABAF4AAAA6AAIAAgAAAAYqK7UAKLEAAAACAF8AAAAWAAIAAAAGABcAGAAAAAAABgAbABEAAQBgAAAABgABAAAADAABABIAKwABAF4AAAAvAAEAAQAAAAUqtAAtsAAAAAIAXwAAAAwAAQAAAAUAFwAYAAAAYAAAAAYAAQAAAA0AAQAuAC8AAQBeAAAAOgACAAIAAAAGKiu1AC2xAAAAAgBfAAAAFgACAAAABgAXABgAAAAAAAYAGwATAAEAYAAAAAYAAQAAAA0AAgAwADEAAQBeAAAAdgACAAIAAAAoKrYAMyu5ADkCAFcqtgA7xwAUKrYAPcYADCq2AD25AEMBALEqtgA7vwAAAAMAXwAAABYAAgAAACgAFwAYAAAAAAAoAEQARQABAGAAAAAWAAUAAAAPAAsAEAASABEAIgAOACMAEABjAAAABAACIgAAAQBGAEEAAQBeAAAAMQACAAEAAAAHKhJItwBKsQAAAAIAXwAAAAwAAQAAAAcAFwAYAAAAYAAAAAYAAQAAABMAAQBLACoAAQBeAAAARAACAAIAAAAMKiu2AE0qEk+3AEqxAAAAAgBfAAAAFgACAAAADAAXABgAAAAAAAwAUAARAAEAYAAAAAoAAgAAABUABQAWAAEAUQAlAAEAXgAAAEQAAgACAAAADCortgBTKhJVtwBKsQAAAAIAXwAAABYAAgAAAAwAFwAYAAAAAAAMAFYADwABAGAAAAAKAAIAAAAZAAUAGgABAFcAQQABAF4AAABiAAMAAQAAACQqtwBZKrsAW1m3AFy1ABYqAbUAHioBtQAjKgG1ACgqAbUALbEAAAACAF8AAAAMAAEAAAAkABcAGAAAAGAAAAAaAAYAAAAIAAQACQAPAAoAFAALABkADAAeAA0AAwBkAAAAAgAFAGUAAAALAAEABgABAAdzAAgAZgAAAAMFAAA= diff --git a/src/test/resources/compat/ReferencePostClientBase.class.b64 b/src/test/resources/compat/ReferencePostClientBase.class.b64 new file mode 100644 index 0000000..8556ad9 --- /dev/null +++ b/src/test/resources/compat/ReferencePostClientBase.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAVQEANGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlUG9zdENsaWVudEJhc2UHAAEBACFjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2sHAAMBAChSZWZlcmVuY2VTY2FsYVBvc3RNaWNyb2Jsb2NrQ2xpZW50LnNjYWxhAQAeTHNjYWxhL3JlZmxlY3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBAvMGAQk0USEBAgICJRFxQ1UzZ0tKLGduWTNRX04kOAlcNWZdUhQVbV0zCwUNIRFBQjJwW0IMR08DAgYNBUlRLh43dVNCDCcPHgYCDwVZMW0cM2ZHIkw3bVszbwcBGSIBAQYRBS1xUSIBBwsFNTERQUM3akdKfCcNXDhkVyYRcQIEAgsbJhwnbxwybV8OXAciQgkBCQMREkECH2pdJiRoCEYBFCEJIQIhRAEDER0xAgExQQUCXQlhIRo8Zl1SHFgjAQ0RB2VxAiVEARsVCVlCJAEDdmkmZCciQQ8CCSkMZy9ZBQM/aRFBAVQ1dGlCERFlCggDRRVqEWEJBgJJBSkxb1kxbUMmEWFlSQEHIUosRy0aNAoFIUojQUIqdWUmdHdNAwInRyE5MQYBYQEKA2ETQUMzd0s6JDhvGBNmY1IRUQYNCQNFOUohYUwSAwlVcxcOHgUIYykKCRExARkDDUFIJQ0FB2cBAQsVAg0CDxU0WE0cO3RBITlRBwFhAQoDMRQhAzRiUzIcVg9dM3MrBTkEQwESORMJSTRFQQRDXz5kVy0ZOAkPbQIBGSFDAXkFaWEtWTVtJ1YEWE1dMCVLRiQiIUwfCQ9FUhQRIWEBbyExcQgBUSEKXQohQloxallOKwgvGjohER0JBQExQQUCCQshYl0zZl1CCzdtWzN1KwUZBUMBI0obBSklQgEkSAMRIRcNXjELBSEzEWEBN2pFJhEhKhICDBsOIxUNXjFKXUIsSA9DBE0BAQdJEUEnAh1NLFdNHCliRy4sR28YE2ZjUhFRRhQFCGMtCwkRMQFEERkBBgEpUQUHBlkxL1ozbyEGHDcuGjshERURBgEiEVQDHXlnLhEzZUsSJBIhDAUGKwIhCUVWAQVlFgxHDQYCLi8iKQEMFmEBBwYxAS9ZMmxLUkRRQRcBBUJtC1FiHDhRQ0okOAlbMW9PFiRHQ0EXXREVaRYMMQFfAxEBGE0dOxEFfQNXIgEDCgUFJCFBAytOazIkGA5VMXNpAgEABmV2ZW50cwEAEExqYXZhL3V0aWwvTGlzdDsBACRMamF2YS91dGlsL0xpc3Q8TGphdmEvbGFuZy9TdHJpbmc7PjsBAAlmYWlsU3VwZXIBAAFaAQAKc2VlblBhY2tldAEAIkxjb2RlY2hpY2tlbi9saWIvZGF0YS9NQ0RhdGFJbnB1dDsBABIoKUxqYXZhL3V0aWwvTGlzdDsMAAkACgkAAgARAQAEdGhpcwEANkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVBvc3RDbGllbnRCYXNlOwEACmV2ZW50c18kZXEBABMoTGphdmEvdXRpbC9MaXN0OylWAQADeCQxAQADKClaDAAMAA0JAAIAGQEADWZhaWxTdXBlcl8kZXEBAAQoWilWAQAkKClMY29kZWNoaWNrZW4vbGliL2RhdGEvTUNEYXRhSW5wdXQ7DAAOAA8JAAIAHgEADnNlZW5QYWNrZXRfJGVxAQAlKExjb2RlY2hpY2tlbi9saWIvZGF0YS9NQ0RhdGFJbnB1dDspVgEAB29uQWRkZWQBAAMoKVYMAAkAEAoAAgAkAQAKc3VwZXJBZGRlZAgAJgEADmphdmEvdXRpbC9MaXN0BwAoAQADYWRkAQAVKExqYXZhL2xhbmcvT2JqZWN0OylaDAAqACsLACkALAwADAAYCgACAC4BAB9qYXZhL2xhbmcvSWxsZWdhbFN0YXRlRXhjZXB0aW9uBwAwAQAFc3VwZXIIADIBAAY8aW5pdD4BABUoTGphdmEvbGFuZy9TdHJpbmc7KVYMADQANQoAMQA2AQAEcmVhZAEACXN1cGVyUmVhZAgAOQwAIAAhCgACADsBAAZwYWNrZXQBAA1vblBhcnRDaGFuZ2VkAQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspVgEADHN1cGVyQ2hhbmdlZAgAQAEABHBhcnQBACJMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7AQAEKEkpVgwANABECgAEAEUBABNqYXZhL3V0aWwvQXJyYXlMaXN0BwBHDAA0ACMKAEgASQEACVNpZ25hdHVyZQEABENvZGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAA9MaW5lTnVtYmVyVGFibGUBACYoKUxqYXZhL3V0aWwvTGlzdDxMamF2YS9sYW5nL1N0cmluZzs+OwEAJyhMamF2YS91dGlsL0xpc3Q8TGphdmEvbGFuZy9TdHJpbmc7PjspVgEADVN0YWNrTWFwVGFibGUBAApTb3VyY2VGaWxlAQAZUnVudGltZVZpc2libGVBbm5vdGF0aW9ucwEACFNjYWxhU2lnBCEAAgAEAAAAAwACAAkACgABAEsAAAACAAsAAgAMAA0AAAACAA4ADwAAAAoAAQAJABAAAgBMAAAALwABAAEAAAAFKrQAErAAAAACAE0AAAAMAAEAAAAFABMAFAAAAE4AAAAGAAEAAAAKAEsAAAACAE8AAQAVABYAAgBMAAAAOgACAAIAAAAGKiu1ABKxAAAAAgBNAAAAFgACAAAABgATABQAAAAAAAYAFwAKAAEATgAAAAYAAQAAAAoASwAAAAIAUAABAAwAGAABAEwAAAAvAAEAAQAAAAUqtAAarAAAAAIATQAAAAwAAQAAAAUAEwAUAAAATgAAAAYAAQAAAAsAAQAbABwAAQBMAAAAOgACAAIAAAAGKhu1ABqxAAAAAgBNAAAAFgACAAAABgATABQAAAAAAAYAFwANAAEATgAAAAYAAQAAAAsAAQAOAB0AAQBMAAAALwABAAEAAAAFKrQAH7AAAAACAE0AAAAMAAEAAAAFABMAFAAAAE4AAAAGAAEAAAAMAAEAIAAhAAEATAAAADoAAgACAAAABiortQAfsQAAAAIATQAAABYAAgAAAAYAEwAUAAAAAAAGABcADwABAE4AAAAGAAEAAAAMAAEAIgAjAAEATAAAAFEAAwABAAAAHiq2ACUSJ7kALQIAVyq2AC+ZAA27ADFZEjO3ADe/sQAAAAMATQAAAAwAAQAAAB4AEwAUAAAATgAAAAYAAQAAAA0AUQAAAAMAAR0AAQA4ACEAAQBMAAAAaAADAAIAAAAjKrYAJRI6uQAtAgBXKrYAL5kADbsAMVkSM7cAN78qK7YAPLEAAAADAE0AAAAWAAIAAAAjABMAFAAAAAAAIwA9AA8AAQBOAAAADgADAAAADwAMABAAHQARAFEAAAADAAEdAAEAPgA/AAEATAAAAEEAAgACAAAADSq2ACUSQbkALQIAV7EAAAACAE0AAAAWAAIAAAANABMAFAAAAAAADQBCAEMAAQBOAAAABgABAAAAEwABADQAIwABAEwAAABSAAMAAQAAABwqECm3AEYquwBIWbcASrUAEioDtQAaKgG1AB+xAAAAAgBNAAAADAABAAAAHAATABQAAABOAAAAEgAEAAAACQAGAAoAEQALABYADAADAFIAAAACAAUAUwAAAAsAAQAGAAEAB3MACABUAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferencePostFace.class.b64 b/src/test/resources/compat/ReferencePostFace.class.b64 new file mode 100644 index 0000000..bbfe08d --- /dev/null +++ b/src/test/resources/compat/ReferencePostFace.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAfgEALmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlUG9zdEZhY2UHAAEBACFjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2sHAAMBACdjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2sHAAUBACJSZWZlcmVuY2VTY2FsYVBvc3RNaWNyb2Jsb2NrLnNjYWxhAQAeTHNjYWxhL3JlZmxlY3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBAp0GAXkzQSEBAgETCQkiKxo0ZmUWdDctGilwZ1I0FW1ZMwsFDSERQUIycFtCDEdPAwIGDQVJUS4eN3VTQgwnDx4GAg8FWTFtHDNmRyJMN21bM28HARkyAQEGESEJWWEiRAENFQlpYSEBBm5TDhR4Thk3cEcuTCFhBAcDFTVLN01dOGNZPhw3DgUCDCMlESEDBAIRBz5sV24cOE5TDhR4Thk3cEcuRFEBBgEFAlUJYQFQNW9TUnREIwEMEQVdAVEiAQIJD2UBARkhQwE1BTFRTV4zb2lOLBJhBwkEOQUaUyJBDwsFeXkSAUI7dVMyVBEBSQEFVQY0GC0DAiM7CSFBKls6dSEJISNGBAImUTUJYUVDASgDFRk4LRk3YhMJSWMlAQRRZRYkV01aBQNXMRJhYRU7c1M6PCdCQRUnER1xAwExQQUCPQohIho8Zl1SHHgMSjNyKQkBNAcFAiZjJREhRwoCBSs6TEcPQwQ1WwUFCRlBDgIHYSQTBwMENwEBBkthRwEIS1osZw5eOiERHUEEATFBBQJlCkFhHTdwaVYJIQgFAiZ3JRFBSAoCBBM6JAhiAiABAQQlCWFQAQlnMnxHbxgTZmNSEQEHEQUIaXUKCRExATsRGREFASlRBXUFKTEPXDh1QSEpQQkBQwELBlFRLlsyc18OYxdtXToVAxkDImFDJAoFIWMhAUUicFs2fGcuVDVkZT4cRS5ZOnQRFVEFASIRTAMdOVcNHit6YRYkEgEUCQMbQmsRQRQGAx9+CUEBXDFvTyYRMUYUBQYlAiEJJU8BCE8WJDgLXDh1ERUhBgEiAVYDJTlXDR4icGs6JDcvRgFXIQk5RixEAVkVCUkmLEECd0sOVCFhFwQCBzFMJy0DAl4xCjkxKR4ycFMSNAQBAAZldmVudHMBABBMamF2YS91dGlsL0xpc3Q7AQAkTGphdmEvdXRpbC9MaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47AQAEc2xvdAEAAUkBAAtnZXRTbG90TWFzawEAAygpSQEALWNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jayRjbGFzcwcAEgEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrOylJDAAQABQKABMAFQEABHRoaXMBADBMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VQb3N0RmFjZTsBABhnZXRQYXJ0aWFsT2NjbHVzaW9uQm94ZXMBABIoKUxqYXZhL3V0aWwvTGlzdDsBADsoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jazspTGphdmEvdXRpbC9MaXN0OwwAGQAbCgATABwBAAtpdGVtQ2xhc3NJRAwAHgAUCgATAB8BADtjb2RlY2hpY2tlbiRtaWNyb2Jsb2NrJFRNaWNyb09jY2x1c2lvbiQkc3VwZXIkb2NjbHVzaW9uVGVzdAEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoBACBjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydAcAIwEADW9jY2x1c2lvblRlc3QMACUAIgoAJAAmAQAFbnBhcnQBACJMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7AQAsY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb24kY2xhc3MHACoBAE0oTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgwAJQAsCgArAC0BABdlZGdlQ29ybmVyT2NjbHVzaW9uVGVzdAEAUyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOylaAQB7KExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOylaDAAvADEKACsAMgEABGVkZ2UBAChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247AQAGY29ybmVyDAALAAwJAAIANwEACmV2ZW50c18kZXEBABMoTGphdmEvdXRpbC9MaXN0OylWAQADeCQxDAAOAA8JAAIAPAEACHNsb3RfJGVxAQAEKEkpVgEACm1pY3JvQ2xhc3MBACsoKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvQ2xhc3M7AQAHZ2V0VHlwZQEAFCgpTGphdmEvbGFuZy9TdHJpbmc7DAALABoKAAIARAEACXR5cGU6ZmFjZQgARgEADmphdmEvdXRpbC9MaXN0BwBIAQADYWRkAQAVKExqYXZhL2xhbmcvT2JqZWN0OylaDABKAEsLAEkATAEACG1jcl9mYWNlCABOAQAHZ2V0U2xvdAEACXNsb3Q6ZmFjZQgAUQwADgARCgACAFMBAAlnZXRCb3VuZHMBAB8oKUxjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7AQALYm91bmRzOmZhY2UIAFcBABtjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDYHAFkBAARmdWxsAQAdTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjsMAFsAXAkAWgBdAQAWKClMamF2YS9sYW5nL0l0ZXJhYmxlOwwAGQAaCgACAGABACooKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGFzczsMAEAAQQoAAgBjAQAGPGluaXQ+AQADKClWDABlAD8KAAQAZwEABiRpbml0JAEAKyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247KVYMAGkAagoAKwBrAQAsKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2s7KVYMAGkAbQoAEwBuAQATamF2YS91dGlsL0FycmF5TGlzdAcAcAwAZQBmCgBxAHIBAAlTaWduYXR1cmUBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQAxKClMamF2YS91dGlsL0xpc3Q8TGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjs+OwEAJigpTGphdmEvdXRpbC9MaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47AQAnKExqYXZhL3V0aWwvTGlzdDxMamF2YS9sYW5nL1N0cmluZzs+OylWAQAKU291cmNlRmlsZQEAGVJ1bnRpbWVWaXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwAhAAIABAABAAYAAgACAAsADAABAHQAAAACAA0AAgAOAA8AAAARAAEAEAARAAEAdQAAAC8AAQABAAAABSq4ABasAAAAAgB2AAAADAABAAAABQAXABgAAAB3AAAABgABAAAAMAABABkAGgACAHUAAAAvAAEAAQAAAAUquAAdsAAAAAIAdgAAAAwAAQAAAAUAFwAYAAAAdwAAAAYAAQAAADAAdAAAAAIAeAABAB4AEQABAHUAAAAvAAEAAQAAAAUquAAgrAAAAAIAdgAAAAwAAQAAAAUAFwAYAAAAdwAAAAYAAQAAADAQAQAhACIAAQB1AAAAOgACAAIAAAAGKiu3ACesAAAAAgB2AAAAFgACAAAABgAXABgAAAAAAAYAKAApAAEAdwAAAAYAAQAAADAAAQAlACIAAQB1AAAAOgACAAIAAAAGKiu4AC6sAAAAAgB2AAAAFgACAAAABgAXABgAAAAAAAYAKAApAAEAdwAAAAYAAQAAADAAAQAvADAAAQB1AAAARQADAAMAAAAHKissuAAzrAAAAAIAdgAAACAAAwAAAAcAFwAYAAAAAAAHADQANQABAAAABwA2ADUAAgB3AAAABgABAAAAMAABAAsAGgACAHUAAAAvAAEAAQAAAAUqtAA4sAAAAAIAdgAAAAwAAQAAAAUAFwAYAAAAdwAAAAYAAQAAADEAdAAAAAIAeQABADkAOgACAHUAAAA6AAIAAgAAAAYqK7UAOLEAAAACAHYAAAAWAAIAAAAGABcAGAAAAAAABgA7AAwAAQB3AAAABgABAAAAMQB0AAAAAgB6AAEADgARAAEAdQAAAC8AAQABAAAABSq0AD2sAAAAAgB2AAAADAABAAAABQAXABgAAAB3AAAABgABAAAAMgABAD4APwABAHUAAAA6AAIAAgAAAAYqG7UAPbEAAAACAHYAAAAWAAIAAAAGABcAGAAAAAAABgA7AA8AAQB3AAAABgABAAAAMgABAEAAQQABAHUAAAAsAAEAAQAAAAIBsAAAAAIAdgAAAAwAAQAAAAIAFwAYAAAAdwAAAAYAAQAAADMAAQBCAEMAAQB1AAAAOQACAAEAAAAPKrYARRJHuQBNAgBXEk+wAAAAAgB2AAAADAABAAAADwAXABgAAAB3AAAABgABAAAANAABAFAAEQABAHUAAAA7AAIAAQAAABEqtgBFElK5AE0CAFcqtgBUrAAAAAIAdgAAAAwAAQAAABEAFwAYAAAAdwAAAAYAAQAAADUAAQBVAFYAAQB1AAAAOgACAAEAAAAQKrYARRJYuQBNAgBXsgBesAAAAAIAdgAAAAwAAQAAABAAFwAYAAAAdwAAAAYAAQAAADYQQQAZAF8AAQB1AAAALwABAAEAAAAFKrYAYbAAAAACAHYAAAAMAAEAAAAFABcAGAAAAHcAAAAGAAEAAAAwEEEAQABiAAEAdQAAAC8AAQABAAAABSq2AGSwAAAAAgB2AAAADAABAAAABQAXABgAAAB3AAAABgABAAAAMAABAGUAZgABAHUAAABQAAMAAQAAAB4qA7cAaCq4AGwquABvKrsAcVm3AHO1ADgqA7UAPbEAAAACAHYAAAAMAAEAAAAeABcAGAAAAHcAAAAOAAMAAAAwAA0AMQAYADIAAwB7AAAAAgAHAHwAAAALAAEACAABAAlzAAoAfQAAAAMFAAA= diff --git a/src/test/resources/compat/ReferencePostMicroblockBase.class.b64 b/src/test/resources/compat/ReferencePostMicroblockBase.class.b64 new file mode 100644 index 0000000..f6d6cee --- /dev/null +++ b/src/test/resources/compat/ReferencePostMicroblockBase.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAXwEAOGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlUG9zdE1pY3JvYmxvY2tCYXNlBwABAQAhY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrBwADAQAiUmVmZXJlbmNlU2NhbGFQb3N0TWljcm9ibG9jay5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxhU2lnbmF0dXJlOwEABWJ5dGVzAQL8BgF9M1EhAQICAiURMURVM2dLSixnblkzUV9OJFgqWzJzXwpkd25ZNkNDTiwnQkECBQMZGXcuHDliaSoRUUFCAQpbVmRHLxs5YmVSVBFhQgEMRz4kV20ZNWpHLixnbgEBFAUBUQFDQQYPGwVhIUJBBwcDKWkXbhk6cEUyfDdtWwUDHzERISJUNWRlPhRHblwybBEVCQIBIgETAxlhFE5cNXV9UQkxAwUCFQE1CSEBQwQXAQEHSRFBDAINFTRYTRw7dCsFQQJjQQ0fQTUJIUQDAhw5BSFRD141bRUFaRIBAjZibQZMIWEIDgMJMUs3Dx4JA0MdciFBSRMOAw1SEQFKAQZnDgxHLlkFA00NCmEBFTpmSRY0F0IBFSoFGRlGT101b08qEWFlCQUIVwEBDREiAS0DKSlnLxo4dWd+I1MtHQsDW0ECIkEJGAoFPRojAUIrb1NSRHEhDRYCAgMHASRBAnlJRUJhYQ0BIUITQRJhQjN3SzokOA8JBQhrAQENESIBNwMVYRdNWTNtKwU5BEMBHTwbBUkkQgEeHQMRYRdNXDQKBSFKBGJCHwEBBCUJQVABClkGFFcNXDAlS0YkIiFMIAkPRWIUESFhAW8hMREJAVEhCl0KYQFcMWNLMgQDYkIiAQEEJQkBUgEMZ1YEWE0dKmZnVmRHL0YBRiEJEWMpAwJIRwk5IWlcOG1LBnQHYkIlAQEEJQlBUwEQZ1YEWE0dKmZnVmRHbxgTZmNSEVFmEwUIYyELCRExAUYRGWkFASlRBQsGYTEvHjlmZUorNy8eN3VBITlxCgFhAQoDIRUBRDp2YRYUaClZNW1rSiwHYkIpAQEEJQlBVQERZ1YEWE0dJGJTMiwoL1owJUtGJCIhTCoJD0UCFhEhYQELIjFRCwFRIQoVC1FiXTtxS0o0FS0bN3ZlFgQDIkIsAQkDQhYhRDhkRzIsOC9bOG8pFhxIDwYCRjMiKSFMFmEBNwYhAS8ZOnUhCWFWLEQBBRMJcUZBAQZVG1ZkRy8bKWJlUgQBAAZldmVudHMBABBMamF2YS91dGlsL0xpc3Q7AQAkTGphdmEvdXRpbC9MaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47AQAFbGFiZWwBABJMamF2YS9sYW5nL1N0cmluZzsBAAtzdXBlclJlc3VsdAEAAVoBAAxzdXBlckZhaWx1cmUBABIoKUxqYXZhL3V0aWwvTGlzdDsMAAkACgkAAgASAQAEdGhpcwEAOkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVBvc3RNaWNyb2Jsb2NrQmFzZTsBAApldmVudHNfJGVxAQATKExqYXZhL3V0aWwvTGlzdDspVgEAA3gkMQEAFCgpTGphdmEvbGFuZy9TdHJpbmc7DAAMAA0JAAIAGgEACWxhYmVsXyRlcQEAFShMamF2YS9sYW5nL1N0cmluZzspVgEAAygpWgwADgAPCQACAB8BAA9zdXBlclJlc3VsdF8kZXEBAAQoWilWDAAQAA8JAAIAIwEAEHN1cGVyRmFpbHVyZV8kZXEBAA1vY2NsdXNpb25UZXN0AQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgwACQARCgACACgBACZzY2FsYS9jb2xsZWN0aW9uL211dGFibGUvU3RyaW5nQnVpbGRlcgcAKgEABjxpbml0PgEAAygpVgwALAAtCgArAC4BAAZzdXBlcjoIADABAAZhcHBlbmQBADwoTGphdmEvbGFuZy9PYmplY3Q7KUxzY2FsYS9jb2xsZWN0aW9uL211dGFibGUvU3RyaW5nQnVpbGRlcjsMADIAMwoAKwA0DAAMABkKAAIANgEACHRvU3RyaW5nDAA4ABkKACsAOQEADmphdmEvdXRpbC9MaXN0BwA7AQADYWRkAQAVKExqYXZhL2xhbmcvT2JqZWN0OylaDAA9AD4LADwAPwwAEAAeCgACAEEBAB9qYXZhL2xhbmcvSWxsZWdhbFN0YXRlRXhjZXB0aW9uBwBDAQANc3VwZXIgZmFpbHVyZQgARQwALAAdCgBEAEcMAA4AHgoAAgBJAQAEcGFydAEAIkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDsBAAQoSSlWDAAsAE0KAAQATgEAE2phdmEvdXRpbC9BcnJheUxpc3QHAFAKAFEALgEABHNlbGYIAFMBAAlTaWduYXR1cmUBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQAmKClMamF2YS91dGlsL0xpc3Q8TGphdmEvbGFuZy9TdHJpbmc7PjsBACcoTGphdmEvdXRpbC9MaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47KVYBAA1TdGFja01hcFRhYmxlAQAKU291cmNlRmlsZQEAGVJ1bnRpbWVWaXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwQhAAIABAAAAAQAAgAJAAoAAQBVAAAAAgALAAIADAANAAAAAgAOAA8AAAACABAADwAAAAoAAQAJABEAAgBWAAAALwABAAEAAAAFKrQAE7AAAAACAFcAAAAMAAEAAAAFABQAFQAAAFgAAAAGAAEAAAAJAFUAAAACAFkAAQAWABcAAgBWAAAAOgACAAIAAAAGKiu1ABOxAAAAAgBXAAAAFgACAAAABgAUABUAAAAAAAYAGAAKAAEAWAAAAAYAAQAAAAkAVQAAAAIAWgABAAwAGQABAFYAAAAvAAEAAQAAAAUqtAAbsAAAAAIAVwAAAAwAAQAAAAUAFAAVAAAAWAAAAAYAAQAAAAoAAQAcAB0AAQBWAAAAOgACAAIAAAAGKiu1ABuxAAAAAgBXAAAAFgACAAAABgAUABUAAAAAAAYAGAANAAEAWAAAAAYAAQAAAAoAAQAOAB4AAQBWAAAALwABAAEAAAAFKrQAIKwAAAACAFcAAAAMAAEAAAAFABQAFQAAAFgAAAAGAAEAAAALAAEAIQAiAAEAVgAAADoAAgACAAAABiobtQAgsQAAAAIAVwAAABYAAgAAAAYAFAAVAAAAAAAGABgADwABAFgAAAAGAAEAAAALAAEAEAAeAAEAVgAAAC8AAQABAAAABSq0ACSsAAAAAgBXAAAADAABAAAABQAUABUAAABYAAAABgABAAAADAABACUAIgABAFYAAAA6AAIAAgAAAAYqG7UAJLEAAAACAFcAAAAWAAIAAAAGABQAFQAAAAAABgAYAA8AAQBYAAAABgABAAAADAABACYAJwABAFYAAAB7AAMAAgAAADYqtgApuwArWbcALxIxtgA1KrYAN7YANbYAOrkAQAIAVyq2AEKZAA27AERZEka3AEi/KrYASqwAAAADAFcAAAAWAAIAAAA2ABQAFQAAAAAANgBLAEwAAQBYAAAADgADAAAADwAgABAAMQARAFsAAAADAAExAAEALAAtAAEAVgAAAFwAAwABAAAAIioQH7cATyq7AFFZtwBStQATKhJUtQAbKgS1ACAqA7UAJLEAAAACAFcAAAAMAAEAAAAiABQAFQAAAFgAAAAWAAUAAAAIAAYACQARAAoAFwALABwADAADAFwAAAACAAUAXQAAAAsAAQAGAAEAB3MACABeAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaAppliedTypeDescriptor$$anon$1.class.b64 b/src/test/resources/compat/ReferenceScalaAppliedTypeDescriptor$$anon$1.class.b64 new file mode 100644 index 0000000..9625d02 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaAppliedTypeDescriptor$$anon$1.class.b64 @@ -0,0 +1,33 @@ +yv66vgAAADQANgEASGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFB +cHBsaWVkVHlwZURlc2NyaXB0b3IkJGFub24kMQcAAQEANGNvZGVjaGlja2VuL211bHRpcGFydC9h +c20vU2NhbGFTaWduYXR1cmUkVHlwZVJlZlR5cGUHAAMBAClSZWZlcmVuY2VTY2FsYUFwcGxpZWRU +eXBlRGVzY3JpcHRvci5zY2FsYQEAQGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJl +bmNlU2NhbGFBcHBsaWVkVHlwZURlc2NyaXB0b3IHAAYBAANyZWYBAKAoTGNvZGVjaGlja2VuL211 +bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7TGphdmEvdXRpbC9mdW5jdGlvbi9TdXBwbGllcjtM +c2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvTGlzdDspTGNvZGVjaGlja2VuL211bHRpcGFydC9h +c20vU2NhbGFTaWduYXR1cmUkVHlwZVJlZlR5cGU7DAAIAAkBAAduYW1lcyQxAQAdTGphdmEvdXRp +bC9mdW5jdGlvbi9TdXBwbGllcjsBAARuYW1lAQAUKClMamF2YS9sYW5nL1N0cmluZzsMAAsADAkA +AgAPAQAbamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyBwARAQADZ2V0AQAUKClMamF2YS9sYW5n +L09iamVjdDsMABMAFAsAEgAVAQAQamF2YS9sYW5nL1N0cmluZwcAFwEABHRoaXMBAEpMY29kZWNo +aWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUFwcGxpZWRUeXBlRGVzY3JpcHRv +ciQkYW5vbiQxOwEABjxpbml0PgEArShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZl +cmVuY2VTY2FsYUFwcGxpZWRUeXBlRGVzY3JpcHRvcjtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2Fz +bS9TY2FsYVNpZ25hdHVyZTtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyO0xzY2FsYS9jb2xs +ZWN0aW9uL2ltbXV0YWJsZS9MaXN0OylWAQC0KExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1Nj +YWxhU2lnbmF0dXJlO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFR5 +cGVSZWY7TGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkU3ltYm9sUmVm +O0xzY2FsYS9jb2xsZWN0aW9uL2ltbXV0YWJsZS9MaXN0OylWDAAbAB0KAAQAHgEABiRvdXRlcgEA +Qkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhQXBwbGllZFR5cGVE +ZXNjcmlwdG9yOwEABXNpZyQxAQAqTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWdu +YXR1cmU7AQALYXJndW1lbnRzJDEBACFMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvTGlzdDsB +ADBjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFR5cGVSZWYHACYBAChj +b2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlBwAoAQAHVHlwZVJlZgEAMmNv +ZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkU3ltYm9sUmVmBwArAQAJU3lt +Ym9sUmVmAQALVHlwZVJlZlR5cGUBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51 +bWJlclRhYmxlAQAKU291cmNlRmlsZQEAD0VuY2xvc2luZ01ldGhvZAEADElubmVyQ2xhc3NlcwEA +BVNjYWxhADEAAgAEAAAAAQASAAsADAAAAAIAAQANAA4AAQAvAAAANwABAAEAAAANKrQAELkAFgEA +wAAYsAAAAAIAMAAAAAwAAQAAAA0AGQAaAAAAMQAAAAYAAQAAABIAAQAbABwAAQAvAAAAcQAFAAUA +AAAPKi21ABAqLAEBGQS3AB+xAAAAAgAwAAAANAAFAAAADwAZABoAAAAAAA8AIAAhAAEAAAAPACIA +IwACAAAADwALAAwAAwAAAA8AJAAlAAQAMQAAABYABQAAAA0ABwAOAAgADwAJABAACwANAAQAMgAA +AAIABQAzAAAABAAHAAoANAAAACIABAAnACkAKgYBACwAKQAtBgEABAApAC4AAQACAAAAAAARADUA +AAAA diff --git a/src/test/resources/compat/ReferenceScalaAppliedTypeDescriptor.class.b64 b/src/test/resources/compat/ReferenceScalaAppliedTypeDescriptor.class.b64 new file mode 100644 index 0000000..13b8ae7 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaAppliedTypeDescriptor.class.b64 @@ -0,0 +1,42 @@ +yv66vgAAADQAMQEAQGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFB +cHBsaWVkVHlwZURlc2NyaXB0b3IHAAEBABBqYXZhL2xhbmcvT2JqZWN0BwADAQApUmVmZXJlbmNl +U2NhbGFBcHBsaWVkVHlwZURlc2NyaXB0b3Iuc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNp +Z25hdHVyZTsBAAVieXRlcwECEwYBLTNBIQECARMJGSMrGjRmZRZ0Ny1aKmRDMgwXCR05bVMWJEcr +HzlmCRYcOE1dNXFpPhQoQkECBQMZGXcuHDliaSoRUUFCAQpbVmRHLxs5YmVSVBFhQgEMRz4kV20Z +NWpHLixnbgEBFAUBUQFDQQYPGwVhISJBBwILTRwXDVwxCgU9YSFBQiFvc0orZw1DAxIBEQUhIwEE +PVM6TEdPEAsCJ0ERQQNBBwIFISlhAwFDAS8FGSEvGjQVCWEJM0UOCQMzfQEiQUcPDgNtUSEBCAMC +BwUcWC4DAh83CXExa1kxbUNOS3dNXDF1a0osF0IBER4FLSEWEF0zU0saJBYQXTMJCwkqAhlBDQIH +TUx3DUMDJSsBB1ElQQNvQzYsNw9FAidbPWoRYQoGA1ElCgFCWjtvR1JMd04cBgNVLQpBIR47alkq +CUEmAQNrQ1oMF0IBGCgFIRlWDx05bVMWFAhDARk0HQlZEScDAjMZBTEBS10zZUsaTCEBThsDDU0j +KC8bOGgVCRFEAkMDOCsBBwEoQQViZR4sWC4aOHVnQhkRKBEjDwVpemRCQR4/GwVhJEJBHwkDGWEk +b1w4dX0lCVEiAwJBGQU5AS9ZMmxDHiwXQgEiRAURYRVuHTsLBQFjAUNBDUYTCTFVREEEVXNCLCcr +GjQJCyEDQRFBJQIVESw3bxk6amFSfCcPBgIwFSIpYWMSYQExAQEAA3JlZgEAoChMY29kZWNoaWNr +ZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBs +aWVyO0xzY2FsYS9jb2xsZWN0aW9uL2ltbXV0YWJsZS9MaXN0OylMY29kZWNoaWNrZW4vbXVsdGlw +YXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRUeXBlUmVmVHlwZTsBAEhjb2RlY2hpY2tlbi9tdWx0aXBh +cnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhQXBwbGllZFR5cGVEZXNjcmlwdG9yJCRhbm9uJDEHAAsB +AAY8aW5pdD4BAK0oTGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFB +cHBsaWVkVHlwZURlc2NyaXB0b3I7TGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWdu +YXR1cmU7TGphdmEvdXRpbC9mdW5jdGlvbi9TdXBwbGllcjtMc2NhbGEvY29sbGVjdGlvbi9pbW11 +dGFibGUvTGlzdDspVgwADQAOCgAMAA8BAAR0aGlzAQBCTGNvZGVjaGlja2VuL211bHRpcGFydC9j +b21wYXQvUmVmZXJlbmNlU2NhbGFBcHBsaWVkVHlwZURlc2NyaXB0b3I7AQADc2lnAQAqTGNvZGVj +aGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7AQAFbmFtZXMBAB1MamF2YS91dGls +L2Z1bmN0aW9uL1N1cHBsaWVyOwEACWFyZ3VtZW50cwEAIUxzY2FsYS9jb2xsZWN0aW9uL2ltbXV0 +YWJsZS9MaXN0OwEACmRlc2NyaXB0b3IBAEooTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2Nh +bGFTaWduYXR1cmUkVHlwZVJlZlR5cGU7KUxqYXZhL2xhbmcvU3RyaW5nOwEANGNvZGVjaGlja2Vu +L211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkVHlwZVJlZlR5cGUHABsBAAVqRGVzYwEAFCgp +TGphdmEvbGFuZy9TdHJpbmc7DAAdAB4KABwAHwEANkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNt +L1NjYWxhU2lnbmF0dXJlJFR5cGVSZWZUeXBlOwEAAygpVgwADQAiCgAEACMBAChjb2RlY2hpY2tl +bi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlBwAlAQALVHlwZVJlZlR5cGUBAARDb2RlAQAS +TG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQAJU2lnbmF0dXJlAQDoKExjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlO0xqYXZhL3V0aWwvZnVuY3Rpb24v +U3VwcGxpZXI8TGphdmEvbGFuZy9TdHJpbmc7PjtMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUv +TGlzdDxMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRUeXBlUmVmOz47 +KUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFR5cGVSZWZUeXBlOwEA +ClNvdXJjZUZpbGUBAAxJbm5lckNsYXNzZXMBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAI +U2NhbGFTaWcAIQACAAQAAAAAAAMAAQAJAAoAAgAoAAAAVAAGAAQAAAAMuwAMWSorLC23ABCwAAAA +AgApAAAAKgAEAAAADAARABIAAAAAAAwAEwAUAAEAAAAMABUAFgACAAAADAAXABgAAwAqAAAABgAB +AAAADQArAAAAAgAsAAEAGQAaAAEAKAAAADkAAQACAAAABSu2ACCwAAAAAgApAAAAFgACAAAABQAR +ABIAAAAAAAUACQAhAAEAKgAAAAYAAQAAABUAAQANACIAAQAoAAAALwABAAEAAAAFKrcAJLEAAAAC +ACkAAAAMAAEAAAAFABEAEgAAACoAAAAGAAEAAAAWAAQALQAAAAIABQAuAAAAEgACABwAJgAnAAEA +DAAAAAAAEQAvAAAACwABAAYAAQAHcwAIADAAAAADBQAA diff --git a/src/test/resources/compat/ReferenceScalaBlockMicroMaterialConsumer.class.b64 b/src/test/resources/compat/ReferenceScalaBlockMicroMaterialConsumer.class.b64 new file mode 100644 index 0000000..5f3b9b2 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaBlockMicroMaterialConsumer.class.b64 @@ -0,0 +1,31 @@ +yv66vgAAADQAOwEARWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFC +bG9ja01pY3JvTWF0ZXJpYWxDb25zdW1lcgcAAQEAEGphdmEvbGFuZy9PYmplY3QHAAMBAC5SZWZl +cmVuY2VTY2FsYUJsb2NrTWljcm9NYXRlcmlhbENvbnN1bWVyLnNjYWxhAQAeTHNjYWxhL3JlZmxl +Y3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBAY8GAUEyQSEBAgETCUEjKxo0ZmUWdDctWipkQzIM +JwlcOGRXNks3TV04TkNSLCcvWzFtBz50Ny9eN2ZlKhExAUIBB0c+bAcvGTsLBRUxESFDN3ZZUkwH +Lxk6dRUFORFhQzJwSRYcBy5bMmxLOhwBYQUCARVBETFCRAcCGSkJUSJBA3RHBmQXLQMCEBkJMRFJ +XD1TSxpEUSEFAQUCSQlhAVA1b1NSdEQjQQoRBVEBUSIBAgkLWQFBEUEMAhc1DEcvGjpqQzJcVS0f +CwQxfQkDQ0ENHR0JWSEkAwIcGQUxAUtdM2VLGkwhIQgQAw1NIygvGzhoFQlZQgJDAyErAQcBJAED +b0M2LAciAhIWAQQZEwFCN2ZpBgQiYQMTCgUVYiFhQSVvaSIpcQUBQwFRBREybRw4dGlKLDgNXjhz +CRY0Fy0eN3UrBRkDIgIWAQkDQRNhBTpmTyYcSE9dMXVTPnRHKRo0YmsyJAgiAhcBCQNpE0EDNWZZ +QiwnD1UxdGdSETFFDAUGXy0CDWFJAQZtBmRXLxoBAAttYXRlcmlhbEtleQEAJyhMamF2YS9sYW5n +L1N0cmluZztJKUxqYXZhL2xhbmcvU3RyaW5nOwEAKmNvZGVjaGlja2VuL21pY3JvYmxvY2svQmxv +Y2tNaWNyb01hdGVyaWFsJAcACwEAB01PRFVMRSQBACxMY29kZWNoaWNrZW4vbWljcm9ibG9jay9C +bG9ja01pY3JvTWF0ZXJpYWwkOwwADQAOCQAMAA8MAAkACgoADAARAQAEdGhpcwEAR0xjb2RlY2hp +Y2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhQmxvY2tNaWNyb01hdGVyaWFsQ29u +c3VtZXI7AQAEbmFtZQEAEkxqYXZhL2xhbmcvU3RyaW5nOwEABG1ldGEBAAFJAQASY29uc3RydWN0 +b3JEZWZhdWx0AQADKClJAQAbJGxlc3Npbml0JGdyZWF0ZXIkZGVmYXVsdCQyDAAbABoKAAwAHAEA +E3JlZ2lzdHJhdGlvbkRlZmF1bHQBABtjcmVhdGVBbmRSZWdpc3RlciRkZWZhdWx0JDIMAB8AGgoA +DAAgAQAKaGVscGVyUGFzcwEABChJKUkBACxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01hdGVyaWFs +UmVuZGVySGVscGVyJAcAJAEALkxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01hdGVyaWFsUmVuZGVy +SGVscGVyJDsMAA0AJgkAJQAnAQAIcGFzc18kZXEBAAQoSSlWDAApACoKACUAKwEABHBhc3MMAC0A +GgoAJQAuAQAFdmFsdWUBAAY8aW5pdD4BAAMoKVYMADEAMgoABAAzAQAEQ29kZQEAEkxvY2FsVmFy +aWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBABlSdW50aW1lVmlzaWJs +ZUFubm90YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAAAAAAUAAQAJAAoAAQA1AAAARwADAAMAAAAJ +sgAQKxy2ABKwAAAAAgA2AAAAIAADAAAACQATABQAAAAAAAkAFQAWAAEAAAAJABcAGAACADcAAAAG +AAEAAAAHAAEAGQAaAAEANQAAADEAAQABAAAAB7IAELYAHawAAAACADYAAAAMAAEAAAAHABMAFAAA +ADcAAAAGAAEAAAAJAAEAHgAaAAEANQAAADEAAQABAAAAB7IAELYAIawAAAACADYAAAAMAAEAAAAH +ABMAFAAAADcAAAAGAAEAAAALAAEAIgAjAAEANQAAAEYAAgACAAAADrIAKBu2ACyyACi2AC+sAAAA +AgA2AAAAFgACAAAADgATABQAAAAAAA4AMAAYAAEANwAAAAoAAgAAAA4ABwAPAAEAMQAyAAEANQAA +AC8AAQABAAAABSq3ADSxAAAAAgA2AAAADAABAAAABQATABQAAAA3AAAABgABAAAAEQADADgAAAAC +AAUAOQAAAAsAAQAGAAEAB3MACAA6AAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaClassParent$$anon$1.class.b64 b/src/test/resources/compat/ReferenceScalaClassParent$$anon$1.class.b64 new file mode 100644 index 0000000..75dddc5 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaClassParent$$anon$1.class.b64 @@ -0,0 +1,30 @@ +yv66vgAAADQAOAEAPmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFD +bGFzc1BhcmVudCQkYW5vbiQxBwABAQAyY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNp +Z25hdHVyZSRDbGFzc1R5cGUHAAMBAB9SZWZlcmVuY2VTY2FsYUNsYXNzUGFyZW50LnNjYWxhAQA2 +Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUNsYXNzUGFyZW50BwAG +AQAEaW5mbwEAfShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2 +YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOylMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2Fs +YVNpZ25hdHVyZSRDbGFzc1R5cGU7DAAIAAkBAAZyZWFkJDEBAB1MamF2YS91dGlsL2Z1bmN0aW9u +L1N1cHBsaWVyOwEABnBhcmVudAEANCgpTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFT +aWduYXR1cmUkVHlwZVJlZjsMAAsADAkAAgAPAQAbamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVy +BwARAQADZ2V0AQAUKClMamF2YS9sYW5nL09iamVjdDsMABMAFAsAEgAVAQAwY29kZWNoaWNrZW4v +bXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRUeXBlUmVmBwAXAQAEdGhpcwEAQExjb2RlY2hp +Y2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhQ2xhc3NQYXJlbnQkJGFub24kMTsB +AAY8aW5pdD4BAIIoTGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFD +bGFzc1BhcmVudDtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2 +YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOylWAQAfc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUv +TmlsJAcAHQEAB01PRFVMRSQBACFMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvTmlsJDsMAB8A +IAkAHgAhAQCCKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlO0xjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFN5bWJvbFJlZjtMc2NhbGEvY29s +bGVjdGlvbi9pbW11dGFibGUvTGlzdDspVgwAGwAjCgAEACQBAAYkb3V0ZXIBADhMY29kZWNoaWNr +ZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUNsYXNzUGFyZW50OwEABXNpZyQxAQAq +TGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7AQAoY29kZWNoaWNrZW4v +bXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZQcAKgEAB1R5cGVSZWYBAAlDbGFzc1R5cGUBADJj +b2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFN5bWJvbFJlZgcALgEACVN5 +bWJvbFJlZgEABENvZGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAA9MaW5lTnVtYmVyVGFibGUBAApT +b3VyY2VGaWxlAQAPRW5jbG9zaW5nTWV0aG9kAQAMSW5uZXJDbGFzc2VzAQAFU2NhbGEAMQACAAQA +AAABABIACwAMAAAAAgABAA0ADgABADEAAAA3AAEAAQAAAA0qtAAQuQAWAQDAABiwAAAAAgAyAAAA +DAABAAAADQAZABoAAAAzAAAABgABAAAAEQABABsAHAABADEAAABXAAQABAAAAA8qLbUAECosAbIA +IrcAJbEAAAACADIAAAAqAAQAAAAPABkAGgAAAAAADwAmACcAAQAAAA8AKAApAAIAAAAPAAsADAAD +ADMAAAAGAAEAAAAQAAQANAAAAAIABQA1AAAABAAHAAoANgAAACIABAAYACsALAYBAAQAKwAtAAEA +LwArADAGAQACAAAAAAARADcAAAAA \ No newline at end of file diff --git a/src/test/resources/compat/ReferenceScalaClassParent$$anon$2.class.b64 b/src/test/resources/compat/ReferenceScalaClassParent$$anon$2.class.b64 new file mode 100644 index 0000000..1392cdc --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaClassParent$$anon$2.class.b64 @@ -0,0 +1,83 @@ +yv66vgAAADQAmgEAPmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFD +bGFzc1BhcmVudCQkYW5vbiQyBwABAQAQamF2YS9sYW5nL09iamVjdAcAAwEAN2NvZGVjaGlja2Vu +L211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NTeW1ib2xSZWYHAAUBAB9SZWZlcmVu +Y2VTY2FsYUNsYXNzUGFyZW50LnNjYWxhAQA2Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9S +ZWZlcmVuY2VTY2FsYUNsYXNzUGFyZW50BwAIAQADcmVmAQCCKExjb2RlY2hpY2tlbi9tdWx0aXBh +cnQvYXNtL1NjYWxhU2lnbmF0dXJlO0xqYXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXI7KUxjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzU3ltYm9sUmVmOwwACgAL +AQAFc2lnJDIBACpMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTsBAAdp +bmZvcyQxAQAdTGphdmEvdXRpbC9mdW5jdGlvbi9TdXBwbGllcjsBAARmdWxsAQAUKClMamF2YS9s +YW5nL1N0cmluZzsBAD1jb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENs +YXNzU3ltYm9sUmVmJGNsYXNzBwATAQBNKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxh +U2lnbmF0dXJlJENsYXNzU3ltYm9sUmVmOylMamF2YS9sYW5nL1N0cmluZzsMABEAFQoAFAAWAQAE +dGhpcwEAQExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhQ2xhc3NQ +YXJlbnQkJGFub24kMjsBAAh0b1N0cmluZwwAGgAVCgAUABsBAAhpc09iamVjdAEAAygpWgEAPChM +Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1N5bWJvbFJlZjsp +WgwAHQAfCgAUACABAAdqUGFyZW50DAAiABUKABQAIwEAC2pJbnRlcmZhY2VzAQAjKClMc2NhbGEv +Y29sbGVjdGlvbi9pbW11dGFibGUvTGlzdDsBAFwoTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20v +U2NhbGFTaWduYXR1cmUkQ2xhc3NTeW1ib2xSZWY7KUxzY2FsYS9jb2xsZWN0aW9uL2ltbXV0YWJs +ZS9MaXN0OwwAJQAnCgAUACgBAAdoYXNGbGFnAQAEKEkpWgEAOGNvZGVjaGlja2VuL211bHRpcGFy +dC9hc20vU2NhbGFTaWduYXR1cmUkU3ltYm9sUmVmJGNsYXNzBwAsAQA4KExjb2RlY2hpY2tlbi9t +dWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFN5bWJvbFJlZjtJKVoMACoALgoALQAvAQAEZmxh +ZwEAAUkBAAlpc1ByaXZhdGUBADRjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0 +dXJlJEZsYWdzJGNsYXNzBwA0AQAzKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2ln +bmF0dXJlJEZsYWdzOylaDAAzADYKADUANwEAC2lzUHJvdGVjdGVkDAA5ADYKADUAOgEACmlzQWJz +dHJhY3QMADwANgoANQA9AQAKaXNEZWZlcnJlZAwAPwA2CgA1AEABAAhpc01ldGhvZAwAQgA2CgA1 +AEMBAAhpc01vZHVsZQwARQA2CgA1AEYBAAtpc0ludGVyZmFjZQwASAA2CgA1AEkBAAdpc1BhcmFt +DABLADYKADUATAEACGlzU3RhdGljDABOADYKADUATwEAB2lzVHJhaXQMAFEANgoANQBSAQAKaXNB +Y2Nlc3NvcgwAVAA2CgA1AFUBAARuYW1lAQAGdW51c2VkCABYAQAFb3duZXIBABcoKUxzY2FsYS9y +dW50aW1lL051bGwkOwEABWZsYWdzAQADKClJAQAGaW5mb0lkAQAEaW5mbwEANigpTGNvZGVjaGlj +a2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NUeXBlOwwADwAQCQACAGEBABtq +YXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXIHAGMBAANnZXQBABQoKUxqYXZhL2xhbmcvT2JqZWN0 +OwwAZQBmCwBkAGcBADJjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENs +YXNzVHlwZQcAaQEAP2NvZGVjaGlja2VuJG11bHRpcGFydCRhc20kU2NhbGFTaWduYXR1cmUkQ2xh +c3NTeW1ib2xSZWYkJCRvdXRlcgEALCgpTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFT +aWduYXR1cmU7DAANAA4JAAIAbQEAOmNvZGVjaGlja2VuJG11bHRpcGFydCRhc20kU2NhbGFTaWdu +YXR1cmUkU3ltYm9sUmVmJCQkb3V0ZXIBADYoKUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1Nj +YWxhU2lnbmF0dXJlJFN5bWJvbFJlZjsMAFoAWwoAAgBxAQAGPGluaXQ+AQCCKExjb2RlY2hpY2tl +bi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhQ2xhc3NQYXJlbnQ7TGNvZGVjaGlja2Vu +L211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7TGphdmEvdXRpbC9mdW5jdGlvbi9TdXBwbGll +cjspVgEAAygpVgwAcwB1CgAEAHYBAAYkaW5pdCQBADMoTGNvZGVjaGlja2VuL211bHRpcGFydC9h +c20vU2NhbGFTaWduYXR1cmUkRmxhZ3M7KVYMAHgAeQoANQB6AQA3KExjb2RlY2hpY2tlbi9tdWx0 +aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFN5bWJvbFJlZjspVgwAeAB8CgAtAH0BADwoTGNvZGVj +aGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NTeW1ib2xSZWY7KVYMAHgA +fwoAFACAAQAGJG91dGVyAQA4TGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNl +U2NhbGFDbGFzc1BhcmVudDsBAC5jb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0 +dXJlJEZsYWdzBwCEAQAoY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZQcA +hgEABUZsYWdzAQAyY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRTeW1i +b2xSZWYHAIkBAAlTeW1ib2xSZWYBAAlDbGFzc1R5cGUBAAtGbGFncyRjbGFzcwEADkNsYXNzU3lt +Ym9sUmVmAQAPU3ltYm9sUmVmJGNsYXNzAQAUQ2xhc3NTeW1ib2xSZWYkY2xhc3MBAARDb2RlAQAS +TG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQAJU2lnbmF0dXJlAQA3KClMc2Nh +bGEvY29sbGVjdGlvbi9pbW11dGFibGUvTGlzdDxMamF2YS9sYW5nL1N0cmluZzs+OwEAClNvdXJj +ZUZpbGUBAA9FbmNsb3NpbmdNZXRob2QBAAxJbm5lckNsYXNzZXMBAAVTY2FsYQAxAAIABAABAAYA +AgASAA0ADgAAABIADwAQAAAAGgABABEAEgABAJEAAAAvAAEAAQAAAAUquAAXsAAAAAIAkgAAAAwA +AQAAAAUAGAAZAAAAkwAAAAYAAQAAABcAAQAaABIAAQCRAAAALwABAAEAAAAFKrgAHLAAAAACAJIA +AAAMAAEAAAAFABgAGQAAAJMAAAAGAAEAAAAXAAEAHQAeAAEAkQAAAC8AAQABAAAABSq4ACGsAAAA +AgCSAAAADAABAAAABQAYABkAAACTAAAABgABAAAAFwABACIAEgABAJEAAAAvAAEAAQAAAAUquAAk +sAAAAAIAkgAAAAwAAQAAAAUAGAAZAAAAkwAAAAYAAQAAABcAAQAlACYAAgCRAAAALwABAAEAAAAF +KrgAKbAAAAACAJIAAAAMAAEAAAAFABgAGQAAAJMAAAAGAAEAAAAXAJQAAAACAJUAAQAqACsAAQCR +AAAAOgACAAIAAAAGKhu4ADCsAAAAAgCSAAAAFgACAAAABgAYABkAAAAAAAYAMQAyAAEAkwAAAAYA +AQAAABcAAQAzAB4AAQCRAAAALwABAAEAAAAFKrgAOKwAAAACAJIAAAAMAAEAAAAFABgAGQAAAJMA +AAAGAAEAAAAXAAEAOQAeAAEAkQAAAC8AAQABAAAABSq4ADusAAAAAgCSAAAADAABAAAABQAYABkA +AACTAAAABgABAAAAFwABADwAHgABAJEAAAAvAAEAAQAAAAUquAA+rAAAAAIAkgAAAAwAAQAAAAUA +GAAZAAAAkwAAAAYAAQAAABcAAQA/AB4AAQCRAAAALwABAAEAAAAFKrgAQawAAAACAJIAAAAMAAEA +AAAFABgAGQAAAJMAAAAGAAEAAAAXAAEAQgAeAAEAkQAAAC8AAQABAAAABSq4AESsAAAAAgCSAAAA +DAABAAAABQAYABkAAACTAAAABgABAAAAFwABAEUAHgABAJEAAAAvAAEAAQAAAAUquABHrAAAAAIA +kgAAAAwAAQAAAAUAGAAZAAAAkwAAAAYAAQAAABcAAQBIAB4AAQCRAAAALwABAAEAAAAFKrgASqwA +AAACAJIAAAAMAAEAAAAFABgAGQAAAJMAAAAGAAEAAAAXAAEASwAeAAEAkQAAAC8AAQABAAAABSq4 +AE2sAAAAAgCSAAAADAABAAAABQAYABkAAACTAAAABgABAAAAFwABAE4AHgABAJEAAAAvAAEAAQAA +AAUquABQrAAAAAIAkgAAAAwAAQAAAAUAGAAZAAAAkwAAAAYAAQAAABcAAQBRAB4AAQCRAAAALwAB +AAEAAAAFKrgAU6wAAAACAJIAAAAMAAEAAAAFABgAGQAAAJMAAAAGAAEAAAAXAAEAVAAeAAEAkQAA +AC8AAQABAAAABSq4AFasAAAAAgCSAAAADAABAAAABQAYABkAAACTAAAABgABAAAAFwABAFcAEgAB +AJEAAAAtAAEAAQAAAAMSWbAAAAACAJIAAAAMAAEAAAADABgAGQAAAJMAAAAGAAEAAAAYAAEAWgBb +AAEAkQAAACwAAQABAAAAAgGwAAAAAgCSAAAADAABAAAAAgAYABkAAACTAAAABgABAAAAGQABAFwA +XQABAJEAAAAsAAEAAQAAAAIDrAAAAAIAkgAAAAwAAQAAAAIAGAAZAAAAkwAAAAYAAQAAABoAAQBe +AF0AAQCRAAAALAABAAEAAAACA6wAAAACAJIAAAAMAAEAAAACABgAGQAAAJMAAAAGAAEAAAAbAAEA +XwBgAAEAkQAAADcAAQABAAAADSq0AGK5AGgBAMAAarAAAAACAJIAAAAMAAEAAAANABgAGQAAAJMA +AAAGAAEAAAAcEAEAawBsAAEAkQAAACMAAQABAAAABSq0AG6wAAAAAQCSAAAADAABAAAABQAYABkA +ABABAG8AbAABAJEAAAAjAAEAAQAAAAUqtABusAAAAAEAkgAAAAwAAQAAAAUAGAAZAAAQQQBaAHAA +AQCRAAAAMwABAAEAAAAJKrYAclcBVwGwAAAAAgCSAAAADAABAAAACQAYABkAAACTAAAABgABAAAA +FwABAHMAdAABAJEAAABjAAIABAAAABsqLLUAbiottQBiKrcAdyq4AHsquAB+KrgAgbEAAAACAJIA +AAAqAAQAAAAbABgAGQAAAAAAGwCCAIMAAQAAABsADQAOAAIAAAAbAA8AEAADAJMAAAAGAAEAAAAX +AAQAlgAAAAIABwCXAAAABAAJAAwAmAAAAEIACACFAIcAiAYJAIoAhwCLBgEAagCHAIwAAQA1AIcA +jQQJAAYAhwCOBgEALQCHAI8EAQACAAAAAAARABQAhwCQBAEAmQAAAAA= \ No newline at end of file diff --git a/src/test/resources/compat/ReferenceScalaClassParent.class.b64 b/src/test/resources/compat/ReferenceScalaClassParent.class.b64 new file mode 100644 index 0000000..0b4aec1 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaClassParent.class.b64 @@ -0,0 +1,62 @@ +yv66vgAAADQARAEANmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFD +bGFzc1BhcmVudAcAAQEAEGphdmEvbGFuZy9PYmplY3QHAAMBAB9SZWZlcmVuY2VTY2FsYUNsYXNz +UGFyZW50LnNjYWxhAQAeTHNjYWxhL3JlZmxlY3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBAmwG +AWUzQSEBAgETCUkiKxo0ZmUWdDctWipkQzIMNwlcMXRnQgsnLxo4dRUJGUEhAQRkXzYEGA0eBgML +GQkRIlw7bWkmBBhNHTsLAx0JMWJZOGVLDkQXblk2Zl0OATFDAQELIQlZYSJEAQ0VBWkRIUI6ZEMy +DBdCQQgNBRkJZS4fKmZNIikRAwFDASUFMUEoGzhqaXoiEmEFCQMpAWkRQQEFBi0BIQlhRgEKRzIM +N28dK3phFiQyAUcRJCEJSXIEBQIbOzUJMUQDAh0JBRkRbV03CgV5WSJBRCpkQzIMNytbNG9DUiwo +L1oFA0F1ERFiETdiZ04kFhBdMwkLCSoCGUENAgdNTHcNQwMlKwEHUSVBBHFDSixnDl46EQcZchNH +BAIoWTkRAWZLBwJTKREhBkMBB3lJfHcOHiAKAzVJISEMBwIPQQw3bVsxaEsmEXEGDQIFGSYcSE8D +Ai4ZQRERRE0FA2d1EXEBVj1xS0orZw1DAzYBEQVhJwEDal0afEdjAQ04cSEpIQUOYQEzISkRCA5h +AXUFISEvWjFlIQ1ZJClNBwJ5KRFRSFABCU1WdDcNXjVwXSoRcQhRAQVrUkxHTkMBQgMRURdNXjEK +BQ1jJAFDKnZhQmQXLho6CQsVA0ERASQCB0ksZw1GAkgVLgMiIQclCgUlayJBRCJtQ04cOCtfN2Nf +MhRWTRoFBkURAw0hBwUGGRIDDSFUAQZTOjR3bh0JBHcJQwIiQigBCQMBFkECOWJlFnRHDwYCUjFC +ESErFggDF01LIQEWBwINQRNYDVozZxMJMXZLAQRUaUpMZ24aBgMpMkFRIRIoQQIdAwEACWNsYXNz +VHlwZQEAgShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMc2NhbGEv +Y29sbGVjdGlvbi9pbW11dGFibGUvTGlzdDspTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2Nh +bGFTaWduYXR1cmUkQ2xhc3NUeXBlOwEAMmNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFT +aWduYXR1cmUkQ2xhc3NUeXBlBwALAQAGPGluaXQ+AQCCKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQv +YXNtL1NjYWxhU2lnbmF0dXJlO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0 +dXJlJFN5bWJvbFJlZjtMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvTGlzdDspVgwADQAOCgAM +AA8BAAR0aGlzAQA4TGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFD +bGFzc1BhcmVudDsBAANzaWcBACpMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25h +dHVyZTsBAAdwYXJlbnRzAQAhTHNjYWxhL2NvbGxlY3Rpb24vaW1tdXRhYmxlL0xpc3Q7AQAEaW5m +bwEAfShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2YS91dGls +L2Z1bmN0aW9uL1N1cHBsaWVyOylMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25h +dHVyZSRDbGFzc1R5cGU7AQA+Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VT +Y2FsYUNsYXNzUGFyZW50JCRhbm9uJDEHABkBAIIoTGNvZGVjaGlja2VuL211bHRpcGFydC9jb21w +YXQvUmVmZXJlbmNlU2NhbGFDbGFzc1BhcmVudDtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9T +Y2FsYVNpZ25hdHVyZTtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOylWDAANABsKABoAHAEA +BHJlYWQBAB1MamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOwEAA3JlZgEAgihMY29kZWNoaWNr +ZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBs +aWVyOylMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1N5bWJv +bFJlZjsBAD5jb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhQ2xhc3NQ +YXJlbnQkJGFub24kMgcAIgoAIwAcAQAFaW5mb3MBAAZwYXJlbnQBAE0oTGNvZGVjaGlja2VuL211 +bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NTeW1ib2xSZWY7KUxqYXZhL2xhbmcvU3Ry +aW5nOwEAN2NvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NTeW1i +b2xSZWYHACgBAAdqUGFyZW50AQAUKClMamF2YS9sYW5nL1N0cmluZzsMACoAKwsAKQAsAQA5TGNv +ZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NTeW1ib2xSZWY7AQAD +KClWDAANAC8KAAQAMAEAKGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUH +ADIBAAlDbGFzc1R5cGUBADJjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJl +JFN5bWJvbFJlZgcANQEACVN5bWJvbFJlZgEADkNsYXNzU3ltYm9sUmVmAQAEQ29kZQEAEkxvY2Fs +VmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEACVNpZ25hdHVyZQEAtShMY29kZWNoaWNr +ZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFi +bGUvTGlzdDxMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRUeXBlUmVm +Oz47KUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzVHlwZTsB +ALEoTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7TGphdmEvdXRpbC9m +dW5jdGlvbi9TdXBwbGllcjxMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVy +ZSRUeXBlUmVmOz47KUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENs +YXNzVHlwZTsBALgoTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7TGph +dmEvdXRpbC9mdW5jdGlvbi9TdXBwbGllcjxMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2Fs +YVNpZ25hdHVyZSRDbGFzc1R5cGU7PjspTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFT +aWduYXR1cmUkQ2xhc3NTeW1ib2xSZWY7AQAKU291cmNlRmlsZQEADElubmVyQ2xhc3NlcwEAGVJ1 +bnRpbWVWaXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwAhAAIABAAAAAAABQABAAkACgACADkA +AABJAAUAAwAAAAu7AAxZKwEstwAQsAAAAAIAOgAAACAAAwAAAAsAEQASAAAAAAALABMAFAABAAAA +CwAVABYAAgA7AAAABgABAAAACwA8AAAAAgA9AAEAFwAYAAIAOQAAAEkABQADAAAAC7sAGlkqKyy3 +AB2wAAAAAgA6AAAAIAADAAAACwARABIAAAAAAAsAEwAUAAEAAAALAB4AHwACADsAAAAGAAEAAAAQ +ADwAAAACAD4AAQAgACEAAgA5AAAASQAFAAMAAAALuwAjWSorLLcAJLAAAAACADoAAAAgAAMAAAAL +ABEAEgAAAAAACwATABQAAQAAAAsAJQAfAAIAOwAAAAYAAQAAABcAPAAAAAIAPwABACYAJwABADkA +AAA7AAEAAgAAAAcruQAtAQCwAAAAAgA6AAAAFgACAAAABwARABIAAAAAAAcAIAAuAAEAOwAAAAYA +AQAAAB8AAQANAC8AAQA5AAAALwABAAEAAAAFKrcAMbEAAAACADoAAAAMAAEAAAAFABEAEgAAADsA +AAAGAAEAAAAgAAQAQAAAAAIABQBBAAAAKgAFAAwAMwA0AAEANgAzADcGAQApADMAOAYBABoAAAAA +ABEAIwAAAAAAEQBCAAAACwABAAYAAQAHcwAIAEMAAAADBQAA \ No newline at end of file diff --git a/src/test/resources/compat/ReferenceScalaClassSymbolFull$$anon$1.class.b64 b/src/test/resources/compat/ReferenceScalaClassSymbolFull$$anon$1.class.b64 new file mode 100644 index 0000000..963295b --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaClassSymbolFull$$anon$1.class.b64 @@ -0,0 +1,86 @@ +yv66vgAAADQAnQEAQmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFD +bGFzc1N5bWJvbEZ1bGwkJGFub24kMQcAAQEAEGphdmEvbGFuZy9PYmplY3QHAAMBADdjb2RlY2hp +Y2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzU3ltYm9sUmVmBwAFAQAjUmVm +ZXJlbmNlU2NhbGFDbGFzc1N5bWJvbEZ1bGwuc2NhbGEBADpjb2RlY2hpY2tlbi9tdWx0aXBhcnQv +Y29tcGF0L1JlZmVyZW5jZVNjYWxhQ2xhc3NTeW1ib2xGdWxsBwAIAQADcmVmAQCfKExjb2RlY2hp +Y2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlO0xqYXZhL3V0aWwvZnVuY3Rpb24vU3Vw +cGxpZXI7TGphdmEvdXRpbC9mdW5jdGlvbi9TdXBwbGllcjspTGNvZGVjaGlja2VuL211bHRpcGFy +dC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NTeW1ib2xSZWY7DAAKAAsBAAVzaWckMQEAKkxjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlOwEACG93bmVycyQxAQAdTGphdmEv +dXRpbC9mdW5jdGlvbi9TdXBwbGllcjsBAAduYW1lcyQxAQAEZnVsbAEAFCgpTGphdmEvbGFuZy9T +dHJpbmc7AQA9Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1N5 +bWJvbFJlZiRjbGFzcwcAFAEATShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25h +dHVyZSRDbGFzc1N5bWJvbFJlZjspTGphdmEvbGFuZy9TdHJpbmc7DAASABYKABUAFwEABHRoaXMB +AERMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUNsYXNzU3ltYm9s +RnVsbCQkYW5vbiQxOwEACHRvU3RyaW5nDAAbABYKABUAHAEACGlzT2JqZWN0AQADKClaAQA8KExj +b2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzU3ltYm9sUmVmOyla +DAAeACAKABUAIQEABGluZm8BADYoKUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2ln +bmF0dXJlJENsYXNzVHlwZTsBAG8oTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWdu +YXR1cmUkQ2xhc3NTeW1ib2xSZWY7KUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2ln +bmF0dXJlJENsYXNzVHlwZTsMACMAJQoAFQAmAQAHalBhcmVudAwAKAAWCgAVACkBAAtqSW50ZXJm +YWNlcwEAIygpTHNjYWxhL2NvbGxlY3Rpb24vaW1tdXRhYmxlL0xpc3Q7AQBcKExjb2RlY2hpY2tl +bi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzU3ltYm9sUmVmOylMc2NhbGEvY29s +bGVjdGlvbi9pbW11dGFibGUvTGlzdDsMACsALQoAFQAuAQAHaGFzRmxhZwEABChJKVoBADhjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFN5bWJvbFJlZiRjbGFzcwcAMgEA +OChMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRTeW1ib2xSZWY7SSla +DAAwADQKADMANQEABGZsYWcBAAFJAQAJaXNQcml2YXRlAQA0Y29kZWNoaWNrZW4vbXVsdGlwYXJ0 +L2FzbS9TY2FsYVNpZ25hdHVyZSRGbGFncyRjbGFzcwcAOgEAMyhMY29kZWNoaWNrZW4vbXVsdGlw +YXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRGbGFnczspWgwAOQA8CgA7AD0BAAtpc1Byb3RlY3RlZAwA +PwA8CgA7AEABAAppc0Fic3RyYWN0DABCADwKADsAQwEACmlzRGVmZXJyZWQMAEUAPAoAOwBGAQAI +aXNNZXRob2QMAEgAPAoAOwBJAQAIaXNNb2R1bGUMAEsAPAoAOwBMAQALaXNJbnRlcmZhY2UMAE4A +PAoAOwBPAQAHaXNQYXJhbQwAUQA8CgA7AFIBAAhpc1N0YXRpYwwAVAA8CgA7AFUBAAdpc1RyYWl0 +DABXADwKADsAWAEACmlzQWNjZXNzb3IMAFoAPAoAOwBbAQAEbmFtZQwAEQAQCQACAF4BABtqYXZh +L3V0aWwvZnVuY3Rpb24vU3VwcGxpZXIHAGABAANnZXQBABQoKUxqYXZhL2xhbmcvT2JqZWN0OwwA +YgBjCwBhAGQBABBqYXZhL2xhbmcvU3RyaW5nBwBmAQAFb3duZXIBADYoKUxjb2RlY2hpY2tlbi9t +dWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFN5bWJvbFJlZjsMAA8AEAkAAgBqAQAyY29kZWNo +aWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRTeW1ib2xSZWYHAGwBAAVmbGFncwEA +AygpSQEABmluZm9JZAEAP2NvZGVjaGlja2VuJG11bHRpcGFydCRhc20kU2NhbGFTaWduYXR1cmUk +Q2xhc3NTeW1ib2xSZWYkJCRvdXRlcgEALCgpTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2Nh +bGFTaWduYXR1cmU7DAANAA4JAAIAcwEAOmNvZGVjaGlja2VuJG11bHRpcGFydCRhc20kU2NhbGFT +aWduYXR1cmUkU3ltYm9sUmVmJCQkb3V0ZXIBAAY8aW5pdD4BAKMoTGNvZGVjaGlja2VuL211bHRp +cGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFDbGFzc1N5bWJvbEZ1bGw7TGNvZGVjaGlja2VuL211 +bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7TGphdmEvdXRpbC9mdW5jdGlvbi9TdXBwbGllcjtM +amF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOylWAQADKClWDAB2AHgKAAQAeQEABiRpbml0JAEA +MyhMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRGbGFnczspVgwAewB8 +CgA7AH0BADcoTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkU3ltYm9s +UmVmOylWDAB7AH8KADMAgAEAPChMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25h +dHVyZSRDbGFzc1N5bWJvbFJlZjspVgwAewCCCgAVAIMBAAYkb3V0ZXIBADxMY29kZWNoaWNrZW4v +bXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUNsYXNzU3ltYm9sRnVsbDsBAC5jb2RlY2hp +Y2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJEZsYWdzBwCHAQAoY29kZWNoaWNrZW4v +bXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZQcAiQEABUZsYWdzAQAyY29kZWNoaWNrZW4vbXVs +dGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1R5cGUHAIwBAAlDbGFzc1R5cGUBAAlTeW1i +b2xSZWYBAAtGbGFncyRjbGFzcwEADkNsYXNzU3ltYm9sUmVmAQAPU3ltYm9sUmVmJGNsYXNzAQAU +Q2xhc3NTeW1ib2xSZWYkY2xhc3MBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51 +bWJlclRhYmxlAQAJU2lnbmF0dXJlAQA3KClMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvTGlz +dDxMamF2YS9sYW5nL1N0cmluZzs+OwEAClNvdXJjZUZpbGUBAA9FbmNsb3NpbmdNZXRob2QBAAxJ +bm5lckNsYXNzZXMBAAVTY2FsYQAxAAIABAABAAYAAwASAA0ADgAAABIADwAQAAAAEgARABAAAAAZ +AAEAEgATAAEAlAAAAC8AAQABAAAABSq4ABiwAAAAAgCVAAAADAABAAAABQAZABoAAACWAAAABgAB +AAAADAABABsAEwABAJQAAAAvAAEAAQAAAAUquAAdsAAAAAIAlQAAAAwAAQAAAAUAGQAaAAAAlgAA +AAYAAQAAAAwAAQAeAB8AAQCUAAAALwABAAEAAAAFKrgAIqwAAAACAJUAAAAMAAEAAAAFABkAGgAA +AJYAAAAGAAEAAAAMAAEAIwAkAAEAlAAAAC8AAQABAAAABSq4ACewAAAAAgCVAAAADAABAAAABQAZ +ABoAAACWAAAABgABAAAADAABACgAEwABAJQAAAAvAAEAAQAAAAUquAAqsAAAAAIAlQAAAAwAAQAA +AAUAGQAaAAAAlgAAAAYAAQAAAAwAAQArACwAAgCUAAAALwABAAEAAAAFKrgAL7AAAAACAJUAAAAM +AAEAAAAFABkAGgAAAJYAAAAGAAEAAAAMAJcAAAACAJgAAQAwADEAAQCUAAAAOgACAAIAAAAGKhu4 +ADasAAAAAgCVAAAAFgACAAAABgAZABoAAAAAAAYANwA4AAEAlgAAAAYAAQAAAAwAAQA5AB8AAQCU +AAAALwABAAEAAAAFKrgAPqwAAAACAJUAAAAMAAEAAAAFABkAGgAAAJYAAAAGAAEAAAAMAAEAPwAf +AAEAlAAAAC8AAQABAAAABSq4AEGsAAAAAgCVAAAADAABAAAABQAZABoAAACWAAAABgABAAAADAAB +AEIAHwABAJQAAAAvAAEAAQAAAAUquABErAAAAAIAlQAAAAwAAQAAAAUAGQAaAAAAlgAAAAYAAQAA +AAwAAQBFAB8AAQCUAAAALwABAAEAAAAFKrgAR6wAAAACAJUAAAAMAAEAAAAFABkAGgAAAJYAAAAG +AAEAAAAMAAEASAAfAAEAlAAAAC8AAQABAAAABSq4AEqsAAAAAgCVAAAADAABAAAABQAZABoAAACW +AAAABgABAAAADAABAEsAHwABAJQAAAAvAAEAAQAAAAUquABNrAAAAAIAlQAAAAwAAQAAAAUAGQAa +AAAAlgAAAAYAAQAAAAwAAQBOAB8AAQCUAAAALwABAAEAAAAFKrgAUKwAAAACAJUAAAAMAAEAAAAF +ABkAGgAAAJYAAAAGAAEAAAAMAAEAUQAfAAEAlAAAAC8AAQABAAAABSq4AFOsAAAAAgCVAAAADAAB +AAAABQAZABoAAACWAAAABgABAAAADAABAFQAHwABAJQAAAAvAAEAAQAAAAUquABWrAAAAAIAlQAA +AAwAAQAAAAUAGQAaAAAAlgAAAAYAAQAAAAwAAQBXAB8AAQCUAAAALwABAAEAAAAFKrgAWawAAAAC +AJUAAAAMAAEAAAAFABkAGgAAAJYAAAAGAAEAAAAMAAEAWgAfAAEAlAAAAC8AAQABAAAABSq4AFys +AAAAAgCVAAAADAABAAAABQAZABoAAACWAAAABgABAAAADAABAF0AEwABAJQAAAA3AAEAAQAAAA0q +tABfuQBlAQDAAGewAAAAAgCVAAAADAABAAAADQAZABoAAACWAAAABgABAAAADQABAGgAaQABAJQA +AAA3AAEAAQAAAA0qtABruQBlAQDAAG2wAAAAAgCVAAAADAABAAAADQAZABoAAACWAAAABgABAAAA +DgABAG4AbwABAJQAAAAsAAEAAQAAAAIDrAAAAAIAlQAAAAwAAQAAAAIAGQAaAAAAlgAAAAYAAQAA +AA8AAQBwAG8AAQCUAAAALAABAAEAAAACA6wAAAACAJUAAAAMAAEAAAACABkAGgAAAJYAAAAGAAEA +AAAQEAEAcQByAAEAlAAAACMAAQABAAAABSq0AHSwAAAAAQCVAAAADAABAAAABQAZABoAABABAHUA +cgABAJQAAAAjAAEAAQAAAAUqtAB0sAAAAAEAlQAAAAwAAQAAAAUAGQAaAAAAAQB2AHcAAQCUAAAA +cwACAAUAAAAhKiy1AHQqLbUAayoZBLUAXyq3AHoquAB+KrgAgSq4AISxAAAAAgCVAAAANAAFAAAA +IQAZABoAAAAAACEAhQCGAAEAAAAhAA0ADgACAAAAIQAPABAAAwAAACEAEQAQAAQAlgAAAAYAAQAA +AAwABACZAAAAAgAHAJoAAAAEAAkADACbAAAAQgAIAIgAigCLBgkAjQCKAI4AAQBtAIoAjwYBADsA +igCQBAkABgCKAJEGAQAzAIoAkgQBABUAigCTBAEAAgAAAAAAEQCcAAAAAA== \ No newline at end of file diff --git a/src/test/resources/compat/ReferenceScalaClassSymbolFull.class.b64 b/src/test/resources/compat/ReferenceScalaClassSymbolFull.class.b64 new file mode 100644 index 0000000..44b3f68 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaClassSymbolFull.class.b64 @@ -0,0 +1,40 @@ +yv66vgAAADQALwEAOmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFD +bGFzc1N5bWJvbEZ1bGwHAAEBABBqYXZhL2xhbmcvT2JqZWN0BwADAQAjUmVmZXJlbmNlU2NhbGFD +bGFzc1N5bWJvbEZ1bGwuc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVi +eXRlcwEBywYBATNBIQECARMJaSIrGjRmZRZ0Ny1aKmRDMgw3CVwxdGdOS1hOWThtDVZkR04DAgQJ +BTExbVw3cUNSVCEhAgQCEzUsSA5eNXFDSiQoIkEEAhcNfEctWjJpUw5cV01cAgEnCQEhAgUCDB01 +CUFCQwEOAxUZOC0ZN2ITCXlBQgEEQl1mFFZNGgUGIwEhCUFFAQd5JXQXDh4gFQNNASIBBgEOAwlB +UUEGAQUCXQkxQV0zZykRQRJlCRoRBWV5AkMBDh4bBVkiQgEPBQMNCTcvXAUDPW0RYWJVMmJZBhwW +bho4YmlWFFgtAwIhOwlxMQlcMXRnTktYTlk4bSUWNAciAhIWAQRJEmFBOmpPIilBJQZhAUsFMXFu +HjhmZU4EMkFKFzAbBTkjQgEVKgMhMVdPXDJ1Uz50J0IBFiwDESlILxs3CwMxCkFBWzF3QyYRYWYK +AgknVgQID1w1ZmVCEREETQUDY3UREWJVPW5FPmQnKxo0CQtNKgIZARsCCzkMVy5aOhEHGWpTBwUC +N3M5ETFiTgUDcTEJYQEVOmZJFjQXQgEePAUZGUZPXTVvTyoRAQgEBQZ7ASEJQVABBU1WZEcOBgI2 +fyEpYQMQYQExAQEAA3JlZgEAnyhMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25h +dHVyZTtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyO0xqYXZhL3V0aWwvZnVuY3Rpb24vU3Vw +cGxpZXI7KUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzU3lt +Ym9sUmVmOwEAQmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFDbGFz +c1N5bWJvbEZ1bGwkJGFub24kMQcACwEABjxpbml0PgEAoyhMY29kZWNoaWNrZW4vbXVsdGlwYXJ0 +L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUNsYXNzU3ltYm9sRnVsbDtMY29kZWNoaWNrZW4vbXVsdGlw +YXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyO0xqYXZh +L3V0aWwvZnVuY3Rpb24vU3VwcGxpZXI7KVYMAA0ADgoADAAPAQAEdGhpcwEAPExjb2RlY2hpY2tl +bi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhQ2xhc3NTeW1ib2xGdWxsOwEAA3NpZwEA +Kkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlOwEABm93bmVycwEAHUxq +YXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXI7AQAFbmFtZXMBAARmdWxsAQBNKExjb2RlY2hpY2tl +bi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzU3ltYm9sUmVmOylMamF2YS9sYW5n +L1N0cmluZzsBADdjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNz +U3ltYm9sUmVmBwAaAQAUKClMamF2YS9sYW5nL1N0cmluZzsMABgAHAsAGwAdAQA5TGNvZGVjaGlj +a2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NTeW1ib2xSZWY7AQADKClWDAAN +ACAKAAQAIQEAKGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUHACMBAA5D +bGFzc1N5bWJvbFJlZgEABENvZGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAA9MaW5lTnVtYmVyVGFi +bGUBAAlTaWduYXR1cmUBAOkoTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1 +cmU7TGphdmEvdXRpbC9mdW5jdGlvbi9TdXBwbGllcjxMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2Fz +bS9TY2FsYVNpZ25hdHVyZSRTeW1ib2xSZWY7PjtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVy +PExqYXZhL2xhbmcvU3RyaW5nOz47KUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2ln +bmF0dXJlJENsYXNzU3ltYm9sUmVmOwEAClNvdXJjZUZpbGUBAAxJbm5lckNsYXNzZXMBABlSdW50 +aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAAAAAAMAAQAJAAoAAgAmAAAA +VAAGAAQAAAAMuwAMWSorLC23ABCwAAAAAgAnAAAAKgAEAAAADAARABIAAAAAAAwAEwAUAAEAAAAM +ABUAFgACAAAADAAXABYAAwAoAAAABgABAAAADAApAAAAAgAqAAEAGAAZAAEAJgAAADsAAQACAAAA +Byu5AB4BALAAAAACACcAAAAWAAIAAAAHABEAEgAAAAAABwAJAB8AAQAoAAAABgABAAAAEwABAA0A +IAABACYAAAAvAAEAAQAAAAUqtwAisQAAAAIAJwAAAAwAAQAAAAUAEQASAAAAKAAAAAYAAQAAABQA +BAArAAAAAgAFACwAAAASAAIAGwAkACUGAQAMAAAAAAARAC0AAAALAAEABgABAAdzAAgALgAAAAMF +AAA= \ No newline at end of file diff --git a/src/test/resources/compat/ReferenceScalaCornerMicroblock.class.b64 b/src/test/resources/compat/ReferenceScalaCornerMicroblock.class.b64 new file mode 100644 index 0000000..74a09d8 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaCornerMicroblock.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAmQEAO2NvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFDb3JuZXJNaWNyb2Jsb2NrBwABAQAhY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrBwADAQAnY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db3JuZXJNaWNyb2Jsb2NrBwAFAQAkUmVmZXJlbmNlU2NhbGFDb3JuZXJNaWNyb2Jsb2NrLnNjYWxhAQAeTHNjYWxhL3JlZmxlY3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBAzYGAW0zQSEBAgETCXEiKxo0ZmUWdDctWipkQzIMN2kcOm9LSmwVbhk6cEUyfDdtGwYDBxEJYWFZOG5hBiQoQkEDBwMlaVcPHDtqYQYUSE9DAQgDLRl3DlozZFEmHDcuGjgEAU0ZAUEDCREFLXFRIgEHCwU1MRFBQzdqR0p8Jw1cOGRXJhFxAgQCCxsmHCdvHDJtXw5cB0NBBhITCRFCQgEJRF9KdFdNXSdqR0p8Jw1cOGRXIilBAwFDASsFMUEoGzhqaXoiEkEGCQMvAWkRQQEFCDMBAQ0RIgEbAxk5KC8bO2ZnVgkxBAUCHT81CVFEQwEfAxUZOC0ZN2ITCQFTREECSl1SRHFBCQFBAhMFMSUBBnhlJiRYbV0wJUtGJCIBShQRBXEpE0IBFB4FESlmLhs7CQ8hChMRIWEBNwUZARBKGQkNKQIBFSkDHAMdOSgvGztmZwJCcQEMAUECEwVRJgEHeGUmJEgvGjhUUQYEWC1GAS8hCWFyJgMCMTsJISEpHztmER0RBAExQQUCTQoBYx46amlSLGduFTViYRZ8RiVaORUFESIEYgIVMgMDBQ1BDAUHbQEBCxUCGAIbXRQYDh47Zl1OQxcNXTMhER1BBAExQQUCaQlRQV0zYklORHFBDwFBAhMFMShBBXNLBiQ3bxgTZmNSEUEFEAUIUWUKCRExARwRGXEEASlRBTcFMSEvWjFlZwJCcQERAUECEwURKUEHcG0WFCgvGzNmJyIMBy9aCwIFQhFBZFEFAwl2EXFBUThwWRYMZw5DBEcBAQdJEUEkAiM9NFhNHTpqSRYcBi4ZOWY/EioXDwYCJREiOQEmUkEBAgQRBUICJgFBAyYhKQEIcG0WFCgvGzNmJyIMBy8aEQkPMQMBGSFDATUFaTEvGjdmR1IsR20VNWJhFkRxQRQBQQITBXEqQQl0SzIsNw1eM2UnIgwHL1owJUtGJCIBCikJDyFqFREhYQE3ITEhCwFRIQptCWFiXTNtSw4kWA1aKmlDQiwHBUMDVQERBVMrQQV0UQYEWG0YE2ZjUhFBRRYFBi9OAw1BTAEGbQZkVy8aBQYzAiEJRVcBCU8WJDgLWzFxS1IJMQQBAAZ3cml0ZXMBAAFJAQAMd3JpdHRlblNoYXBlAQABQgEABXJlYWRzAQANb3ZlcnJpZGVTaGFwZQEAAVoBAA1zZWxlY3RlZFNoYXBlAQAIc2V0U2hhcGUBAAUoSUkpVgEALWNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29ybmVyTWljcm9ibG9jayRjbGFzcwcAFQEALihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db3JuZXJNaWNyb2Jsb2NrO0lJKVYMABMAFwoAFgAYAQAEdGhpcwEAPUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhQ29ybmVyTWljcm9ibG9jazsBAARzaXplAQAEc2xvdAEACm1pY3JvQ2xhc3MBACwoKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0Nvcm5lck1pY3JvQ2xhc3MkOwEAVShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db3JuZXJNaWNyb2Jsb2NrOylMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db3JuZXJNaWNyb0NsYXNzJDsMAB4AIAoAFgAhAQAJZ2V0Qm91bmRzAQAfKClMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwEASChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db3JuZXJNaWNyb2Jsb2NrOylMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwAIwAlCgAWACYBAAdnZXRTbG90AQADKClJAQAsKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0Nvcm5lck1pY3JvYmxvY2s7KUkMACgAKgoAFgArAQALZ2V0U2xvdE1hc2sBAC1jb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2skY2xhc3MHAC4BACwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jazspSQwALQAwCgAvADEBABhnZXRQYXJ0aWFsT2NjbHVzaW9uQm94ZXMBABIoKUxqYXZhL3V0aWwvTGlzdDsBADsoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jazspTGphdmEvdXRpbC9MaXN0OwwAMwA1CgAvADYBAAtpdGVtQ2xhc3NJRAwAOAAwCgAvADkBADtjb2RlY2hpY2tlbiRtaWNyb2Jsb2NrJFRNaWNyb09jY2x1c2lvbiQkc3VwZXIkb2NjbHVzaW9uVGVzdAEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoBACBjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydAcAPQEADW9jY2x1c2lvblRlc3QMAD8APAoAPgBAAQAFbnBhcnQBACJMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7AQAsY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb24kY2xhc3MHAEQBAE0oTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgwAPwBGCgBFAEcBABdlZGdlQ29ybmVyT2NjbHVzaW9uVGVzdAEAUyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOylaAQB7KExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOylaDABJAEsKAEUATAEABGVkZ2UBAChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247AQAGY29ybmVyDAALAAwJAAIAUQEACndyaXRlc18kZXEBAAQoSSlWAQADeCQxAQADKClCDAANAA4JAAIAVwEAEHdyaXR0ZW5TaGFwZV8kZXEBAAQoQilWDAAPAAwJAAIAWwEACXJlYWRzXyRlcQEAAygpWgwAEAARCQACAF8BABFvdmVycmlkZVNoYXBlXyRlcQEABChaKVYMABIADAkAAgBjAQARc2VsZWN0ZWRTaGFwZV8kZXEBAAlzaGFwZV8kZXEMAAsAKQoAAgBnDABTAFQKAAIAaQwAWQBaCgACAGsMAGYAWgoABABtAQAFdmFsdWUBAAhnZXRTaGFwZQwADwApCgACAHEMAF0AVAoAAgBzDAAQAF4KAAIAdQwAEgApCgACAHcMAHAAKQoABAB5AQAWKClMamF2YS9sYW5nL0l0ZXJhYmxlOwwAMwA0CgACAHwBACooKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGFzczsMAB4AHwoAAgB/AQArKClMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb0NsYXNzOwEABjxpbml0PgEAAygpVgwAggBUCgAEAIQBAAYkaW5pdCQBACsoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOylWDACGAIcKAEUAiAEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrOylWDACGAIoKAC8AiwEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db3JuZXJNaWNyb2Jsb2NrOylWDACGAI0KABYAjgEABENvZGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAA9MaW5lTnVtYmVyVGFibGUBAAlTaWduYXR1cmUBADEoKUxqYXZhL3V0aWwvTGlzdDxMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2Oz47AQANU3RhY2tNYXBUYWJsZQEAClNvdXJjZUZpbGUBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAQAGAAUAAgALAAwAAAACAA0ADgAAAAIADwAMAAAAAgAQABEAAAACABIADAAAABoAAQATABQAAQCQAAAARQADAAMAAAAHKhscuAAZsQAAAAIAkQAAACAAAwAAAAcAGgAbAAAAAAAHABwADAABAAAABwAdAAwAAgCSAAAABgABAAAABgABAB4AHwABAJAAAAAvAAEAAQAAAAUquAAisAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAYAAQAjACQAAQCQAAAALwABAAEAAAAFKrgAJ7AAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAAGAAEAKAApAAEAkAAAAC8AAQABAAAABSq4ACysAAAAAgCRAAAADAABAAAABQAaABsAAACSAAAABgABAAAABgABAC0AKQABAJAAAAAvAAEAAQAAAAUquAAyrAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAYAAQAzADQAAgCQAAAALwABAAEAAAAFKrgAN7AAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAAGAJMAAAACAJQAAQA4ACkAAQCQAAAALwABAAEAAAAFKrgAOqwAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAAGEAEAOwA8AAEAkAAAADoAAgACAAAABiortwBBrAAAAAIAkQAAABYAAgAAAAYAGgAbAAAAAAAGAEIAQwABAJIAAAAGAAEAAAAGAAEAPwA8AAEAkAAAADoAAgACAAAABioruABIrAAAAAIAkQAAABYAAgAAAAYAGgAbAAAAAAAGAEIAQwABAJIAAAAGAAEAAAAGAAEASQBKAAEAkAAAAEUAAwADAAAAByorLLgATawAAAACAJEAAAAgAAMAAAAHABoAGwAAAAAABwBOAE8AAQAAAAcAUABPAAIAkgAAAAYAAQAAAAYAAQALACkAAQCQAAAALwABAAEAAAAFKrQAUqwAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAAHAAEAUwBUAAEAkAAAADoAAgACAAAABiobtQBSsQAAAAIAkQAAABYAAgAAAAYAGgAbAAAAAAAGAFUADAABAJIAAAAGAAEAAAAHAAEADQBWAAEAkAAAAC8AAQABAAAABSq0AFisAAAAAgCRAAAADAABAAAABQAaABsAAACSAAAABgABAAAACAABAFkAWgABAJAAAAA6AAIAAgAAAAYqG7UAWLEAAAACAJEAAAAWAAIAAAAGABoAGwAAAAAABgBVAA4AAQCSAAAABgABAAAACAABAA8AKQABAJAAAAAvAAEAAQAAAAUqtABcrAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAkAAQBdAFQAAQCQAAAAOgACAAIAAAAGKhu1AFyxAAAAAgCRAAAAFgACAAAABgAaABsAAAAAAAYAVQAMAAEAkgAAAAYAAQAAAAkAAQAQAF4AAQCQAAAALwABAAEAAAAFKrQAYKwAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAAKAAEAYQBiAAEAkAAAADoAAgACAAAABiobtQBgsQAAAAIAkQAAABYAAgAAAAYAGgAbAAAAAAAGAFUAEQABAJIAAAAGAAEAAAAKAAEAEgApAAEAkAAAAC8AAQABAAAABSq0AGSsAAAAAgCRAAAADAABAAAABQAaABsAAACSAAAABgABAAAACwABAGUAVAABAJAAAAA6AAIAAgAAAAYqG7UAZLEAAAACAJEAAAAWAAIAAAAGABoAGwAAAAAABgBVAAwAAQCSAAAABgABAAAACwABAGYAWgABAJAAAABRAAMAAgAAABUqKrYAaARgtgBqKhu2AGwqG7cAbrEAAAACAJEAAAAWAAIAAAAVABoAGwAAAAAAFQBvAA4AAQCSAAAADgADAAAADgAKAA8ADwAQAAEAcAApAAEAkAAAAFoAAwABAAAAHSoqtgByBGC2AHQqtgB2mQAKKrYAeKcAByq3AHqsAAAAAwCRAAAADAABAAAAHQAaABsAAACSAAAADgADAAAAFAAKABUAHAATAJUAAAAFAAIYQwEQQQAzAHsAAQCQAAAALwABAAEAAAAFKrYAfbAAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAAGEEEAHgB+AAEAkAAAAC8AAQABAAAABSq2AICwAAAAAgCRAAAADAABAAAABQAaABsAAACSAAAABgABAAAABhBBAB4AgQABAJAAAAAvAAEAAQAAAAUqtgCAsAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAYAAQCCAIMAAQCQAAAAagACAAEAAAAsKhAdtwCFKrgAiSq4AIwquACPKgO1AFIqA7UAWCoDtQBcKgO1AGAqA7UAZLEAAAACAJEAAAAMAAEAAAAsABoAGwAAAJIAAAAaAAYAAAAGABIABwAXAAgAHAAJACEACgAmAAsAAwCWAAAAAgAHAJcAAAALAAEACAABAAlzAAoAmAAAAAMFAAA= diff --git a/src/test/resources/compat/ReferenceScalaCuboidPart.class.b64 b/src/test/resources/compat/ReferenceScalaCuboidPart.class.b64 new file mode 100644 index 0000000..22eb03a --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaCuboidPart.class.b64 @@ -0,0 +1,37 @@ +yv66vgAAADQAQAEANWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFD +dWJvaWRQYXJ0BwABAQAgY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQHAAMBACFjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvVEN1Ym9pZFBhcnQHAAUBAB5SZWZlcmVuY2VTY2FsYUN1Ym9pZFBh +cnQuc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVieXRlcwEBNQYBMTJB +IQECARMJQSIrGjRmZRZ0Ny1aKmRDMgw3KR4ycFMSBBZNHTsLBQ0hEUFCMnBbQgxHTwMCBg0FSVEu +Hjd1U0IMJw8eBgIPBVkxbRwzZkciTDdtWzNvBwEZMgEBBg8hCVlBIkQBBRMJaUFBAQZVG1ZkRy8b +KWJlUgQiYUMICgVBISFhAytEawp8Fw4aKWJlUkRRQQUBBQJNCWEBUDVvU1J0RCMBCxEFVQFRIgEC +CQtdAUERAQ0CDx0sRw9WPXFLVgkRBAUCGz81CTFEAwIdOwUhQS4ZOGgVBXESAQI2Ym0GTCEBSQ4D +DU0jKC8bOGgRFREDASIBJAMlOVcNHiJwazokNy9GASUhCSkjJkQBJxUJOQMmQQJ3Sw5UISELBAIH +MUwnLQMCLE0JOTEpHjJwUxI0BAEAC2dldFN1YlBhcnRzAQAWKClMamF2YS9sYW5nL0l0ZXJhYmxl +OwEAJ2NvZGVjaGlja2VuL211bHRpcGFydC9UQ3Vib2lkUGFydCRjbGFzcwcADQEAOShMY29kZWNo +aWNrZW4vbXVsdGlwYXJ0L1RDdWJvaWRQYXJ0OylMamF2YS9sYW5nL0l0ZXJhYmxlOwwACwAPCgAO +ABABAAR0aGlzAQA3TGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFD +dWJvaWRQYXJ0OwEAEWdldENvbGxpc2lvbkJveGVzDAAUAA8KAA4AFQEADGRyYXdCcmVha2luZwEA +LyhMbmV0L21pbmVjcmFmdC9jbGllbnQvcmVuZGVyZXIvUmVuZGVyQmxvY2tzOylWAQAiTGNwdy9t +b2RzL2ZtbC9yZWxhdW5jaGVyL1NpZGVPbmx5OwEABXZhbHVlAQAeTGNwdy9tb2RzL2ZtbC9yZWxh +dW5jaGVyL1NpZGU7AQAGQ0xJRU5UAQBSKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVEN1Ym9pZFBh +cnQ7TG5ldC9taW5lY3JhZnQvY2xpZW50L3JlbmRlcmVyL1JlbmRlckJsb2NrczspVgwAFwAdCgAO +AB4BAAxyZW5kZXJCbG9ja3MBACxMbmV0L21pbmVjcmFmdC9jbGllbnQvcmVuZGVyZXIvUmVuZGVy +QmxvY2tzOwEAB2dldFR5cGUBABQoKUxqYXZhL2xhbmcvU3RyaW5nOwEAFXRlc3Q6cmVmZXJlbmNl +LWN1Ym9pZAgAJAEACWdldEJvdW5kcwEAHygpTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjsB +ABtjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDYHACgGP+AAAAAAAAABAAY8aW5pdD4BAAkoRERE +REREKVYMACwALQoAKQAuAQADKClWDAAsADAKAAQAMQEABiRpbml0JAEAJihMY29kZWNoaWNrZW4v +bXVsdGlwYXJ0L1RDdWJvaWRQYXJ0OylWDAAzADQKAA4ANQEABENvZGUBABJMb2NhbFZhcmlhYmxl +VGFibGUBAA9MaW5lTnVtYmVyVGFibGUBAAlTaWduYXR1cmUBAEIoKUxqYXZhL2xhbmcvSXRlcmFi +bGU8TGNvZGVjaGlja2VuL2xpYi9yYXl0cmFjZXIvSW5kZXhlZEN1Ym9pZDY7PjsBADUoKUxqYXZh +L2xhbmcvSXRlcmFibGU8TGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjs+OwEAGVJ1bnRpbWVW +aXNpYmxlQW5ub3RhdGlvbnMBAApTb3VyY2VGaWxlAQAIU2NhbGFTaWcAIQACAAQAAQAGAAAABgAB +AAsADAACADcAAAAvAAEAAQAAAAUquAARsAAAAAIAOAAAAAwAAQAAAAUAEgATAAAAOQAAAAYAAQAA +AAkAOgAAAAIAOwABABQADAACADcAAAAvAAEAAQAAAAUquAAWsAAAAAIAOAAAAAwAAQAAAAUAEgAT +AAAAOQAAAAYAAQAAAAkAOgAAAAIAPAABABcAGAACADcAAAA6AAIAAgAAAAYqK7gAH7EAAAACADgA +AAAWAAIAAAAGABIAEwAAAAAABgAgACEAAQA5AAAABgABAAAACQA9AAAADQABABkAAQAaZQAbABwA +AQAiACMAAQA3AAAALQABAAEAAAADEiWwAAAAAgA4AAAADAABAAAAAwASABMAAAA5AAAABgABAAAA +CgABACYAJwABADcAAAA+AA4AAQAAABS7AClZDg4OFAAqFAAqFAAqtwAvsAAAAAIAOAAAAAwAAQAA +ABQAEgATAAAAOQAAAAYAAQAAAAwAAQAsADAAAQA3AAAAMwABAAEAAAAJKrcAMiq4ADaxAAAAAgA4 +AAAADAABAAAACQASABMAAAA5AAAABgABAAAACQADAD4AAAACAAcAPQAAAAsAAQAIAAEACXMACgA/ +AAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaEdgeMicroblock.class.b64 b/src/test/resources/compat/ReferenceScalaEdgeMicroblock.class.b64 new file mode 100644 index 0000000..9c4c1a9 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaEdgeMicroblock.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAmQEAOWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFFZGdlTWljcm9ibG9jawcAAQEAIWNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9jawcAAwEAJWNvZGVjaGlja2VuL21pY3JvYmxvY2svRWRnZU1pY3JvYmxvY2sHAAUBACJSZWZlcmVuY2VTY2FsYUVkZ2VNaWNyb2Jsb2NrLnNjYWxhAQAeTHNjYWxhL3JlZmxlY3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBAzIGAW0zQSEBAgETCWEiKxo0ZmUWdDctWipkQzIMVwlaNGYbJhwnbxwybV8OXCdCQQIFAxkZdy4cOWJpKhFRQUIBCltWZEcvGzliZVJUEWFCAQxHPiRXbRk1akcuLGduAQEUBwFRAQMFAgwdNQlBQgMCDg0FUVEuWzJzXwpkd25ZNgoFPWEhQUMnakdKfCcNXDhkV0IRMSJFBQMlMRFhIhIzaEs2SzdNXThjWT4cNw5DAxUBEQVRIwEEPVM6TEdPEAsCLUERcQNBBwIFITkRBAFhAQoDURJBQjxzU1IsNy9GARwhCWFyJEQBHhUFcRIhQjpkQzIMF0IBER4FDUllDh4FCEUBAQ0RIgEkAyk5KC8bO2ZnfiNTLR0LA0kdAiIBSBMKBRlqIgFCK29TUkRxAUsRAgIDBzEkQQJ5SUVCYUELASFCE1kSYUI8c1NSLDcPCQUIWQEBDREiAS4DMTkoLxs7dUs6HAYuGTlmKwVxA0MBDzATCQFURAEDQ3NSLAdiAhoBAQQlCWFNARFvSkxHD14zbyciDAcvWjAlS0YkIgEKGwkPIQoUESFhAV0hMWEHAVEhCjkKUWIeOmppUixnbhU1YmEWBANiAh0BAQQlCUFHAQZlFgxHbR0FCHUBAQ0RIgE8AyURWC0ZM3Q/EioXDwYCJXkhOQEmT0EBAgRZAkICIAFBAyYxJAEEc0sGJDcPCQUIAQIBDREiAUIDNXlnLxo6c1MSLDcLWzFxS1YJIQkFAh0HJhFBKQgCCAU+fEcuWjFvER0xBQExQQUCHQsRYxw8ZmVKTEctWippQ0IsdwxKM3IpCSEDCkMEKQsGBQkZASIJDSkDARUpA0MDOXlnLxo6c1MSLDcLWzFxSwJCcQEUAUECEwUhJEEHdEsyLDcNXjNlJyIMBy8aBQgdAgENESIBUANFGVgNXDNkaRYkNwtbMXFLfiNTLR0LA0lBQ3EBSycCAgMHMQQDBFMBAQZLYUcBD2cWZFdtGTtmSU5DFw1dMyERFSEGASIRVgMlGQguGTlmPxIqFw8GAiUtIilxaxVhAV0FKWEvGTd2SyIpEQwBQyE1BkFxLRo7VFEGBFgNRgEcAQEABndyaXRlcwEAAUkBAAx3cml0dGVuU2hhcGUBAAFCAQAFcmVhZHMBAA1vdmVycmlkZVNoYXBlAQABWgEADXNlbGVjdGVkU2hhcGUBAAhzZXRTaGFwZQEABShJSSlWAQArY29kZWNoaWNrZW4vbWljcm9ibG9jay9FZGdlTWljcm9ibG9jayRjbGFzcwcAFQEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9FZGdlTWljcm9ibG9jaztJSSlWDAATABcKABYAGAEABHRoaXMBADtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUVkZ2VNaWNyb2Jsb2NrOwEABHNpemUBAARzbG90AQAKbWljcm9DbGFzcwEAKigpTGNvZGVjaGlja2VuL21pY3JvYmxvY2svRWRnZU1pY3JvQ2xhc3MkOwEAUShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9FZGdlTWljcm9ibG9jazspTGNvZGVjaGlja2VuL21pY3JvYmxvY2svRWRnZU1pY3JvQ2xhc3MkOwwAHgAgCgAWACEBAAlnZXRCb3VuZHMBAB8oKUxjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7AQBGKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0VkZ2VNaWNyb2Jsb2NrOylMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwAIwAlCgAWACYBAAdnZXRTbG90AQADKClJAQAqKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0VkZ2VNaWNyb2Jsb2NrOylJDAAoACoKABYAKwEAC2dldFNsb3RNYXNrAQAtY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrJGNsYXNzBwAuAQAsKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2s7KUkMAC0AMAoALwAxAQAYZ2V0UGFydGlhbE9jY2x1c2lvbkJveGVzAQASKClMamF2YS91dGlsL0xpc3Q7AQA7KExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2s7KUxqYXZhL3V0aWwvTGlzdDsMADMANQoALwA2AQALaXRlbUNsYXNzSUQMADgAMAoALwA5AQA7Y29kZWNoaWNrZW4kbWljcm9ibG9jayRUTWljcm9PY2NsdXNpb24kJHN1cGVyJG9jY2x1c2lvblRlc3QBACUoTGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OylaAQAgY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQHAD0BAA1vY2NsdXNpb25UZXN0DAA/ADwKAD4AQAEABW5wYXJ0AQAiTGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OwEALGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uJGNsYXNzBwBEAQBNKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoMAD8ARgoARQBHAQAXZWRnZUNvcm5lck9jY2x1c2lvblRlc3QBAFMoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspWgEAeyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspWgwASQBLCgBFAEwBAARlZGdlAQAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOwEABmNvcm5lcgwACwAMCQACAFEBAAp3cml0ZXNfJGVxAQAEKEkpVgEAA3gkMQEAAygpQgwADQAOCQACAFcBABB3cml0dGVuU2hhcGVfJGVxAQAEKEIpVgwADwAMCQACAFsBAAlyZWFkc18kZXEBAAMoKVoMABAAEQkAAgBfAQARb3ZlcnJpZGVTaGFwZV8kZXEBAAQoWilWDAASAAwJAAIAYwEAEXNlbGVjdGVkU2hhcGVfJGVxAQAJc2hhcGVfJGVxDAALACkKAAIAZwwAUwBUCgACAGkMAFkAWgoAAgBrDABmAFoKAAQAbQEABXZhbHVlAQAIZ2V0U2hhcGUMAA8AKQoAAgBxDABdAFQKAAIAcwwAEABeCgACAHUMABIAKQoAAgB3DABwACkKAAQAeQEAFigpTGphdmEvbGFuZy9JdGVyYWJsZTsMADMANAoAAgB8AQAqKClMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xhc3M7DAAeAB8KAAIAfwEAKygpTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9DbGFzczsBAAY8aW5pdD4BAAMoKVYMAIIAVAoABACEAQAGJGluaXQkAQArKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspVgwAhgCHCgBFAIgBACwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jazspVgwAhgCKCgAvAIsBACooTGNvZGVjaGlja2VuL21pY3JvYmxvY2svRWRnZU1pY3JvYmxvY2s7KVYMAIYAjQoAFgCOAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEACVNpZ25hdHVyZQEAMSgpTGphdmEvdXRpbC9MaXN0PExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7PjsBAA1TdGFja01hcFRhYmxlAQAKU291cmNlRmlsZQEAGVJ1bnRpbWVWaXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwAhAAIABAABAAYABQACAAsADAAAAAIADQAOAAAAAgAPAAwAAAACABAAEQAAAAIAEgAMAAAAGgABABMAFAABAJAAAABFAAMAAwAAAAcqGxy4ABmxAAAAAgCRAAAAIAADAAAABwAaABsAAAAAAAcAHAAMAAEAAAAHAB0ADAACAJIAAAAGAAEAAAAGAAEAHgAfAAEAkAAAAC8AAQABAAAABSq4ACKwAAAAAgCRAAAADAABAAAABQAaABsAAACSAAAABgABAAAABgABACMAJAABAJAAAAAvAAEAAQAAAAUquAAnsAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAYAAQAoACkAAQCQAAAALwABAAEAAAAFKrgALKwAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAAGAAEALQApAAEAkAAAAC8AAQABAAAABSq4ADKsAAAAAgCRAAAADAABAAAABQAaABsAAACSAAAABgABAAAABgABADMANAACAJAAAAAvAAEAAQAAAAUquAA3sAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAYAkwAAAAIAlAABADgAKQABAJAAAAAvAAEAAQAAAAUquAA6rAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAYQAQA7ADwAAQCQAAAAOgACAAIAAAAGKiu3AEGsAAAAAgCRAAAAFgACAAAABgAaABsAAAAAAAYAQgBDAAEAkgAAAAYAAQAAAAYAAQA/ADwAAQCQAAAAOgACAAIAAAAGKiu4AEisAAAAAgCRAAAAFgACAAAABgAaABsAAAAAAAYAQgBDAAEAkgAAAAYAAQAAAAYAAQBJAEoAAQCQAAAARQADAAMAAAAHKissuABNrAAAAAIAkQAAACAAAwAAAAcAGgAbAAAAAAAHAE4ATwABAAAABwBQAE8AAgCSAAAABgABAAAABgABAAsAKQABAJAAAAAvAAEAAQAAAAUqtABSrAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAcAAQBTAFQAAQCQAAAAOgACAAIAAAAGKhu1AFKxAAAAAgCRAAAAFgACAAAABgAaABsAAAAAAAYAVQAMAAEAkgAAAAYAAQAAAAcAAQANAFYAAQCQAAAALwABAAEAAAAFKrQAWKwAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAAIAAEAWQBaAAEAkAAAADoAAgACAAAABiobtQBYsQAAAAIAkQAAABYAAgAAAAYAGgAbAAAAAAAGAFUADgABAJIAAAAGAAEAAAAIAAEADwApAAEAkAAAAC8AAQABAAAABSq0AFysAAAAAgCRAAAADAABAAAABQAaABsAAACSAAAABgABAAAACQABAF0AVAABAJAAAAA6AAIAAgAAAAYqG7UAXLEAAAACAJEAAAAWAAIAAAAGABoAGwAAAAAABgBVAAwAAQCSAAAABgABAAAACQABABAAXgABAJAAAAAvAAEAAQAAAAUqtABgrAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAoAAQBhAGIAAQCQAAAAOgACAAIAAAAGKhu1AGCxAAAAAgCRAAAAFgACAAAABgAaABsAAAAAAAYAVQARAAEAkgAAAAYAAQAAAAoAAQASACkAAQCQAAAALwABAAEAAAAFKrQAZKwAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAALAAEAZQBUAAEAkAAAADoAAgACAAAABiobtQBksQAAAAIAkQAAABYAAgAAAAYAGgAbAAAAAAAGAFUADAABAJIAAAAGAAEAAAALAAEAZgBaAAEAkAAAAFEAAwACAAAAFSoqtgBoBGC2AGoqG7YAbCobtwBusQAAAAIAkQAAABYAAgAAABUAGgAbAAAAAAAVAG8ADgABAJIAAAAOAAMAAAAOAAoADwAPABAAAQBwACkAAQCQAAAAWgADAAEAAAAdKiq2AHIEYLYAdCq2AHaZAAoqtgB4pwAHKrcAeqwAAAADAJEAAAAMAAEAAAAdABoAGwAAAJIAAAAOAAMAAAAUAAoAFQAcABMAlQAAAAUAAhhDARBBADMAewABAJAAAAAvAAEAAQAAAAUqtgB9sAAAAAIAkQAAAAwAAQAAAAUAGgAbAAAAkgAAAAYAAQAAAAYQQQAeAH4AAQCQAAAALwABAAEAAAAFKrYAgLAAAAACAJEAAAAMAAEAAAAFABoAGwAAAJIAAAAGAAEAAAAGEEEAHgCBAAEAkAAAAC8AAQABAAAABSq2AICwAAAAAgCRAAAADAABAAAABQAaABsAAACSAAAABgABAAAABgABAIIAgwABAJAAAABqAAIAAQAAACwqEB23AIUquACJKrgAjCq4AI8qA7UAUioDtQBYKgO1AFwqA7UAYCoDtQBksQAAAAIAkQAAAAwAAQAAACwAGgAbAAAAkgAAABoABgAAAAYAEgAHABcACAAcAAkAIQAKACYACwADAJYAAAACAAcAlwAAAAsAAQAIAAEACXMACgCYAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaEdgePart.class.b64 b/src/test/resources/compat/ReferenceScalaEdgePart.class.b64 new file mode 100644 index 0000000..a43b0ca --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaEdgePart.class.b64 @@ -0,0 +1,22 @@ +yv66vgAAADQAKQEAM2NvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFF +ZGdlUGFydAcAAQEAIGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0BwADAQAfY29kZWNo +aWNrZW4vbXVsdGlwYXJ0L1RFZGdlUGFydAcABQEAHFJlZmVyZW5jZVNjYWxhRWRnZVBhcnQuc2Nh +bGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVieXRlcwEBJQYBKTJBIQECARMJ +MSIrGjRmZRZ0Ny1aKmRDMgxXCVo0ZiEGFEhPAwIECQUxMW1cN3FDUlQhIQIEAhM1LEgOXjVxQ0ok +KCJBBAIXDXxHLVoyaVMOXFdNXAIBJw0BIUIECQMXMWkRAUIFAxsRESECVid2WVJMBysZOnUhCVlx +IgMCEQkJSUErEjNoS0ILJw8eBQYlASEJYUUBB3kldBcOHiAVA1EBIiEGAQ4DCUFRYQYBBQJhCXFh +WjN1KWYEWC1GARohCVFyJEQBHBUJYVIkAQNtQzo8JyIBEAIJKQxnL1kFA0FtEWFhFTtzUzo8ByIC +EgEJAxkTYUM0ZmlOY3cOXidiZy4sEgEKCQNLIWoRQQoGAk8FKTFvWTFtQyYREUYKAgQTOiQIAQAQ +Y29uZHVjdHNSZWRzdG9uZQEAAygpWgEAJWNvZGVjaGlja2VuL211bHRpcGFydC9URWRnZVBhcnQk +Y2xhc3MHAA0BACQoTGNvZGVjaGlja2VuL211bHRpcGFydC9URWRnZVBhcnQ7KVoMAAsADwoADgAQ +AQAEdGhpcwEANUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhRWRn +ZVBhcnQ7AQAHZ2V0VHlwZQEAFCgpTGphdmEvbGFuZy9TdHJpbmc7AQATdGVzdDpyZWZlcmVuY2Ut +ZWRnZQgAFgEAC2dldFNsb3RNYXNrAQADKClJAwAAgAABAAY8aW5pdD4BAAMoKVYMABsAHAoABAAd +AQAGJGluaXQkAQAkKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVEVkZ2VQYXJ0OylWDAAfACAKAA4A +IQEABENvZGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAA9MaW5lTnVtYmVyVGFibGUBAApTb3VyY2VG +aWxlAQAZUnVudGltZVZpc2libGVBbm5vdGF0aW9ucwEACFNjYWxhU2lnACEAAgAEAAEABgAAAAQA +AQALAAwAAQAjAAAALwABAAEAAAAFKrgAEawAAAACACQAAAAMAAEAAAAFABIAEwAAACUAAAAGAAEA +AAAIAAEAFAAVAAEAIwAAAC0AAQABAAAAAxIXsAAAAAIAJAAAAAwAAQAAAAMAEgATAAAAJQAAAAYA +AQAAAAkAAQAYABkAAQAjAAAALQABAAEAAAADEhqsAAAAAgAkAAAADAABAAAAAwASABMAAAAlAAAA +BgABAAAACwABABsAHAABACMAAAAzAAEAAQAAAAkqtwAeKrgAIrEAAAACACQAAAAMAAEAAAAJABIA +EwAAACUAAAAGAAEAAAAIAAMAJgAAAAIABwAnAAAACwABAAgAAQAJcwAKACgAAAADBQAA diff --git a/src/test/resources/compat/ReferenceScalaFaceMicroblockClient.class.b64 b/src/test/resources/compat/ReferenceScalaFaceMicroblockClient.class.b64 new file mode 100644 index 0000000..7363d89 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaFaceMicroblockClient.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQBFAEAP2NvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFGYWNlTWljcm9ibG9ja0NsaWVudAcAAQEAIWNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9jawcAAwEAK2NvZGVjaGlja2VuL21pY3JvYmxvY2svRmFjZU1pY3JvYmxvY2tDbGllbnQHAAUBAChSZWZlcmVuY2VTY2FsYUZhY2VNaWNyb2Jsb2NrQ2xpZW50LnNjYWxhAQAeTHNjYWxhL3JlZmxlY3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBBMMGAQVdYQFCAQMBJREhRVUzZ0tKLGduWTNURwZkF01SMWRLNks3TV04Y1k+HDduETdqSzokKEJBAgUDGRl3Lhw5YmkqEVFBQgEKW1ZkRy8bOWJlUlQRYUIBDEc+JFdtGTVqRy4sZ24BARQHAVEBAwUCDB01CUFCAwIODQVRUS5bMnNfCmR3blk2CgU9YSFBQydqR0p8Jw1cOGRXQhExIkUFAyUxEUFDUjFkSzZLN01dOGNZPhw3bhE3aks6JAgiAgsBCQMpEkECH2pdJiRoCEYBFyEJOQIhRAEDER1JAkExQQUCaQlhIRo8Zl1SHFgjQQ4RB3EJMyVEAR4VCXFyJAEDdmkmZCciARECCSkMZy9ZBQNFdRERIhE6c0NmZBVuHTsRBRFSY0JBEykbBTEjIkEUAgtNHBcNXDEKBSUyE0ECKXNLEixnLQMCLFkJMTELHjpqXR5UISELFAkNOQIBFSEDHAMdKWcvGjh1ZwJCEQINAUECAwdJEUEZAiFNLEcuWjJ1SxJsFQ1eM3NTBmRXIwEaEQVNamRCARs8HQkpJEgEAjdzNQlxRwMCOREFMUFIXThwaXpKEWFCBQMbGUkhARAHAis1SzdNXThOQ1IsJy9bMW0lFjwXbh07c3MmEWFoEAIPEzZLN01dOE5DUiwnL1sxbRUJYUQCQwVCAQEHCRkhQwEFBiEyLxo3ZkdSLEctVDF1S0pMFw1cMCVLRiQiYREkEQUVIhVCQSMnBREpZi4bOwkPHQMVESFhAWUFGQEQShkJDSUDARUpAzMDRRlYDVwzZGkWJFcqGTtmZSYMRw4JBQgXAgENESIBTQMZEXcuHjhlZ1YJUQoFAk8nNglxSgMCUSMGGWEvWjILBUkzEWEBN2pFJhFBaxQCCAdWFHcuGzM3ER0xBgExQQUCXQshQlk4dl0SHHgMSjNyKQkZBQxDBEgrBgUJGUEnCQ1pAwEVKQNOAx0Rdy4eOGVnAkJxARgBQQITBVEsQQZ1ZQZ0Nw9dMXNLOiRYIwEwEQUVehZCATEnBR0RdW4cN2ZDOkRxQRkBQQITBTEtQQh1ZQZ0Nw9dMXNLOiR4DEozcikJGUUNQwRIQwYFCRkBMAkNGQQBFSkDXwMxISgvGTh0YQYUWE0cOyERHUEHATFBBQIlDEFiXTNtSw4kWA1aKm1fUiwSQRsJA0stTCEBHBQDByVzRw9DBG8BAQdJEUE4AiFNLEcuWjJ1SxIcRm4cO2BJFQxIQ0EicREdOVUuIUFBAilEYUEdASFCE1EXIUQ6ZlkWHEcvGjNUWT4kCAVDBHUBAQdJEUE1AhdNZHcOXiFlbQZ0Ny0aBQhtAgENESIBeAM9GUhuHDtCSVoMZ25ZM2BJFQxIQ0EieREdOVUvIUFBAilEYUEfASFCE1EXAUQ6bV9SDEVNXjFvRxYEAyICPwEJA2kYQUM3akdKfDcJXDF0Z1IJYRAFAgx/JhkREQEHAyENe1cuXDhvGyYcJ29cIm1DThwIYkJBAwERBRNxQQENTxYkGCpUMXVLSkwXDRwLAmUhORExAgEFQgU1ESFENXQpSgxnbh05YmUWdEcPRgFfERkJCQIBQwEZBklxLRo7Q19WdEdtHQUHAysBQRFJNQIPHSxHbxU3cGkCAQAGZXZlbnRzAQAVTGphdmEvdXRpbC9BcnJheUxpc3Q7AQApTGphdmEvdXRpbC9BcnJheUxpc3Q8TGphdmEvbGFuZy9TdHJpbmc7PjsBABBzZWxlY3RlZE1hdGVyaWFsAQA9TGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lzdHJ5JElNaWNyb01hdGVyaWFsOwEABmJvdW5kcwEAHUxjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7AQALdHJhbnNwYXJlbnQBAAFaAQAMc2VsZWN0ZWRTbG90AQABSQEAC3Nsb3RBZHZhbmNlAQAMcmVuZGVyQm91bmRzAQAKcmVuZGVyTWFzawEABnJlbmRlcgEAIShMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpVgEAMWNvZGVjaGlja2VuL21pY3JvYmxvY2svRmFjZU1pY3JvYmxvY2tDbGllbnQkY2xhc3MHABsBAE4oTGNvZGVjaGlja2VuL21pY3JvYmxvY2svRmFjZU1pY3JvYmxvY2tDbGllbnQ7TGNvZGVjaGlja2VuL2xpYi92ZWMvVmVjdG9yMztJKVYMABkAHQoAHAAeAQAEdGhpcwEAQUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhRmFjZU1pY3JvYmxvY2tDbGllbnQ7AQADcG9zAQAdTGNvZGVjaGlja2VuL2xpYi92ZWMvVmVjdG9yMzsBAARwYXNzAQAfKClMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwAFwARCQACACYBABByZW5kZXJCb3VuZHNfJGVxAQAgKExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7KVYBAAN4JDEBAAMoKUkMABgAFQkAAgAsAQAOcmVuZGVyTWFza18kZXEBAAQoSSlWAQBBY29kZWNoaWNrZW4kbWljcm9ibG9jayRUTWljcm9PY2NsdXNpb25DbGllbnQkJHN1cGVyJG9uUGFydENoYW5nZWQBACUoTGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OylWAQAgY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQHADIBAA1vblBhcnRDaGFuZ2VkDAA0ADEKADMANQEABHBhcnQBACJMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7AQA7Y29kZWNoaWNrZW4kbWljcm9ibG9jayRUTWljcm9PY2NsdXNpb25DbGllbnQkJHN1cGVyJG9uQWRkZWQBAAMoKVYBAAdvbkFkZGVkDAA7ADoKADMAPAEAOGNvZGVjaGlja2VuJG1pY3JvYmxvY2skVE1pY3JvT2NjbHVzaW9uQ2xpZW50JCRzdXBlciRyZWFkAQAlKExjb2RlY2hpY2tlbi9saWIvZGF0YS9NQ0RhdGFJbnB1dDspVgEABHJlYWQMAEAAPwoABABBAQAGcGFja2V0AQAiTGNvZGVjaGlja2VuL2xpYi9kYXRhL01DRGF0YUlucHV0OwEAMmNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uQ2xpZW50JGNsYXNzBwBFAQBTKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbkNsaWVudDtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVYMADQARwoARgBIAQAxKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbkNsaWVudDspVgwAOwBKCgBGAEsBAFMoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uQ2xpZW50O0xjb2RlY2hpY2tlbi9saWIvZGF0YS9NQ0RhdGFJbnB1dDspVgwAQABNCgBGAE4BAAxyZWNhbGNCb3VuZHMMAFAASgoARgBRAQAQZ2V0UHJpb3JpdHlDbGFzcwEAMShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb25DbGllbnQ7KUkMAFMAVAoARgBVAQANZ2V0QnJva2VuSWNvbgEAHShJKUxuZXQvbWluZWNyYWZ0L3V0aWwvSUljb247AQAtY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50JGNsYXNzBwBZAQBGKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGllbnQ7SSlMbmV0L21pbmVjcmFmdC91dGlsL0lJY29uOwwAVwBbCgBaAFwBAARzaWRlAQANYWRkSGl0RWZmZWN0cwEAWihMbmV0L21pbmVjcmFmdC91dGlsL01vdmluZ09iamVjdFBvc2l0aW9uO0xuZXQvbWluZWNyYWZ0L2NsaWVudC9wYXJ0aWNsZS9FZmZlY3RSZW5kZXJlcjspVgEAgyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50O0xuZXQvbWluZWNyYWZ0L3V0aWwvTW92aW5nT2JqZWN0UG9zaXRpb247TG5ldC9taW5lY3JhZnQvY2xpZW50L3BhcnRpY2xlL0VmZmVjdFJlbmRlcmVyOylWDABfAGEKAFoAYgEAA2hpdAEAKUxuZXQvbWluZWNyYWZ0L3V0aWwvTW92aW5nT2JqZWN0UG9zaXRpb247AQAOZWZmZWN0UmVuZGVyZXIBAC5MbmV0L21pbmVjcmFmdC9jbGllbnQvcGFydGljbGUvRWZmZWN0UmVuZGVyZXI7AQARYWRkRGVzdHJveUVmZmVjdHMBADEoTG5ldC9taW5lY3JhZnQvY2xpZW50L3BhcnRpY2xlL0VmZmVjdFJlbmRlcmVyOylWAQBaKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGllbnQ7TG5ldC9taW5lY3JhZnQvY2xpZW50L3BhcnRpY2xlL0VmZmVjdFJlbmRlcmVyOylWDABoAGoKAFoAawEADHJlbmRlclN0YXRpYwEAIShMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpWgEASihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50O0xjb2RlY2hpY2tlbi9saWIvdmVjL1ZlY3RvcjM7SSlaDABtAG8KAFoAcAEAD2dldFJlbmRlckJvdW5kcwEASChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50OylMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwAcgBzCgBaAHQBAAtnZXRTbG90TWFzawEALWNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jayRjbGFzcwcAdwEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrOylJDAB2AHkKAHgAegEAGGdldFBhcnRpYWxPY2NsdXNpb25Cb3hlcwEAEigpTGphdmEvdXRpbC9MaXN0OwEAOyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrOylMamF2YS91dGlsL0xpc3Q7DAB8AH4KAHgAfwEAC2l0ZW1DbGFzc0lEDACBAHkKAHgAggEAO2NvZGVjaGlja2VuJG1pY3JvYmxvY2skVE1pY3JvT2NjbHVzaW9uJCRzdXBlciRvY2NsdXNpb25UZXN0AQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgEADW9jY2x1c2lvblRlc3QMAIYAhQoAMwCHAQAFbnBhcnQBACxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbiRjbGFzcwcAigEATShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OylaDACGAIwKAIsAjQEAF2VkZ2VDb3JuZXJPY2NsdXNpb25UZXN0AQBTKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247KVoBAHsoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247KVoMAI8AkQoAiwCSAQAEZWRnZQEAKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjsBAAZjb3JuZXIBABcoKUxqYXZhL3V0aWwvQXJyYXlMaXN0OwwACwAMCQACAJgBAD8oKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvTWF0ZXJpYWxSZWdpc3RyeSRJTWljcm9NYXRlcmlhbDsMAA4ADwkAAgCbAQAUc2VsZWN0ZWRNYXRlcmlhbF8kZXEBAEAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lzdHJ5JElNaWNyb01hdGVyaWFsOylWDAAQABEJAAIAnwEACmJvdW5kc18kZXEBAAMoKVoMABIAEwkAAgCjAQAPdHJhbnNwYXJlbnRfJGVxAQAEKFopVgwAFAAVCQACAKcBABBzZWxlY3RlZFNsb3RfJGVxDAAWABUJAAIAqgEAD3Nsb3RBZHZhbmNlXyRlcQEACm1pY3JvQ2xhc3MBACsoKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvQ2xhc3M7AQAMZ2V0SU1hdGVyaWFsDAALAJcKAAIAsAEACG1hdGVyaWFsCACyAQATamF2YS91dGlsL0FycmF5TGlzdAcAtAEAA2FkZAEAFShMamF2YS9sYW5nL09iamVjdDspWgwAtgC3CgC1ALgMAA4AmgoAAgC6AQANaXNUcmFuc3BhcmVudAgAEgwAEgCiCgACAL4BAAlnZXRCb3VuZHMIABAMABAAJQoAAgDCAQAHZ2V0U2xvdAEAJnNjYWxhL2NvbGxlY3Rpb24vbXV0YWJsZS9TdHJpbmdCdWlsZGVyBwDFAQAGPGluaXQ+DADHADoKAMYAyAEABXNsb3Q6CADKAQAGYXBwZW5kAQA8KExqYXZhL2xhbmcvT2JqZWN0OylMc2NhbGEvY29sbGVjdGlvbi9tdXRhYmxlL1N0cmluZ0J1aWxkZXI7DADMAM0KAMYAzgwAFAArCgACANABABpzY2FsYS9ydW50aW1lL0JveGVzUnVuVGltZQcA0gEADGJveFRvSW50ZWdlcgEAFihJKUxqYXZhL2xhbmcvSW50ZWdlcjsMANQA1QoA0wDWAQAIdG9TdHJpbmcBABQoKUxqYXZhL2xhbmcvU3RyaW5nOwwA2ADZCgDGANoMABYAKwoAAgDcDACpAC8KAAIA3gEABHNsb3QBABYoKUxqYXZhL2xhbmcvSXRlcmFibGU7DAB8AH0KAAIA4gEAKigpTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsYXNzOwwArQCuCgACAOUMAMcALwoABADnAQAGJGluaXQkAQArKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspVgwA6QDqCgCLAOsBACwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jazspVgwA6QDtCgB4AO4BACwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsaWVudDspVgwA6QDwCgBaAPEMAOkASgoARgDzAQAzY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrQ2xpZW50JGNsYXNzBwD1AQAyKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2tDbGllbnQ7KVYMAOkA9woA9gD4AQAwKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0ZhY2VNaWNyb2Jsb2NrQ2xpZW50OylWDADpAPoKABwA+woAtQDIAQAbY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2BwD+Bj/QAAAAAAAAAQAJKERERERERClWDADHAQIKAP8BAwEAO2NvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lzdHJ5JElNaWNyb01hdGVyaWFsBwEFAQAsY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb01hdGVyaWFsUmVnaXN0cnkHAQcBAA5JTWljcm9NYXRlcmlhbAEACVNpZ25hdHVyZQEABENvZGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAA9MaW5lTnVtYmVyVGFibGUBADEoKUxqYXZhL3V0aWwvTGlzdDxMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2Oz47AQArKClMamF2YS91dGlsL0FycmF5TGlzdDxMamF2YS9sYW5nL1N0cmluZzs+OwEAClNvdXJjZUZpbGUBAAxJbm5lckNsYXNzZXMBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAQAGAAgAEgALAAwAAQEKAAAAAgANAAIADgAPAAAAAgAQABEAAAACABIAEwAAAAIAFAAVAAAAAgAWABUAAAACABcAEQAAAAIAGAAVAAAAKwABABkAGgABAQsAAABFAAMAAwAAAAcqKxy4AB+xAAAAAgEMAAAAIAADAAAABwAgACEAAAAAAAcAIgAjAAEAAAAHACQAFQACAQ0AAAAGAAEAAAAIAAEAFwAlAAEBCwAAAC8AAQABAAAABSq0ACewAAAAAgEMAAAADAABAAAABQAgACEAAAENAAAABgABAAAACAABACgAKQABAQsAAAA6AAIAAgAAAAYqK7UAJ7EAAAACAQwAAAAWAAIAAAAGACAAIQAAAAAABgAqABEAAQENAAAABgABAAAACAABABgAKwABAQsAAAAvAAEAAQAAAAUqtAAtrAAAAAIBDAAAAAwAAQAAAAUAIAAhAAABDQAAAAYAAQAAAAgAAQAuAC8AAQELAAAAOgACAAIAAAAGKhu1AC2xAAAAAgEMAAAAFgACAAAABgAgACEAAAAAAAYAKgAVAAEBDQAAAAYAAQAAAAgQAQAwADEAAQELAAAAOgACAAIAAAAGKiu3ADaxAAAAAgEMAAAAFgACAAAABgAgACEAAAAAAAYANwA4AAEBDQAAAAYAAQAAAAgQAQA5ADoAAQELAAAALwABAAEAAAAFKrcAPbEAAAACAQwAAAAMAAEAAAAFACAAIQAAAQ0AAAAGAAEAAAAIEAEAPgA/AAEBCwAAADoAAgACAAAABiortwBCsQAAAAIBDAAAABYAAgAAAAYAIAAhAAAAAAAGAEMARAABAQ0AAAAGAAEAAAAIAAEANAAxAAEBCwAAADoAAgACAAAABioruABJsQAAAAIBDAAAABYAAgAAAAYAIAAhAAAAAAAGADcAOAABAQ0AAAAGAAEAAAAIAAEAOwA6AAEBCwAAAC8AAQABAAAABSq4AEyxAAAAAgEMAAAADAABAAAABQAgACEAAAENAAAABgABAAAACAABAEAAPwABAQsAAAA6AAIAAgAAAAYqK7gAT7EAAAACAQwAAAAWAAIAAAAGACAAIQAAAAAABgBDAEQAAQENAAAABgABAAAACAABAFAAOgABAQsAAAAvAAEAAQAAAAUquABSsQAAAAIBDAAAAAwAAQAAAAUAIAAhAAABDQAAAAYAAQAAAAgAAQBTACsAAQELAAAALwABAAEAAAAFKrgAVqwAAAACAQwAAAAMAAEAAAAFACAAIQAAAQ0AAAAGAAEAAAAIAAEAVwBYAAEBCwAAADoAAgACAAAABiobuABdsAAAAAIBDAAAABYAAgAAAAYAIAAhAAAAAAAGAF4AFQABAQ0AAAAGAAEAAAAIAAEAXwBgAAEBCwAAAEUAAwADAAAAByorLLgAY7EAAAACAQwAAAAgAAMAAAAHACAAIQAAAAAABwBkAGUAAQAAAAcAZgBnAAIBDQAAAAYAAQAAAAgAAQBoAGkAAQELAAAAOgACAAIAAAAGKiu4AGyxAAAAAgEMAAAAFgACAAAABgAgACEAAAAAAAYAZgBnAAEBDQAAAAYAAQAAAAgAAQBtAG4AAQELAAAARQADAAMAAAAHKiscuABxrAAAAAIBDAAAACAAAwAAAAcAIAAhAAAAAAAHACIAIwABAAAABwAkABUAAgENAAAABgABAAAACAABAHIAJQABAQsAAAAvAAEAAQAAAAUquAB1sAAAAAIBDAAAAAwAAQAAAAUAIAAhAAABDQAAAAYAAQAAAAgAAQB2ACsAAQELAAAALwABAAEAAAAFKrgAe6wAAAACAQwAAAAMAAEAAAAFACAAIQAAAQ0AAAAGAAEAAAAIAAEAfAB9AAIBCwAAAC8AAQABAAAABSq4AICwAAAAAgEMAAAADAABAAAABQAgACEAAAENAAAABgABAAAACAEKAAAAAgEOAAEAgQArAAEBCwAAAC8AAQABAAAABSq4AIOsAAAAAgEMAAAADAABAAAABQAgACEAAAENAAAABgABAAAACBABAIQAhQABAQsAAAA6AAIAAgAAAAYqK7cAiKwAAAACAQwAAAAWAAIAAAAGACAAIQAAAAAABgCJADgAAQENAAAABgABAAAACAABAIYAhQABAQsAAAA6AAIAAgAAAAYqK7gAjqwAAAACAQwAAAAWAAIAAAAGACAAIQAAAAAABgCJADgAAQENAAAABgABAAAACAABAI8AkAABAQsAAABFAAMAAwAAAAcqKyy4AJOsAAAAAgEMAAAAIAADAAAABwAgACEAAAAAAAcAlACVAAEAAAAHAJYAlQACAQ0AAAAGAAEAAAAIAAEACwCXAAIBCwAAAC8AAQABAAAABSq0AJmwAAAAAgEMAAAADAABAAAABQAgACEAAAENAAAABgABAAAACQEKAAAAAgEPAAEADgCaAAEBCwAAAC8AAQABAAAABSq0AJywAAAAAgEMAAAADAABAAAABQAgACEAAAENAAAABgABAAAACgABAJ0AngABAQsAAAA6AAIAAgAAAAYqK7UAnLEAAAACAQwAAAAWAAIAAAAGACAAIQAAAAAABgAqAA8AAQENAAAABgABAAAACgABABAAJQABAQsAAAAvAAEAAQAAAAUqtACgsAAAAAIBDAAAAAwAAQAAAAUAIAAhAAABDQAAAAYAAQAAAAsAAQChACkAAQELAAAAOgACAAIAAAAGKiu1AKCxAAAAAgEMAAAAFgACAAAABgAgACEAAAAAAAYAKgARAAEBDQAAAAYAAQAAAAsAAQASAKIAAQELAAAALwABAAEAAAAFKrQApKwAAAACAQwAAAAMAAEAAAAFACAAIQAAAQ0AAAAGAAEAAAAMAAEApQCmAAEBCwAAADoAAgACAAAABiobtQCksQAAAAIBDAAAABYAAgAAAAYAIAAhAAAAAAAGACoAEwABAQ0AAAAGAAEAAAAMAAEAFAArAAEBCwAAAC8AAQABAAAABSq0AKisAAAAAgEMAAAADAABAAAABQAgACEAAAENAAAABgABAAAADQABAKkALwABAQsAAAA6AAIAAgAAAAYqG7UAqLEAAAACAQwAAAAWAAIAAAAGACAAIQAAAAAABgAqABUAAQENAAAABgABAAAADQABABYAKwABAQsAAAAvAAEAAQAAAAUqtACrrAAAAAIBDAAAAAwAAQAAAAUAIAAhAAABDQAAAAYAAQAAAA4AAQCsAC8AAQELAAAAOgACAAIAAAAGKhu1AKuxAAAAAgEMAAAAFgACAAAABgAgACEAAAAAAAYAKgAVAAEBDQAAAAYAAQAAAA4AAQCtAK4AAQELAAAALAABAAEAAAACAbAAAAACAQwAAAAMAAEAAAACACAAIQAAAQ0AAAAGAAEAAAAQAAEArwCaAAEBCwAAAD0AAgABAAAADyq2ALESs7YAuVcqtgC7sAAAAAIBDAAAAAwAAQAAAA8AIAAhAAABDQAAAAoAAgAAABMACgAUAAEAvACiAAEBCwAAAD0AAgABAAAADyq2ALESvbYAuVcqtgC/rAAAAAIBDAAAAAwAAQAAAA8AIAAhAAABDQAAAAoAAgAAABgACgAZAAEAwAAlAAEBCwAAAD0AAgABAAAADyq2ALESwbYAuVcqtgDDsAAAAAIBDAAAAAwAAQAAAA8AIAAhAAABDQAAAAoAAgAAAB0ACgAeAAEAxAArAAEBCwAAAHUAAwACAAAANSq2ALG7AMZZtwDJEsu2AM8qtgDRuADXtgDPtgDbtgC5Vyq2ANE8Kiq2ANEqtgDdYLYA3xusAAAAAgEMAAAAFgACAAAANQAgACEAAAAmAA4A4AAVAAEBDQAAABIABAAAACIAIQAjACYAJAAzACUQQQB8AOEAAQELAAAALwABAAEAAAAFKrYA47AAAAACAQwAAAAMAAEAAAAFACAAIQAAAQ0AAAAGAAEAAAAIEEEArQDkAAEBCwAAAC8AAQABAAAABSq2AOawAAAAAgEMAAAADAABAAAABQAgACEAAAENAAAABgABAAAACAABAMcAOgABAQsAAACKAA8AAQAAAEwqECW3AOgquADsKrgA7yq4APIquAD0KrgA+Sq4APwquwC1WbcA/bUAmSq7AP9ZDg4ODxQBAA+3AQS1AKAqA7UApCoDtQCoKgO1AKuxAAAAAgEMAAAADAABAAAATAAgACEAAAENAAAAGgAGAAAACAAeAAkAKQALADwADABBAA0ARgAOAAQBEAAAAAIABwERAAAACgABAQYBCAEJBgkBEgAAAAsAAQAIAAEACXMACgETAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaFacePart.class.b64 b/src/test/resources/compat/ReferenceScalaFacePart.class.b64 new file mode 100644 index 0000000..598030c --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaFacePart.class.b64 @@ -0,0 +1,25 @@ +yv66vgAAADQALgEAM2NvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFG +YWNlUGFydAcAAQEAIGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0BwADAQAfY29kZWNo +aWNrZW4vbXVsdGlwYXJ0L1RGYWNlUGFydAcABQEAHFJlZmVyZW5jZVNjYWxhRmFjZVBhcnQuc2Nh +bGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVieXRlcwEBJQYBKTJBIQECARMJ +MSIrGjRmZRZ0Ny1aKmRDMgxnKVkyZiEGFEhPAwIECQUxMW1cN3FDUlQhIQIEAhM1LEgOXjVxQ0ok +KCJBBAIXDXxHLVoyaVMOXFdNXAIBJw0BIUIECQMXMWkRAUIFAxsRESECVid2WVJMBysZOnUhCVlx +IgMCEQkJSUFLUjFkS0ILJw8eBQYlASEJYUUBB3kldBcOHiAVA1EBIiEGAQ4DCUFRYQYBBQJhCXFh +WjN1KWYEWC1GARohCVFyJEQBHBUJYVIkAQNtQzo8JyIBEAIJKQxnL1kFA0FtEWFhFTtzUzo8ByIC +EgEJAxkTYUM0ZmlOY3cOXidiZy4sEgEKCQNLIWoRQQoGAk8FKTFvWTFtQyYREUYKAgQTOiQIAQAF +c29saWQBAAQoSSlaAQAlY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RGYWNlUGFydCRjbGFzcwcADQEA +JShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RGYWNlUGFydDtJKVoMAAsADwoADgAQAQAEdGhpcwEA +NUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhRmFjZVBhcnQ7AQAE +c2lkZQEAAUkBABVyZWRzdG9uZUNvbmR1Y3Rpb25NYXABAAMoKUkBACQoTGNvZGVjaGlja2VuL211 +bHRpcGFydC9URmFjZVBhcnQ7KUkMABYAGAoADgAZAQAHZ2V0VHlwZQEAFCgpTGphdmEvbGFuZy9T +dHJpbmc7AQATdGVzdDpyZWZlcmVuY2UtZmFjZQgAHQEAC2dldFNsb3RNYXNrAQAGPGluaXQ+AQAD +KClWDAAgACEKAAQAIgEABiRpbml0JAEAJChMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RGYWNlUGFy +dDspVgwAJAAlCgAOACYBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRh +YmxlAQAKU291cmNlRmlsZQEAGVJ1bnRpbWVWaXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwAh +AAIABAABAAYAAAAFAAEACwAMAAEAKAAAADoAAgACAAAABiobuAARrAAAAAIAKQAAABYAAgAAAAYA +EgATAAAAAAAGABQAFQABACoAAAAGAAEAAAAIAAEAFgAXAAEAKAAAAC8AAQABAAAABSq4ABqsAAAA +AgApAAAADAABAAAABQASABMAAAAqAAAABgABAAAACAABABsAHAABACgAAAAtAAEAAQAAAAMSHrAA +AAACACkAAAAMAAEAAAADABIAEwAAACoAAAAGAAEAAAAJAAEAHwAXAAEAKAAAAC0AAQABAAAAAxA/ +rAAAAAIAKQAAAAwAAQAAAAMAEgATAAAAKgAAAAYAAQAAAAsAAQAgACEAAQAoAAAAMwABAAEAAAAJ +KrcAIyq4ACexAAAAAgApAAAADAABAAAACQASABMAAAAqAAAABgABAAAACAADACsAAAACAAcALAAA +AAsAAQAIAAEACXMACgAtAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaHollowMicroblock.class.b64 b/src/test/resources/compat/ReferenceScalaHollowMicroblock.class.b64 new file mode 100644 index 0000000..41fd5e4 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaHollowMicroblock.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQA/gEAO2NvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFIb2xsb3dNaWNyb2Jsb2NrBwABAQA6Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VIb2xsb3dNaWNyb2Jsb2NrQmFzZQcAAwEAJ2NvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9ibG9jawcABQEAJFJlZmVyZW5jZVNjYWxhSG9sbG93TWljcm9ibG9jay5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxhU2lnbmF0dXJlOwEABWJ5dGVzAQb9BgEFRWQBQgEDASURYURVM2dLSixnblkzVEcGZBcNUzhtWT48WCpbMnNfCmR3blk2CwUNIRFBQjJwW0IMR08DAgYNBUlRLh43dVNCDCcPHgYCDwVZMW0cM2ZHIkw3bVszbwcBGTIBAQYPIQlZQSJEAQMTCWkhQUEPU0saLCcvGjhkSyJ7Rw5cOHgbJhwnbxwybV8OXCcpWTpmIQl5ISNEAREVCQliIQEGblMOFHhOGTdwRy5MIWEFCQMhIXtHDlw4eBsmHCdvHDJtXw5cByJCCwEJAzESQQIfal0mJGgIRgEYIQlZAQFDBBoBAQdJEQEOAhMZTCdvHTtVUzIsVyNBDhEFcWlSIgEDCgV5ISEhBCtqWRZsVQ8cO2phBhRID0MEIQEBB0kRQRECGxlMJ28dO1VTMix3DEozcikJEQMGBQIkTTUJQUVDASYDFRk4LRk3YhMJOUNFAQNWXSYkCGJCFSADAwUNYUcBBHESCgRCQhYBQQMmMSQBBmdTShxID1Y1bUsCQnEhDAFBAhMFISQBBnRLDnxnDhoralkWRHFhDAFBAhMFAScBCHRLDnxnDhoralkWfEYlWjkVBQkKBGJCFS8DAwUNYQcFB2cBAQsVQg4CF00sN20cOGUpJmRXDQkFCGsBAQ0RIgE3AyUhGA5cM1NLBiQ3L0YBOCEJGQMoAwI6SQkZEUocOwkPbQIBGSFDAXkFaUEvGzdmJRYMR21dMCVLRiQiQUkfCQ8lUhQRIWEBbyExcQgBUSEKXQohAl41bUtKKxcNWjohER0JBQExQQUCCQshQlo1c2dSHAYuGTlmKwUZBUNBEkUTCSlFRQEDQ3NSLAdiQiQBAQQlCQFTAQ9NJhQ4D14qaUNCLHcMSjNyKQkREwpDBCoNBgUJGUEiCQ0tAwEVKQNEAy0xF05dOnUnIgwHLxoRCQ81AwEZIUMBBQZZMS9aMnBdEhwGLhk5ZhEdeQUBMUEFAkELcWJdM2RfOiQ3C1sxcUt+I1MtHQsDRUVDcSELKAICAwcxCQMEVAEBBkthUQENZxYcd04cM1RRBgRYDQkFCCsCAQ0RIgE3AykZCC4ZOWYlFgxHbR0FCC8CAQ0RIgFZAzkZCC4ZOWYlFgxHbV0wJUtGJCJBSS0JDyUyFhEhYQFvITExDAFRIQpdCjFiHTViYRYUVi0ZM3RBITlRDAFhAQoDMRQBQjptX1JEcWEYAUECEwUBLQEFdFk+JHgMSjNyKQkREw1DBCo9BgUJGUEcCQ0NBAEVKQM4AxUZSG4cOyERHSkHATFBBQIZDEFiHDxmZUpMRy1aKmp1FiwSYRoJA0chTCEhGxMDDwl7dw5cM2JdIjkxDgFhAQoDYRcBRTh3S0oUGA5aM1RTaix3DEozcikJEVMOQwQqVQYFCRlBNAkNPQQBFSkDaAM1eWcvGjpzUxIsNysbPmZBITkRDwFhAQoDMRRBAzVwWTJ8d29VNXtLIjkxDwFhAQoDIRhBBDVwWTJ8d29VNXtLfiNTLR0LA0VVRHEhCzoCAgMHcQcDBHgBAQZLYU4BDFE+ZEduXDxUU2osBwVDBHoBAQdJEQE0AiM9NFhNHTpqSRYcdQ4cN2pnJnxnDkMEfAEBB0kRAT8CKz00WE0dOmpJFhx1Dhw3amcmfGduGBNmY1IRISUgBQhTaQwJETEBaBEZeQgBKVEFTwYRck5eM3NlJiRXbVE4bVkmHBhuHDghESUJGQEBYQEKAwkpIUEFZF8yZBduXTVwXVYREXEBCQcDEwkZImEGDgUFLSECQkEHAx8JQSEeO2pZKhEREUMBBVUGNBgtAwMCFgUtIQECJ2pnUgRCISEHAiQ1ERExBAYFAzsJeSJBAndLDlQxISEJBwMNYRdOWQUFA0sJWUJBBERrCnwXDhocCRMFJQIBMUEFAgUtEiFEMnBZMkw3L1s4bz8SKhcPRgIjA1tBESJLQRQDAwUNIWECCREFRQIBKVEFAw8JIWJZOG1ZJhwYbhw4IRElCSkEAWEBCgMJOSQBBG9fSmwXDVwLAwNzAWIhYQ8CQgVdUUJBQR8VEQl5JGEEAgkxDGduWgUFAwcKaUQBBUppFhQYTRk3ZhElCTkFAWEBCgMJSSUBBm9fSmwXDVwwJUtGJDJBSUEmESVJE1FJQQECBAlJBAMFAlABAQsVQkEdAx1xd05dN2JZAkJxIWEVAQkDCikmAQN1UzIsRyNBDgkPBWUDASIRAlwFKTEPWzFxS1IJMQkDBAJgASEJRU4BCE8WJDgLXDh1ERkJGQcBQyFtBWlxLRo7SV8yZHduXipqdRZEcSFhGgEJAwpJJ0EJaEtSHHUOHDdqZyZ8Z05ROHlLTiQiIWECCQ8FNQQBIhECcAUJci0aO1BHDmRXb101cF0KewcwWjoVBQVlAgEACWZpcnN0VGlsZQEAJUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVGlsZU11bHRpcGFydDsBAApzZWNvbmRUaWxlAQAJdGlsZVJlYWRzAQABSQEACmZpcnN0U2hhcGUBAAFCAQALc2Vjb25kU2hhcGUBAApzaGFwZVJlYWRzAQAEc2xvdAEADG92ZXJyaWRlU2l6ZQEAAVoBAApob2xsb3dTaXplAQARb3ZlcnJpZGVDb2xsaXNpb24BAAljb2xsaXNpb24BABBMamF2YS91dGlsL0xpc3Q7AQAvTGphdmEvdXRpbC9MaXN0PExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7PjsBAAZub3JtYWwBABRMamF2YS9sYW5nL0l0ZXJhYmxlOwEAM0xqYXZhL2xhbmcvSXRlcmFibGU8TGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjs+OwEAPGNvZGVjaGlja2VuJG1pY3JvYmxvY2skSG9sbG93TWljcm9ibG9jayQkc3VwZXIkb2NjbHVzaW9uVGVzdAEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoBACxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbiRjbGFzcwcAIQEADW9jY2x1c2lvblRlc3QBAE0oTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgwAIwAkCgAiACUBAAR0aGlzAQA9TGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFIb2xsb3dNaWNyb2Jsb2NrOwEABW5wYXJ0AQAiTGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OwEACm1pY3JvQ2xhc3MBACwoKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0hvbGxvd01pY3JvQ2xhc3MkOwEALWNvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9ibG9jayRjbGFzcwcALQEAVShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrOylMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb0NsYXNzJDsMACsALwoALgAwAQAJZ2V0Qm91bmRzAQAfKClMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwEASChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrOylMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwAMgA0CgAuADUBAE4oTGNvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9ibG9jaztMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoMACMANwoALgA4AQAYZ2V0UGFydGlhbE9jY2x1c2lvbkJveGVzAQASKClMamF2YS91dGlsL0xpc3Q7AQA7KExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0hvbGxvd01pY3JvYmxvY2s7KUxqYXZhL3V0aWwvTGlzdDsMADoAPAoALgA9AQALZ2V0U3ViUGFydHMMAD8APAoALgBAAQAWYWxsb3dDb21wbGV0ZU9jY2x1c2lvbgEAAygpWgEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrOylaDABCAEQKAC4ARQEABXNvbGlkAQAEKEkpWgEALShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrO0kpWgwARwBJCgAuAEoBAARzaWRlAQAVcmVkc3RvbmVDb25kdWN0aW9uTWFwAQADKClJAQAsKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0hvbGxvd01pY3JvYmxvY2s7KUkMAE0ATwoALgBQAQALZ2V0U2xvdE1hc2sBAC1jb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2skY2xhc3MHAFMBACwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jazspSQwAUgBVCgBUAFYBAAtpdGVtQ2xhc3NJRAwAWABVCgBUAFkBADtjb2RlY2hpY2tlbiRtaWNyb2Jsb2NrJFRNaWNyb09jY2x1c2lvbiQkc3VwZXIkb2NjbHVzaW9uVGVzdAwAIwAgCgAEAFwBABdlZGdlQ29ybmVyT2NjbHVzaW9uVGVzdAEAUyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOylaAQB7KExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOylaDABeAGAKACIAYQEABGVkZ2UBAChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247AQAGY29ybmVyAQAnKClMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RpbGVNdWx0aXBhcnQ7DAALAAwJAAIAZwEADWZpcnN0VGlsZV8kZXEBACgoTGNvZGVjaGlja2VuL211bHRpcGFydC9UaWxlTXVsdGlwYXJ0OylWAQADeCQxDAANAAwJAAIAbAEADnNlY29uZFRpbGVfJGVxDAAOAA8JAAIAbwEADXRpbGVSZWFkc18kZXEBAAQoSSlWAQADKClCDAAQABEJAAIAdAEADmZpcnN0U2hhcGVfJGVxAQAEKEIpVgwAEgARCQACAHgBAA9zZWNvbmRTaGFwZV8kZXEMABMADwkAAgB7AQAOc2hhcGVSZWFkc18kZXEMABQADwkAAgB+AQAIc2xvdF8kZXEMABUAFgkAAgCBAQAQb3ZlcnJpZGVTaXplXyRlcQEABChaKVYMABcADwkAAgCFAQAOaG9sbG93U2l6ZV8kZXEMABgAFgkAAgCIAQAVb3ZlcnJpZGVDb2xsaXNpb25fJGVxDAAZABoJAAIAiwEADWNvbGxpc2lvbl8kZXEBABMoTGphdmEvdXRpbC9MaXN0OylWAQAWKClMamF2YS9sYW5nL0l0ZXJhYmxlOwwAHAAdCQACAJABAApub3JtYWxfJGVxAQAXKExqYXZhL2xhbmcvSXRlcmFibGU7KVYBAAR0aWxlAQAGZXZlbnRzDACVADsKAAIAlggAlAEADmphdmEvdXRpbC9MaXN0BwCZAQADYWRkAQAVKExqYXZhL2xhbmcvT2JqZWN0OylaDACbAJwLAJoAnQwADgBOCgACAJ8MAHEAcgoAAgChDAALAGYKAAIAowwADQBmCgACAKUBACNjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVGlsZU11bHRpcGFydAcApwEABXNoYXBlCACpDAATAE4KAAIAqwwAfQByCgACAK0MABAAcwoAAgCvDAASAHMKAAIAsQEAB2dldFNsb3QIABQMABQATgoAAgC1AQANZ2V0SG9sbG93U2l6ZQEABHNpemUIALgMABUAQwoAAgC6DAAXAE4KAAIAvAwAtwBPCgAuAL4BABFnZXRDb2xsaXNpb25Cb3hlcwgAGQwAGABDCgACAMIMABkAOwoAAgDEDADAADwKAC4AxgEAEWdldE9jY2x1c2lvbkJveGVzAQALbm9ybWFsOnNlbGYIAMkMABwAjwoAAgDLDAA/ADsKAAIAzQwAOgA7CgACAM8BACooKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGFzczsMACsALAoAAgDSAQArKClMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb0NsYXNzOwwAwAA7CgACANUBAAY8aW5pdD4BAAMoKVYMANcA2AoABADZAQAGJGluaXQkAQArKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspVgwA2wDcCgAiAN0BACwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jazspVgwA2wDfCgBUAOABACwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9ibG9jazspVgwA2wDiCgAuAOMBABtjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDYHAOUBAARmdWxsAQAdTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjsMAOcA6AkA5gDpAQAVamF2YS91dGlsL0NvbGxlY3Rpb25zBwDrAQANc2luZ2xldG9uTGlzdAEAJChMamF2YS9sYW5nL09iamVjdDspTGphdmEvdXRpbC9MaXN0OwwA7QDuCgDsAO8BAAlTaWduYXR1cmUBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQAxKClMamF2YS91dGlsL0xpc3Q8TGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjs+OwEAPigpTGphdmEvdXRpbC9MaXN0PExjb2RlY2hpY2tlbi9saWIvcmF5dHJhY2VyL0luZGV4ZWRDdWJvaWQ2Oz47AQAyKExqYXZhL3V0aWwvTGlzdDxMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2Oz47KVYBADUoKUxqYXZhL2xhbmcvSXRlcmFibGU8TGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjs+OwEANihMamF2YS9sYW5nL0l0ZXJhYmxlPExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7PjspVgEADVN0YWNrTWFwVGFibGUBAApTb3VyY2VGaWxlAQAZUnVudGltZVZpc2libGVBbm5vdGF0aW9ucwEACFNjYWxhU2lnACEAAgAEAAEABgAMAAIACwAMAAAAAgANAAwAAAACAA4ADwAAAAIAEAARAAAAAgASABEAAAACABMADwAAAAIAFAAPAAAAAgAVABYAAAACABcADwAAAAIAGAAWAAAAAgAZABoAAQDxAAAAAgAbAAIAHAAdAAEA8QAAAAIAHgAxEAEAHwAgAAEA8gAAADoAAgACAAAABioruAAmrAAAAAIA8wAAABYAAgAAAAYAJwAoAAAAAAAGACkAKgABAPQAAAAGAAEAAAATAAEAKwAsAAEA8gAAAC8AAQABAAAABSq4ADGwAAAAAgDzAAAADAABAAAABQAnACgAAAD0AAAABgABAAAAEwABADIAMwABAPIAAAAvAAEAAQAAAAUquAA2sAAAAAIA8wAAAAwAAQAAAAUAJwAoAAAA9AAAAAYAAQAAABMAAQAjACAAAQDyAAAAOgACAAIAAAAGKiu4ADmsAAAAAgDzAAAAFgACAAAABgAnACgAAAAAAAYAKQAqAAEA9AAAAAYAAQAAABMAAQA6ADsAAgDyAAAALwABAAEAAAAFKrgAPrAAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAATAPEAAAACAPUAAQA/ADsAAgDyAAAALwABAAEAAAAFKrgAQbAAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAATAPEAAAACAPYAAQBCAEMAAQDyAAAALwABAAEAAAAFKrgARqwAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAATAAEARwBIAAEA8gAAADoAAgACAAAABiobuABLrAAAAAIA8wAAABYAAgAAAAYAJwAoAAAAAAAGAEwADwABAPQAAAAGAAEAAAATAAEATQBOAAEA8gAAAC8AAQABAAAABSq4AFGsAAAAAgDzAAAADAABAAAABQAnACgAAAD0AAAABgABAAAAEwABAFIATgABAPIAAAAvAAEAAQAAAAUquABXrAAAAAIA8wAAAAwAAQAAAAUAJwAoAAAA9AAAAAYAAQAAABMAAQBYAE4AAQDyAAAALwABAAEAAAAFKrgAWqwAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAATEAEAWwAgAAEA8gAAADoAAgACAAAABiortwBdrAAAAAIA8wAAABYAAgAAAAYAJwAoAAAAAAAGACkAKgABAPQAAAAGAAEAAAATAAEAXgBfAAEA8gAAAEUAAwADAAAAByorLLgAYqwAAAACAPMAAAAgAAMAAAAHACcAKAAAAAAABwBjAGQAAQAAAAcAZQBkAAIA9AAAAAYAAQAAABMAAQALAGYAAQDyAAAALwABAAEAAAAFKrQAaLAAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAAUAAEAaQBqAAEA8gAAADoAAgACAAAABiortQBosQAAAAIA8wAAABYAAgAAAAYAJwAoAAAAAAAGAGsADAABAPQAAAAGAAEAAAAUAAEADQBmAAEA8gAAAC8AAQABAAAABSq0AG2wAAAAAgDzAAAADAABAAAABQAnACgAAAD0AAAABgABAAAAFQABAG4AagABAPIAAAA6AAIAAgAAAAYqK7UAbbEAAAACAPMAAAAWAAIAAAAGACcAKAAAAAAABgBrAAwAAQD0AAAABgABAAAAFQABAA4ATgABAPIAAAAvAAEAAQAAAAUqtABwrAAAAAIA8wAAAAwAAQAAAAUAJwAoAAAA9AAAAAYAAQAAABYAAQBxAHIAAQDyAAAAOgACAAIAAAAGKhu1AHCxAAAAAgDzAAAAFgACAAAABgAnACgAAAAAAAYAawAPAAEA9AAAAAYAAQAAABYAAQAQAHMAAQDyAAAALwABAAEAAAAFKrQAdawAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAAXAAEAdgB3AAEA8gAAADoAAgACAAAABiobtQB1sQAAAAIA8wAAABYAAgAAAAYAJwAoAAAAAAAGAGsAEQABAPQAAAAGAAEAAAAXAAEAEgBzAAEA8gAAAC8AAQABAAAABSq0AHmsAAAAAgDzAAAADAABAAAABQAnACgAAAD0AAAABgABAAAAGAABAHoAdwABAPIAAAA6AAIAAgAAAAYqG7UAebEAAAACAPMAAAAWAAIAAAAGACcAKAAAAAAABgBrABEAAQD0AAAABgABAAAAGAABABMATgABAPIAAAAvAAEAAQAAAAUqtAB8rAAAAAIA8wAAAAwAAQAAAAUAJwAoAAAA9AAAAAYAAQAAABkAAQB9AHIAAQDyAAAAOgACAAIAAAAGKhu1AHyxAAAAAgDzAAAAFgACAAAABgAnACgAAAAAAAYAawAPAAEA9AAAAAYAAQAAABkAAQAUAE4AAQDyAAAALwABAAEAAAAFKrQAf6wAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAAaAAEAgAByAAEA8gAAADoAAgACAAAABiobtQB/sQAAAAIA8wAAABYAAgAAAAYAJwAoAAAAAAAGAGsADwABAPQAAAAGAAEAAAAaAAEAFQBDAAEA8gAAAC8AAQABAAAABSq0AIKsAAAAAgDzAAAADAABAAAABQAnACgAAAD0AAAABgABAAAAGwABAIMAhAABAPIAAAA6AAIAAgAAAAYqG7UAgrEAAAACAPMAAAAWAAIAAAAGACcAKAAAAAAABgBrABYAAQD0AAAABgABAAAAGwABABcATgABAPIAAAAvAAEAAQAAAAUqtACGrAAAAAIA8wAAAAwAAQAAAAUAJwAoAAAA9AAAAAYAAQAAABwAAQCHAHIAAQDyAAAAOgACAAIAAAAGKhu1AIaxAAAAAgDzAAAAFgACAAAABgAnACgAAAAAAAYAawAPAAEA9AAAAAYAAQAAABwAAQAYAEMAAQDyAAAALwABAAEAAAAFKrQAiawAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAAdAAEAigCEAAEA8gAAADoAAgACAAAABiobtQCJsQAAAAIA8wAAABYAAgAAAAYAJwAoAAAAAAAGAGsAFgABAPQAAAAGAAEAAAAdAAEAGQA7AAIA8gAAAC8AAQABAAAABSq0AIywAAAAAgDzAAAADAABAAAABQAnACgAAAD0AAAABgABAAAAHgDxAAAAAgD1AAEAjQCOAAIA8gAAADoAAgACAAAABiortQCMsQAAAAIA8wAAABYAAgAAAAYAJwAoAAAAAAAGAGsAGgABAPQAAAAGAAEAAAAeAPEAAAACAPcAAQAcAI8AAgDyAAAALwABAAEAAAAFKrQAkbAAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAAfAPEAAAACAPgAAQCSAJMAAgDyAAAAOgACAAIAAAAGKiu1AJGxAAAAAgDzAAAAFgACAAAABgAnACgAAAAAAAYAawAdAAEA9AAAAAYAAQAAAB8A8QAAAAIA+QABAJQAZgABAPIAAABtAAMAAQAAACoqtgCXEpi5AJ4CAFcqKrYAoARgtgCiKrYAoASgAAoqtgCkpwAHKrYAprAAAAADAPMAAAAMAAEAAAAqACcAKAAAAPQAAAASAAQAAAAiAAwAIwAWACQAKQAhAPoAAAAHAAIlQwcAqAABAKkAcwABAPIAAABrAAMAAQAAACoqtgCXEqq5AJ4CAFcqKrYArARgtgCuKrYArASgAAoqtgCwpwAHKrYAsqwAAAADAPMAAAAMAAEAAAAqACcAKAAAAPQAAAASAAQAAAAnAAwAKAAWACkAKQAmAPoAAAAFAAIlQwEAAQCzAE4AAQDyAAAAOwACAAEAAAARKrYAlxK0uQCeAgBXKrYAtqwAAAACAPMAAAAMAAEAAAARACcAKAAAAPQAAAAGAAEAAAArAAEAtwBOAAEA8gAAAFwAAgABAAAAHyq2AJcSubkAngIAVyq2ALuZAAoqtgC9pwAHKrgAv6wAAAADAPMAAAAMAAEAAAAfACcAKAAAAPQAAAAOAAMAAAAtAAwALgAeACwA+gAAAAUAAhpDAQABAMAAOwACAPIAAABeAAIAAQAAAB8qtgCXEsG5AJ4CAFcqtgDDmQAKKrYAxacAByq4AMewAAAAAwDzAAAADAABAAAAHwAnACgAAAD0AAAADgADAAAAMQAMADIAHgAwAPoAAAAHAAIaQwcAmgDxAAAAAgD1AAEAyACPAAIA8gAAAD8AAgABAAAAESq2AJcSyrkAngIAVyq2AMywAAAAAgDzAAAADAABAAAAEQAnACgAAAD0AAAACgACAAAANQAMADYA8QAAAAIA+BBBAD8AjwABAPIAAAAvAAEAAQAAAAUqtgDOsAAAAAIA8wAAAAwAAQAAAAUAJwAoAAAA9AAAAAYAAQAAABMQQQA6AI8AAQDyAAAALwABAAEAAAAFKrYA0LAAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAATEEEAKwDRAAEA8gAAAC8AAQABAAAABSq2ANOwAAAAAgDzAAAADAABAAAABQAnACgAAAD0AAAABgABAAAAExBBACsA1AABAPIAAAAvAAEAAQAAAAUqtgDTsAAAAAIA8wAAAAwAAQAAAAUAJwAoAAAA9AAAAAYAAQAAABMQQQDAAI8AAQDyAAAALwABAAEAAAAFKrYA1rAAAAACAPMAAAAMAAEAAAAFACcAKAAAAPQAAAAGAAEAAAATAAEA1wDYAAEA8gAAAK8AAgABAAAAVSq3ANoquADeKrgA4Sq4AOQqAbUAaCoBtQBtKgO1AHAqEDC1AHUqEDC1AHkqA7UAfCoDtQB/KgO1AIIqEAi1AIYqA7UAiSoBtQCMKrIA6rgA8LUAkbEAAAACAPMAAAAMAAEAAABVACcAKAAAAPQAAAA2AA0AAAATABAAFAAVABUAGgAWAB8AFwAlABgAKwAZADAAGgA1ABsAOgAcAEAAHQBFAB4ASgAfAAMA+wAAAAIABwD8AAAACwABAAgAAQAJcwAKAP0AAAADBQAA diff --git a/src/test/resources/compat/ReferenceScalaHollowMicroblockClient.class.b64 b/src/test/resources/compat/ReferenceScalaHollowMicroblockClient.class.b64 new file mode 100644 index 0000000..6dd9f44 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaHollowMicroblockClient.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQBPwEAQWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFIb2xsb3dNaWNyb2Jsb2NrQ2xpZW50BwABAQA2Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VIb2xsb3dDbGllbnRCYXNlBwADAQAtY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrQ2xpZW50BwAFAQAqUmVmZXJlbmNlU2NhbGFIb2xsb3dNaWNyb2Jsb2NrQ2xpZW50LnNjYWxhAQAeTHNjYWxhL3JlZmxlY3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBCG0GAQUlZwFCAQMBJRFBRVUzZ0tKLGduWTNURwZkFw1TOG1ZPjxYKlsyc18KZHduWTZEWSYsZw4eBgMHEQlhYVk4bmEGJChCQQMHAyVpVw8cO2phBhRIT0MBCAMtGXcOWjNkUSYcNy4aOAQBTRkBQQMIEQUtYVEiAQIKBTURISEHKmZNFhRYTVwyZhE+ZEduXDxEWSYsZw4eImJnFgQiYQQKDgNBUSEhBQQCFTVMN01dOGNZPhw3LgMCFCEJMQJqHDdtX15sFW4ZOnBFMnw3bVsibVMWdEcPQwMWAREFYSMBBD1TOkxHTxALAi9BETECAQUIMwEBDREiARsDGRF3Lh44ZWdWCTEEBQIdQzUJUUQDAh8/BRlhL1oyCwUBMhFhATdqRSYRISUIAggHVhR3LhszNxEdIQMBMUEFAhUKIUJZOHZdEhx4DEozcikJMUMGBQIoVTUJAUZDASoDFRk4LRk3YhMJWQNGAQNWXSYkCGJCFyQDAwUNYUcBBHESCgRCQhgBQQMmMSRBBGNfVnRHbR0RCQ9FAgEZIUMBZQUBMi8aN2ZHUixHLVQxdUtKTBcNXAsCZ0ERQUcQCANrcXIhQU4eDwVdUlQiAR0LBWVCEUECH3NfPiRoKEMBCBMJCWIhAwI+IQUpUipbMnNfNgtHLxo6akMyFFZtWjV0aUpMGEJBIEEFOUlVKlsyc182C0cvGjpqQzJUISEQCQkPCQMBGSFDAQcGITIvGjdmR1IsRy1UMXVLSkwXDVwwJUtGJCJBCiMJDzUKFREhYQFnITFhCQFRIQpNChFjXTNtSw4kWA1aJ2JpFhQYLhk3IREdQQUBMUEFAiULMQIeOmJdTgQYTV0zb2lWCSEKBQIoFyYRQQoLAggFPnxHLloxbxEdcQUBMUEFAj0LcQIeOmJdTgQYTV0zb2l+I1MtHQsDTUFDcSFMJwICAwchCgMEUwEBBktBUwENaUoMZ24dOWJlFnRHDwkFCCkCAQ0RIgFWAxEZSG4cOxYDWQMiYUosCgVhQyNhQSVvaSI5IQwBYQEKA1kWAUM6bV9SfEYlWjkVBRliBmJCF1oDAwUNQRYFBz0CAQsVAiwCC01kdw4eEQkPAQQBGSFDASsGWTEPXDh1AxI0GE1cMmYRHREHATFBBQINDHFiHTdwaQYjZy8ZOGRLfiNTLR0LA00RRHEhTDECAgMHYQsDBGcBAQZLQVYBDWcyfEcvETN3QzocVw0JBQhRAgENESIBVgMpQXcOHDdwb05LJzAaBQhVAgENESIBbAM5QXcOHDdwb05LJzBaMCVLRiQiQQo3CQ81ShcRIWEBLSIxYQ4BUSEKWQsxAls4bVk+PDgrGz5mQSE5AQ8BYQEKA0kVAUUyaUM6PFctVDF0Vz5zNysbPmYRHREIATFBBQJNDEFjGTViXR4sVypZOmwfOhwWTl8zYEkVDEhDARR1ER1pEy8hQUECKUNhQR4BIUITURUhRTJpQzo8Vy1UMXRXPnM3Kxs+ZkEhOQEQAWEBCgNJGAEDOmJvTkMXDV0zFgNpBCJhSj4KBXFEIwECInppFkRxQSABQQITBXEwAQdzQ14cBi4ZOWY/EioXD0YCJwMDQXEhTD8CAgMHIRBDBAIGAQELFQI+AhNJDHdvFTViYRYEAwJDQQUBAQdJEUErAhlNRBcNXTNCSVoMZ25ZMwkTBTUBATFBBQIFPREBRTppQ0IsFwkaPGJdDix3DEozcikNMRMRAwUJWwUtEREhYQEtIjkRUQMBIUITMRYhRDppQ0IsFwkaPGJdDiwHBQMFAhoBAQ0RIgFKAyURWE8cJXBZMnx3D0MFAh4BAQ0RIgECIAVpIS8eOElfMmR3bl4wJUtGJDJBSkERESFpEzFEQQECBFEFYkJBEwEBBktBUwELZVZ0B2ocN21fXgQDIkNBFQEBB0kRQUEWAy0JZw1eM3MRPmRHblw8FgUFNQIDQkEYA3NpISEhDQsJBU0SUUcBBVkGdHdNAwICOAUhIS4ZPGITEQlZJCENAxFJK2hOXDFjWRZEESJhEAEBBCUJISERAh8FNEcvGjpJXzJkd25eMCVLRiQyQUpBIhElaRNRSEEBAgQJaQMDBQJIAQELFUJBFwMxCWcNXjNzET5kR25cPCERJQlZBQFhAQoDCWklQQNlZQY8OC8GAgJQQTEREUtBLAM3aiEhYRULCQVVE1FHAQVrUkxHLgMDAloFTSMBAidqZ1IEUmFKQS8DQ0oxIWEYKQUVCSVPXTF6IREJeSNhGQoJBRUUEQcCBx8KVFdtGTsJEwUlBAExQQUCBS0UIQMzc0NeHHgMSjNyKQ0xE1EOBQpbBR0UESFhAQMfQgEiIR0BQQMmEXFKAQdJSgx3bx0RCQ0FVQQBIhEbAyU5Vw0eInBrOiQ3D0MEAnoBIQklYR8CGR0sRy9TJ2JpFhQYLhk3FQNNQnEhYSABCQMKCSlBB2pnUhMYTVw6cUNKLGcOHgsCFSIxEVERAQVCVQtxYVozdScyfEcPAwQCCgIhCSVWAQ5PFiQIahw3bV9eHBZOXzMJDwU1BQEiEQIQBikxD1sxcUtSCSEQQwQCFAIhCSUhJgIDYSQSQRYFCAMzA0ERSUFLAwVJCGJCQU8BEQUTUVMBAnUiORERFQEFQgUNFgEEOmZdEiwnD1M4bVk+PEgjBBQCJgY9FjFXQVwDdwt5DAMFAigGfQUZQUFVAw0BeG4dCQQ5BS0WYkFBVzsJOWErWjJ1X0ocBGJCQVkDPwMNQVYBBWEGHDgPQwQCNgZ9BRlBDgIDDURxISEvAiACB2ErAQNuQ05cB2JCQV8DPwMNQVMBBU0GHFcNAwUCQgZ9BRlBQWIDBTEHQ0MUAkYGJTZHVg5XTSUZEXEZFQMTGStobhk7al86LAQBAAZib3VuZHMBAB1MY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwEAEHNlbGVjdGVkTWF0ZXJpYWwBAD1MY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb01hdGVyaWFsUmVnaXN0cnkkSU1pY3JvTWF0ZXJpYWw7AQALdHJhbnNwYXJlbnQBAAFaAQAEc2xvdAEAAUkBAAtzbG90QWR2YW5jZQEACmhvbGxvd1NpemUBABBjaGFuZ2VNYXNrT25TaXplAQAIcmF3U2hhcGUBAAFCAQAMc2hhcGVBZHZhbmNlAQAJcnVuSG9sbG93AQALYWZ0ZXJIb2xsb3cBABRMamF2YS9sYW5nL1J1bm5hYmxlOwEABWRyYXdzAQAQTGphdmEvdXRpbC9MaXN0OwEAJUxqYXZhL3V0aWwvTGlzdDxbTGphdmEvbGFuZy9PYmplY3Q7PjsBAEFjb2RlY2hpY2tlbiRtaWNyb2Jsb2NrJEhvbGxvd01pY3JvYmxvY2tDbGllbnQkJHN1cGVyJHJlY2FsY0JvdW5kcwEAAygpVgEADHJlY2FsY0JvdW5kcwwAIQAgCgAEACIBAAR0aGlzAQBDTGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFIb2xsb3dNaWNyb2Jsb2NrQ2xpZW50OwEAM2NvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9ibG9ja0NsaWVudCRjbGFzcwcAJgEAMihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrQ2xpZW50OylWDAAhACgKACcAKQEADGRyYXdCcmVha2luZwEALyhMbmV0L21pbmVjcmFmdC9jbGllbnQvcmVuZGVyZXIvUmVuZGVyQmxvY2tzOylWAQBeKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0hvbGxvd01pY3JvYmxvY2tDbGllbnQ7TG5ldC9taW5lY3JhZnQvY2xpZW50L3JlbmRlcmVyL1JlbmRlckJsb2NrczspVgwAKwAtCgAnAC4BAAxyZW5kZXJCbG9ja3MBACxMbmV0L21pbmVjcmFmdC9jbGllbnQvcmVuZGVyZXIvUmVuZGVyQmxvY2tzOwEABnJlbmRlcgEAIShMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpVgEAUChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrQ2xpZW50O0xjb2RlY2hpY2tlbi9saWIvdmVjL1ZlY3RvcjM7SSlWDAAyADQKACcANQEAA3BvcwEAHUxjb2RlY2hpY2tlbi9saWIvdmVjL1ZlY3RvcjM7AQAEcGFzcwEADWRyYXdIaWdobGlnaHQBAFcoTG5ldC9taW5lY3JhZnQvdXRpbC9Nb3ZpbmdPYmplY3RQb3NpdGlvbjtMbmV0L21pbmVjcmFmdC9lbnRpdHkvcGxheWVyL0VudGl0eVBsYXllcjtGKVoBAIYoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9ibG9ja0NsaWVudDtMbmV0L21pbmVjcmFmdC91dGlsL01vdmluZ09iamVjdFBvc2l0aW9uO0xuZXQvbWluZWNyYWZ0L2VudGl0eS9wbGF5ZXIvRW50aXR5UGxheWVyO0YpWgwAOgA8CgAnAD0BAANoaXQBAClMbmV0L21pbmVjcmFmdC91dGlsL01vdmluZ09iamVjdFBvc2l0aW9uOwEABnBsYXllcgEAKkxuZXQvbWluZWNyYWZ0L2VudGl0eS9wbGF5ZXIvRW50aXR5UGxheWVyOwEABWZyYW1lAQABRgEAPGNvZGVjaGlja2VuJG1pY3JvYmxvY2skSG9sbG93TWljcm9ibG9jayQkc3VwZXIkb2NjbHVzaW9uVGVzdAEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoBACxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbiRjbGFzcwcARwEADW9jY2x1c2lvblRlc3QBAE0oTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgwASQBKCgBIAEsBAAVucGFydAEAIkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDsBAAptaWNyb0NsYXNzAQAsKClMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb0NsYXNzJDsBAC1jb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0hvbGxvd01pY3JvYmxvY2skY2xhc3MHAFEBAFUoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9ibG9jazspTGNvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9DbGFzcyQ7DABPAFMKAFIAVAEATihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgwASQBWCgBSAFcBABhnZXRQYXJ0aWFsT2NjbHVzaW9uQm94ZXMBABIoKUxqYXZhL3V0aWwvTGlzdDsBADsoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9ibG9jazspTGphdmEvdXRpbC9MaXN0OwwAWQBbCgBSAFwBABFnZXRPY2NsdXNpb25Cb3hlcwEAFigpTGphdmEvbGFuZy9JdGVyYWJsZTsBAD8oTGNvZGVjaGlja2VuL21pY3JvYmxvY2svSG9sbG93TWljcm9ibG9jazspTGphdmEvbGFuZy9JdGVyYWJsZTsMAF4AYAoAUgBhAQARZ2V0Q29sbGlzaW9uQm94ZXMMAGMAWwoAUgBkAQALZ2V0U3ViUGFydHMMAGYAWwoAUgBnAQAWYWxsb3dDb21wbGV0ZU9jY2x1c2lvbgEAAygpWgEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrOylaDABpAGsKAFIAbAEABXNvbGlkAQAEKEkpWgEALShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrO0kpWgwAbgBwCgBSAHEBAARzaWRlAQAVcmVkc3RvbmVDb25kdWN0aW9uTWFwAQADKClJAQAsKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0hvbGxvd01pY3JvYmxvY2s7KUkMAHQAdgoAUgB3AQAfKClMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwACwAMCQACAHoBAApib3VuZHNfJGVxAQAgKExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7KVYBAAN4JDEBAD8oKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvTWF0ZXJpYWxSZWdpc3RyeSRJTWljcm9NYXRlcmlhbDsMAA0ADgkAAgCAAQAUc2VsZWN0ZWRNYXRlcmlhbF8kZXEBAEAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lzdHJ5JElNaWNyb01hdGVyaWFsOylWDAAPABAJAAIAhAEAD3RyYW5zcGFyZW50XyRlcQEABChaKVYMABEAEgkAAgCIAQAIc2xvdF8kZXEBAAQoSSlWDAATABIJAAIAjAEAD3Nsb3RBZHZhbmNlXyRlcQwAFAASCQACAI8BAA5ob2xsb3dTaXplXyRlcQwAFQAQCQACAJIBABRjaGFuZ2VNYXNrT25TaXplXyRlcQEAAygpQgwAFgAXCQACAJYBAAxyYXdTaGFwZV8kZXEBAAQoQilWDAAYABIJAAIAmgEAEHNoYXBlQWR2YW5jZV8kZXEMABkAEAkAAgCdAQANcnVuSG9sbG93XyRlcQEAFigpTGphdmEvbGFuZy9SdW5uYWJsZTsMABoAGwkAAgChAQAPYWZ0ZXJIb2xsb3dfJGVxAQAXKExqYXZhL2xhbmcvUnVubmFibGU7KVYMABwAHQkAAgClAQAJZHJhd3NfJGVxAQATKExqYXZhL3V0aWwvTGlzdDspVgEACWdldEJvdW5kcwEABmV2ZW50cwwAqgBaCgACAKsIAAsBAA5qYXZhL3V0aWwvTGlzdAcArgEAA2FkZAEAFShMamF2YS9sYW5nL09iamVjdDspWgwAsACxCwCvALIMAAsAeQoAAgC0AQAMZ2V0SU1hdGVyaWFsAQAIbWF0ZXJpYWwIALcMAA0AfwoAAgC5AQANaXNUcmFuc3BhcmVudAgADwwADwBqCgACAL0BAAdnZXRTbG90CAARDAARAHUKAAIAwQwAEwB1CgACAMMMAIoAiwoAAgDFAQAGcmVzdWx0AQANZ2V0SG9sbG93U2l6ZQEABHNpemUIAMkMABUAagoAAgDLA96tvu8BAA5yZW5kZXJNYXNrXyRlcQwAzgCLCgACAM8MABQAdQoAAgDRAQAFc2hhcGUIANMMABYAlQoAAgDVDAAYAHUKAAIA1wwAmACZCgACANkBAAF4CADbAQABeQgA3QEAAXoIAN8BAAxyZW5kZXJIb2xsb3cBAFEoTGNvZGVjaGlja2VuL2xpYi92ZWMvVmVjdG9yMztJTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjtJWkxzY2FsYS9GdW5jdGlvbjU7KVYBAAZob2xsb3cIAOMMABwAWgoAAgDlAQAQamF2YS9sYW5nL09iamVjdAcA5wEAGnNjYWxhL3J1bnRpbWUvQm94ZXNSdW5UaW1lBwDpAQAMYm94VG9JbnRlZ2VyAQAWKEkpTGphdmEvbGFuZy9JbnRlZ2VyOwwA6wDsCgDqAO0BAAxib3hUb0Jvb2xlYW4BABYoWilMamF2YS9sYW5nL0Jvb2xlYW47DADvAPAKAOoA8QwAGgCgCgACAPMBABJqYXZhL2xhbmcvUnVubmFibGUHAPUBAANydW4MAPcAIAsA9gD4DAAZAGoKAAIA+gEAgChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrQ2xpZW50O0xjb2RlY2hpY2tlbi9saWIvdmVjL1ZlY3RvcjM7SUxjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7SVpMc2NhbGEvRnVuY3Rpb241OylWDADhAPwKACcA/QEAAWMBAARtYXNrAQAEZmFjZQEAAWYBABFMc2NhbGEvRnVuY3Rpb241OwwAZgBaCgACAQQMAGMAWgoAAgEGDABZAFoKAAIBCAEAKigpTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsYXNzOwwATwBQCgACAQsBACsoKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvQ2xhc3M7AQAGPGluaXQ+DAEOACAKAAQBDwEABiRpbml0JAEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Ib2xsb3dNaWNyb2Jsb2NrOylWDAERARIKAFIBEwwBEQAoCgAnARUBABtjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDYHARcGP7mZmZmZmZoGP8mZmZmZmZoGP9MzMzMzMzMGP+zMzMzMzM0GP+mZmZmZmZoGP+ZmZmZmZmYBAAkoREREREREKVYMAQ4BJQoBGAEmAQATamF2YS91dGlsL0FycmF5TGlzdAcBKAoBKQEPAQA7Y29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb01hdGVyaWFsUmVnaXN0cnkkSU1pY3JvTWF0ZXJpYWwHASsBACxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvTWF0ZXJpYWxSZWdpc3RyeQcBLQEADklNaWNyb01hdGVyaWFsAQAJU2lnbmF0dXJlAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEAMSgpTGphdmEvdXRpbC9MaXN0PExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7PjsBADUoKUxqYXZhL2xhbmcvSXRlcmFibGU8TGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjs+OwEAPigpTGphdmEvdXRpbC9MaXN0PExjb2RlY2hpY2tlbi9saWIvcmF5dHJhY2VyL0luZGV4ZWRDdWJvaWQ2Oz47AQAnKClMamF2YS91dGlsL0xpc3Q8W0xqYXZhL2xhbmcvT2JqZWN0Oz47AQAoKExqYXZhL3V0aWwvTGlzdDxbTGphdmEvbGFuZy9PYmplY3Q7PjspVgEADVN0YWNrTWFwVGFibGUBAQcoTGNvZGVjaGlja2VuL2xpYi92ZWMvVmVjdG9yMztJTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjtJWkxzY2FsYS9GdW5jdGlvbjU8TGNvZGVjaGlja2VuL2xpYi92ZWMvVmVjdG9yMztMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb01hdGVyaWFsUmVnaXN0cnkkSU1pY3JvTWF0ZXJpYWw7TGphdmEvbGFuZy9PYmplY3Q7TGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjtMamF2YS9sYW5nL09iamVjdDtMc2NhbGEvcnVudGltZS9Cb3hlZFVuaXQ7PjspVgEAClNvdXJjZUZpbGUBAAxJbm5lckNsYXNzZXMBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAQAGAAwAAgALAAwAAAACAA0ADgAAAAIADwAQAAAAAgARABIAAAACABMAEgAAAAIAFAASAAAAAgAVABAAAAACABYAFwAAAAIAGAASAAAAAgAZABAAAAACABoAGwAAAAIAHAAdAAEBMAAAAAIAHgA3EAEAHwAgAAEBMQAAAC8AAQABAAAABSq3ACOxAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAFAABACEAIAABATEAAAAvAAEAAQAAAAUquAAqsQAAAAIBMgAAAAwAAQAAAAUAJAAlAAABMwAAAAYAAQAAABQAAQArACwAAQExAAAAOgACAAIAAAAGKiu4AC+xAAAAAgEyAAAAFgACAAAABgAkACUAAAAAAAYAMAAxAAEBMwAAAAYAAQAAABQAAQAyADMAAQExAAAARQADAAMAAAAHKiscuAA2sQAAAAIBMgAAACAAAwAAAAcAJAAlAAAAAAAHADcAOAABAAAABwA5ABIAAgEzAAAABgABAAAAFAABADoAOwABATEAAABQAAQABAAAAAgqKywluAA+rAAAAAIBMgAAACoABAAAAAgAJAAlAAAAAAAIAD8AQAABAAAACABBAEIAAgAAAAgAQwBEAAMBMwAAAAYAAQAAABQQAQBFAEYAAQExAAAAOgACAAIAAAAGKiu4AEysAAAAAgEyAAAAFgACAAAABgAkACUAAAAAAAYATQBOAAEBMwAAAAYAAQAAABQAAQBPAFAAAQExAAAALwABAAEAAAAFKrgAVbAAAAACATIAAAAMAAEAAAAFACQAJQAAATMAAAAGAAEAAAAUAAEASQBGAAEBMQAAADoAAgACAAAABioruABYrAAAAAIBMgAAABYAAgAAAAYAJAAlAAAAAAAGAE0ATgABATMAAAAGAAEAAAAUAAEAWQBaAAIBMQAAAC8AAQABAAAABSq4AF2wAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAFAEwAAAAAgE0AAEAXgBfAAIBMQAAAC8AAQABAAAABSq4AGKwAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAFAEwAAAAAgE1AAEAYwBaAAIBMQAAAC8AAQABAAAABSq4AGWwAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAFAEwAAAAAgE0AAEAZgBaAAIBMQAAAC8AAQABAAAABSq4AGiwAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAFAEwAAAAAgE2AAEAaQBqAAEBMQAAAC8AAQABAAAABSq4AG2sAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAFAABAG4AbwABATEAAAA6AAIAAgAAAAYqG7gAcqwAAAACATIAAAAWAAIAAAAGACQAJQAAAAAABgBzABIAAQEzAAAABgABAAAAFAABAHQAdQABATEAAAAvAAEAAQAAAAUquAB4rAAAAAIBMgAAAAwAAQAAAAUAJAAlAAABMwAAAAYAAQAAABQAAQALAHkAAQExAAAALwABAAEAAAAFKrQAe7AAAAACATIAAAAMAAEAAAAFACQAJQAAATMAAAAGAAEAAAAVAAEAfAB9AAEBMQAAADoAAgACAAAABiortQB7sQAAAAIBMgAAABYAAgAAAAYAJAAlAAAAAAAGAH4ADAABATMAAAAGAAEAAAAVAAEADQB/AAEBMQAAAC8AAQABAAAABSq0AIGwAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAFgABAIIAgwABATEAAAA6AAIAAgAAAAYqK7UAgbEAAAACATIAAAAWAAIAAAAGACQAJQAAAAAABgB+AA4AAQEzAAAABgABAAAAFgABAA8AagABATEAAAAvAAEAAQAAAAUqtACFrAAAAAIBMgAAAAwAAQAAAAUAJAAlAAABMwAAAAYAAQAAABcAAQCGAIcAAQExAAAAOgACAAIAAAAGKhu1AIWxAAAAAgEyAAAAFgACAAAABgAkACUAAAAAAAYAfgAQAAEBMwAAAAYAAQAAABcAAQARAHUAAQExAAAALwABAAEAAAAFKrQAiawAAAACATIAAAAMAAEAAAAFACQAJQAAATMAAAAGAAEAAAAYAAEAigCLAAEBMQAAADoAAgACAAAABiobtQCJsQAAAAIBMgAAABYAAgAAAAYAJAAlAAAAAAAGAH4AEgABATMAAAAGAAEAAAAYAAEAEwB1AAEBMQAAAC8AAQABAAAABSq0AI2sAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAGQABAI4AiwABATEAAAA6AAIAAgAAAAYqG7UAjbEAAAACATIAAAAWAAIAAAAGACQAJQAAAAAABgB+ABIAAQEzAAAABgABAAAAGQABABQAdQABATEAAAAvAAEAAQAAAAUqtACQrAAAAAIBMgAAAAwAAQAAAAUAJAAlAAABMwAAAAYAAQAAABoAAQCRAIsAAQExAAAAOgACAAIAAAAGKhu1AJCxAAAAAgEyAAAAFgACAAAABgAkACUAAAAAAAYAfgASAAEBMwAAAAYAAQAAABoAAQAVAGoAAQExAAAALwABAAEAAAAFKrQAk6wAAAACATIAAAAMAAEAAAAFACQAJQAAATMAAAAGAAEAAAAbAAEAlACHAAEBMQAAADoAAgACAAAABiobtQCTsQAAAAIBMgAAABYAAgAAAAYAJAAlAAAAAAAGAH4AEAABATMAAAAGAAEAAAAbAAEAFgCVAAEBMQAAAC8AAQABAAAABSq0AJesAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAHAABAJgAmQABATEAAAA6AAIAAgAAAAYqG7UAl7EAAAACATIAAAAWAAIAAAAGACQAJQAAAAAABgB+ABcAAQEzAAAABgABAAAAHAABABgAdQABATEAAAAvAAEAAQAAAAUqtACbrAAAAAIBMgAAAAwAAQAAAAUAJAAlAAABMwAAAAYAAQAAAB0AAQCcAIsAAQExAAAAOgACAAIAAAAGKhu1AJuxAAAAAgEyAAAAFgACAAAABgAkACUAAAAAAAYAfgASAAEBMwAAAAYAAQAAAB0AAQAZAGoAAQExAAAALwABAAEAAAAFKrQAnqwAAAACATIAAAAMAAEAAAAFACQAJQAAATMAAAAGAAEAAAAeAAEAnwCHAAEBMQAAADoAAgACAAAABiobtQCesQAAAAIBMgAAABYAAgAAAAYAJAAlAAAAAAAGAH4AEAABATMAAAAGAAEAAAAeAAEAGgCgAAEBMQAAAC8AAQABAAAABSq0AKKwAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAHwABAKMApAABATEAAAA6AAIAAgAAAAYqK7UAorEAAAACATIAAAAWAAIAAAAGACQAJQAAAAAABgB+ABsAAQEzAAAABgABAAAAHwABABwAWgACATEAAAAvAAEAAQAAAAUqtACmsAAAAAIBMgAAAAwAAQAAAAUAJAAlAAABMwAAAAYAAQAAACABMAAAAAIBNwABAKcAqAACATEAAAA6AAIAAgAAAAYqK7UAprEAAAACATIAAAAWAAIAAAAGACQAJQAAAAAABgB+AB0AAQEzAAAABgABAAAAIAEwAAAAAgE4AAEAqQB5AAEBMQAAADsAAgABAAAAESq2AKwSrbkAswIAVyq2ALWwAAAAAgEyAAAADAABAAAAEQAkACUAAAEzAAAABgABAAAAIQABALYAfwABATEAAAA7AAIAAQAAABEqtgCsEri5ALMCAFcqtgC6sAAAAAIBMgAAAAwAAQAAABEAJAAlAAABMwAAAAYAAQAAACIAAQC7AGoAAQExAAAAOwACAAEAAAARKrYArBK8uQCzAgBXKrYAvqwAAAACATIAAAAMAAEAAAARACQAJQAAATMAAAAGAAEAAAAjAAEAvwB1AAEBMQAAAFQAAwACAAAAICq2AKwSwLkAswIAVyq2AMI8Kiq2AMIqtgDEYLYAxhusAAAAAgEyAAAAFgACAAAAIAAkACUAAAARAA4AxwASAAEBMwAAAAYAAQAAACQAAQDIAHUAAQExAAAAWQACAAEAAAAeKrYArBLKuQCzAgBXKrYAzJkACSoSzbYA0Cq2ANKsAAAAAwEyAAAADAABAAAAHgAkACUAAAEzAAAADgADAAAAJgAMACcAGQAoATkAAAADAAEZAAEA0wCVAAEBMQAAAFUAAwACAAAAISq2AKwS1LkAswIAVyq2ANY8Kiq2ANYqtgDYYJG2ANobrAAAAAIBMgAAABYAAgAAACEAJAAlAAAAEQAPAMcAFwABATMAAAAGAAEAAAAqAAEA2wB1AAEBMQAAADgAAgABAAAADiq2AKwS3LkAswIAVwWsAAAAAgEyAAAADAABAAAADgAkACUAAAEzAAAABgABAAAAKwABAN0AdQABATEAAAA5AAIAAQAAAA8qtgCsEt65ALMCAFcQ/awAAAACATIAAAAMAAEAAAAPACQAJQAAATMAAAAGAAEAAAAsAAEA3wB1AAEBMQAAADgAAgABAAAADiq2AKwS4LkAswIAVwesAAAAAgEyAAAADAABAAAADgAkACUAAAEzAAAABgABAAAALQABAOEA4gACATEAAADmAAcABwAAAGQqtgCsEuS5ALMCAFcqtgDmEAa9AOhZAytTWQQcuADuU1kFLVNZBhUEuADuU1kHFQW4APJTWQgZBlO5ALMCAFcqtgD0xgAMKrYA9LkA+QEAKrYA+5kAECorHC0VBBUFGQa4AP6xAAAAAwEyAAAASAAHAAAAZAAkACUAAAAAAGQANwA4AAEAAABkADkAEgACAAAAZAD/AAwAAwAAAGQBAAASAAQAAABkAQEAEAAFAAAAZAECAQMABgEzAAAAFgAFAAAAMAAMADEAPwAyAE8AMwBjAC8BOQAAAAYAAvsATxMBMAAAAAIBOhBBAGYAXwABATEAAAAvAAEAAQAAAAUqtgEFsAAAAAIBMgAAAAwAAQAAAAUAJAAlAAABMwAAAAYAAQAAABQQQQBjAF8AAQExAAAALwABAAEAAAAFKrYBB7AAAAACATIAAAAMAAEAAAAFACQAJQAAATMAAAAGAAEAAAAUEEEAWQBfAAEBMQAAAC8AAQABAAAABSq2AQmwAAAAAgEyAAAADAABAAAABQAkACUAAAEzAAAABgABAAAAFBBBAE8BCgABATEAAAAvAAEAAQAAAAUqtgEMsAAAAAIBMgAAAAwAAQAAAAUAJAAlAAABMwAAAAYAAQAAABQQQQBPAQ0AAQExAAAALwABAAEAAAAFKrYBDLAAAAACATIAAAAMAAEAAAAFACQAJQAAATMAAAAGAAEAAAAUAAEBDgAgAAEBMQAAAMMADwABAAAAaSq3ARAquAEUKrgBFiq7ARhZFAEZFAEbFAEdFAEfFAEhFAEjtwEntQB7KgG1AIEqA7UAhSoDtQCJKgO1AI0qEAi1AJAqA7UAkyoQMLUAlyoDtQCbKgO1AJ4qAbUAoiq7ASlZtwEqtQCmsQAAAAIBMgAAAAwAAQAAAGkAJAAlAAABMwAAADYADQAAABQADAAVACkAFgAuABcAMwAYADgAGQA9ABoAQwAbAEgAHABOAB0AUwAeAFgAHwBdACAABAE7AAAAAgAHATwAAAAKAAEBLAEuAS8GCQE9AAAACwABAAgAAQAJcwAKAT4AAAADBQAA diff --git a/src/test/resources/compat/ReferenceScalaIconHitEffects.class.b64 b/src/test/resources/compat/ReferenceScalaIconHitEffects.class.b64 new file mode 100644 index 0000000..4e6598b --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaIconHitEffects.class.b64 @@ -0,0 +1,55 @@ +yv66vgAAADQAUwEAOWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJ +Y29uSGl0RWZmZWN0cwcAAQEAIGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0BwADAQAl +Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RJY29uSGl0RWZmZWN0cwcABQEAIlJlZmVyZW5jZVNjYWxh +SWNvbkhpdEVmZmVjdHMuc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVi +eXRlcwECMAYBOTNBIQECARMJYSIrGjRmZRZ0Ny1aKmRDMgwXalk4bxEmJFhJGjRmR1IcKEJBAgUD +GRl3Lhw5YmkqEVFBQgEKW1ZkRy8bOWJlUlQRYUIBDEc+JFdtGTVqRy4sZ24BARQHAVFhAgUCDBk1 +CUEhAwIOCQlRQStUO21pJgQWTR07EQUteRFCAQkFBT0hFmpZOG8RJiRYSRo0ZkdSHAgiAgoBCQMZ +EkECH2pdJiRoCEYBFSEJKQIhRAEDER05AgExQQUCYQkBAlwxdGlOS0ctWgsCM0ERISRIBwI3KQlB +JEEDdEcGZBctAwIfNwkZEUocOwkPAQIBGSFDAUMFYUEuWTp1JyYkV20YE2ZjUhEhJQoJAzUNSiEB +Sg4DCVVzFw4eBQhNfQkJETEBGgMNQUglDQUHUQEBCxVCDQITMQw3D14qakkWBAMiAhYBCQNZE2FC +NGZpUksIL1oLAllBEVFGTQcCXSkRcQZNAQVZBnR3TUMBMgMRURdNXjEKBU1yI0FCKnVlJnR3DUMD +NgERBWEnQQVoS1IUdS4eOGVnVglxBwUCOXs1CRFIAwI7dwUZYS9aMgsFcTIRYQE3akUmEWEoDwII +B1YUdy4bMzcRFQEFASIBQgM1OVcNHiJzXy4sZy5TMnBdUhEhCRQJAwcqaxEBEgYDCxoLQSEeO2pZ +KhFxCVMBClsmdFdtGTpiTVJUESFTAQRdFiQYQkEmRQUVSRVqWThvERVpdQgxARoDERkYDlozAQAI +bGFzdFNpZGUBAAFJAQANYWRkSGl0RWZmZWN0cwEAWihMbmV0L21pbmVjcmFmdC91dGlsL01vdmlu +Z09iamVjdFBvc2l0aW9uO0xuZXQvbWluZWNyYWZ0L2NsaWVudC9wYXJ0aWNsZS9FZmZlY3RSZW5k +ZXJlcjspVgEAIkxjcHcvbW9kcy9mbWwvcmVsYXVuY2hlci9TaWRlT25seTsBAAV2YWx1ZQEAHkxj +cHcvbW9kcy9mbWwvcmVsYXVuY2hlci9TaWRlOwEABkNMSUVOVAEAK2NvZGVjaGlja2VuL211bHRp +cGFydC9USWNvbkhpdEVmZmVjdHMkY2xhc3MHABMBAIEoTGNvZGVjaGlja2VuL211bHRpcGFydC9U +SWNvbkhpdEVmZmVjdHM7TG5ldC9taW5lY3JhZnQvdXRpbC9Nb3ZpbmdPYmplY3RQb3NpdGlvbjtM +bmV0L21pbmVjcmFmdC9jbGllbnQvcGFydGljbGUvRWZmZWN0UmVuZGVyZXI7KVYMAA0AFQoAFAAW +AQAEdGhpcwEAO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhSWNv +bkhpdEVmZmVjdHM7AQADaGl0AQApTG5ldC9taW5lY3JhZnQvdXRpbC9Nb3ZpbmdPYmplY3RQb3Np +dGlvbjsBAA5lZmZlY3RSZW5kZXJlcgEALkxuZXQvbWluZWNyYWZ0L2NsaWVudC9wYXJ0aWNsZS9F +ZmZlY3RSZW5kZXJlcjsBABFhZGREZXN0cm95RWZmZWN0cwEAMShMbmV0L21pbmVjcmFmdC9jbGll +bnQvcGFydGljbGUvRWZmZWN0UmVuZGVyZXI7KVYBAFgoTGNvZGVjaGlja2VuL211bHRpcGFydC9U +SWNvbkhpdEVmZmVjdHM7TG5ldC9taW5lY3JhZnQvY2xpZW50L3BhcnRpY2xlL0VmZmVjdFJlbmRl +cmVyOylWDAAeACAKABQAIQEAD2dldEJyZWFraW5nSWNvbgEALyhMamF2YS9sYW5nL09iamVjdDtJ +KUxuZXQvbWluZWNyYWZ0L3V0aWwvSUljb247AQArY29kZWNoaWNrZW4vbXVsdGlwYXJ0L0pJY29u +SGl0RWZmZWN0cyRjbGFzcwcAJQEAVihMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L0pJY29uSGl0RWZm +ZWN0cztMamF2YS9sYW5nL09iamVjdDtJKUxuZXQvbWluZWNyYWZ0L3V0aWwvSUljb247DAAjACcK +ACYAKAEAB3N1YlBhcnQBABJMamF2YS9sYW5nL09iamVjdDsBAARzaWRlAQADKClJDAALAAwJAAIA +LgEADGxhc3RTaWRlXyRlcQEABChJKVYBAAN4JDEBAAdnZXRUeXBlAQAUKClMamF2YS9sYW5nL1N0 +cmluZzsBABd0ZXN0OnJlZmVyZW5jZS1pY29uLWhpdAgANQEACWdldEJvdW5kcwEAHygpTGNvZGVj +aGlja2VuL2xpYi92ZWMvQ3Vib2lkNjsBABtjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDYHADkB +AAY8aW5pdD4BAAkoREREREREKVYMADsAPAoAOgA9AQANZ2V0QnJva2VuSWNvbgEAHShJKUxuZXQv +bWluZWNyYWZ0L3V0aWwvSUljb247DAAwADEKAAIAQQEAAygpVgwAOwBDCgAEAEQBAAYkaW5pdCQB +ACooTGNvZGVjaGlja2VuL211bHRpcGFydC9KSWNvbkhpdEVmZmVjdHM7KVYMAEYARwoAJgBIAQAq +KExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVEljb25IaXRFZmZlY3RzOylWDABGAEoKABQASwEABENv +ZGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAA9MaW5lTnVtYmVyVGFibGUBABlSdW50aW1lVmlzaWJs +ZUFubm90YXRpb25zAQAKU291cmNlRmlsZQEACFNjYWxhU2lnACEAAgAEAAEABgABAAIACwAMAAAA +CQABAA0ADgACAE0AAABFAAMAAwAAAAcqKyy4ABexAAAAAgBOAAAAIAADAAAABwAYABkAAAAAAAcA +GgAbAAEAAAAHABwAHQACAE8AAAAGAAEAAAALAFAAAAANAAEADwABABBlABEAEgABAB4AHwACAE0A +AAA6AAIAAgAAAAYqK7gAIrEAAAACAE4AAAAWAAIAAAAGABgAGQAAAAAABgAcAB0AAQBPAAAABgAB +AAAACwBQAAAADQABAA8AAQAQZQARABIAAQAjACQAAgBNAAAARQADAAMAAAAHKiscuAApsAAAAAIA +TgAAACAAAwAAAAcAGAAZAAAAAAAHACoAKwABAAAABwAsAAwAAgBPAAAABgABAAAACwBQAAAADQAB +AA8AAQAQZQARABIAAQALAC0AAQBNAAAALwABAAEAAAAFKrQAL6wAAAACAE4AAAAMAAEAAAAFABgA +GQAAAE8AAAAGAAEAAAAMAAEAMAAxAAEATQAAADoAAgACAAAABiobtQAvsQAAAAIATgAAABYAAgAA +AAYAGAAZAAAAAAAGADIADAABAE8AAAAGAAEAAAAMAAEAMwA0AAEATQAAAC0AAQABAAAAAxI2sAAA +AAIATgAAAAwAAQAAAAMAGAAZAAAATwAAAAYAAQAAAA4AAQA3ADgAAQBNAAAAOAAOAAEAAAAOuwA6 +WQ4ODg8PD7cAPrAAAAACAE4AAAAMAAEAAAAOABgAGQAAAE8AAAAGAAEAAAAQAAEAPwBAAAEATQAA +AD8AAgACAAAAByobtgBCAbAAAAACAE4AAAAWAAIAAAAHABgAGQAAAAAABwAsAAwAAQBPAAAACgAC +AAAAEwAFABQAAQA7AEMAAQBNAAAAQAACAAEAAAASKrcARSq4AEkquABMKgK1AC+xAAAAAgBOAAAA +DAABAAAAEgAYABkAAABPAAAACgACAAAACwAMAAwAAwBRAAAAAgAHAFAAAAALAAEACAABAAlzAAoA +UgAAAAMFAAA= diff --git a/src/test/resources/compat/ReferenceScalaInterfaceNames$$anon$1.class.b64 b/src/test/resources/compat/ReferenceScalaInterfaceNames$$anon$1.class.b64 new file mode 100644 index 0000000..53dbb1d --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaInterfaceNames$$anon$1.class.b64 @@ -0,0 +1,30 @@ +yv66vgAAADQANwEAQWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJ +bnRlcmZhY2VOYW1lcyQkYW5vbiQxBwABAQA0Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2Fs +YVNpZ25hdHVyZSRDbGFzc1N5bWJvbAcAAwEAIlJlZmVyZW5jZVNjYWxhSW50ZXJmYWNlTmFtZXMu +c2NhbGEBADljb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhSW50ZXJm +YWNlTmFtZXMHAAYBAAZzeW1ib2wBAIIoTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFT +aWduYXR1cmU7TGphdmEvdXRpbC9mdW5jdGlvbi9TdXBwbGllcjspTGNvZGVjaGlja2VuL211bHRp +cGFydC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NTeW1ib2xSZWY7DAAIAAkBAAZyZWFkJDIBAB1M +amF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOwEABGluZm8BADYoKUxjb2RlY2hpY2tlbi9tdWx0 +aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzVHlwZTsMAAsADAkAAgAPAQAbamF2YS91dGls +L2Z1bmN0aW9uL1N1cHBsaWVyBwARAQADZ2V0AQAUKClMamF2YS9sYW5nL09iamVjdDsMABMAFAsA +EgAVAQAyY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1R5cGUH +ABcBAAR0aGlzAQBDTGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJ +bnRlcmZhY2VOYW1lcyQkYW5vbiQxOwEABjxpbml0PgEAhShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0 +L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUludGVyZmFjZU5hbWVzO0xjb2RlY2hpY2tlbi9tdWx0aXBh +cnQvYXNtL1NjYWxhU2lnbmF0dXJlO0xqYXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXI7KVYBAAZ1 +bnVzZWQIAB0BAHUoTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7TGph +dmEvbGFuZy9TdHJpbmc7TGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUk +U3ltYm9sUmVmO0lJKVYMABsAHwoABAAgAQAGJG91dGVyAQA7TGNvZGVjaGlja2VuL211bHRpcGFy +dC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJbnRlcmZhY2VOYW1lczsBAAVzaWckMgEAKkxjb2RlY2hp +Y2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlOwEAKGNvZGVjaGlja2VuL211bHRpcGFy +dC9hc20vU2NhbGFTaWduYXR1cmUHACYBAAlDbGFzc1R5cGUBADJjb2RlY2hpY2tlbi9tdWx0aXBh +cnQvYXNtL1NjYWxhU2lnbmF0dXJlJFN5bWJvbFJlZgcAKQEACVN5bWJvbFJlZgEAC0NsYXNzU3lt +Ym9sAQA3Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1N5bWJv +bFJlZgcALQEADkNsYXNzU3ltYm9sUmVmAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xp +bmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBAA9FbmNsb3NpbmdNZXRob2QBAAxJbm5lckNsYXNz +ZXMBAAVTY2FsYQAxAAIABAAAAAEAEgALAAwAAAACAAEADQAOAAEAMAAAADcAAQABAAAADSq0ABC5 +ABYBAMAAGLAAAAACADEAAAAMAAEAAAANABkAGgAAADIAAAAGAAEAAAATAAEAGwAcAAEAMAAAAFgA +BgAEAAAAECottQAQKiwSHgEDArcAIbEAAAACADEAAAAqAAQAAAAQABkAGgAAAAAAEAAiACMAAQAA +ABAAJAAlAAIAAAAQAAsADAADADIAAAAGAAEAAAASAAQAMwAAAAIABQA0AAAABAAHAAoANQAAACoA +BQAYACcAKAABACoAJwArBgEABAAnACwAAQAuACcALwYBAAIAAAAAABEANgAAAAA= diff --git a/src/test/resources/compat/ReferenceScalaInterfaceNames$$anon$2.class.b64 b/src/test/resources/compat/ReferenceScalaInterfaceNames$$anon$2.class.b64 new file mode 100644 index 0000000..a0f34ce --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaInterfaceNames$$anon$2.class.b64 @@ -0,0 +1,31 @@ +yv66vgAAADQAOQEAQWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJ +bnRlcmZhY2VOYW1lcyQkYW5vbiQyBwABAQAyY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2Fs +YVNpZ25hdHVyZSRDbGFzc1R5cGUHAAMBACJSZWZlcmVuY2VTY2FsYUludGVyZmFjZU5hbWVzLnNj +YWxhAQA5Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUludGVyZmFj +ZU5hbWVzBwAGAQAEaW5mbwEAfShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25h +dHVyZTtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOylMY29kZWNoaWNrZW4vbXVsdGlwYXJ0 +L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1R5cGU7DAAIAAkBAAZyZWFkJDEBAB1MamF2YS91dGls +L2Z1bmN0aW9uL1N1cHBsaWVyOwEACmludGVyZmFjZXMBACMoKUxzY2FsYS9jb2xsZWN0aW9uL2lt +bXV0YWJsZS9MaXN0OwwACwAMCQACAA8BABtqYXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXIHABEB +AANnZXQBABQoKUxqYXZhL2xhbmcvT2JqZWN0OwwAEwAUCwASABUBAB9zY2FsYS9jb2xsZWN0aW9u +L2ltbXV0YWJsZS9MaXN0BwAXAQAEdGhpcwEAQ0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0 +L1JlZmVyZW5jZVNjYWxhSW50ZXJmYWNlTmFtZXMkJGFub24kMjsBAAY8aW5pdD4BAIUoTGNvZGVj +aGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJbnRlcmZhY2VOYW1lcztMY29k +ZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2YS91dGlsL2Z1bmN0aW9u +L1N1cHBsaWVyOylWAQAfc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvTmlsJAcAHQEAB01PRFVM +RSQBACFMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvTmlsJDsMAB8AIAkAHgAhAQCCKExjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlO0xjb2RlY2hpY2tlbi9tdWx0aXBh +cnQvYXNtL1NjYWxhU2lnbmF0dXJlJFN5bWJvbFJlZjtMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFi +bGUvTGlzdDspVgwAGwAjCgAEACQBAAYkb3V0ZXIBADtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2Nv +bXBhdC9SZWZlcmVuY2VTY2FsYUludGVyZmFjZU5hbWVzOwEABXNpZyQxAQAqTGNvZGVjaGlja2Vu +L211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7AQAoY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2Fz +bS9TY2FsYVNpZ25hdHVyZQcAKgEACUNsYXNzVHlwZQEAMmNvZGVjaGlja2VuL211bHRpcGFydC9h +c20vU2NhbGFTaWduYXR1cmUkU3ltYm9sUmVmBwAtAQAJU3ltYm9sUmVmAQAEQ29kZQEAEkxvY2Fs +VmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEACVNpZ25hdHVyZQEAVygpTHNjYWxhL2Nv +bGxlY3Rpb24vaW1tdXRhYmxlL0xpc3Q8TGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFT +aWduYXR1cmUkVHlwZVJlZjs+OwEAClNvdXJjZUZpbGUBAA9FbmNsb3NpbmdNZXRob2QBAAxJbm5l +ckNsYXNzZXMBAAVTY2FsYQAxAAIABAAAAAEAEgALAAwAAAACAAEADQAOAAIAMAAAADcAAQABAAAA +DSq0ABC5ABYBAMAAGLAAAAACADEAAAAMAAEAAAANABkAGgAAADIAAAAGAAEAAAAMADMAAAACADQA +AQAbABwAAQAwAAAAVwAEAAQAAAAPKi21ABAqLAGyACK3ACWxAAAAAgAxAAAAKgAEAAAADwAZABoA +AAAAAA8AJgAnAAEAAAAPACgAKQACAAAADwALAAwAAwAyAAAABgABAAAACwAEADUAAAACAAUANgAA +AAQABwAKADcAAAAaAAMABAArACwAAQAuACsALwYBAAIAAAAAABEAOAAAAAA= diff --git a/src/test/resources/compat/ReferenceScalaInterfaceNames.class.b64 b/src/test/resources/compat/ReferenceScalaInterfaceNames.class.b64 new file mode 100644 index 0000000..356ffb2 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaInterfaceNames.class.b64 @@ -0,0 +1,53 @@ +yv66vgAAADQAOgEAOWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJ +bnRlcmZhY2VOYW1lcwcAAQEAEGphdmEvbGFuZy9PYmplY3QHAAMBACJSZWZlcmVuY2VTY2FsYUlu +dGVyZmFjZU5hbWVzLnNjYWxhAQAeTHNjYWxhL3JlZmxlY3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0 +ZXMBAkAGAVEzQSEBAgETCWEiKxo0ZmUWdDctWipkQzIMF0ocO2ZlGgw3LRooYlsWHChCQQIFAxkZ +dy4cOWJpKhFRQUIBCltWZEcvGzliZVJUEWFCAQxHPiRXbRk1akcuLGduAQEUBQFRAUNBBg8bBWEh +IkEHAgtNHBcNXDEKBT1hIUFCIW9zSitnDUMDEgERBSEjAQQ9UzpMR08QCwInQRFBA0EHAgUhKWED +AUMBLwUhEU4cNHApDUESZQkJAzN9ASJBRw8OA21RIQEIAwIHBRxYLgMCHzcJcTFrWTFtQ05Ld01c +MXVrSiwXQgERHgUlGUUuWTp0KWYEWA1DAyMrAQcRJEECdFMeRFEBSgtBAhUKQUFdM2JJQhlhJUwY +DgMdUiEBSxUCERksaG4ZO2pfOlQhQUsWAglVJBgOHAYCWQUhIS4ZPGITCXFzRQEFVGtCBEguWzNz +IQ0BBGgPCANjWXIhQU0bDgNNUiEBDgUCDXESeG4cOz8TBWkRQkEcDQMdARhtWTZiTxZMISEPHgMJ +MUs3Dx4GA28xASIhBx8KBXVqImECK3phFhRWTRoFBn8BIQkBUQEHZ2ZsJ20cNxUHBSNVCQUCGgUm +ETEpCAIPBzIMN29dKnpbCnxHTlUzZxEVEWMIMQEaERUhYwgxAUchDTFTBgcFBhECIQkhUwEGXQZs +V20dCwMVSgMyAQ0dTCEJYXVKBAIMGyYRYQpEAQchSixHLRo0CgVBCyZBQip1ZSZ0d00DAk8ZISkx +axJhAQMGGSEvGjQBAARpbmZvAQB9KExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2ln +bmF0dXJlO0xqYXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXI7KUxjb2RlY2hpY2tlbi9tdWx0aXBh +cnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzVHlwZTsBAEFjb2RlY2hpY2tlbi9tdWx0aXBhcnQv +Y29tcGF0L1JlZmVyZW5jZVNjYWxhSW50ZXJmYWNlTmFtZXMkJGFub24kMgcACwEABjxpbml0PgEA +hShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUludGVyZmFjZU5h +bWVzO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlO0xqYXZhL3V0aWwv +ZnVuY3Rpb24vU3VwcGxpZXI7KVYMAA0ADgoADAAPAQAEdGhpcwEAO0xjb2RlY2hpY2tlbi9tdWx0 +aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhSW50ZXJmYWNlTmFtZXM7AQADc2lnAQAqTGNvZGVj +aGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmU7AQAEcmVhZAEAHUxqYXZhL3V0aWwv +ZnVuY3Rpb24vU3VwcGxpZXI7AQAGc3ltYm9sAQCCKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNt +L1NjYWxhU2lnbmF0dXJlO0xqYXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXI7KUxjb2RlY2hpY2tl +bi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzU3ltYm9sUmVmOwEAQWNvZGVjaGlj +a2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJbnRlcmZhY2VOYW1lcyQkYW5vbiQx +BwAZCgAaAA8BAAVuYW1lcwEAXChMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25h +dHVyZSRDbGFzc1N5bWJvbFJlZjspTHNjYWxhL2NvbGxlY3Rpb24vaW1tdXRhYmxlL0xpc3Q7AQA3 +Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1N5bWJvbFJlZgcA +HgEAC2pJbnRlcmZhY2VzAQAjKClMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvTGlzdDsMACAA +IQsAHwAiAQADcmVmAQA5TGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUk +Q2xhc3NTeW1ib2xSZWY7AQADKClWDAANACYKAAQAJwEAMmNvZGVjaGlja2VuL211bHRpcGFydC9h +c20vU2NhbGFTaWduYXR1cmUkQ2xhc3NUeXBlBwApAQAoY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2Fz +bS9TY2FsYVNpZ25hdHVyZQcAKwEACUNsYXNzVHlwZQEADkNsYXNzU3ltYm9sUmVmAQAEQ29kZQEA +EkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEACVNpZ25hdHVyZQEA1ChMY29k +ZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2YS91dGlsL2Z1bmN0aW9u +L1N1cHBsaWVyPExzY2FsYS9jb2xsZWN0aW9uL2ltbXV0YWJsZS9MaXN0PExjb2RlY2hpY2tlbi9t +dWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFR5cGVSZWY7Pjs+OylMY29kZWNoaWNrZW4vbXVs +dGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1R5cGU7AQC4KExjb2RlY2hpY2tlbi9tdWx0 +aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlO0xqYXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXI8TGNv +ZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkQ2xhc3NUeXBlOz47KUxjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJENsYXNzU3ltYm9sUmVmOwEAcChM +Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRDbGFzc1N5bWJvbFJlZjsp +THNjYWxhL2NvbGxlY3Rpb24vaW1tdXRhYmxlL0xpc3Q8TGphdmEvbGFuZy9TdHJpbmc7PjsBAApT +b3VyY2VGaWxlAQAMSW5uZXJDbGFzc2VzAQAZUnVudGltZVZpc2libGVBbm5vdGF0aW9ucwEACFNj +YWxhU2lnACEAAgAEAAAAAAAEAAEACQAKAAIALwAAAEkABQADAAAAC7sADFkqKyy3ABCwAAAAAgAw +AAAAIAADAAAACwARABIAAAAAAAsAEwAUAAEAAAALABUAFgACADEAAAAGAAEAAAALADIAAAACADMA +AQAXABgAAgAvAAAASQAFAAMAAAALuwAaWSorLLcAG7AAAAACADAAAAAgAAMAAAALABEAEgAAAAAA +CwATABQAAQAAAAsAFQAWAAIAMQAAAAYAAQAAABIAMgAAAAIANAABABwAHQACAC8AAAA7AAEAAgAA +AAcruQAjAQCwAAAAAgAwAAAAFgACAAAABwARABIAAAAAAAcAJAAlAAEAMQAAAAYAAQAAABYAMgAA +AAIANQABAA0AJgABAC8AAAAvAAEAAQAAAAUqtwAosQAAAAIAMAAAAAwAAQAAAAUAEQASAAAAMQAA +AAYAAQAAABcABAA2AAAAAgAFADcAAAAiAAQAKgAsAC0AAQAfACwALgYBAAwAAAAAABEAGgAAAAAA +EQA4AAAACwABAAYAAQAHcwAIADkAAAADBQAA diff --git a/src/test/resources/compat/ReferenceScalaItemMicroPartConsumer.class.b64 b/src/test/resources/compat/ReferenceScalaItemMicroPartConsumer.class.b64 new file mode 100644 index 0000000..6525c76 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaItemMicroPartConsumer.class.b64 @@ -0,0 +1,37 @@ +yv66vgAAADQAOQEAQGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJ +dGVtTWljcm9QYXJ0Q29uc3VtZXIHAAEBABBqYXZhL2xhbmcvT2JqZWN0BwADAQApUmVmZXJlbmNl +U2NhbGFJdGVtTWljcm9QYXJ0Q29uc3VtZXIuc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNp +Z25hdHVyZTsBAAVieXRlcwECRgYBNTNBIQECARMJGSMrGjRmZRZ0Ny1aKmRDMgwXCl4zbhsmHCdv +HCliZVIcdU5cOnZbFhQoQkECBQMZGXcuHDliaSoRUUFCAQpbVmRHLxs5YmVSVBFhQgEMRz4kV20Z +NWpHLixnbgEBFAUBUQFDQQYPGwVhISJBBwILTRwXDVwxCgU9YSFBQiFvc0orZw1DAxIBEQUhIwEE +PVM6TEdPEAsCJ0ERQQNBBwIFISlhAwFDAS8FUTFNXTNiaRYUFTATMxUHYRFzBQUCGkE1CSFEAwIc +OQUhEQ5eM24VCWliJEEFblM6LDdNXTFnaSoJcSRBAm9LUkwhIQkOAxMlI1gtXCp1Qw5cByJCEhYB +BCETQQIzYlsGPFcNBQIMSyURYQUEAgQTOiQIIgIVFgEEIRMBQzdiaRYUGC4ZNwkLKQJBEUEWAhkN +FFgtGTtmBWZ0FS1cMxUHYWFTBkMDJFMBB0EFQwMpUwEHYQYFAjBlORExAk0FA2MxCWEBFTpmSRY0 +F0JBGjUFGRlGT101b08qEREHBAUGUQEhCUEOCwNvHQMiAQ8jDwVlCmVCAR5AHQlZZChEAT0VCWkE +IgEEPWU+fEdPUAUCDyURAUlCAQtbJhwnbxwybV8OXBdCASJEA1VpFW4ZOnAbBiRYTV01YllKK3ct +Wzp1ZWZUIQERBAoFFTMlQUQlTlMOFHguVDF1S0pMFw0cBgMFDkNRAVMbQQJhCVFhHTtiRy5EUUET +AQUCLQshIlwxdUtKTBcNXCVlKQkhQwpDA0kTAgcBBAEACmNyZWF0ZUJ5SWQBACIoSUkpTG5ldC9t +aW5lY3JhZnQvaXRlbS9JdGVtU3RhY2s7AQAlY29kZWNoaWNrZW4vbWljcm9ibG9jay9JdGVtTWlj +cm9QYXJ0JAcACwEAB01PRFVMRSQBACdMY29kZWNoaWNrZW4vbWljcm9ibG9jay9JdGVtTWljcm9Q +YXJ0JDsMAA0ADgkADAAPAQAGY3JlYXRlDAARAAoKAAwAEgEABHRoaXMBAEJMY29kZWNoaWNrZW4v +bXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYUl0ZW1NaWNyb1BhcnRDb25zdW1lcjsBAAZk +YW1hZ2UBAAFJAQAIbWF0ZXJpYWwBAAxjcmVhdGVCeU5hbWUBADMoSUxqYXZhL2xhbmcvU3RyaW5n +OylMbmV0L21pbmVjcmFmdC9pdGVtL0l0ZW1TdGFjazsMABEAGgoADAAbAQASTGphdmEvbGFuZy9T +dHJpbmc7AQBdKExuZXQvbWluZWNyYWZ0L2l0ZW0vSXRlbVN0YWNrOylMY29kZWNoaWNrZW4vbWlj +cm9ibG9jay9NaWNyb01hdGVyaWFsUmVnaXN0cnkkSU1pY3JvTWF0ZXJpYWw7AQALZ2V0TWF0ZXJp +YWwMAB8AHgoADAAgAQAFc3RhY2sBAB5MbmV0L21pbmVjcmFmdC9pdGVtL0l0ZW1TdGFjazsBAApt +YXRlcmlhbElkAQAhKExuZXQvbWluZWNyYWZ0L2l0ZW0vSXRlbVN0YWNrOylJAQANZ2V0TWF0ZXJp +YWxJRAwAJgAlCgAMACcBAAY8aW5pdD4BAAMoKVYMACkAKgoABAArAQA7Y29kZWNoaWNrZW4vbWlj +cm9ibG9jay9NaWNyb01hdGVyaWFsUmVnaXN0cnkkSU1pY3JvTWF0ZXJpYWwHAC0BACxjb2RlY2hp +Y2tlbi9taWNyb2Jsb2NrL01pY3JvTWF0ZXJpYWxSZWdpc3RyeQcALwEADklNaWNyb01hdGVyaWFs +AQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZp +bGUBAAxJbm5lckNsYXNzZXMBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcA +IQACAAQAAAAAAAUAAQAJAAoAAQAyAAAARwADAAMAAAAJsgAQGxy2ABOwAAAAAgAzAAAAIAADAAAA +CQAUABUAAAAAAAkAFgAXAAEAAAAJABgAFwACADQAAAAGAAEAAAAKAAEAGQAaAAEAMgAAAEcAAwAD +AAAACbIAEBsstgAcsAAAAAIAMwAAACAAAwAAAAkAFAAVAAAAAAAJABYAFwABAAAACQAYAB0AAgA0 +AAAABgABAAAADQABABgAHgABADIAAAA8AAIAAgAAAAiyABArtgAhsAAAAAIAMwAAABYAAgAAAAgA +FAAVAAAAAAAIACIAIwABADQAAAAGAAEAAAAQAAEAJAAlAAEAMgAAADwAAgACAAAACLIAECu2ACis +AAAAAgAzAAAAFgACAAAACAAUABUAAAAAAAgAIgAjAAEANAAAAAYAAQAAABMAAQApACoAAQAyAAAA +LwABAAEAAAAFKrcALLEAAAACADMAAAAMAAEAAAAFABQAFQAAADQAAAAGAAEAAAAUAAQANQAAAAIA +BQA2AAAACgABAC4AMAAxBgkANwAAAAsAAQAGAAEAB3MACAA4AAAAAwUAAA== \ No newline at end of file diff --git a/src/test/resources/compat/ReferenceScalaItemMultiPart.class.b64 b/src/test/resources/compat/ReferenceScalaItemMultiPart.class.b64 new file mode 100644 index 0000000..7f67dd8 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaItemMultiPart.class.b64 @@ -0,0 +1,66 @@ +yv66vgAAADQAgwEAOGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJ +dGVtTXVsdGlQYXJ0BwABAQAXbmV0L21pbmVjcmFmdC9pdGVtL0l0ZW0HAAMBACRjb2RlY2hpY2tl +bi9tdWx0aXBhcnQvVEl0ZW1NdWx0aVBhcnQHAAUBACFSZWZlcmVuY2VTY2FsYUl0ZW1NdWx0aVBh +cnQuc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVieXRlcwECuAYBDTRB +IQECARMJWSIrGjRmZRZ0Ny1aKmRDMgwXCl4zbhtWZEcvGyliZVJUIWEBAwINDXxXDl0xdRUJKWEh +QQVuazIkGA5dMXNpKglxIUEGZF8SLDcNWzVkVxZ0NwFBCgQBKSECQ0EGExsFYSFCQQcPAxFJRy9a +NwsFPQESIUM3al0WHCcvGTR1FQUJEmEBOGZpJhExAwQCBRNSLFcOBQIWLTUJQSEDAhgJCXFBKxM7 +Zls2K0gOXjVRQ0okCCJCDQEJA1ESQQIfal0mJGgIRgEcIQlhAiFEAQMRHXECATFBBQJ9CQEiGTt1 +SzYESG9dCwJBQRERRUoHAkUpETEFSgEFWQZ0d01DASYDEVEXTV4xCgUdEiNBQip1ZSZ0dw1DBCoB +AQdJEQEWAhkFJEgvWjdxaU58RiVaORUFLQoEQwEXMBsFaSMiARgCC00cFw1cMQoFQWojAUIrb1NS +RHFBDRUCAgMHASVBAnlJRUJhAQ4BIUITARMhQzF1aRZsBw9eOiERFTEEASIBOAMdcVdtHiliZVIk +cgFPHkARPktmDAUCFnMlESEIAgILKTYrSA5eNVFDSiQIIkIHNgEEYQRDQQY+EwlxREJBBUppFmw3 +C14xZFciKQEpDmEBAwYxAQ9cMXpLSgQiQREkDgMNUyEBESMLBRVzEUFCM29pJiQYMAMCSAcKYVFJ +HDtqaWYERi5ZPWZlIikRKg5hARUGKXFvHDptSUIRMSpUBwIZKhERSkQFAx0yE1FhVjhzWRJEUQFV +G0ECRQsxAV04dCEJEXYrRAFUFQkhVitBAndLDlQhQRYEAgcxTCctAwJZJwpRIQlcOGRXDnt3Th0z +CQtpKwQZQS4CCU1MRy0aCQNZcUshIVgXAwclc0cPQwNgawEHAS0BA3dRJiQIQwEqYhMJETdLQQRX +Sw4keE5dGgEACGF0dGVtcHRzAQASTGphdmEvbGFuZy9TdHJpbmc7AQALZ2V0SGl0RGVwdGgBACEo +TGNvZGVjaGlja2VuL2xpYi92ZWMvVmVjdG9yMztJKUQBACpjb2RlY2hpY2tlbi9tdWx0aXBhcnQv +VEl0ZW1NdWx0aVBhcnQkY2xhc3MHAA8BAEcoTGNvZGVjaGlja2VuL211bHRpcGFydC9USXRlbU11 +bHRpUGFydDtMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpRAwADQARCgAQABIBAAR0aGlz +AQA6TGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFJdGVtTXVsdGlQ +YXJ0OwEABHZoaXQBAB1MY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzOwEABHNpZGUBAAFJAQAJ +b25JdGVtVXNlAQBtKExuZXQvbWluZWNyYWZ0L2l0ZW0vSXRlbVN0YWNrO0xuZXQvbWluZWNyYWZ0 +L2VudGl0eS9wbGF5ZXIvRW50aXR5UGxheWVyO0xuZXQvbWluZWNyYWZ0L3dvcmxkL1dvcmxkO0lJ +SUlGRkYpWgEAkyhMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RJdGVtTXVsdGlQYXJ0O0xuZXQvbWlu +ZWNyYWZ0L2l0ZW0vSXRlbVN0YWNrO0xuZXQvbWluZWNyYWZ0L2VudGl0eS9wbGF5ZXIvRW50aXR5 +UGxheWVyO0xuZXQvbWluZWNyYWZ0L3dvcmxkL1dvcmxkO0lJSUlGRkYpWgwAGgAcCgAQAB0BAARp +dGVtAQAeTG5ldC9taW5lY3JhZnQvaXRlbS9JdGVtU3RhY2s7AQAGcGxheWVyAQAqTG5ldC9taW5l +Y3JhZnQvZW50aXR5L3BsYXllci9FbnRpdHlQbGF5ZXI7AQAFd29ybGQBABtMbmV0L21pbmVjcmFm +dC93b3JsZC9Xb3JsZDsBAAF4AQABeQEAAXoBAARoaXRYAQABRgEABGhpdFkBAARoaXRaAQAUKClM +amF2YS9sYW5nL1N0cmluZzsMAAsADAkAAgAtAQAMYXR0ZW1wdHNfJGVxAQAVKExqYXZhL2xhbmcv +U3RyaW5nOylWAQADeCQxAQAHbmV3UGFydAEAxShMbmV0L21pbmVjcmFmdC9pdGVtL0l0ZW1TdGFj +aztMbmV0L21pbmVjcmFmdC9lbnRpdHkvcGxheWVyL0VudGl0eVBsYXllcjtMbmV0L21pbmVjcmFm +dC93b3JsZC9Xb3JsZDtMY29kZWNoaWNrZW4vbGliL3ZlYy9CbG9ja0Nvb3JkO0lMY29kZWNoaWNr +ZW4vbGliL3ZlYy9WZWN0b3IzOylMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7AQAm +c2NhbGEvY29sbGVjdGlvbi9tdXRhYmxlL1N0cmluZ0J1aWxkZXIHADQBAAY8aW5pdD4BAAMoKVYM +ADYANwoANQA4DAALACwKAAIAOgEABmFwcGVuZAEAPChMamF2YS9sYW5nL09iamVjdDspTHNjYWxh +L2NvbGxlY3Rpb24vbXV0YWJsZS9TdHJpbmdCdWlsZGVyOwwAPAA9CgA1AD4BABNzY2FsYS9TdHJp +bmdDb250ZXh0BwBAAQANc2NhbGEvUHJlZGVmJAcAQgEAB01PRFVMRSQBAA9Mc2NhbGEvUHJlZGVm +JDsMAEQARQkAQwBGAQAQamF2YS9sYW5nL1N0cmluZwcASAEAAAgASgEAASwIAEwBAAE7CABOAQAT +W0xqYXZhL2xhbmcvT2JqZWN0OwcAUAEADHdyYXBSZWZBcnJheQEAPChbTGphdmEvbGFuZy9PYmpl +Y3Q7KUxzY2FsYS9jb2xsZWN0aW9uL211dGFibGUvV3JhcHBlZEFycmF5OwwAUgBTCgBDAFQBABko +THNjYWxhL2NvbGxlY3Rpb24vU2VxOylWDAA2AFYKAEEAVwEAEGphdmEvbGFuZy9PYmplY3QHAFkB +AB5jb2RlY2hpY2tlbi9saWIvdmVjL0Jsb2NrQ29vcmQHAFsMACUAGQkAXABdAQAac2NhbGEvcnVu +dGltZS9Cb3hlc1J1blRpbWUHAF8BAAxib3hUb0ludGVnZXIBABYoSSlMamF2YS9sYW5nL0ludGVn +ZXI7DABhAGIKAGAAYwwAJgAZCQBcAGUMACcAGQkAXABnAQAQZ2VuZXJpY1dyYXBBcnJheQEAOyhM +amF2YS9sYW5nL09iamVjdDspTHNjYWxhL2NvbGxlY3Rpb24vbXV0YWJsZS9XcmFwcGVkQXJyYXk7 +DABpAGoKAEMAawEAAXMBACooTHNjYWxhL2NvbGxlY3Rpb24vU2VxOylMamF2YS9sYW5nL1N0cmlu +ZzsMAG0AbgoAQQBvAQAIdG9TdHJpbmcMAHEALAoANQByDAAvADAKAAIAdAEAA3BvcwEAIExjb2Rl +Y2hpY2tlbi9saWIvdmVjL0Jsb2NrQ29vcmQ7CgAEADgBAAYkaW5pdCQBACkoTGNvZGVjaGlja2Vu +L211bHRpcGFydC9USXRlbU11bHRpUGFydDspVgwAeQB6CgAQAHsBAARDb2RlAQASTG9jYWxWYXJp +YWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQAKU291cmNlRmlsZQEAGVJ1bnRpbWVWaXNpYmxl +QW5ub3RhdGlvbnMBAAhTY2FsYVNpZwAhAAIABAABAAYAAQACAAsADAAAAAYAAQANAA4AAQB9AAAA +RQADAAMAAAAHKiscuAATrwAAAAIAfgAAACAAAwAAAAcAFAAVAAAAAAAHABYAFwABAAAABwAYABkA +AgB/AAAABgABAAAADwABABoAGwABAH0AAACkAAsACwAAABYqKywtFQQVBRUGFQcXCBcJFwq4AB6s +AAAAAgB+AAAAcAALAAAAFgAUABUAAAAAABYAHwAgAAEAAAAWACEAIgACAAAAFgAjACQAAwAAABYA +JQAZAAQAAAAWACYAGQAFAAAAFgAnABkABgAAABYAGAAZAAcAAAAWACgAKQAIAAAAFgAqACkACQAA +ABYAKwApAAoAfwAAAAYAAQAAAA8AAQALACwAAQB9AAAALwABAAEAAAAFKrQALrAAAAACAH4AAAAM +AAEAAAAFABQAFQAAAH8AAAAGAAEAAAAQAAEALwAwAAEAfQAAADoAAgACAAAABiortQAusQAAAAIA +fgAAABYAAgAAAAYAFAAVAAAAAAAGADEADAABAH8AAAAGAAEAAAAQAAEAMgAzAAEAfQAAANoACQAH +AAAAcCq7ADVZtwA5KrYAO7YAP7sAQVmyAEcHvQBJWQMSS1NZBBJNU1kFEk1TWQYST1PAAFG2AFW3 +AFiyAEcGvQBaWQMZBLQAXrgAZFNZBBkEtABmuABkU1kFGQS0AGi4AGRTtgBstgBwtgA/tgBztgB1 +AbAAAAACAH4AAABIAAcAAABwABQAFQAAAAAAcAAfACAAAQAAAHAAIQAiAAIAAABwACMAJAADAAAA +cAB2AHcABAAAAHAAGAAZAAUAAABwABYAFwAGAH8AAAAKAAIAAAAaAG4AGwABADYANwABAH0AAAA9 +AAIAAQAAAA8qtwB4KrgAfCoSS7UALrEAAAACAH4AAAAMAAEAAAAPABQAFQAAAH8AAAAKAAIAAAAP +AAgAEAADAIAAAAACAAcAgQAAAAsAAQAIAAEACXMACgCCAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaMethodSymbolDescriptor$$anon$1.class.b64 b/src/test/resources/compat/ReferenceScalaMethodSymbolDescriptor$$anon$1.class.b64 new file mode 100644 index 0000000..26c1098 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaMethodSymbolDescriptor$$anon$1.class.b64 @@ -0,0 +1,29 @@ +yv66vgAAADQAMgEASWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFN +ZXRob2RTeW1ib2xEZXNjcmlwdG9yJCRhbm9uJDEHAAEBADVjb2RlY2hpY2tlbi9tdWx0aXBhcnQv +YXNtL1NjYWxhU2lnbmF0dXJlJE1ldGhvZFN5bWJvbAcAAwEAKlJlZmVyZW5jZVNjYWxhTWV0aG9k +U3ltYm9sRGVzY3JpcHRvci5zY2FsYQEAQWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVm +ZXJlbmNlU2NhbGFNZXRob2RTeW1ib2xEZXNjcmlwdG9yBwAGAQADcmVmAQCAKExjb2RlY2hpY2tl +bi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlO0xqYXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxp +ZXI7KUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJE1ldGhvZFN5bWJv +bDsMAAgACQEAB2luZm9zJDEBAB1MamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOwEABGluZm8B +ADgoKUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFRNZXRob2RUeXBl +OwwACwAMCQACAA8BABtqYXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXIHABEBAANnZXQBABQoKUxq +YXZhL2xhbmcvT2JqZWN0OwwAEwAUCwASABUBADRjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1Nj +YWxhU2lnbmF0dXJlJFRNZXRob2RUeXBlBwAXAQAEdGhpcwEAS0xjb2RlY2hpY2tlbi9tdWx0aXBh +cnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhTWV0aG9kU3ltYm9sRGVzY3JpcHRvciQkYW5vbiQxOwEA +Bjxpbml0PgEAjShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYU1l +dGhvZFN5bWJvbERlc2NyaXB0b3I7TGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWdu +YXR1cmU7TGphdmEvdXRpbC9mdW5jdGlvbi9TdXBwbGllcjspVgEAdShMY29kZWNoaWNrZW4vbXVs +dGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2YS9sYW5nL1N0cmluZztMY29kZWNoaWNrZW4v +bXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRTeW1ib2xSZWY7SUkpVgwAGwAdCgAEAB4BAAYk +b3V0ZXIBAENMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYU1ldGhv +ZFN5bWJvbERlc2NyaXB0b3I7AQAFc2lnJDEBACpMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9T +Y2FsYVNpZ25hdHVyZTsBADJjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJl +JFN5bWJvbFJlZgcAJAEAKGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUH +ACYBAAlTeW1ib2xSZWYBAAtUTWV0aG9kVHlwZQEADE1ldGhvZFN5bWJvbAEABENvZGUBABJMb2Nh +bFZhcmlhYmxlVGFibGUBAA9MaW5lTnVtYmVyVGFibGUBAApTb3VyY2VGaWxlAQAPRW5jbG9zaW5n +TWV0aG9kAQAMSW5uZXJDbGFzc2VzAQAFU2NhbGEAMQACAAQAAAABABIACwAMAAAAAgABAA0ADgAB +ACsAAAA3AAEAAQAAAA0qtAAQuQAWAQDAABiwAAAAAgAsAAAADAABAAAADQAZABoAAAAtAAAABgAB +AAAADAABABsAHAABACsAAABXAAYABAAAAA8qLbUAECosAQEDA7cAH7EAAAACACwAAAAqAAQAAAAP +ABkAGgAAAAAADwAgACEAAQAAAA8AIgAjAAIAAAAPAAsADAADAC0AAAAGAAEAAAALAAQALgAAAAIA +BQAvAAAABAAHAAoAMAAAACIABAAlACcAKAYBABgAJwApBgEABAAnACoAAQACAAAAAAARADEAAAAA \ No newline at end of file diff --git a/src/test/resources/compat/ReferenceScalaMethodSymbolDescriptor.class.b64 b/src/test/resources/compat/ReferenceScalaMethodSymbolDescriptor.class.b64 new file mode 100644 index 0000000..9267e8e --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaMethodSymbolDescriptor.class.b64 @@ -0,0 +1,38 @@ +yv66vgAAADQALwEAQWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFN +ZXRob2RTeW1ib2xEZXNjcmlwdG9yBwABAQAQamF2YS9sYW5nL09iamVjdAcAAwEAKlJlZmVyZW5j +ZVNjYWxhTWV0aG9kU3ltYm9sRGVzY3JpcHRvci5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxh +U2lnbmF0dXJlOwEABWJ5dGVzAQHCBgF1MkEhAQIBEwkhIysaNGZlFnQ3LVoqZEMyDFcqGjtpXxIc +FjAcMnBZEis3bxk6amFSfCdPAwIECQUxMW1cN3FDUlQhIQIEAhM1LEgOXjVxQ0okKCJBBAIXDXxH +LVoyaVMOXFdNXAIBJwkBIQIFAgwdNQlBQkMBDgMVGTgtGTdiEwl5QUIBBEJdZhRWTRoFBiMBIQlB +RQEHeSV0Fw4eIBUDTQEiAQYBDgMJQVFBBgEFAl0JMUFdM2cpDUESZQkJAzN9ASJBRw8OA21RIQEI +AwIHBRxYLgMCHzcJcTFrWTFtQ05Ld01cMXVrSiwXQgERHgUxaVUNHjVwSU5LWE5ZOG0RFRFTAzEB +GgMNGRhuGgUGSVUBDSFKAQZTOjR3bh0JBE01elMiQRQLBSFKEwEDNHZdDiQYbhw4CwUpWhMBQjt1 +UzJUEQFMAQVVBjQYLQMCL08JQTErHjlxWSYsJw8FAhphJRERJwgCDCk2K0cPWzhlKWYEWA1DAzQB +EQVBJwEGZUtOHCcvGzl1X0okIiEOHxEFWUpkQkEGOBMJQUQiAQRRZRYkV01aBQN1bRJhYRU7c1M6 +PCdCAR0NERUxIgcxARkBAQADcmVmAQCAKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxh +U2lnbmF0dXJlO0xqYXZhL3V0aWwvZnVuY3Rpb24vU3VwcGxpZXI7KUxjb2RlY2hpY2tlbi9tdWx0 +aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJE1ldGhvZFN5bWJvbDsBAEljb2RlY2hpY2tlbi9tdWx0 +aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhTWV0aG9kU3ltYm9sRGVzY3JpcHRvciQkYW5vbiQx +BwALAQAGPGluaXQ+AQCNKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNj +YWxhTWV0aG9kU3ltYm9sRGVzY3JpcHRvcjtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2Fs +YVNpZ25hdHVyZTtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOylWDAANAA4KAAwADwEABHRo +aXMBAENMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYU1ldGhvZFN5 +bWJvbERlc2NyaXB0b3I7AQADc2lnAQAqTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFT +aWduYXR1cmU7AQAFaW5mb3MBAB1MamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyOwEACmRlc2Ny +aXB0b3IBAEsoTGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkTWV0aG9k +U3ltYm9sOylMamF2YS9sYW5nL1N0cmluZzsBADVjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1Nj +YWxhU2lnbmF0dXJlJE1ldGhvZFN5bWJvbAcAGQEABWpEZXNjAQAUKClMamF2YS9sYW5nL1N0cmlu +ZzsMABsAHAoAGgAdAQA3TGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUk +TWV0aG9kU3ltYm9sOwEAAygpVgwADQAgCgAEACEBAChjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNt +L1NjYWxhU2lnbmF0dXJlBwAjAQAMTWV0aG9kU3ltYm9sAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVU +YWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEACVNpZ25hdHVyZQEAuChMY29kZWNoaWNrZW4vbXVsdGlw +YXJ0L2FzbS9TY2FsYVNpZ25hdHVyZTtMamF2YS91dGlsL2Z1bmN0aW9uL1N1cHBsaWVyPExjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJFRNZXRob2RUeXBlOz47KUxjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2lnbmF0dXJlJE1ldGhvZFN5bWJvbDsBAApTb3Vy +Y2VGaWxlAQAMSW5uZXJDbGFzc2VzAQAZUnVudGltZVZpc2libGVBbm5vdGF0aW9ucwEACFNjYWxh +U2lnACEAAgAEAAAAAAADAAEACQAKAAIAJgAAAEkABQADAAAAC7sADFkqKyy3ABCwAAAAAgAnAAAA +IAADAAAACwARABIAAAAAAAsAEwAUAAEAAAALABUAFgACACgAAAAGAAEAAAALACkAAAACACoAAQAX +ABgAAQAmAAAAOQABAAIAAAAFK7YAHrAAAAACACcAAAAWAAIAAAAFABEAEgAAAAAABQAJAB8AAQAo +AAAABgABAAAADwABAA0AIAABACYAAAAvAAEAAQAAAAUqtwAisQAAAAIAJwAAAAwAAQAAAAUAEQAS +AAAAKAAAAAYAAQAAABAABAArAAAAAgAFACwAAAASAAIAGgAkACUAAQAMAAAAAAARAC0AAAALAAEA +BgABAAdzAAgALgAAAAMFAAA= \ No newline at end of file diff --git a/src/test/resources/compat/ReferenceScalaMethodSymbolFull.class.b64 b/src/test/resources/compat/ReferenceScalaMethodSymbolFull.class.b64 new file mode 100644 index 0000000..3e49d4c --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaMethodSymbolFull.class.b64 @@ -0,0 +1,21 @@ +yv66vgAAADQAIgEAO2NvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFN +ZXRob2RTeW1ib2xGdWxsBwABAQAQamF2YS9sYW5nL09iamVjdAcAAwEAJFJlZmVyZW5jZVNjYWxh +TWV0aG9kU3ltYm9sRnVsbC5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxhU2lnbmF0dXJlOwEA +BWJ5dGVzAQEyBgEpMkEhAQIBEwlxIisaNGZlFnQ3LVoqZEMyDFcqGjtpXxIcFjAcMnBZGitIDhwG +AwcRCWFhWThuYQYkKEJBAwcDJWlXDxw7amEGFEhPQwEIAy0Zdw5aM2RRJhw3Lho4BAFNEQFBAwkD +FzlpEQEEBgIbBSkxb1kxbUMmEXECBAIHAzpMKCsaNAkLRQFBEQEKAg1xSmcuGzs/KQUZAkMBCwEb +BREBIgIMAQkDORIBAjR2WTIkIgFHEBEFZWFiQkEGGxMJWUIiAQRRZRYkV01aBQM7eRFhYRU7c1M6 +PCdCQQ4NERUBUwMxASIDDRFYTRoJA0UhAiJhCRQOAxFSISEKAwIHBRxYLgMCKEkJcTFrWTFtQ05L +d01cMXVrSiwXQkEVJwUxaVUNHjVwSU5LWE5ZOG0BAQAEZnVsbAEASyhMY29kZWNoaWNrZW4vbXVs +dGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRNZXRob2RTeW1ib2w7KUxqYXZhL2xhbmcvU3RyaW5n +OwEANWNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWduYXR1cmUkTWV0aG9kU3ltYm9s +BwALAQAUKClMamF2YS9sYW5nL1N0cmluZzsMAAkADQoADAAOAQAEdGhpcwEAPUxjb2RlY2hpY2tl +bi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhTWV0aG9kU3ltYm9sRnVsbDsBAANyZWYB +ADdMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRNZXRob2RTeW1ib2w7 +AQAGPGluaXQ+AQADKClWDAAUABUKAAQAFgEAKGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2Nh +bGFTaWduYXR1cmUHABgBAAxNZXRob2RTeW1ib2wBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxl +AQAPTGluZU51bWJlclRhYmxlAQAKU291cmNlRmlsZQEADElubmVyQ2xhc3NlcwEAGVJ1bnRpbWVW +aXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwAhAAIABAAAAAAAAgABAAkACgABABsAAAA5AAEA +AgAAAAUrtgAPsAAAAAIAHAAAABYAAgAAAAUAEAARAAAAAAAFABIAEwABAB0AAAAGAAEAAAAGAAEA +FAAVAAEAGwAAAC8AAQABAAAABSq3ABexAAAAAgAcAAAADAABAAAABQAQABEAAAAdAAAABgABAAAA +BwAEAB4AAAACAAUAHwAAAAoAAQAMABkAGgABACAAAAALAAEABgABAAdzAAgAIQAAAAMFAAA= \ No newline at end of file diff --git a/src/test/resources/compat/ReferenceScalaMethodSymbolInfo.class.b64 b/src/test/resources/compat/ReferenceScalaMethodSymbolInfo.class.b64 new file mode 100644 index 0000000..03efed0 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaMethodSymbolInfo.class.b64 @@ -0,0 +1,24 @@ +yv66vgAAADQAJQEAO2NvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFN +ZXRob2RTeW1ib2xJbmZvBwABAQAQamF2YS9sYW5nL09iamVjdAcAAwEAJFJlZmVyZW5jZVNjYWxh +TWV0aG9kU3ltYm9sSW5mby5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxhU2lnbmF0dXJlOwEA +BWJ5dGVzAQEgBgEZMkEhAQIBEwlxIisaNGZlFnQ3LVoqZEMyDFcqGjtpXxIcFjAcMnBZJnNnbRwG +AwcRCWFhWThuYQYkKEJBAwcDJWlXDxw7amEGFEhPQwEIAy0Zdw5aM2RRJhw3Lho4BAFNEQFBAwkD +FzlpEQEEBgIbBSkxb1kxbUMmEXECBAIHAzpMKCsaNAkLRQFBEQEKAg1xSmcuGzs/KQUZAkMBCwEb +BREBIgIMAQkDORIBQjVvTT4kIgFHEREFZXkCQwEOHhsFWSJCAQ8FAw0JNy9cBQM9bRFhYlUyYlkG +HBZuGjhiaVYUWC0DAiE7CVlBK1QzdVE+JEcrHzlmERURUwMxASQDDRFYTRoJAzMRSiEhSg8DGTUr +Rw9bOGUnZmwnbRw3AQAEaW5mbwEAbyhMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNp +Z25hdHVyZSRNZXRob2RTeW1ib2w7KUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxhU2ln +bmF0dXJlJFRNZXRob2RUeXBlOwEANWNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFTaWdu +YXR1cmUkTWV0aG9kU3ltYm9sBwALAQA4KClMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2Fs +YVNpZ25hdHVyZSRUTWV0aG9kVHlwZTsMAAkADQoADAAOAQAEdGhpcwEAPUxjb2RlY2hpY2tlbi9t +dWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhTWV0aG9kU3ltYm9sSW5mbzsBAANyZWYBADdM +Y29kZWNoaWNrZW4vbXVsdGlwYXJ0L2FzbS9TY2FsYVNpZ25hdHVyZSRNZXRob2RTeW1ib2w7AQAG +PGluaXQ+AQADKClWDAAUABUKAAQAFgEANGNvZGVjaGlja2VuL211bHRpcGFydC9hc20vU2NhbGFT +aWduYXR1cmUkVE1ldGhvZFR5cGUHABgBAChjb2RlY2hpY2tlbi9tdWx0aXBhcnQvYXNtL1NjYWxh +U2lnbmF0dXJlBwAaAQALVE1ldGhvZFR5cGUBAAxNZXRob2RTeW1ib2wBAARDb2RlAQASTG9jYWxW +YXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQAKU291cmNlRmlsZQEADElubmVyQ2xhc3Nl +cwEAGVJ1bnRpbWVWaXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwAhAAIABAAAAAAAAgABAAkA +CgABAB4AAAA5AAEAAgAAAAUrtgAPsAAAAAIAHwAAABYAAgAAAAUAEAARAAAAAAAFABIAEwABACAA +AAAGAAEAAAAGAAEAFAAVAAEAHgAAAC8AAQABAAAABSq3ABexAAAAAgAfAAAADAABAAAABQAQABEA +AAAgAAAABgABAAAABwAEACEAAAACAAUAIgAAABIAAgAZABsAHAYBAAwAGwAdAAEAIwAAAAsAAQAG +AAEAB3MACAAkAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaMicroMaterialConsumer.class.b64 b/src/test/resources/compat/ReferenceScalaMicroMaterialConsumer.class.b64 new file mode 100644 index 0000000..3dd7191 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaMicroMaterialConsumer.class.b64 @@ -0,0 +1,42 @@ +yv66vgAAADQAXAEAQGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFN +aWNyb01hdGVyaWFsQ29uc3VtZXIHAAEBABBqYXZhL2xhbmcvT2JqZWN0BwADAQApUmVmZXJlbmNl +U2NhbGFNaWNyb01hdGVyaWFsQ29uc3VtZXIuc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNp +Z25hdHVyZTsBAAVieXRlcwEB5AYBBTNBIQECARMJGSMrGjRmZRZ0Ny1aKmRDMgxXKlsyc182C0cv +GjpqQzIcdU5cOnZbFhQoQkECBQMZGXcuHDliaSoRUUFCAQpbVmRHLxs5YmVSVBFhQgEMRz4kV20Z +NWpHLixnbgEBFAUBUQFDQQYPGwVhISJBBwILTRwXDVwxCgU9YSFBQiFvc0orZw1DAxIBEQUhIwEE +PVM6TEdPEAsCJ0ERQQNBBwIFISlhAwFDAS8FUVEuGTtmZSYMRy4ROxUFYUEDQ0ENJh0JUSJFBAIc +QTkRQWRIBwI7KRFhBEMBB3lJfHcOHiAKAx1JISEJBAIVNUw3TV04Y1k+HDcuAwIkSQUpUipbMnNf +NgtHLxo6akMyFFZtWjV0aUpMKEJBEQcTCTFzRQEIShsmHCdvXCdiaRYUGC4ZNwsFDSIDIkIVFgEE +URNBQTVlIQlZMSYDAi0ZCRkRShw7CQs5AkERQRgCCSUkd0oaCwNVQUJRIU0XQQJJCkFBXDFuS0IR +MUcOCAMXUUohIQ4HAg1BE1gNWjNnEwk5BEgBBFRpSkxnbhoGA2sxQVFBDwEFAm0KYUFcMW5LPjNH +QwEaPREVSRMIMQErERVxBAEiAUADKUlHLVQxcQs6JCgvHwsDZQFDUSFLH0ECKQIBAAptYXRlcmlh +bEF0AQBAKEkpTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lzdHJ5JElN +aWNyb01hdGVyaWFsOwEALWNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lz +dHJ5JAcACwEAB01PRFVMRSQBAC9MY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb01hdGVyaWFs +UmVnaXN0cnkkOwwADQAOCQAMAA8BAAtnZXRNYXRlcmlhbAwAEQAKCgAMABIBAAR0aGlzAQBCTGNv +ZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFNaWNyb01hdGVyaWFsQ29u +c3VtZXI7AQACaWQBAAFJAQAEaWRPZgEAFShMamF2YS9sYW5nL1N0cmluZzspSQEACm1hdGVyaWFs +SUQMABoAGQoADAAbAQAEbmFtZQEAEkxqYXZhL2xhbmcvU3RyaW5nOwEABm5hbWVPZgEAFShJKUxq +YXZhL2xhbmcvU3RyaW5nOwEADG1hdGVyaWFsTmFtZQwAIQAgCgAMACIBAAppZE1hcEVudHJ5AQAI +Z2V0SWRNYXABABEoKVtMc2NhbGEvVHVwbGUyOwwAJQAmCgAMACcBACZzY2FsYS9jb2xsZWN0aW9u +L211dGFibGUvU3RyaW5nQnVpbGRlcgcAKQEABjxpbml0PgEAAygpVgwAKwAsCgAqAC0BAAxzY2Fs +YS9UdXBsZTIHAC8BAAJfMQEAFCgpTGphdmEvbGFuZy9PYmplY3Q7DAAxADIKADAAMwEAEGphdmEv +bGFuZy9TdHJpbmcHADUBAAZhcHBlbmQBADwoTGphdmEvbGFuZy9PYmplY3Q7KUxzY2FsYS9jb2xs +ZWN0aW9uL211dGFibGUvU3RyaW5nQnVpbGRlcjsMADcAOAoAKgA5AQABPQgAOwEAAl8yDAA9ADIK +ADAAPgwACQAKCgACAEABABpzY2FsYS9ydW50aW1lL0JveGVzUnVuVGltZQcAQgEADGJveFRvQm9v +bGVhbgEAFihaKUxqYXZhL2xhbmcvQm9vbGVhbjsMAEQARQoAQwBGAQAIdG9TdHJpbmcBABQoKUxq +YXZhL2xhbmcvU3RyaW5nOwwASABJCgAqAEoBAAVlbnRyeQEADkxzY2FsYS9UdXBsZTI7CgAEAC0B +ADtjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvTWF0ZXJpYWxSZWdpc3RyeSRJTWljcm9NYXRl +cmlhbAcATwEALGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lzdHJ5BwBR +AQAOSU1pY3JvTWF0ZXJpYWwBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJl +clRhYmxlAQANU3RhY2tNYXBUYWJsZQEAClNvdXJjZUZpbGUBAAxJbm5lckNsYXNzZXMBABlSdW50 +aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAAAAAAUAAQAJAAoAAQBUAAAA +PAACAAIAAAAIsgAQG7YAE7AAAAACAFUAAAAWAAIAAAAIABQAFQAAAAAACAAWABcAAQBWAAAABgAB +AAAACgABABgAGQABAFQAAAA8AAIAAgAAAAiyABArtgAcrAAAAAIAVQAAABYAAgAAAAgAFAAVAAAA +AAAIAB0AHgABAFYAAAAGAAEAAAAMAAEAHwAgAAEAVAAAADwAAgACAAAACLIAEBu2ACOwAAAAAgBV +AAAAFgACAAAACAAUABUAAAAAAAgAFgAXAAEAVgAAAAYAAQAAAA4AAQAkACAAAQBUAAAApwAEAAMA +AAA6sgAQtgAoGzJNuwAqWbcALiy2ADTAADa2ADoSPLYAOiy2AD8qG7YAQaYABwSnAAQDuABHtgA6 +tgBLsAAAAAMAVQAAACAAAwAAADoAFAAVAAAAAAA6ABYAFwABAAkAMABMAE0AAgBWAAAACgACAAAA +EgAJABMAVwAAACUAAv8ALwADBwACAQcAMAABBwAq/wAAAAMHAAIBBwAwAAIHACoBAAEAKwAsAAEA +VAAAAC8AAQABAAAABSq3AE6xAAAAAgBVAAAADAABAAAABQAUABUAAABWAAAABgABAAAAFQAEAFgA +AAACAAUAWQAAAAoAAQBQAFIAUwYJAFoAAAALAAEABgABAAdzAAgAWwAAAAMFAAA= diff --git a/src/test/resources/compat/ReferenceScalaMicroblockTraits.class.b64 b/src/test/resources/compat/ReferenceScalaMicroblockTraits.class.b64 new file mode 100644 index 0000000..f504014 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaMicroblockTraits.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQBHQEAO2NvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFNaWNyb2Jsb2NrVHJhaXRzBwABAQAhY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrBwADAQAtY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrQ2xpZW50BwAFAQAkUmVmZXJlbmNlU2NhbGFNaWNyb2Jsb2NrVHJhaXRzLnNjYWxhAQAeTHNjYWxhL3JlZmxlY3QvU2NhbGFTaWduYXR1cmU7AQAFYnl0ZXMBBfUGAQUlYwFCAQMBJRFhRFUzZ0tKLGduWTNURwZkFy1UNWRlPhRHblwybClKDBcOXjoLBQ0hEUFCMnBbQgxHTwMCBg0FSVEuHjd1U0IMJw8eBgIPBVkxbRwzZkciTDdtWzNvBwEZMgEBBhEhCVlhIkQBDRUJaWEhAQZuUw4UeE4ZN3BHLkwhYQQHAxU1SzdNXThjWT4cNw4FAgwjJREhAwQCFwc+bFduHDhOUw4UeE4ZN3BHLhxFLlszb2kiKUEDAUMBKwUxQSgbOGppeiISQQYJAy8BaRFBAQUIMwERDREiARsDGSlnLxo4dWdWCTEERQIdQw1qESEIBgM9fQlBIR47alkqCQElAQNrQ1oMF0IBEh4FJQklT10xehkmHEgPBQIlVTkRUQVLBwJNKQlxJUEDdEcGZBctAwIqTQUxAUtdM2VLGkwhYQsXAw1NIygvGzhoFQlJYwUDBC8BAQZJYUcBCEtaLGcOXjohESUBBAExQUECEwURJwEJdEsyLDcNXjNlGwYkWE1dNWJZVgkhBwUCNHs5EUFnDwgDa2lyIUFOHQ4DXVIhAQ8FAg1xEnhuHDs/EwU5EUJBBwcTCWFEIkELTlMOFHguVDF1S0pMFw0cKmZPJhxIT109CgV5eiRBRCVOUw4UeC5UMXVLSkwXDRwGA3kxQREiEQFBAgMHSREBIgIpTSxHLloydUsSbBUNXjNzUwZkdwxKM3IpCRllCQUCJgkmEVFJCgIFKzpMRw9DBEgBBgUJGQEaAgdhJBMHAwRKAQEGS0FNARJnFmRXbRk7Zkk2C0cvGjpqQzIEAyJDJgEBBAUNESIBTQM1GVgNXDNkaRYkNwlcMXRnVglRCgUCDB0mEXEKBAIRBz5sV24cOE5TDhR4bhE3YmdORBEiFQFBAgMHSREBKgIjTSxHLloydUsSHEUuWTp0PxIqFw8GAkQnIjlxCVVBAQIEaQVCQisBQQMmUSoBCHRLMiw3DV4zZQcyDDdvHREJD10DARkhQwExBjEhbVw7b0lOLBIhFwkDNX5rEWEXBgM5dgsxQV4zZBUJcWYhQQJtUwpMIQFZLgMPDSsobVw1ZW0hOSENAWEBCgMZF0EDMnBrOiQ3bxgTZmNSETEJGgUIDwYMCRExAVoRGTEHASlRBTMGOSFtXDtvSU4EA2ICNQEBBCUJIVsBDV9aLCdPXTVlS05jdw5eCwJVQhFRZVsFA1kaEnFBUThwWRYMZw5DBG8BAQdJEUE4AiE9NFhNHTpqSRYcRm4cO2BJFQxIQ0EicREdOVUuIUFBAilEYUEdASFCE1EXIUQ4d0tKFBgOWjNUWT4kCAVDBHUBAQdJEUE7AhlNLEcuWjJ1SxIcRm4cOxYDWQQiIUo8CgVhNCNhQSVvaSI5IRABYQEKA1kYAUU6ZlkWHEcvGjNUWT4keAxKM3IpCRlFEEMESHMGBQkZATwJDXkEARUpA3cDNRlYDVwzZGkWJDcLXDh1QSFBEREBAUECEwURLgEHZF82bHdOHCpmXRIsJw9DBQIGAQENESIBAggFATJtXDduXzoUVk0cM2ZlfiNTLR0LBAcGJQECQyQCBAUFCRkBNgkPBTUBASlRBVUGaTFtXDduXzoUVk0cM2ZlAkIxIiEFAQEEBQ0RIgECFAUBIi8aOGVLSixHDVU4dFNSTHdOXAsDAysBMkFXQQwTDQlJYhcCCC0WHEdvHDo0ES0JaQIBYQECBCUJIWEIAilJLGcOWjNzSxIEdm5dNXVTPnR3DEozcikNGRURBQUKDwZtEREhYQEDK0EBIiEKAUEDJhFRQwESZRZ0Ry0aOmZJQns3Lxs7al86BANiQkEVAREFEzFGAQ1PFiQYKlQxdUtKTBcNHAsCZSE5EXEGAQUCBUUSQUM3akdKfDcJXDF0Z1IJUQoDBAI2ASEJAVcBCk8WJChpXDtvSU5EYSEhDwEJAyoYYUI0ZmlOY3cOHgUIA3sBQRFJQSADGRFYTRwzZmVSKTEpIRECRiFBETFJQR4BBAkpIkECcV9ORHEhYRICPAEHYS8BA3FDThwIAQAGZXZlbnRzAQAVTGphdmEvdXRpbC9BcnJheUxpc3Q7AQApTGphdmEvdXRpbC9BcnJheUxpc3Q8TGphdmEvbGFuZy9TdHJpbmc7PjsBABBzZWxlY3RlZE1hdGVyaWFsAQA9TGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lzdHJ5JElNaWNyb01hdGVyaWFsOwEADXNlbGVjdGVkQ2xhc3MBAClMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb0NsYXNzOwEABmJvdW5kcwEAHUxjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7AQAMb3ZlcnJpZGVTbG90AQABWgEADHNlbGVjdGVkU2xvdAEAAUkBAAxjb21tb25SZW5kZXIBABByZW5kZXJlZFBvc2l0aW9uAQAdTGNvZGVjaGlja2VuL2xpYi92ZWMvVmVjdG9yMzsBAAxyZW5kZXJCb3VuZHMBAApyZW5kZXJNYXNrAQAfKClMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwAGwATCQACAB4BAAR0aGlzAQA9TGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFNaWNyb2Jsb2NrVHJhaXRzOwEAEHJlbmRlckJvdW5kc18kZXEBACAoTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjspVgEAA3gkMQEAAygpSQwAHAAXCQACACYBAA5yZW5kZXJNYXNrXyRlcQEABChJKVYBAEFjb2RlY2hpY2tlbiRtaWNyb2Jsb2NrJFRNaWNyb09jY2x1c2lvbkNsaWVudCQkc3VwZXIkb25QYXJ0Q2hhbmdlZAEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVYBACBjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydAcALAEADW9uUGFydENoYW5nZWQMAC4AKwoALQAvAQAEcGFydAEAIkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDsBADtjb2RlY2hpY2tlbiRtaWNyb2Jsb2NrJFRNaWNyb09jY2x1c2lvbkNsaWVudCQkc3VwZXIkb25BZGRlZAEAAygpVgEAB29uQWRkZWQMADUANAoALQA2AQA4Y29kZWNoaWNrZW4kbWljcm9ibG9jayRUTWljcm9PY2NsdXNpb25DbGllbnQkJHN1cGVyJHJlYWQBACUoTGNvZGVjaGlja2VuL2xpYi9kYXRhL01DRGF0YUlucHV0OylWAQAEcmVhZAwAOgA5CgAEADsBAAZwYWNrZXQBACJMY29kZWNoaWNrZW4vbGliL2RhdGEvTUNEYXRhSW5wdXQ7AQAyY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb25DbGllbnQkY2xhc3MHAD8BAFMoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uQ2xpZW50O0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspVgwALgBBCgBAAEIBADEoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uQ2xpZW50OylWDAA1AEQKAEAARQEAUyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb25DbGllbnQ7TGNvZGVjaGlja2VuL2xpYi9kYXRhL01DRGF0YUlucHV0OylWDAA6AEcKAEAASAEADHJlY2FsY0JvdW5kcwwASgBECgBAAEsBABBnZXRQcmlvcml0eUNsYXNzAQAxKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbkNsaWVudDspSQwATQBOCgBAAE8BAA1nZXRCcm9rZW5JY29uAQAdKEkpTG5ldC9taW5lY3JhZnQvdXRpbC9JSWNvbjsBAC1jb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGllbnQkY2xhc3MHAFMBAEYoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsaWVudDtJKUxuZXQvbWluZWNyYWZ0L3V0aWwvSUljb247DABRAFUKAFQAVgEABHNpZGUBAA1hZGRIaXRFZmZlY3RzAQBaKExuZXQvbWluZWNyYWZ0L3V0aWwvTW92aW5nT2JqZWN0UG9zaXRpb247TG5ldC9taW5lY3JhZnQvY2xpZW50L3BhcnRpY2xlL0VmZmVjdFJlbmRlcmVyOylWAQCDKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGllbnQ7TG5ldC9taW5lY3JhZnQvdXRpbC9Nb3ZpbmdPYmplY3RQb3NpdGlvbjtMbmV0L21pbmVjcmFmdC9jbGllbnQvcGFydGljbGUvRWZmZWN0UmVuZGVyZXI7KVYMAFkAWwoAVABcAQADaGl0AQApTG5ldC9taW5lY3JhZnQvdXRpbC9Nb3ZpbmdPYmplY3RQb3NpdGlvbjsBAA5lZmZlY3RSZW5kZXJlcgEALkxuZXQvbWluZWNyYWZ0L2NsaWVudC9wYXJ0aWNsZS9FZmZlY3RSZW5kZXJlcjsBABFhZGREZXN0cm95RWZmZWN0cwEAMShMbmV0L21pbmVjcmFmdC9jbGllbnQvcGFydGljbGUvRWZmZWN0UmVuZGVyZXI7KVYBAFooTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsaWVudDtMbmV0L21pbmVjcmFmdC9jbGllbnQvcGFydGljbGUvRWZmZWN0UmVuZGVyZXI7KVYMAGIAZAoAVABlAQAMcmVuZGVyU3RhdGljAQAhKExjb2RlY2hpY2tlbi9saWIvdmVjL1ZlY3RvcjM7SSlaAQBKKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGllbnQ7TGNvZGVjaGlja2VuL2xpYi92ZWMvVmVjdG9yMztJKVoMAGcAaQoAVABqAQADcG9zAQAEcGFzcwEAD2dldFJlbmRlckJvdW5kcwEASChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50OylMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwAbgBvCgBUAHABAAtnZXRTbG90TWFzawEALWNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jayRjbGFzcwcAcwEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrOylJDAByAHUKAHQAdgEAGGdldFBhcnRpYWxPY2NsdXNpb25Cb3hlcwEAEigpTGphdmEvdXRpbC9MaXN0OwEAOyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb2Jsb2NrOylMamF2YS91dGlsL0xpc3Q7DAB4AHoKAHQAewEAC2l0ZW1DbGFzc0lEDAB9AHUKAHQAfgEAO2NvZGVjaGlja2VuJG1pY3JvYmxvY2skVE1pY3JvT2NjbHVzaW9uJCRzdXBlciRvY2NsdXNpb25UZXN0AQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgEADW9jY2x1c2lvblRlc3QMAIIAgQoALQCDAQAFbnBhcnQBACxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbiRjbGFzcwcAhgEATShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OylaDACCAIgKAIcAiQEAF2VkZ2VDb3JuZXJPY2NsdXNpb25UZXN0AQBTKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247KVoBAHsoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247KVoMAIsAjQoAhwCOAQAEZWRnZQEAKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjsBAAZjb3JuZXIBABcoKUxqYXZhL3V0aWwvQXJyYXlMaXN0OwwACwAMCQACAJQBAD8oKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvTWF0ZXJpYWxSZWdpc3RyeSRJTWljcm9NYXRlcmlhbDsMAA4ADwkAAgCXAQAUc2VsZWN0ZWRNYXRlcmlhbF8kZXEBAEAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lzdHJ5JElNaWNyb01hdGVyaWFsOylWAQArKClMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb0NsYXNzOwwAEAARCQACAJwBABFzZWxlY3RlZENsYXNzXyRlcQEALChMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Db21tb25NaWNyb0NsYXNzOylWDAASABMJAAIAoAEACmJvdW5kc18kZXEBAAMoKVoMABQAFQkAAgCkAQAQb3ZlcnJpZGVTbG90XyRlcQEABChaKVYMABYAFwkAAgCoAQAQc2VsZWN0ZWRTbG90XyRlcQwAGAAVCQACAKsBABBjb21tb25SZW5kZXJfJGVxAQAfKClMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzOwwAGQAaCQACAK8BABRyZW5kZXJlZFBvc2l0aW9uXyRlcQEAIChMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzOylWAQAMZ2V0SU1hdGVyaWFsDAALAJMKAAIAtAEACG1hdGVyaWFsCAC2AQATamF2YS91dGlsL0FycmF5TGlzdAcAuAEAA2FkZAEAFShMamF2YS9sYW5nL09iamVjdDspWgwAugC7CgC5ALwMAA4AlgoAAgC+AQAKbWljcm9DbGFzcwwAEACbCgACAMEBAAlnZXRCb3VuZHMIABIMABIAHQoAAgDFAQAHZ2V0U2xvdAwAFACjCgACAMgMABYAJQoAAgDKDADHAHUKAHQAzAEABnJlbmRlcgEAIShMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpVgEAJnNjYWxhL2NvbGxlY3Rpb24vbXV0YWJsZS9TdHJpbmdCdWlsZGVyBwDQAQAGPGluaXQ+DADSADQKANEA0wEAB3JlbmRlcjoIANUBAAZhcHBlbmQBADwoTGphdmEvbGFuZy9PYmplY3Q7KUxzY2FsYS9jb2xsZWN0aW9uL211dGFibGUvU3RyaW5nQnVpbGRlcjsMANcA2AoA0QDZAQAac2NhbGEvcnVudGltZS9Cb3hlc1J1blRpbWUHANsBAAxib3hUb0ludGVnZXIBABYoSSlMamF2YS9sYW5nL0ludGVnZXI7DADdAN4KANwA3wEACHRvU3RyaW5nAQAUKClMamF2YS9sYW5nL1N0cmluZzsMAOEA4goA0QDjDACxALIKAAIA5QwAGACjCgACAOcBADNjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2tDbGllbnQkY2xhc3MHAOkBAFAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9ja0NsaWVudDtMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpVgwAzgDrCgDqAOwBABYoKUxqYXZhL2xhbmcvSXRlcmFibGU7DAB4AHkKAAIA7wEAKigpTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsYXNzOwwAwACbCgACAPIMANIAKQoABAD0AQAGJGluaXQkAQArKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspVgwA9gD3CgCHAPgBACwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svQ29tbW9uTWljcm9ibG9jazspVgwA9gD6CgB0APsBACwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsaWVudDspVgwA9gD9CgBUAP4MAPYARAoAQAEAAQAyKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL0NvbW1vbk1pY3JvYmxvY2tDbGllbnQ7KVYMAPYBAgoA6gEDCgC5ANMBABtjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDYHAQYGP+AAAAAAAAABAAkoREREREREKVYMANIBCgoBBwELAQA7Y29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb01hdGVyaWFsUmVnaXN0cnkkSU1pY3JvTWF0ZXJpYWwHAQ0BACxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvTWF0ZXJpYWxSZWdpc3RyeQcBDwEADklNaWNyb01hdGVyaWFsAQAJU2lnbmF0dXJlAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEAMSgpTGphdmEvdXRpbC9MaXN0PExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7PjsBACsoKUxqYXZhL3V0aWwvQXJyYXlMaXN0PExqYXZhL2xhbmcvU3RyaW5nOz47AQANU3RhY2tNYXBUYWJsZQEAClNvdXJjZUZpbGUBAAxJbm5lckNsYXNzZXMBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAQAGAAoAEgALAAwAAQESAAAAAgANAAIADgAPAAAAAgAQABEAAAACABIAEwAAAAIAFAAVAAAAAgAWABcAAAACABgAFQAAAAIAGQAaAAAAAgAbABMAAAACABwAFwAAAC4AAQAbAB0AAQETAAAALwABAAEAAAAFKrQAH7AAAAACARQAAAAMAAEAAAAFACAAIQAAARUAAAAGAAEAAAAIAAEAIgAjAAEBEwAAADoAAgACAAAABiortQAfsQAAAAIBFAAAABYAAgAAAAYAIAAhAAAAAAAGACQAEwABARUAAAAGAAEAAAAIAAEAHAAlAAEBEwAAAC8AAQABAAAABSq0ACesAAAAAgEUAAAADAABAAAABQAgACEAAAEVAAAABgABAAAACAABACgAKQABARMAAAA6AAIAAgAAAAYqG7UAJ7EAAAACARQAAAAWAAIAAAAGACAAIQAAAAAABgAkABcAAQEVAAAABgABAAAACBABACoAKwABARMAAAA6AAIAAgAAAAYqK7cAMLEAAAACARQAAAAWAAIAAAAGACAAIQAAAAAABgAxADIAAQEVAAAABgABAAAACBABADMANAABARMAAAAvAAEAAQAAAAUqtwA3sQAAAAIBFAAAAAwAAQAAAAUAIAAhAAABFQAAAAYAAQAAAAgQAQA4ADkAAQETAAAAOgACAAIAAAAGKiu3ADyxAAAAAgEUAAAAFgACAAAABgAgACEAAAAAAAYAPQA+AAEBFQAAAAYAAQAAAAgAAQAuACsAAQETAAAAOgACAAIAAAAGKiu4AEOxAAAAAgEUAAAAFgACAAAABgAgACEAAAAAAAYAMQAyAAEBFQAAAAYAAQAAAAgAAQA1ADQAAQETAAAALwABAAEAAAAFKrgARrEAAAACARQAAAAMAAEAAAAFACAAIQAAARUAAAAGAAEAAAAIAAEAOgA5AAEBEwAAADoAAgACAAAABioruABJsQAAAAIBFAAAABYAAgAAAAYAIAAhAAAAAAAGAD0APgABARUAAAAGAAEAAAAIAAEASgA0AAEBEwAAAC8AAQABAAAABSq4AEyxAAAAAgEUAAAADAABAAAABQAgACEAAAEVAAAABgABAAAACAABAE0AJQABARMAAAAvAAEAAQAAAAUquABQrAAAAAIBFAAAAAwAAQAAAAUAIAAhAAABFQAAAAYAAQAAAAgAAQBRAFIAAQETAAAAOgACAAIAAAAGKhu4AFewAAAAAgEUAAAAFgACAAAABgAgACEAAAAAAAYAWAAXAAEBFQAAAAYAAQAAAAgAAQBZAFoAAQETAAAARQADAAMAAAAHKissuABdsQAAAAIBFAAAACAAAwAAAAcAIAAhAAAAAAAHAF4AXwABAAAABwBgAGEAAgEVAAAABgABAAAACAABAGIAYwABARMAAAA6AAIAAgAAAAYqK7gAZrEAAAACARQAAAAWAAIAAAAGACAAIQAAAAAABgBgAGEAAQEVAAAABgABAAAACAABAGcAaAABARMAAABFAAMAAwAAAAcqKxy4AGusAAAAAgEUAAAAIAADAAAABwAgACEAAAAAAAcAbAAaAAEAAAAHAG0AFwACARUAAAAGAAEAAAAIAAEAbgAdAAEBEwAAAC8AAQABAAAABSq4AHGwAAAAAgEUAAAADAABAAAABQAgACEAAAEVAAAABgABAAAACAABAHIAJQABARMAAAAvAAEAAQAAAAUquAB3rAAAAAIBFAAAAAwAAQAAAAUAIAAhAAABFQAAAAYAAQAAAAgAAQB4AHkAAgETAAAALwABAAEAAAAFKrgAfLAAAAACARQAAAAMAAEAAAAFACAAIQAAARUAAAAGAAEAAAAIARIAAAACARYAAQB9ACUAAQETAAAALwABAAEAAAAFKrgAf6wAAAACARQAAAAMAAEAAAAFACAAIQAAARUAAAAGAAEAAAAIEAEAgACBAAEBEwAAADoAAgACAAAABiortwCErAAAAAIBFAAAABYAAgAAAAYAIAAhAAAAAAAGAIUAMgABARUAAAAGAAEAAAAIAAEAggCBAAEBEwAAADoAAgACAAAABioruACKrAAAAAIBFAAAABYAAgAAAAYAIAAhAAAAAAAGAIUAMgABARUAAAAGAAEAAAAIAAEAiwCMAAEBEwAAAEUAAwADAAAAByorLLgAj6wAAAACARQAAAAgAAMAAAAHACAAIQAAAAAABwCQAJEAAQAAAAcAkgCRAAIBFQAAAAYAAQAAAAgAAQALAJMAAgETAAAALwABAAEAAAAFKrQAlbAAAAACARQAAAAMAAEAAAAFACAAIQAAARUAAAAGAAEAAAAJARIAAAACARcAAQAOAJYAAQETAAAALwABAAEAAAAFKrQAmLAAAAACARQAAAAMAAEAAAAFACAAIQAAARUAAAAGAAEAAAAKAAEAmQCaAAEBEwAAADoAAgACAAAABiortQCYsQAAAAIBFAAAABYAAgAAAAYAIAAhAAAAAAAGACQADwABARUAAAAGAAEAAAAKAAEAEACbAAEBEwAAAC8AAQABAAAABSq0AJ2wAAAAAgEUAAAADAABAAAABQAgACEAAAEVAAAABgABAAAACwABAJ4AnwABARMAAAA6AAIAAgAAAAYqK7UAnbEAAAACARQAAAAWAAIAAAAGACAAIQAAAAAABgAkABEAAQEVAAAABgABAAAACwABABIAHQABARMAAAAvAAEAAQAAAAUqtAChsAAAAAIBFAAAAAwAAQAAAAUAIAAhAAABFQAAAAYAAQAAAAwAAQCiACMAAQETAAAAOgACAAIAAAAGKiu1AKGxAAAAAgEUAAAAFgACAAAABgAgACEAAAAAAAYAJAATAAEBFQAAAAYAAQAAAAwAAQAUAKMAAQETAAAALwABAAEAAAAFKrQApawAAAACARQAAAAMAAEAAAAFACAAIQAAARUAAAAGAAEAAAANAAEApgCnAAEBEwAAADoAAgACAAAABiobtQClsQAAAAIBFAAAABYAAgAAAAYAIAAhAAAAAAAGACQAFQABARUAAAAGAAEAAAANAAEAFgAlAAEBEwAAAC8AAQABAAAABSq0AKmsAAAAAgEUAAAADAABAAAABQAgACEAAAEVAAAABgABAAAADgABAKoAKQABARMAAAA6AAIAAgAAAAYqG7UAqbEAAAACARQAAAAWAAIAAAAGACAAIQAAAAAABgAkABcAAQEVAAAABgABAAAADgABABgAowABARMAAAAvAAEAAQAAAAUqtACsrAAAAAIBFAAAAAwAAQAAAAUAIAAhAAABFQAAAAYAAQAAAA8AAQCtAKcAAQETAAAAOgACAAIAAAAGKhu1AKyxAAAAAgEUAAAAFgACAAAABgAgACEAAAAAAAYAJAAVAAEBFQAAAAYAAQAAAA8AAQAZAK4AAQETAAAALwABAAEAAAAFKrQAsLAAAAACARQAAAAMAAEAAAAFACAAIQAAARUAAAAGAAEAAAAQAAEAsQCyAAEBEwAAADoAAgACAAAABiortQCwsQAAAAIBFAAAABYAAgAAAAYAIAAhAAAAAAAGACQAGgABARUAAAAGAAEAAAAQAAEAswCWAAEBEwAAAD0AAgABAAAADyq2ALUSt7YAvVcqtgC/sAAAAAIBFAAAAAwAAQAAAA8AIAAhAAABFQAAAAoAAgAAABMACgAUAAEAwACbAAEBEwAAAC8AAQABAAAABSq2AMKwAAAAAgEUAAAADAABAAAABQAgACEAAAEVAAAABgABAAAAFwABAMMAHQABARMAAAA9AAIAAQAAAA8qtgC1EsS2AL1XKrYAxrAAAAACARQAAAAMAAEAAAAPACAAIQAAARUAAAAKAAIAAAAaAAoAGwABAMcAJQABARMAAABIAAEAAQAAABMqtgDJmQAKKrYAy6cAByq4AM2sAAAAAwEUAAAADAABAAAAEwAgACEAAAEVAAAABgABAAAAHgEYAAAABQACDkMBAAEAzgDPAAEBEwAAAIQAAwADAAAAMSq2ALW7ANFZtwDUEta2ANocuADgtgDatgDktgC9VyortgDmKrYA6JkACSorHLgA7bEAAAADARQAAAAgAAMAAAAxACAAIQAAAAAAMQBsABoAAQAAADEAbQAXAAIBFQAAABIABAAAACEAHgAiACMAIwAwACABGAAAAAMAATAQQQB4AO4AAQETAAAALwABAAEAAAAFKrYA8LAAAAACARQAAAAMAAEAAAAFACAAIQAAARUAAAAGAAEAAAAIEEEAwADxAAEBEwAAAC8AAQABAAAABSq2APOwAAAAAgEUAAAADAABAAAABQAgACEAAAEVAAAABgABAAAACAABANIANAABARMAAACGAA8AAQAAAEgqEBe3APUquAD5KrgA/Cq4AP8quAEBKrgBBCq7ALlZtwEFtQCVKrsBB1kODg4PFAEID7cBDLUAoSoDtQClKgO1AKkqA7UArLEAAAACARQAAAAMAAEAAABIACAAIQAAARUAAAAaAAYAAAAIABoACQAlAAwAOAANAD0ADgBCAA8ABAEZAAAAAgAHARoAAAAKAAEBDgEQAREGCQEbAAAACwABAAgAAQAJcwAKARwAAAADBQAA diff --git a/src/test/resources/compat/ReferenceScalaNormalOcclusion.class.b64 b/src/test/resources/compat/ReferenceScalaNormalOcclusion.class.b64 new file mode 100644 index 0000000..856cc65 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaNormalOcclusion.class.b64 @@ -0,0 +1,34 @@ +yv66vgAAADQAPAEAOmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFO +b3JtYWxPY2NsdXNpb24HAAEBACBjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydAcAAwEA +JmNvZGVjaGlja2VuL211bHRpcGFydC9UTm9ybWFsT2NjbHVzaW9uBwAFAQAjUmVmZXJlbmNlU2Nh +bGFOb3JtYWxPY2NsdXNpb24uc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsB +AAVieXRlcwEBXwYBPTJBIQECARMJaSIrGjRmZRZ0Ny1aKmRDMgxnahw6bkMyfDVtGTd2ZyZ8Z04D +AgQJBTExbVw3cUNSVCEhAgQCEzUsSA5eNXFDSiQoIkEEAhcNfEctWjJpUw5cV01cAgEnDQEhQgQJ +AxcxaREBQgUDGxERIQJWJ3ZZUkwHKxk6dSEJWXEiAwIRCQkBQktUOHNbBmR3alkybWtOTHdOHAUG +JQEhCWFFAQd5JXQXDh4gFQNRASIhBgEOAwlBUWEGAQUCYQlxYVozdSlmBFgtRgEaIQlRciREARwV +CWFSJAEDbUM6PCciARACCSkMZy9ZBQNBbRFhYRU7c1M6PAciAhIBCQMZEyFFNGZpPhs3DVw7dFM+ +dCdpHD1mZ1YJQQVFAhtLHUohQUoOAxElI1hNXTFjWRYEIgFLFw4DJVIhQUsWAgdZLDdNAwItDQUZ +QS4bMgoFOUojYUIidkU+TEdNDgEAO2NvZGVjaGlja2VuJG11bHRpcGFydCRUTm9ybWFsT2NjbHVz +aW9uJCRzdXBlciRvY2NsdXNpb25UZXN0AQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRp +UGFydDspWgEADW9jY2x1c2lvblRlc3QMAA0ADAoABAAOAQAEdGhpcwEAPExjb2RlY2hpY2tlbi9t +dWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhTm9ybWFsT2NjbHVzaW9uOwEABW5wYXJ0AQAi +TGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OwEALGNvZGVjaGlja2VuL211bHRpcGFy +dC9UTm9ybWFsT2NjbHVzaW9uJGNsYXNzBwAUAQBNKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE5v +cm1hbE9jY2x1c2lvbjtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoMAA0AFgoA +FQAXAQAHZ2V0VHlwZQEAFCgpTGphdmEvbGFuZy9TdHJpbmc7AQAfdGVzdDpyZWZlcmVuY2Utbm9y +bWFsLW9jY2x1c2lvbggAGwEAEWdldE9jY2x1c2lvbkJveGVzAQAWKClMamF2YS9sYW5nL0l0ZXJh +YmxlOwEAG2NvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNgcAHwY/4AAAAAAAAAEABjxpbml0PgEA +CShEREREREQpVgwAIwAkCgAgACUBABVqYXZhL3V0aWwvQ29sbGVjdGlvbnMHACcBAA1zaW5nbGV0 +b25MaXN0AQAkKExqYXZhL2xhbmcvT2JqZWN0OylMamF2YS91dGlsL0xpc3Q7DAApACoKACgAKwEA +AygpVgwAIwAtCgAEAC4BAAYkaW5pdCQBACsoTGNvZGVjaGlja2VuL211bHRpcGFydC9UTm9ybWFs +T2NjbHVzaW9uOylWDAAwADEKABUAMgEABENvZGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAA9MaW5l +TnVtYmVyVGFibGUBAAlTaWduYXR1cmUBADUoKUxqYXZhL2xhbmcvSXRlcmFibGU8TGNvZGVjaGlj +a2VuL2xpYi92ZWMvQ3Vib2lkNjs+OwEAClNvdXJjZUZpbGUBABlSdW50aW1lVmlzaWJsZUFubm90 +YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAQAGAAAABRABAAsADAABADQAAAA6AAIAAgAAAAYqK7cA +D6wAAAACADUAAAAWAAIAAAAGABAAEQAAAAAABgASABMAAQA2AAAABgABAAAACgABAA0ADAABADQA +AAA6AAIAAgAAAAYqK7gAGKwAAAACADUAAAAWAAIAAAAGABAAEQAAAAAABgASABMAAQA2AAAABgAB +AAAACgABABkAGgABADQAAAAtAAEAAQAAAAMSHLAAAAACADUAAAAMAAEAAAADABAAEQAAADYAAAAG +AAEAAAALAAEAHQAeAAIANAAAAD0ADgABAAAAE7sAIFkODg4UACEPD7cAJrgALLAAAAACADUAAAAM +AAEAAAATABAAEQAAADYAAAAGAAEAAAAOADcAAAACADgAAQAjAC0AAQA0AAAAMwABAAEAAAAJKrcA +Lyq4ADOxAAAAAgA1AAAADAABAAAACQAQABEAAAA2AAAABgABAAAACgADADkAAAACAAcAOgAAAAsA +AQAIAAEACXMACgA7AAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaPostMicroblock.class.b64 b/src/test/resources/compat/ReferenceScalaPostMicroblock.class.b64 new file mode 100644 index 0000000..b327225 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaPostMicroblock.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAlgEAOWNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFQb3N0TWljcm9ibG9jawcAAQEAOGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlUG9zdE1pY3JvYmxvY2tCYXNlBwADAQAlY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9jawcABQEAIlJlZmVyZW5jZVNjYWxhUG9zdE1pY3JvYmxvY2suc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVieXRlcwEDNwYBfTNBIQECARMJYSIrGjRmZRZ0Ny1aKmRDMgwHa1w6dRsmHCdvHDJtXw5cJ0JBAgUDGRl3Lhw5YmkqEVFBQgEKW1ZkRy8bOWJlUlQRYUIBDEc+JFdtGTVqRy4sZ24BARQHAVFhAgUCDBk1CSEhAwIOBQlZIisaNGZlFnQ3LRopcGdSbBVuGTpwRTJ8N20bImJnFgQiYQQKDgNBUSEhBQQCFTVMN01dOGNZPhw3LgMCFCEJcQFrXDp1GyYcJ28cMm1fDlwHIkILAQkDMRJBAh9qXSYkaAhGARghCVkBAUMEGgEBB0kRAQ4CG00sRy5aMnVLEhwGLhk5ZisFWQJDAQ8gGwVpIiIBEAILTRwXDVwxCgUBaiJhQSVvaSI5IQUBYQEKAxkTIUU6ZlkWHEcvGjNUUQYEWG0YE2ZjUhFBZQoJAzkVSiFBSg8DCVVzFw4eBQhRBQoJETEBHAMNQUglDQUHVQEBCxVCDgIdTSxHLloydUsSHAYuGTlmQSE5QQYBYQEKA2kTQUQ6ZlkWHEcvGjNDX1Z0R21dCwJdQRFxBk4HAmEpERFHTQEEbRYcJ0JBGgcDDWEXTlkFA2tBEnFhUTtjXyYkZwdDBDgBAQdJEQEdAiVNLEcuWjJ1SxIUdS4eOGVnfiNTLR0LA0llQnEBCxwCAgMHYQYDBDwBAQZLQUwBEGcWZFdtGTtmSQp7V08cM3RBITlRCAFhAQoDcRQBBTpmYTIMNy1aN2ZdUhR1Dl8zdCsFeQRjASFGXTUJEUkDAkMHBiFRD141bRUFIRUBAjZibQZMIUFSIQMJMUs3Dx4FCBECAQ0RIgFKA1ERWA0dN2JHFmxXTRw7Q19iLDdvGBNmY1IRQUUTBQhRHQsJETEBQBEZYQUBKVEFfwUJIi8aOW1DDixXLho4dQU+RFhtHREJCzkDQRFJKAIRHSxHbxU1YmEWJBJhBwUGIwIhCUVVAQpPFiQoaVw7b0lOJBJBDAUGKQIhCSVWAQhPFiRIKx85ZikFMQZDQSxbGwVBJkJBLUQDEWEXTVw0CgVtQyZBQip1ZSZ0dw1DA14BEQVjLEEJaEtSfDVtGTd2ZyZ8Z05ROHlLTiQSYRABAA1zZWxlY3RlZFNoYXBlAQABSQEADnNlbGVjdGVkQm91bmRzAQAdTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjsBABByZXBsYWNlbWVudEJveGVzAQAQTGphdmEvdXRpbC9MaXN0OwEAL0xqYXZhL3V0aWwvTGlzdDxMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2Oz47AQA6Y29kZWNoaWNrZW4kbWljcm9ibG9jayRQb3N0TWljcm9ibG9jayQkc3VwZXIkb2NjbHVzaW9uVGVzdAEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoBAA1vY2NsdXNpb25UZXN0DAAUABMKAAQAFQEABHRoaXMBADtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYVBvc3RNaWNyb2Jsb2NrOwEABW5wYXJ0AQAiTGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OwEACm1pY3JvQ2xhc3MBACooKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb0NsYXNzJDsBACtjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrJGNsYXNzBwAdAQBRKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrOylMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9DbGFzcyQ7DAAbAB8KAB4AIAEAGGdldFBhcnRpYWxPY2NsdXNpb25Cb3hlcwEAEigpTGphdmEvdXRpbC9MaXN0OwEAOShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9jazspTGphdmEvdXRpbC9MaXN0OwwAIgAkCgAeACUBAAtpdGVtQ2xhc3NJRAEAAygpSQEAKihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9jazspSQwAJwApCgAeACoBAEwoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svUG9zdE1pY3JvYmxvY2s7TGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OylaDAAUACwKAB4ALQEAE2dldFJlc2lzdGFuY2VGYWN0b3IBAAMoKUYBACooTGNvZGVjaGlja2VuL21pY3JvYmxvY2svUG9zdE1pY3JvYmxvY2s7KUYMAC8AMQoAHgAyAQASY2FuUGxhY2VUb3JjaE9uVG9wAQADKClaAQAqKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrOylaDAA0ADYKAB4ANwwACwAMCQACADkBABFzZWxlY3RlZFNoYXBlXyRlcQEABChJKVYBAAN4JDEBAB8oKUxjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7DAANAA4JAAIAPwEAEnNlbGVjdGVkQm91bmRzXyRlcQEAIChMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OylWDAAPABAJAAIAQwEAFHJlcGxhY2VtZW50Qm94ZXNfJGVxAQATKExqYXZhL3V0aWwvTGlzdDspVgEACGdldFNoYXBlAQAGZXZlbnRzDABIACMKAAIASQEAJnNjYWxhL2NvbGxlY3Rpb24vbXV0YWJsZS9TdHJpbmdCdWlsZGVyBwBLAQAGPGluaXQ+AQADKClWDABNAE4KAEwATwEABnNoYXBlOggAUQEABmFwcGVuZAEAPChMamF2YS9sYW5nL09iamVjdDspTHNjYWxhL2NvbGxlY3Rpb24vbXV0YWJsZS9TdHJpbmdCdWlsZGVyOwwAUwBUCgBMAFUBAAVsYWJlbAEAFCgpTGphdmEvbGFuZy9TdHJpbmc7DABXAFgKAAIAWQEACHRvU3RyaW5nDABbAFgKAEwAXAEADmphdmEvdXRpbC9MaXN0BwBeAQADYWRkAQAVKExqYXZhL2xhbmcvT2JqZWN0OylaDABgAGELAF8AYgwACwAoCgACAGQBAAlnZXRCb3VuZHMBAAdib3VuZHM6CABnDAANAD4KAAIAaQEAB2dldFR5cGUBAAV0eXBlOggAbAEACG1jcl9mYWNlCABuAQARZ2V0T2NjbHVzaW9uQm94ZXMBAAZib3hlczoIAHEMAA8AIwoAAgBzDABwACQKAB4AdQEAFigpTGphdmEvbGFuZy9JdGVyYWJsZTsMACIAIwoAAgB4AQAqKClMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xhc3M7DAAbABwKAAIAewwAcAAjCgACAH0KAAQATwEABiRpbml0JAEAKihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9jazspVgwAgACBCgAeAIIBABtjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDYHAIQBAARmdWxsDACGAA4JAIUAhwEABGNvcHkMAIkAPgoAhQCKAQAJU2lnbmF0dXJlAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEAMSgpTGphdmEvdXRpbC9MaXN0PExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7PjsBADIoTGphdmEvdXRpbC9MaXN0PExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7PjspVgEADVN0YWNrTWFwVGFibGUBAApTb3VyY2VGaWxlAQAZUnVudGltZVZpc2libGVBbm5vdGF0aW9ucwEACFNjYWxhU2lnACEAAgAEAAEABgADAAIACwAMAAAAAgANAA4AAAACAA8AEAABAIwAAAACABEAFRABABIAEwABAI0AAAA6AAIAAgAAAAYqK7cAFqwAAAACAI4AAAAWAAIAAAAGABcAGAAAAAAABgAZABoAAQCPAAAABgABAAAAFgABABsAHAABAI0AAAAvAAEAAQAAAAUquAAhsAAAAAIAjgAAAAwAAQAAAAUAFwAYAAAAjwAAAAYAAQAAABYAAQAiACMAAgCNAAAALwABAAEAAAAFKrgAJrAAAAACAI4AAAAMAAEAAAAFABcAGAAAAI8AAAAGAAEAAAAWAIwAAAACAJAAAQAnACgAAQCNAAAALwABAAEAAAAFKrgAK6wAAAACAI4AAAAMAAEAAAAFABcAGAAAAI8AAAAGAAEAAAAWAAEAFAATAAEAjQAAADoAAgACAAAABioruAAurAAAAAIAjgAAABYAAgAAAAYAFwAYAAAAAAAGABkAGgABAI8AAAAGAAEAAAAWAAEALwAwAAEAjQAAAC8AAQABAAAABSq4ADOuAAAAAgCOAAAADAABAAAABQAXABgAAACPAAAABgABAAAAFgABADQANQABAI0AAAAvAAEAAQAAAAUquAA4rAAAAAIAjgAAAAwAAQAAAAUAFwAYAAAAjwAAAAYAAQAAABYAAQALACgAAQCNAAAALwABAAEAAAAFKrQAOqwAAAACAI4AAAAMAAEAAAAFABcAGAAAAI8AAAAGAAEAAAAXAAEAOwA8AAEAjQAAADoAAgACAAAABiobtQA6sQAAAAIAjgAAABYAAgAAAAYAFwAYAAAAAAAGAD0ADAABAI8AAAAGAAEAAAAXAAEADQA+AAEAjQAAAC8AAQABAAAABSq0AECwAAAAAgCOAAAADAABAAAABQAXABgAAACPAAAABgABAAAAGAABAEEAQgABAI0AAAA6AAIAAgAAAAYqK7UAQLEAAAACAI4AAAAWAAIAAAAGABcAGAAAAAAABgA9AA4AAQCPAAAABgABAAAAGAABAA8AIwACAI0AAAAvAAEAAQAAAAUqtABEsAAAAAIAjgAAAAwAAQAAAAUAFwAYAAAAjwAAAAYAAQAAABkAjAAAAAIAkAABAEUARgACAI0AAAA6AAIAAgAAAAYqK7UARLEAAAACAI4AAAAWAAIAAAAGABcAGAAAAAAABgA9ABAAAQCPAAAABgABAAAAGQCMAAAAAgCRAAEARwAoAAEAjQAAAFMAAwABAAAAJSq2AEq7AExZtwBQElK2AFYqtgBatgBWtgBduQBjAgBXKrYAZawAAAACAI4AAAAMAAEAAAAlABcAGAAAAI8AAAAKAAIAAAAcACAAHQABAGYAPgABAI0AAABTAAMAAQAAACUqtgBKuwBMWbcAUBJotgBWKrYAWrYAVrYAXbkAYwIAVyq2AGqwAAAAAgCOAAAADAABAAAAJQAXABgAAACPAAAACgACAAAAIQAgACIAAQBrAFgAAQCNAAAAUQADAAEAAAAjKrYASrsATFm3AFASbbYAViq2AFq2AFa2AF25AGMCAFcSb7AAAAACAI4AAAAMAAEAAAAjABcAGAAAAI8AAAAKAAIAAAAmACAAJwABAHAAIwACAI0AAAByAAMAAQAAADMqtgBKuwBMWbcAUBJytgBWKrYAWrYAVrYAXbkAYwIAVyq2AHTHAAoquAB2pwAHKrYAdLAAAAADAI4AAAAMAAEAAAAzABcAGAAAAI8AAAAOAAMAAAArACAALAAyACoAkgAAAAcAAi5DBwBfAIwAAAACAJAQQQAiAHcAAQCNAAAALwABAAEAAAAFKrYAebAAAAACAI4AAAAMAAEAAAAFABcAGAAAAI8AAAAGAAEAAAAWEEEAGwB6AAEAjQAAAC8AAQABAAAABSq2AHywAAAAAgCOAAAADAABAAAABQAXABgAAACPAAAABgABAAAAFhBBAHAAdwABAI0AAAAvAAEAAQAAAAUqtgB+sAAAAAIAjgAAAAwAAQAAAAUAFwAYAAAAjwAAAAYAAQAAABYAAQBNAE4AAQCNAAAAUwACAAEAAAAdKrcAfyq4AIMqA7UAOiqyAIi2AIu1AEAqAbUARLEAAAACAI4AAAAMAAEAAAAdABcAGAAAAI8AAAASAAQAAAAWAAgAFwANABgAFwAZAAMAkwAAAAIABwCUAAAACwABAAgAAQAJcwAKAJUAAAADBQAA diff --git a/src/test/resources/compat/ReferenceScalaPostMicroblockClient.class.b64 b/src/test/resources/compat/ReferenceScalaPostMicroblockClient.class.b64 new file mode 100644 index 0000000..cef03ba --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaPostMicroblockClient.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQBZQEAP2NvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFQb3N0TWljcm9ibG9ja0NsaWVudAcAAQEANGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlUG9zdENsaWVudEJhc2UHAAMBACtjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrQ2xpZW50BwAFAQAoUmVmZXJlbmNlU2NhbGFQb3N0TWljcm9ibG9ja0NsaWVudC5zY2FsYQEAHkxzY2FsYS9yZWZsZWN0L1NjYWxhU2lnbmF0dXJlOwEABWJ5dGVzAQi0BgEFfWYBQgEDASURIUVVM2dLSixnblkzVEcGZBcNVTh0aTZLN01dOGNZPhw3bhE3aks6JChCQQIFAxkZdy4cOWJpKhFRQUIBCltWZEcvGzliZVJUEWFCAQxHPiRXbRk1akcuLGduAQEUBwFRYQIFAgwZNQkhIQMCDgUJOSIrGjRmZRZ0Ny0aKXBnUhxFLlszb2kKCzcvGgkDH0lpEQEFBgMjGQkhIlw1ZGU+FEduXDJsEwkZAkMBC1FfTiRYKlsyc18KZHduWTZEWSYsZw4eBQYrASEJQUYBB3kldBcOHiAVA10BImEDAQkPZQEBGSFDATUFKUEuGTJmWVYJMQQFAh1DNQlRRAMCHz8FIUEuGThoFQUBEwECNmJtBkwhQUkPAw1NIygvGzhoER0hAwExQQUCFQoRAlwxY0syfEYlWjkVBRliA0NBFCsbBUEjIkEVAgtNHBcNXDEKBS1CIwFCK29TUkRxIUwSAgIDBzEkQQJ5SUVCYWEMASFCE1kSQQI3YkUWZAcFQwQyAQEHSREBGgIhTSxHLloydUsSbBUNXjNzUwZkVyNBGhEFUXJkQkEbPR0JMTRIBAI4dTUJAUgDAjoRBTFBSF04cGl6ShFhQgUDIxlJISEQCQIrNUs3TV04TkNSLCcvWzFtJRY8F24dO3NzJhFxCBECDxM2SzdNXThOQ1IsJy9bMW0VCWkEA0MEQwEBB0kRQSICKU0sRy5aMnVLEmwVDV4zc1MGZHcMSjNyKQkxQwlDBC4DBgUJGUEaCQ0ZAwEVKQM0A0UZWA1cM2RpFiRXKhk7ZmUmDEcOCQUIEQIBDREiAUoDGRF3Lh44ZWdWCSEKBQJMITYJQUoDAk4dBhlhL1oyCwU9MxFhATdqRSYREQsUAggHVhR3LhszNxEdGQYBMUEFAlELIUJZOHZdEhx4DEozcikJMVMLQwQuJQYFCRkBJgkNXQMBFSkDSwMdEXcuHjhlZwJCcSEXAUECEwUhLAEHdEsyLDcNXjNlJyZUWC1GAVwhCTlDLAMCXlEJGRFKHDsJD30DARkhQwFBBgEyLxo3ZkdSLEdtVTV7S34jUy0dCwNNBURxIQwwAgIDBzEMAwRkAQEGS2FXAQ5nFmRXbRk7ZklOSycwGhEJDxUEARkhQwE1BlkxLxs+ZgMSNBhNXDJmER05BwExQQUCIQxxYl01e0sGI2cvGThkS34jUy0dCwNNJURxIQw0AgIDBzEMAwRsAQEGS2FXAQ1nJlRYLREzd0M6HFcNCQUIWwIBDREiAVsDNRlYDVwzZGkWJDcLWzFxSyI5cQ4BYQEKAwEYIUU6ZlkWHEcvGjNUUQYEWG0YE2ZjUhFhJR0FCFs5DAkRMQFcERkZCAEpUQU3BnExLxo3ZkdSLEdtFTViYRYEA2JCOwEBBCUJQVcBDWciDAcvWiFlbQZ0Ny0aBQhvAgENESIBeQNBGQguGTlmAxI0GE1cMmY/EioXDwYCJ3MiOVFGXkEBAgRZBkJCPgFBAyYxLEEHdFEGBFgtETN3QzocVw0JBQh7AgENESIBfwMtISgvGTh0YQYUWE0cOxYDfQQyYUpBARMNCRkBCwIIBT58Ry5aMW8RJQk5AQFhAQoDCUkhQQh1ZQZ0Nw9dMXNLOiR4DEozcikNMRMxAgUJWwUVEREhYQF/IjkRcQIBIUITeRgBBDtzQzocCC8ZOmZdUgQDAkNBCgEBB0kRAUACIRlkFw4dK3NDOhwILxk6Zl0OTAgiQ0EMAQEHSRFBQQ0DUTFHLhs5VWUGdDcPXTFzSzocF3AYE2ZjUhlhJWEHCRE1CikiIUFBAn1EcSFhCAFBAyZxMEEJZ1kmBEhLXTFvZ0IMJy8aOGRzAkIBImEJAQEEJQlBYAEKZVZ0JytaMmJZDkQRImEKAQEEJQkhIQsCG0ksaE5VM2RDMhx3DEozcikNMRMxBgUJWwUVEhEhYQF/IjkRcQYBIUITeRhBAzp2XUorNy0ZN2RBIUERMQcBQQITBWEwAQZzazocBk5dNW9XTkQRImEOAQEEJQkhIQ8CHUksaG4VNXNTOlw3bxgTZmNSGWElYQ8JETUKKSQhQUECfURxIWEQAUEDJnEwQQZzazocBk5dNW9XTgQDAkNBIgEBB0kRAUACGxl8J29ZM0ZjVgxHLhs7ehElCTkFAWEBCgMJSSVBCWdfShxXLVI5dkMyTEcvXzAlS0YkMkFKQSYRIWkTUUlBAQIEeQhiQkEoAQEGS2FgAQ9NPhQ4LVojcmsGZBcOXj0hESEJGQYBYQEKA3EYQUQzcmsGZBcOXj1TS04sSA4eBQoDLwIBGSFDAQMzCiEjWjl2QzJMRy8fKmZnVmRHbxgTZmNSGWElYRcJETUKKSYhQUECfURxIWEYAUEDJnEwQQhmY1YMRy4bO3olFhxYDxw7IREdCRkHAUMhA0sKQWJaM3UTNgtHLxo6akMyJBJhDQUIA1MCQRFJQTYDJTlXDR4icGs6JDcPRgFLER0JeQcBQyEDYwpxYVozdScmVFgNRgFcER0JKQgBQyEDYwoBYlozdSciDAcvGgUIA3MCQRFJQT4DNUk3DxY6Yl1OBBhNXTNvaVIJcRBDBALAgAEhCSUhIQIJUUxHLhoLAwMHA0IhISICCDYJQSFDAgIKEhFRAlY1bUs2K0gOXjVxQ0okCGJCQUcBEQUTcVIBDWUWHBcNXDJDX1Z0R20dCwJNITkRMRMBBUIFVRVBQzppZSZ0N05SMWRLUhlhJWEmCQ8FZRURE2EBNwYhMS8bM2YRHQlpCgFDIQM/CyFiHTVzUzpcB2tcOnUpDTETERUFCQNHC1kKMQECJgYhAW9cOnUhDXkRcVUFBANTAyJBBClwZ1JsFW4ZOnBFMnw3bRsFCANbA0ERSUFYAxkpFy9eMW1nUhlxMCEtCREFTRYxFmEBA2sLUWEcO2lLSgQyYUpBXBMNCUkMCwIEAzpMCGJCQV8BEQUTEU8BCVEGHAhuUThlSwIBAAVsYWJlbAEAEkxqYXZhL2xhbmcvU3RyaW5nOwEAEHNlbGVjdGVkTWF0ZXJpYWwBAD1MY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb01hdGVyaWFsUmVnaXN0cnkkSU1pY3JvTWF0ZXJpYWw7AQAGYm91bmRzAQAdTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjsBAAxzZWxlY3RlZFNpemUBAAFJAQALc2l6ZUFkdmFuY2UBAA1zZWxlY3RlZFNoYXBlAQAMc2hhcGVBZHZhbmNlAQALdHJhbnNwYXJlbnQBAAFaAQAQZmxpcFRyYW5zcGFyZW5jeQEACXJ1blJlY2FsYwEACnJ1blNocmlua3MBAA1mb3JjZUVxdWFsaXR5AQAOZXF1YWxpdHlSZXN1bHQBAA1yZW5kZXJCb3VuZHMxAQANcmVuZGVyQm91bmRzMgEAHygpTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjsMAB0AEAkAAgAgAQAEdGhpcwEAQUxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhUG9zdE1pY3JvYmxvY2tDbGllbnQ7AQARcmVuZGVyQm91bmRzMV8kZXEBACAoTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjspVgEAA3gkMQwAHgAQCQACACcBABFyZW5kZXJCb3VuZHMyXyRlcQEAOmNvZGVjaGlja2VuJG1pY3JvYmxvY2skUG9zdE1pY3JvYmxvY2tDbGllbnQkJHN1cGVyJG9uQWRkZWQBAAMoKVYBAAdvbkFkZGVkDAAsACsKAAQALQEAN2NvZGVjaGlja2VuJG1pY3JvYmxvY2skUG9zdE1pY3JvYmxvY2tDbGllbnQkJHN1cGVyJHJlYWQBACUoTGNvZGVjaGlja2VuL2xpYi9kYXRhL01DRGF0YUlucHV0OylWAQAEcmVhZAwAMQAwCgAEADIBAAZwYWNrZXQBACJMY29kZWNoaWNrZW4vbGliL2RhdGEvTUNEYXRhSW5wdXQ7AQAGcmVuZGVyAQAhKExjb2RlY2hpY2tlbi9saWIvdmVjL1ZlY3RvcjM7SSlWAQAxY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9ja0NsaWVudCRjbGFzcwcAOAEATihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9ja0NsaWVudDtMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpVgwANgA6CgA5ADsBAANwb3MBAB1MY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzOwEABHBhc3MBAA1vblBhcnRDaGFuZ2VkAQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspVgEAUihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9ja0NsaWVudDtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVYMAEAAQgoAOQBDAQAEcGFydAEAIkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDsBADAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svUG9zdE1pY3JvYmxvY2tDbGllbnQ7KVYMACwARwoAOQBIAQBSKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrQ2xpZW50O0xjb2RlY2hpY2tlbi9saWIvZGF0YS9NQ0RhdGFJbnB1dDspVgwAMQBKCgA5AEsBAAt0aGlzU2hyaW5rcwEAKihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9jazspWgEAVyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9ja0NsaWVudDtMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9jazspWgwATQBPCgA5AFABAAVvdGhlcgEAJ0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrOwEADWdldEJyb2tlbkljb24BAB0oSSlMbmV0L21pbmVjcmFmdC91dGlsL0lJY29uOwEALWNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsaWVudCRjbGFzcwcAVgEARihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50O0kpTG5ldC9taW5lY3JhZnQvdXRpbC9JSWNvbjsMAFQAWAoAVwBZAQAEc2lkZQEADWFkZEhpdEVmZmVjdHMBAFooTG5ldC9taW5lY3JhZnQvdXRpbC9Nb3ZpbmdPYmplY3RQb3NpdGlvbjtMbmV0L21pbmVjcmFmdC9jbGllbnQvcGFydGljbGUvRWZmZWN0UmVuZGVyZXI7KVYBAIMoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsaWVudDtMbmV0L21pbmVjcmFmdC91dGlsL01vdmluZ09iamVjdFBvc2l0aW9uO0xuZXQvbWluZWNyYWZ0L2NsaWVudC9wYXJ0aWNsZS9FZmZlY3RSZW5kZXJlcjspVgwAXABeCgBXAF8BAANoaXQBAClMbmV0L21pbmVjcmFmdC91dGlsL01vdmluZ09iamVjdFBvc2l0aW9uOwEADmVmZmVjdFJlbmRlcmVyAQAuTG5ldC9taW5lY3JhZnQvY2xpZW50L3BhcnRpY2xlL0VmZmVjdFJlbmRlcmVyOwEAEWFkZERlc3Ryb3lFZmZlY3RzAQAxKExuZXQvbWluZWNyYWZ0L2NsaWVudC9wYXJ0aWNsZS9FZmZlY3RSZW5kZXJlcjspVgEAWihMY29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb2Jsb2NrQ2xpZW50O0xuZXQvbWluZWNyYWZ0L2NsaWVudC9wYXJ0aWNsZS9FZmZlY3RSZW5kZXJlcjspVgwAZQBnCgBXAGgBAAxyZW5kZXJTdGF0aWMBACEoTGNvZGVjaGlja2VuL2xpYi92ZWMvVmVjdG9yMztJKVoBAEooTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsaWVudDtMY29kZWNoaWNrZW4vbGliL3ZlYy9WZWN0b3IzO0kpWgwAagBsCgBXAG0BAA9nZXRSZW5kZXJCb3VuZHMBAEgoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9ibG9ja0NsaWVudDspTGNvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNjsMAG8AcAoAVwBxAQA6Y29kZWNoaWNrZW4kbWljcm9ibG9jayRQb3N0TWljcm9ibG9jayQkc3VwZXIkb2NjbHVzaW9uVGVzdAEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoBACBjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydAcAdQEADW9jY2x1c2lvblRlc3QMAHcAdAoAdgB4AQAFbnBhcnQBAAptaWNyb0NsYXNzAQAqKClMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9DbGFzcyQ7AQArY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9jayRjbGFzcwcAfQEAUShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9jazspTGNvZGVjaGlja2VuL21pY3JvYmxvY2svUG9zdE1pY3JvQ2xhc3MkOwwAewB/CgB+AIABABFnZXRPY2NsdXNpb25Cb3hlcwEAEigpTGphdmEvdXRpbC9MaXN0OwEAOShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9Qb3N0TWljcm9ibG9jazspTGphdmEvdXRpbC9MaXN0OwwAggCECgB+AIUBABhnZXRQYXJ0aWFsT2NjbHVzaW9uQm94ZXMMAIcAhAoAfgCIAQALaXRlbUNsYXNzSUQBAAMoKUkBACooTGNvZGVjaGlja2VuL21pY3JvYmxvY2svUG9zdE1pY3JvYmxvY2s7KUkMAIoAjAoAfgCNAQBMKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrO0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgwAdwCPCgB+AJABABNnZXRSZXNpc3RhbmNlRmFjdG9yAQADKClGAQAqKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrOylGDACSAJQKAH4AlQEAEmNhblBsYWNlVG9yY2hPblRvcAEAAygpWgwAlwBOCgB+AJkBABQoKUxqYXZhL2xhbmcvU3RyaW5nOwwACwAMCQACAJwBAAlsYWJlbF8kZXEBABUoTGphdmEvbGFuZy9TdHJpbmc7KVYBAD8oKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvTWF0ZXJpYWxSZWdpc3RyeSRJTWljcm9NYXRlcmlhbDsMAA0ADgkAAgChAQAUc2VsZWN0ZWRNYXRlcmlhbF8kZXEBAEAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svTWljcm9NYXRlcmlhbFJlZ2lzdHJ5JElNaWNyb01hdGVyaWFsOylWDAAPABAJAAIApQEACmJvdW5kc18kZXEMABEAEgkAAgCoAQAQc2VsZWN0ZWRTaXplXyRlcQEABChJKVYMABMAEgkAAgCsAQAPc2l6ZUFkdmFuY2VfJGVxDAAUABIJAAIArwEAEXNlbGVjdGVkU2hhcGVfJGVxDAAVABIJAAIAsgEAEHNoYXBlQWR2YW5jZV8kZXEMABYAFwkAAgC1AQAPdHJhbnNwYXJlbnRfJGVxAQAEKFopVgwAGAAXCQACALkBABRmbGlwVHJhbnNwYXJlbmN5XyRlcQwAGQAXCQACALwBAA1ydW5SZWNhbGNfJGVxDAAaABcJAAIAvwEADnJ1blNocmlua3NfJGVxDAAbABcJAAIAwgEAEWZvcmNlRXF1YWxpdHlfJGVxDAAcABcJAAIAxQEAEmVxdWFsaXR5UmVzdWx0XyRlcQEADGdldElNYXRlcmlhbAEABmV2ZW50cwwAyQCDCgACAMoBAAhtYXRlcmlhbAgAzAEADmphdmEvdXRpbC9MaXN0BwDOAQADYWRkAQAVKExqYXZhL2xhbmcvT2JqZWN0OylaDADQANELAM8A0gwADQCgCgACANQBAAlnZXRCb3VuZHMBACZzY2FsYS9jb2xsZWN0aW9uL211dGFibGUvU3RyaW5nQnVpbGRlcgcA1wEABjxpbml0PgwA2QArCgDYANoBAAdib3VuZHM6CADcAQAGYXBwZW5kAQA8KExqYXZhL2xhbmcvT2JqZWN0OylMc2NhbGEvY29sbGVjdGlvbi9tdXRhYmxlL1N0cmluZ0J1aWxkZXI7DADeAN8KANgA4AwACwCbCgACAOIBAAh0b1N0cmluZwwA5ACbCgDYAOUMAA8AHwoAAgDnAQAHZ2V0U2l6ZQEABXNpemU6CADqDAARAIsKAAIA7AwAEwCLCgACAO4MAKoAqwoAAgDwAQAGcmVzdWx0AQAIZ2V0U2hhcGUBAAZzaGFwZToIAPQMABQAiwoAAgD2DAAVAIsKAAIA+AwAsQCrCgACAPoBAA1pc1RyYW5zcGFyZW50AQAMdHJhbnNwYXJlbnQ6CAD9DAAWAJgKAAIA/wwAGACYCgACAQEMALcAuAoAAgEDAQAEdGlsZQEAJygpTGNvZGVjaGlja2VuL211bHRpcGFydC9UaWxlTXVsdGlwYXJ0OwEABXRpbGU6CAEHDAEFAQYKAHYBCQEADHJlY2FsY0JvdW5kcwEABnJlY2FsYwgBDAwAGQCYCgACAQ4MAQsARwoAOQEQAQAKc2hyaW5rRmFjZQEABWZhY2U6CAETAQAac2NhbGEvcnVudGltZS9Cb3hlc1J1blRpbWUHARUBAAxib3hUb0ludGVnZXIBABYoSSlMamF2YS9sYW5nL0ludGVnZXI7DAEXARgKARYBGQwAGgCYCgACARsBADEoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svUG9zdE1pY3JvYmxvY2tDbGllbnQ7SSlWDAESAR0KADkBHgEACnNocmlua1Bvc3QBACooTGNvZGVjaGlja2VuL21pY3JvYmxvY2svUG9zdE1pY3JvYmxvY2s7KVYBAARwb3N0CAEiAQBXKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrQ2xpZW50O0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1Bvc3RNaWNyb2Jsb2NrOylWDAEgASQKADkBJQEABmVxdWFscwEAB2VxdWFsczoIASgMABsAmAoAAgEqDAAcAJgKAAIBLAEAEGphdmEvbGFuZy9PYmplY3QHAS4MAScA0QoBLwEwAQASTGphdmEvbGFuZy9PYmplY3Q7AQAIaGFzaENvZGUBABBqYXZhL2xhbmcvU3lzdGVtBwE0AQAQaWRlbnRpdHlIYXNoQ29kZQEAFShMamF2YS9sYW5nL09iamVjdDspSQwBNgE3CgE1ATgBABYoKUxqYXZhL2xhbmcvSXRlcmFibGU7DACHAIMKAAIBOwwAggCDCgACAT0BACooKUxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGFzczsMAHsAfAoAAgFACgAEANoBAAYkaW5pdCQMAUMBIQoAfgFEAQAsKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvYmxvY2tDbGllbnQ7KVYMAUMBRgoAVwFHDAFDAEcKADkBSQEABHNlbGYIAUsBABtjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDYHAU0GP9gAAAAAAAAGP+QAAAAAAAABAAkoREREREREKVYMANkBUwoBTgFUAQA7Y29kZWNoaWNrZW4vbWljcm9ibG9jay9NaWNyb01hdGVyaWFsUmVnaXN0cnkkSU1pY3JvTWF0ZXJpYWwHAVYBACxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL01pY3JvTWF0ZXJpYWxSZWdpc3RyeQcBWAEADklNaWNyb01hdGVyaWFsAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEACVNpZ25hdHVyZQEAMSgpTGphdmEvdXRpbC9MaXN0PExjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7PjsBAA1TdGFja01hcFRhYmxlAQAKU291cmNlRmlsZQEADElubmVyQ2xhc3NlcwEAGVJ1bnRpbWVWaXNpYmxlQW5ub3RhdGlvbnMBAAhTY2FsYVNpZwAhAAIABAABAAYADwACAAsADAAAAAIADQAOAAAAAgAPABAAAAACABEAEgAAAAIAEwASAAAAAgAUABIAAAACABUAEgAAAAIAFgAXAAAAAgAYABcAAAACABkAFwAAAAIAGgAXAAAAAgAbABcAAAACABwAFwAAAAIAHQAQAAAAAgAeABAAAABBAAEAHQAfAAEBWwAAAC8AAQABAAAABSq0ACGwAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAFwABACQAJQABAVsAAAA6AAIAAgAAAAYqK7UAIbEAAAACAVwAAAAWAAIAAAAGACIAIwAAAAAABgAmABAAAQFdAAAABgABAAAAFwABAB4AHwABAVsAAAAvAAEAAQAAAAUqtAAosAAAAAIBXAAAAAwAAQAAAAUAIgAjAAABXQAAAAYAAQAAABcAAQApACUAAQFbAAAAOgACAAIAAAAGKiu1ACixAAAAAgFcAAAAFgACAAAABgAiACMAAAAAAAYAJgAQAAEBXQAAAAYAAQAAABcQAQAqACsAAQFbAAAALwABAAEAAAAFKrcALrEAAAACAVwAAAAMAAEAAAAFACIAIwAAAV0AAAAGAAEAAAAXEAEALwAwAAEBWwAAADoAAgACAAAABiortwAzsQAAAAIBXAAAABYAAgAAAAYAIgAjAAAAAAAGADQANQABAV0AAAAGAAEAAAAXAAEANgA3AAEBWwAAAEUAAwADAAAAByorHLgAPLEAAAACAVwAAAAgAAMAAAAHACIAIwAAAAAABwA9AD4AAQAAAAcAPwASAAIBXQAAAAYAAQAAABcAAQBAAEEAAQFbAAAAOgACAAIAAAAGKiu4AESxAAAAAgFcAAAAFgACAAAABgAiACMAAAAAAAYARQBGAAEBXQAAAAYAAQAAABcAAQAsACsAAQFbAAAALwABAAEAAAAFKrgASbEAAAACAVwAAAAMAAEAAAAFACIAIwAAAV0AAAAGAAEAAAAXAAEAMQAwAAEBWwAAADoAAgACAAAABioruABMsQAAAAIBXAAAABYAAgAAAAYAIgAjAAAAAAAGADQANQABAV0AAAAGAAEAAAAXAAEATQBOAAEBWwAAADoAAgACAAAABioruABRrAAAAAIBXAAAABYAAgAAAAYAIgAjAAAAAAAGAFIAUwABAV0AAAAGAAEAAAAXAAEAVABVAAEBWwAAADoAAgACAAAABiobuABasAAAAAIBXAAAABYAAgAAAAYAIgAjAAAAAAAGAFsAEgABAV0AAAAGAAEAAAAXAAEAXABdAAEBWwAAAEUAAwADAAAAByorLLgAYLEAAAACAVwAAAAgAAMAAAAHACIAIwAAAAAABwBhAGIAAQAAAAcAYwBkAAIBXQAAAAYAAQAAABcAAQBlAGYAAQFbAAAAOgACAAIAAAAGKiu4AGmxAAAAAgFcAAAAFgACAAAABgAiACMAAAAAAAYAYwBkAAEBXQAAAAYAAQAAABcAAQBqAGsAAQFbAAAARQADAAMAAAAHKiscuABurAAAAAIBXAAAACAAAwAAAAcAIgAjAAAAAAAHAD0APgABAAAABwA/ABIAAgFdAAAABgABAAAAFwABAG8AHwABAVsAAAAvAAEAAQAAAAUquABysAAAAAIBXAAAAAwAAQAAAAUAIgAjAAABXQAAAAYAAQAAABcQAQBzAHQAAQFbAAAAOgACAAIAAAAGKiu3AHmsAAAAAgFcAAAAFgACAAAABgAiACMAAAAAAAYAegBGAAEBXQAAAAYAAQAAABcAAQB7AHwAAQFbAAAALwABAAEAAAAFKrgAgbAAAAACAVwAAAAMAAEAAAAFACIAIwAAAV0AAAAGAAEAAAAXAAEAggCDAAIBWwAAAC8AAQABAAAABSq4AIawAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAFwFeAAAAAgFfAAEAhwCDAAIBWwAAAC8AAQABAAAABSq4AImwAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAFwFeAAAAAgFfAAEAigCLAAEBWwAAAC8AAQABAAAABSq4AI6sAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAFwABAHcAdAABAVsAAAA6AAIAAgAAAAYqK7gAkawAAAACAVwAAAAWAAIAAAAGACIAIwAAAAAABgB6AEYAAQFdAAAABgABAAAAFwABAJIAkwABAVsAAAAvAAEAAQAAAAUquACWrgAAAAIBXAAAAAwAAQAAAAUAIgAjAAABXQAAAAYAAQAAABcAAQCXAJgAAQFbAAAALwABAAEAAAAFKrgAmqwAAAACAVwAAAAMAAEAAAAFACIAIwAAAV0AAAAGAAEAAAAXAAEACwCbAAEBWwAAAC8AAQABAAAABSq0AJ2wAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAGAABAJ4AnwABAVsAAAA6AAIAAgAAAAYqK7UAnbEAAAACAVwAAAAWAAIAAAAGACIAIwAAAAAABgAmAAwAAQFdAAAABgABAAAAGAABAA0AoAABAVsAAAAvAAEAAQAAAAUqtACisAAAAAIBXAAAAAwAAQAAAAUAIgAjAAABXQAAAAYAAQAAABkAAQCjAKQAAQFbAAAAOgACAAIAAAAGKiu1AKKxAAAAAgFcAAAAFgACAAAABgAiACMAAAAAAAYAJgAOAAEBXQAAAAYAAQAAABkAAQAPAB8AAQFbAAAALwABAAEAAAAFKrQAprAAAAACAVwAAAAMAAEAAAAFACIAIwAAAV0AAAAGAAEAAAAaAAEApwAlAAEBWwAAADoAAgACAAAABiortQCmsQAAAAIBXAAAABYAAgAAAAYAIgAjAAAAAAAGACYAEAABAV0AAAAGAAEAAAAaAAEAEQCLAAEBWwAAAC8AAQABAAAABSq0AKmsAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAGwABAKoAqwABAVsAAAA6AAIAAgAAAAYqG7UAqbEAAAACAVwAAAAWAAIAAAAGACIAIwAAAAAABgAmABIAAQFdAAAABgABAAAAGwABABMAiwABAVsAAAAvAAEAAQAAAAUqtACtrAAAAAIBXAAAAAwAAQAAAAUAIgAjAAABXQAAAAYAAQAAABwAAQCuAKsAAQFbAAAAOgACAAIAAAAGKhu1AK2xAAAAAgFcAAAAFgACAAAABgAiACMAAAAAAAYAJgASAAEBXQAAAAYAAQAAABwAAQAUAIsAAQFbAAAALwABAAEAAAAFKrQAsKwAAAACAVwAAAAMAAEAAAAFACIAIwAAAV0AAAAGAAEAAAAdAAEAsQCrAAEBWwAAADoAAgACAAAABiobtQCwsQAAAAIBXAAAABYAAgAAAAYAIgAjAAAAAAAGACYAEgABAV0AAAAGAAEAAAAdAAEAFQCLAAEBWwAAAC8AAQABAAAABSq0ALOsAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAHgABALQAqwABAVsAAAA6AAIAAgAAAAYqG7UAs7EAAAACAVwAAAAWAAIAAAAGACIAIwAAAAAABgAmABIAAQFdAAAABgABAAAAHgABABYAmAABAVsAAAAvAAEAAQAAAAUqtAC2rAAAAAIBXAAAAAwAAQAAAAUAIgAjAAABXQAAAAYAAQAAAB8AAQC3ALgAAQFbAAAAOgACAAIAAAAGKhu1ALaxAAAAAgFcAAAAFgACAAAABgAiACMAAAAAAAYAJgAXAAEBXQAAAAYAAQAAAB8AAQAYAJgAAQFbAAAALwABAAEAAAAFKrQAuqwAAAACAVwAAAAMAAEAAAAFACIAIwAAAV0AAAAGAAEAAAAgAAEAuwC4AAEBWwAAADoAAgACAAAABiobtQC6sQAAAAIBXAAAABYAAgAAAAYAIgAjAAAAAAAGACYAFwABAV0AAAAGAAEAAAAgAAEAGQCYAAEBWwAAAC8AAQABAAAABSq0AL2sAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAIQABAL4AuAABAVsAAAA6AAIAAgAAAAYqG7UAvbEAAAACAVwAAAAWAAIAAAAGACIAIwAAAAAABgAmABcAAQFdAAAABgABAAAAIQABABoAmAABAVsAAAAvAAEAAQAAAAUqtADArAAAAAIBXAAAAAwAAQAAAAUAIgAjAAABXQAAAAYAAQAAACIAAQDBALgAAQFbAAAAOgACAAIAAAAGKhu1AMCxAAAAAgFcAAAAFgACAAAABgAiACMAAAAAAAYAJgAXAAEBXQAAAAYAAQAAACIAAQAbAJgAAQFbAAAALwABAAEAAAAFKrQAw6wAAAACAVwAAAAMAAEAAAAFACIAIwAAAV0AAAAGAAEAAAAjAAEAxAC4AAEBWwAAADoAAgACAAAABiobtQDDsQAAAAIBXAAAABYAAgAAAAYAIgAjAAAAAAAGACYAFwABAV0AAAAGAAEAAAAjAAEAHACYAAEBWwAAAC8AAQABAAAABSq0AMasAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAJAABAMcAuAABAVsAAAA6AAIAAgAAAAYqG7UAxrEAAAACAVwAAAAWAAIAAAAGACIAIwAAAAAABgAmABcAAQFdAAAABgABAAAAJAABAMgAoAABAVsAAAA7AAIAAQAAABEqtgDLEs25ANMCAFcqtgDVsAAAAAIBXAAAAAwAAQAAABEAIgAjAAABXQAAAAYAAQAAACYAAQDWAB8AAQFbAAAATwADAAEAAAAlKrYAy7sA2Fm3ANsS3bYA4Sq2AOO2AOG2AOa5ANMCAFcqtgDosAAAAAIBXAAAAAwAAQAAACUAIgAjAAABXQAAAAYAAQAAACcAAQDpAIsAAQFbAAAAdAADAAIAAAA0KrYAy7sA2Fm3ANsS67YA4Sq2AOO2AOG2AOa5ANMCAFcqtgDtPCoqtgDtKrYA72C2APEbrAAAAAIBXAAAABYAAgAAADQAIgAjAAAAJQAOAPIAEgABAV0AAAASAAQAAAApACAAKgAlACsAMgAsAAEA8wCLAAEBWwAAAHQAAwACAAAANCq2AMu7ANhZtwDbEvW2AOEqtgDjtgDhtgDmuQDTAgBXKrYA9zwqKrYA9yq2APlgtgD7G6wAAAACAVwAAAAWAAIAAAA0ACIAIwAAACUADgDyABIAAQFdAAAAEgAEAAAALwAgADAAJQAxADIAMgABAPwAmAABAVsAAACkAAMAAgAAAD4qtgDLuwDYWbcA2xL+tgDhKrYA47YA4bYA5rkA0wIAVyq2AQA8KrYBApkAEyoqtgEAmQAHA6cABAS2AQQbrAAAAAMBXAAAABYAAgAAAD4AIgAjAAAAJQAYAPIAFwABAV0AAAASAAQAAAA1ACAANgAlADcAPAA4AWAAAAAgAAP/ADgAAgcAAgEAAQcAAv8AAAACBwACAQACBwACAQIAAQEFAQYAAQFbAAAAUAADAAEAAAAmKrYAy7sA2Fm3ANsTAQi2AOEqtgDjtgDhtgDmuQDTAgBXKrcBCrAAAAACAVwAAAAMAAEAAAAmACIAIwAAAV0AAAAGAAEAAAA6AAEBCwArAAEBWwAAAEwAAgABAAAAGSq2AMsTAQ25ANMCAFcqtgEPmQAHKrgBEbEAAAADAVwAAAAMAAEAAAAZACIAIwAAAV0AAAAGAAEAAAA7AWAAAAADAAEYAAEBEgCrAAEBWwAAAGsAAwACAAAALiq2AMu7ANhZtwDbEwEUtgDhG7gBGrYA4bYA5rkA0wIAVyq2ARyZAAgqG7gBH7EAAAADAVwAAAAWAAIAAAAuACIAIwAAAAAALgBbABIAAQFdAAAABgABAAAAPAFgAAAAAwABLQABASABIQABAVsAAABXAAIAAgAAABoqtgDLEwEjuQDTAgBXKrYBHJkACCoruAEmsQAAAAMBXAAAABYAAgAAABoAIgAjAAAAAAAaASIAUwABAV0AAAAGAAEAAAA9AWAAAAADAAEZAAEBJwDRAAEBWwAAAHwAAwACAAAANSq2AMu7ANhZtwDbEwEptgDhKrYA47YA4bYA5rkA0wIAVyq2ASuZAAoqtgEtpwAIKiu3ATGsAAAAAwFcAAAAFgACAAAANQAiACMAAAAAADUAUgEyAAEBXQAAAA4AAwAAAD8AIQBAADQAPgFgAAAABQACL0QBAAEBMwCLAAEBWwAAAC8AAQABAAAABSq4ATmsAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAQhBBAIcBOgABAVsAAAAvAAEAAQAAAAUqtgE8sAAAAAIBXAAAAAwAAQAAAAUAIgAjAAABXQAAAAYAAQAAABcQQQCCAToAAQFbAAAALwABAAEAAAAFKrYBPrAAAAACAVwAAAAMAAEAAAAFACIAIwAAAV0AAAAGAAEAAAAXEEEAewE/AAEBWwAAAC8AAQABAAAABSq2AUGwAAAAAgFcAAAADAABAAAABQAiACMAAAFdAAAABgABAAAAFwABANkAKwABAVsAAADGAA8AAQAAAGgqtwFCKrgBRSq4AUgquAFKKhMBTLUAnSoBtQCiKrsBTlkUAU8OFAFPFAFRDxQBUbcBVbUApioFtQCpKgO1AK0qA7UAsCoDtQCzKgO1ALYqA7UAuioEtQC9KgS1AMAqA7UAwyoDtQDGsQAAAAIBXAAAAAwAAQAAAGgAIgAjAAABXQAAADoADgAAABcAEAAYABcAGQAcABoANQAbADoAHAA/AB0ARAAeAEkAHwBOACAAUwAhAFgAIgBdACMAYgAkAAQBYQAAAAIABwFiAAAACgABAVcBWQFaBgkBYwAAAAsAAQAIAAEACXMACgFkAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaSaw.class.b64 b/src/test/resources/compat/ReferenceScalaSaw.class.b64 new file mode 100644 index 0000000..bd336e6 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaSaw.class.b64 @@ -0,0 +1,24 @@ +yv66vgAAADQALQEALmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFT +YXcHAAEBABduZXQvbWluZWNyYWZ0L2l0ZW0vSXRlbQcAAwEAGmNvZGVjaGlja2VuL21pY3JvYmxv +Y2svU2F3BwAFAQAXUmVmZXJlbmNlU2NhbGFTYXcuc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2Fs +YVNpZ25hdHVyZTsBAAVieXRlcwEBMwYBMTJBIQECARMJCSIrGjRmZRZ0Ny1aKmRDMgw3K1k8CwUN +IRFBQjJwW0IMR08DAgYNBUlRLh43dVNCDCcPHgYCDwVZMW0cM2ZHIkw3bVszbwcBGTIBAQYVIQlZ +ISNEAQ0VCWlhIgEDamkWbCdCQQgRAyVpF05cM2RlBjRHT0MBEgMNcVcNXgUDJzERQSETO2ZbQhFR +A0cHAi0pEXFDQgELWyYcJ28cMm1fDlwXQkENFwUNGRZtHgUGNwEhCQFIAQd5JXQXDh4gFQN1ASJB +CAEOAwlBUQEJAQUCBQohY1ozdQdWJEgvGzhoJ1IUWE1cNHVRUhEhBQsJA0cZahEBCgYCSwUpMW9Z +MW1DJhFxBQoCBBM6JAgiQgcgAQRJA0NBBisTCVlDQkEFSmkWbDcLXjFkVwIBABVnZXRNYXhDdXR0 +aW5nU3RyZW5ndGgBAAMoKUkBACBjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1NhdyRjbGFzcwcADQEA +HyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9TYXc7KUkMAAsADwoADgAQAQAEdGhpcwEAMExjb2Rl +Y2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZVNjYWxhU2F3OwEAEmdldEN1dHRpbmdT +dHJlbmd0aAEAIShMbmV0L21pbmVjcmFmdC9pdGVtL0l0ZW1TdGFjazspSQEAHG5ldC9taW5lY3Jh +ZnQvaXRlbS9JdGVtU3RhY2sHABYBAAdnZXRJdGVtAQAbKClMbmV0L21pbmVjcmFmdC9pdGVtL0l0 +ZW07DAAYABkKABcAGgEABGl0ZW0BAB5MbmV0L21pbmVjcmFmdC9pdGVtL0l0ZW1TdGFjazsBAAY8 +aW5pdD4BAAMoKVYMAB4AHwoABAAgAQAGJGluaXQkAQAfKExjb2RlY2hpY2tlbi9taWNyb2Jsb2Nr +L1NhdzspVgwAIgAjCgAOACQBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJl +clRhYmxlAQANU3RhY2tNYXBUYWJsZQEAClNvdXJjZUZpbGUBABlSdW50aW1lVmlzaWJsZUFubm90 +YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAQAGAAAAAwABAAsADAABACYAAAAvAAEAAQAAAAUquAAR +rAAAAAIAJwAAAAwAAQAAAAUAEgATAAAAKAAAAAYAAQAAAAwAAQAUABUAAQAmAAAAUgACAAIAAAAT +K8YAECu2ABsqpgAIEAenAAQCrAAAAAMAJwAAABYAAgAAABMAEgATAAAAAAATABwAHQABACgAAAAG +AAEAAAAOACkAAAAFAAIRQAEAAQAeAB8AAQAmAAAAMwABAAEAAAAJKrcAISq4ACWxAAAAAgAnAAAA +DAABAAAACQASABMAAAAoAAAABgABAAAADAADACoAAAACAAcAKwAAAAsAAQAIAAEACXMACgAsAAAA +AwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaTMicroOcclusion.class.b64 b/src/test/resources/compat/ReferenceScalaTMicroOcclusion.class.b64 new file mode 100644 index 0000000..1770b3b --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaTMicroOcclusion.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQAsQEAOmNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFUTWljcm9PY2NsdXNpb24HAAEBADhjb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZU1pY3JvT2NjbHVzaW9uQmFzZQcAAwEAJmNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uBwAFAQAjUmVmZXJlbmNlU2NhbGFUTWljcm9PY2NsdXNpb24uc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVieXRlcwEFqAYBBX1iAUIBAwElEVFEVTNnS0osZ25ZM1RHBmQXDVYnakdKfHdqWTJta05Md04cBgMHEQlhYVk4bmEGJChCQQMHAyVpVw8cO2phBhRIT0MBCAMtGXcOWjNkUSYcNy4aOAQBTRkBQQMIEQUtYVEiAQIKBTURIWEHKmZNFhRYTVwyZhsmHCdvXChkRzIsOC9bOG8FBhxYDQUCECU1CQFDAwISDQVRUS5bMnNfCmR3blk2CgVNASJhBCtOUw4UeG5UMmRZVhwYbhw4CQtVAUERAQwCDXFKZy4bOz8pBTkCQ0EGAREdSQIBMUEFAmkJQWEdN3BpVgkxBAUCHT81CVFEQwEfAxUZOC0ZN2ITCQFTREECSl1SRHFBCQFBAhMFMSUBBXRZPiR4DEozcikJIXMFBQIdSyURYSUIAgUrOkxHD0MEKUMFBQkZQQ4CB2EkEwcDBCsBAQZLYUcBBmcyfEcPCQUIWQEBDREiARsDLRlIbhw7QklaDGduWTMJDzkCARkhQwFfBXkxD1w4dQMSNBhNXDJmPxIqFw8GAiVhITkBJkxBAQIEWQJCAhoBQQMmMSQBB3RZPiQYCRo8Yl0OLAcFQwQ1AQEHSREBDgIJTUwnMBoFCG0BAQ0RIgE4AyEZGE5fM2BJFQxIQwETOREdQVMnIUFBAm1BYUEPASFCE1kSIUI6anUWBANiAh8BAQQlCUFHAQlbBiRYTV01YlkiOWEIAWEBCgN5FAFEN2JpFhQYLhk3YEkVDEhDARNBER1BUyghQUECbUFhQREBIUITWRIhQzdiaRYUGC4ZNyERHSEFATFBBQIVC2FBWjFqWT5zVyMBJBEFHWNVIgElCwUlUxUBAjdiXR5UEWFTAQVVBjQYLQMCThEKMTELHjpqXR5EcWEUAUECEwUBKwEGZ0MmZHdKXDAlS0YkIgFKKQkPIXIVESFhAQ0iMTELAVEhChkLcUFaMWpZPnMHBUMEVgEBB0kRASwCG1UcWC1RMnVrBmRXCVo0ZisFOQZDAQ9ZEwlJVkRBBENfPmRXLRk4CQ9tAwEZIUMBOQYJUm9dM0JHUiwYDVwjZU8WfEYlWjkVBRFqBmICFVsDAwUNYRYFBz8CAQsVQiwCHVUcWC1RMnVrBmRXCVo0ZkEhORENAWEBCgMxFkFDM2VPFhRWbV07bWkiOTENAWEBCgMhF0FEM2VPFhRWbV07bWl+I1MtHQsDSRVEcQELMgICAwdxCwMEaAEBBkthVgEMSxI8V01VM3RrMiQIBUMEagEBB0kRATYCEU0sV01cI2VPFiwSQQQFCFkCAQ0RIgFuAzEZWC0aOEZJHix3DEozcikJIWMOQwQpVwYFCRkBCAkNQQQBFSkDDwMlGVgtGjhGSR4sBwVDBHMBAQdJEQE2AhVNLFdNXCJwZTosJw9DBHUBAQdJEUE7Ah1NLFdNXCJwZTosJ28YE2ZjUhFBRR4FCFFNDAkRMQEPERlBCAEpUQUdBVkxL1ozbwc+FGguGjohERVRCAEiAXwDHTlXDR4remEWJBJBEgUGewIhCUFgAQpPFiQoaVw7b0lOLBJhIAkFAwMJWSEEAgIEKSERUUFBBAMNMVhtGQYEAxMxEWEBN2pFJiERUUJBAgUdGVVPWThqSVpCcSEhBQEJEwkZIgEEc0sOfCcPGgsESQVVAQJDQQwDHwENISEHAgk5DFcuGgkFAzcJCUNEAh0DO0kxIWEIHgMZASYvGjNmTSYZUSphCQsHBX1RBAMEAigBIQlBRwEITxYkOAtcOHURGQlZAwFDATUFOXEtGjtUU2osB0JCQRgBEQUhJEEGaEtSbBUNXjNzUwZkB2JCQRoBEQUTUUcBGEsSPFdtUThzXRYUeGpZMm1rTkx3ThwrZmdSJFJhVkEcA3dBcSEhDwIyAQdhIgEDZkkeLAdiQkEfA2MBDUFEAQdHPhRoLho6AQAEc2xvdAEAAUkBAAtzbG90QWR2YW5jZQEABHNpemUBAAhtYXRlcmlhbAEABmZhaWxPbgEAEkxqYXZhL2xhbmcvU3RyaW5nOwEADXVzZUFjdHVhbEVkZ2UBAAFaAQAKZWRnZVJlc3VsdAEACHNlZW5FZGdlAQAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOwEACnNlZW5Db3JuZXIBADtjb2RlY2hpY2tlbiRtaWNyb2Jsb2NrJFRNaWNyb09jY2x1c2lvbiQkc3VwZXIkb2NjbHVzaW9uVGVzdAEAJShMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoBAA1vY2NsdXNpb25UZXN0DAAaABkKAAQAGwEABHRoaXMBADxMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L2NvbXBhdC9SZWZlcmVuY2VTY2FsYVRNaWNyb09jY2x1c2lvbjsBAAVucGFydAEAIkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDsBACxjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbiRjbGFzcwcAIQEATShMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0OylaDAAaACMKACIAJAEAAygpSQwACwAMCQACACcBAAhzbG90XyRlcQEABChJKVYBAAN4JDEMAA0ADAkAAgAsAQAPc2xvdEFkdmFuY2VfJGVxDAAOAAwJAAIALwEACHNpemVfJGVxDAAPAAwJAAIAMgEADG1hdGVyaWFsXyRlcQEAFCgpTGphdmEvbGFuZy9TdHJpbmc7DAAQABEJAAIANgEACmZhaWxPbl8kZXEBABUoTGphdmEvbGFuZy9TdHJpbmc7KVYBAAMoKVoMABIAEwkAAgA7AQARdXNlQWN0dWFsRWRnZV8kZXEBAAQoWilWDAAUABMJAAIAPwEADmVkZ2VSZXN1bHRfJGVxAQAqKClMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247DAAVABYJAAIAQwEADHNlZW5FZGdlXyRlcQEAKyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247KVYMABcAFgkAAgBHAQAOc2VlbkNvcm5lcl8kZXEBAAdnZXRUeXBlAQAUdGVzdDptaWNyb19vY2NsdXNpb24IAEsBAAlnZXRCb3VuZHMBAB8oKUxjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7AQAYamF2YS9sYW5nL0Fzc2VydGlvbkVycm9yBwBPAQAXYm91bmRzIG11c3Qgbm90IGJlIHJlYWQIAFEBAAY8aW5pdD4BABUoTGphdmEvbGFuZy9PYmplY3Q7KVYMAFMAVAoAUABVAQAGcmVjb3JkAQAGZXZlbnRzAQASKClMamF2YS91dGlsL0xpc3Q7DABYAFkKAAIAWgEAJnNjYWxhL2NvbGxlY3Rpb24vbXV0YWJsZS9TdHJpbmdCdWlsZGVyBwBcAQADKClWDABTAF4KAF0AXwEABmFwcGVuZAEAPChMamF2YS9sYW5nL09iamVjdDspTHNjYWxhL2NvbGxlY3Rpb24vbXV0YWJsZS9TdHJpbmdCdWlsZGVyOwwAYQBiCgBdAGMBAAE6CABlAQAFbGFiZWwMAGcANQoAAgBoAQAIdG9TdHJpbmcMAGoANQoAXQBrAQAOamF2YS91dGlsL0xpc3QHAG0BAANhZGQBABUoTGphdmEvbGFuZy9PYmplY3Q7KVoMAG8AcAsAbgBxDAAQADUKAAIAcwEAEGphdmEvbGFuZy9PYmplY3QHAHUBAAZlcXVhbHMMAHcAcAoAdgB4AQAfamF2YS9sYW5nL0lsbGVnYWxTdGF0ZUV4Y2VwdGlvbgcAegwAUwA5CgB7AHwBAARuYW1lAQAQamF2YS9sYW5nL1N0cmluZwcAfwEAB2dldFNsb3QIAAsMAFcAOQoAAgCDDAALACYKAAIAhQwADQAmCgACAIcMACkAKgoAAgCJAQAGcmVzdWx0AQAHZ2V0U2l6ZQgADgwADgAmCgACAI4BAAtnZXRNYXRlcmlhbAgADwwADwAmCgACAJIBABdlZGdlQ29ybmVyT2NjbHVzaW9uVGVzdAEAUyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOylaAQAEZWRnZQgAlgwARQBGCgACAJgMAEkARgoAAgCaDAASADoKAAIAnAEAeyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspWgwAlACeCgAiAJ8MABQAOgoAAgChAQAGY29ybmVyCgAEAF8BAAYkaW5pdCQMAKUARgoAIgCmAQAACACoAQAEQ29kZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEAD0xpbmVOdW1iZXJUYWJsZQEADVN0YWNrTWFwVGFibGUBAApTb3VyY2VGaWxlAQAZUnVudGltZVZpc2libGVBbm5vdGF0aW9ucwEACFNjYWxhU2lnACEAAgAEAAEABgAJAAIACwAMAAAAAgANAAwAAAACAA4ADAAAAAIADwAMAAAAAgAQABEAAAACABIAEwAAAAIAFAATAAAAAgAVABYAAAACABcAFgAAABwQAQAYABkAAQCqAAAAOgACAAIAAAAGKiu3ABysAAAAAgCrAAAAFgACAAAABgAdAB4AAAAAAAYAHwAgAAEArAAAAAYAAQAAABQAAQAaABkAAQCqAAAAOgACAAIAAAAGKiu4ACWsAAAAAgCrAAAAFgACAAAABgAdAB4AAAAAAAYAHwAgAAEArAAAAAYAAQAAABQAAQALACYAAQCqAAAALwABAAEAAAAFKrQAKKwAAAACAKsAAAAMAAEAAAAFAB0AHgAAAKwAAAAGAAEAAAAVAAEAKQAqAAEAqgAAADoAAgACAAAABiobtQAosQAAAAIAqwAAABYAAgAAAAYAHQAeAAAAAAAGACsADAABAKwAAAAGAAEAAAAVAAEADQAmAAEAqgAAAC8AAQABAAAABSq0AC2sAAAAAgCrAAAADAABAAAABQAdAB4AAACsAAAABgABAAAAFgABAC4AKgABAKoAAAA6AAIAAgAAAAYqG7UALbEAAAACAKsAAAAWAAIAAAAGAB0AHgAAAAAABgArAAwAAQCsAAAABgABAAAAFgABAA4AJgABAKoAAAAvAAEAAQAAAAUqtAAwrAAAAAIAqwAAAAwAAQAAAAUAHQAeAAAArAAAAAYAAQAAABcAAQAxACoAAQCqAAAAOgACAAIAAAAGKhu1ADCxAAAAAgCrAAAAFgACAAAABgAdAB4AAAAAAAYAKwAMAAEArAAAAAYAAQAAABcAAQAPACYAAQCqAAAALwABAAEAAAAFKrQAM6wAAAACAKsAAAAMAAEAAAAFAB0AHgAAAKwAAAAGAAEAAAAYAAEANAAqAAEAqgAAADoAAgACAAAABiobtQAzsQAAAAIAqwAAABYAAgAAAAYAHQAeAAAAAAAGACsADAABAKwAAAAGAAEAAAAYAAEAEAA1AAEAqgAAAC8AAQABAAAABSq0ADewAAAAAgCrAAAADAABAAAABQAdAB4AAACsAAAABgABAAAAGQABADgAOQABAKoAAAA6AAIAAgAAAAYqK7UAN7EAAAACAKsAAAAWAAIAAAAGAB0AHgAAAAAABgArABEAAQCsAAAABgABAAAAGQABABIAOgABAKoAAAAvAAEAAQAAAAUqtAA8rAAAAAIAqwAAAAwAAQAAAAUAHQAeAAAArAAAAAYAAQAAABoAAQA9AD4AAQCqAAAAOgACAAIAAAAGKhu1ADyxAAAAAgCrAAAAFgACAAAABgAdAB4AAAAAAAYAKwATAAEArAAAAAYAAQAAABoAAQAUADoAAQCqAAAALwABAAEAAAAFKrQAQKwAAAACAKsAAAAMAAEAAAAFAB0AHgAAAKwAAAAGAAEAAAAbAAEAQQA+AAEAqgAAADoAAgACAAAABiobtQBAsQAAAAIAqwAAABYAAgAAAAYAHQAeAAAAAAAGACsAEwABAKwAAAAGAAEAAAAbAAEAFQBCAAEAqgAAAC8AAQABAAAABSq0AESwAAAAAgCrAAAADAABAAAABQAdAB4AAACsAAAABgABAAAAHAABAEUARgABAKoAAAA6AAIAAgAAAAYqK7UARLEAAAACAKsAAAAWAAIAAAAGAB0AHgAAAAAABgArABYAAQCsAAAABgABAAAAHAABABcAQgABAKoAAAAvAAEAAQAAAAUqtABIsAAAAAIAqwAAAAwAAQAAAAUAHQAeAAAArAAAAAYAAQAAAB0AAQBJAEYAAQCqAAAAOgACAAIAAAAGKiu1AEixAAAAAgCrAAAAFgACAAAABgAdAB4AAAAAAAYAKwAWAAEArAAAAAYAAQAAAB0AAQBKADUAAQCqAAAALQABAAEAAAADEkywAAAAAgCrAAAADAABAAAAAwAdAB4AAACsAAAABgABAAAAHgABAE0ATgABAKoAAAA0AAMAAQAAAAq7AFBZElK3AFa/AAAAAgCrAAAADAABAAAACgAdAB4AAACsAAAABgABAAAAHwACAFcAOQABAKoAAACgAAMAAwAAAEcqtgBbuwBdWbcAYCu2AGQSZrYAZCq2AGm2AGS2AGy5AHICAFcqtgB0K01ZxwALVyzGAA2nABMstgB5mQAMuwB7WSu3AH2/sQAAAAMAqwAAABYAAgAAAEcAHQAeAAAAAABHAH4AEQABAKwAAAAOAAMAAAAhACQAIgBGACAArQAAABcAA/8ANgADBwACBwCABwCAAAEHAIAGCAABAIEAJgABAKoAAABOAAMAAgAAABoqEoK3AIQqtgCGPCoqtgCGKrYAiGC2AIobrAAAAAIAqwAAABYAAgAAABoAHQAeAAAACwAOAIsADAABAKwAAAAGAAEAAAAkAAEAjAAmAAEAqgAAADUAAgABAAAACyoSjbcAhCq2AI+sAAAAAgCrAAAADAABAAAACwAdAB4AAACsAAAABgABAAAAJQABAJAAJgABAKoAAAA1AAIAAQAAAAsqEpG3AIQqtgCTrAAAAAIAqwAAAAwAAQAAAAsAHQAeAAAArAAAAAYAAQAAACYAAQCUAJUAAQCqAAAAfgADAAMAAAAlKhKXtwCEKiu2AJkqLLYAmyq2AJ2ZAAwqKyy4AKCnAAcqtgCirAAAAAMAqwAAACAAAwAAACUAHQAeAAAAAAAlAJYAFgABAAAAJQCjABYAAgCsAAAAFgAFAAAAKAAGACkACwAqABAAKwAkACcArQAAAAUAAiBDAQABAFMAXgABAKoAAACFAAIAAQAAADcqtwCkKrgApyoDtQAoKgO1AC0qCLUAMCoDtQAzKhKptQA3KgS1ADwqBLUAQCoBtQBEKgG1AEixAAAAAgCrAAAADAABAAAANwAdAB4AAACsAAAAKgAKAAAAFAAIABUADQAWABIAFwAXABgAHAAZACIAGgAnABsALAAcADEAHQADAK4AAAACAAcArwAAAAsAAQAIAAEACXMACgCwAAAAAwUAAA== diff --git a/src/test/resources/compat/ReferenceScalaTMicroOcclusionClient.class.b64 b/src/test/resources/compat/ReferenceScalaTMicroOcclusionClient.class.b64 new file mode 100644 index 0000000..7fe7a79 --- /dev/null +++ b/src/test/resources/compat/ReferenceScalaTMicroOcclusionClient.class.b64 @@ -0,0 +1 @@ +yv66vgAAADQArQEAQGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFUTWljcm9PY2NsdXNpb25DbGllbnQHAAEBAD5jb2RlY2hpY2tlbi9tdWx0aXBhcnQvY29tcGF0L1JlZmVyZW5jZU1pY3JvT2NjbHVzaW9uQ2xpZW50QmFzZQcAAwEALGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uQ2xpZW50BwAFAQApUmVmZXJlbmNlU2NhbGFUTWljcm9PY2NsdXNpb25DbGllbnQuc2NhbGEBAB5Mc2NhbGEvcmVmbGVjdC9TY2FsYVNpZ25hdHVyZTsBAAVieXRlcwEEhgYBBS1hAUIBAwElETFFVTNnS0osZ25ZM1RHBmQXDVYnakdKfHdqWTJta05Md05cIm1TFnRHTwMCBAkFMTFtXDdxQ1JUISECBAITNSxIDl41cUNKJCgiQQQCFw18Ry1aMmlTDlxXTVwCAScNASFCBAkDFzFpEUFBBQMbCRERRVUzZ0tKLGduWTNOUw4UeG5UMmRZVhwYbhw4RFkmLGcOHiJiZxYEImEECg4DQVEhIQUEAhU1TDdNXThjWT4cNy4DAhQhCSlCK1Q1ZGU+fDVtGTd2ZyZ8Z24RN2pLOiQIIkILAQkDMRJBAh9qXSYkaAhGARghCVkBAUMEGgEBB0kRAQ4CDQl8V08cM3QrBVkCQwEPIhsFaSJCARAgAw0xWG0ZBgNBGQkxAVw1YxMJEVNEQQREawp8Fw4aHAkPEQIBGSFDAUsFUSFtXDtvSU58RiVaORUFGWIDQ0EUKxsFQSMiQRUCC00cFw1cMQoFLUIjAUIrb1NSRHEhTBICAgMHMSRBAnlJRUJhYQwBIUITWRJhAjJwazokNw8JBQhjAQENESIBMwMRGUhuHDsWA00CImEKGwoFVUIjYUElb2kiOXEHAWEBCgNBFAFDOm1fUnxGJVo5FQUZSgRiQhc3AwMFDWENBQd3AQELFUIaAgtNZHcOHhEJD3UCARkhQwFlBSExLxs+ZhEdeQQBMUEFAgELAWJdNXtLfiNTLR0LA00FQ3EhDCACAgMHMQcDBEQBAQZLYU0BBmcmVFgNCQUICwIBDREiAUcDLSEoLxk4dGEGFFhNHDsWAx0DImEKJQoFJUMjYQIicF8yLBdNHAUIFwIBDREiAU0DPSEoLxk4dGEGFFhNHDtgSRUMSEMBFE4RHWkjKiFBQQIdQ2FhFAEhQhM5FQEEO3NDOhwILxk6Zl1SBANiQikBAQQlCUFSAQplVnQnK1oyYlkORHFhFQFBAhMFQStBB3NrOhRWbVkxbUd+I1MtHQsDTVVDcSEMKgICAwdxCQMEWAEBBkthUgELZVZ0JytaMmJZDgQDYkItAQEEJQlBVwEOZRYcFw1cMkdDJmRXT10zFgNtAyIBGDMPBXUTZ0IBMGIbBXkmQgExCQMZYSRvXDh1fSUJESYDAmRRBTkBL1kybEMeLBdCQTNnBUERVk8cO2pbFiwFcFkzcWkmfGdOAwJkUSE5AQ4BYQEKA0kXIQU6ZkcGZDdNUjFqWVYUWG0YE2ZjUhFhRRsFCFsdDAkRMQFcERlhBwEpUQU3BnEhL1oyYlkONBUtGzd2ZRYEAyICOAEJA3oXYUI0ZmlSSwgvGgsCYUIREU9eBwJlKhExD14BBVkGdHdNQwF2AxFRF01eMQoFXRQoQUIqdWUmdHcNQwN6AREFIyRBBWhLUhR1Lh44ZWciKTEQAUMhZQU5cS0aO1RZPiQIIkI/AQkDEhRhQjRmaU5LJzAaBQZ/AiEJRU0BDE8WJFgqGTtmZSYMRw4DBAIEASEJRVIBDlNOJCYvGTh0YQYUWE0cOwkPBR0BASIRAgoFYSEvWjJiWQ4UdS4eOGVnUglhBQEABmJvdW5kcwEAHUxjb2RlY2hpY2tlbi9saWIvdmVjL0N1Ym9pZDY7AQAEc2xvdAEAAUkBAARzaXplAQALdHJhbnNwYXJlbnQBAAFaAQAJcnVuUmVjYWxjAQANcmVjYWxjRmFpbHVyZQEAHExqYXZhL2xhbmcvUnVudGltZUV4Y2VwdGlvbjsBAAxyZW5kZXJCb3VuZHMBAApyZW5kZXJNYXNrAQAfKClMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OwwAFQAMCQACABgBAAR0aGlzAQBCTGNvZGVjaGlja2VuL211bHRpcGFydC9jb21wYXQvUmVmZXJlbmNlU2NhbGFUTWljcm9PY2NsdXNpb25DbGllbnQ7AQAQcmVuZGVyQm91bmRzXyRlcQEAIChMY29kZWNoaWNrZW4vbGliL3ZlYy9DdWJvaWQ2OylWAQADeCQxAQADKClJDAAWAA4JAAIAIAEADnJlbmRlck1hc2tfJGVxAQAEKEkpVgEAQWNvZGVjaGlja2VuJG1pY3JvYmxvY2skVE1pY3JvT2NjbHVzaW9uQ2xpZW50JCRzdXBlciRvblBhcnRDaGFuZ2VkAQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspVgEADW9uUGFydENoYW5nZWQMACYAJQoABAAnAQAEcGFydAEAIkxjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDsBADtjb2RlY2hpY2tlbiRtaWNyb2Jsb2NrJFRNaWNyb09jY2x1c2lvbkNsaWVudCQkc3VwZXIkb25BZGRlZAEAAygpVgEAB29uQWRkZWQMAC0ALAoABAAuAQA4Y29kZWNoaWNrZW4kbWljcm9ibG9jayRUTWljcm9PY2NsdXNpb25DbGllbnQkJHN1cGVyJHJlYWQBACUoTGNvZGVjaGlja2VuL2xpYi9kYXRhL01DRGF0YUlucHV0OylWAQAEcmVhZAwAMgAxCgAEADMBAAZwYWNrZXQBACJMY29kZWNoaWNrZW4vbGliL2RhdGEvTUNEYXRhSW5wdXQ7AQAyY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb25DbGllbnQkY2xhc3MHADcBAFMoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uQ2xpZW50O0xjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspVgwAJgA5CgA4ADoBADEoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uQ2xpZW50OylWDAAtADwKADgAPQEAUyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb25DbGllbnQ7TGNvZGVjaGlja2VuL2xpYi9kYXRhL01DRGF0YUlucHV0OylWDAAyAD8KADgAQAEAEGdldFByaW9yaXR5Q2xhc3MBADEoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uQ2xpZW50OylJDABCAEMKADgARAEAO2NvZGVjaGlja2VuJG1pY3JvYmxvY2skVE1pY3JvT2NjbHVzaW9uJCRzdXBlciRvY2NsdXNpb25UZXN0AQAlKExjb2RlY2hpY2tlbi9tdWx0aXBhcnQvVE11bHRpUGFydDspWgEAIGNvZGVjaGlja2VuL211bHRpcGFydC9UTXVsdGlQYXJ0BwBIAQANb2NjbHVzaW9uVGVzdAwASgBHCgBJAEsBAAVucGFydAEALGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uJGNsYXNzBwBOAQBNKExjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjtMY29kZWNoaWNrZW4vbXVsdGlwYXJ0L1RNdWx0aVBhcnQ7KVoMAEoAUAoATwBRAQAXZWRnZUNvcm5lck9jY2x1c2lvblRlc3QBAFMoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspWgEAeyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247TGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uO0xjb2RlY2hpY2tlbi9taWNyb2Jsb2NrL1RNaWNyb09jY2x1c2lvbjspWgwAUwBVCgBPAFYBAARlZGdlAQAoTGNvZGVjaGlja2VuL21pY3JvYmxvY2svVE1pY3JvT2NjbHVzaW9uOwEABmNvcm5lcgwACwAMCQACAFsBAApib3VuZHNfJGVxDAANAA4JAAIAXgEACHNsb3RfJGVxDAAPAA4JAAIAYQEACHNpemVfJGVxAQADKClaDAAQABEJAAIAZQEAD3RyYW5zcGFyZW50XyRlcQEABChaKVYMABIAEQkAAgBpAQANcnVuUmVjYWxjXyRlcQEAHigpTGphdmEvbGFuZy9SdW50aW1lRXhjZXB0aW9uOwwAEwAUCQACAG0BABFyZWNhbGNGYWlsdXJlXyRlcQEAHyhMamF2YS9sYW5nL1J1bnRpbWVFeGNlcHRpb247KVYBAAdnZXRUeXBlAQAUKClMamF2YS9sYW5nL1N0cmluZzsBABt0ZXN0Om1pY3JvX29jY2x1c2lvbl9jbGllbnQIAHMBAAlnZXRCb3VuZHMBAAZldmVudHMBABIoKUxqYXZhL3V0aWwvTGlzdDsMAHYAdwoAAgB4CAALAQAOamF2YS91dGlsL0xpc3QHAHsBAANhZGQBABUoTGphdmEvbGFuZy9PYmplY3Q7KVoMAH0AfgsAfAB/DAALABcKAAIAgQEAB2dldFNsb3QMAA0AHwoAAgCEAQAHZ2V0U2l6ZQwADwAfCgACAIcBAAtnZXRNYXRlcmlhbAEADWlzVHJhbnNwYXJlbnQMABAAZAoAAgCLAQAMcmVjYWxjQm91bmRzAQAGcmVjYWxjCACODAATAGwKAAIAkAwAEgBkCgACAJIMAI0APAoAOACUAQAGPGluaXQ+DACWACwKAAQAlwEABiRpbml0JAEAKyhMY29kZWNoaWNrZW4vbWljcm9ibG9jay9UTWljcm9PY2NsdXNpb247KVYMAJkAmgoATwCbDACZADwKADgAnQEAG2NvZGVjaGlja2VuL2xpYi92ZWMvQ3Vib2lkNgcAnwY/0AAAAAAAAAEACShEREREREQpVgwAlgCjCgCgAKQBAARDb2RlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAPTGluZU51bWJlclRhYmxlAQANU3RhY2tNYXBUYWJsZQEAClNvdXJjZUZpbGUBABlSdW50aW1lVmlzaWJsZUFubm90YXRpb25zAQAIU2NhbGFTaWcAIQACAAQAAQAGAAgAAgALAAwAAAACAA0ADgAAAAIADwAOAAAAAgAQABEAAAACABIAEQAAAAIAEwAUAAAAAgAVAAwAAAACABYADgAAACIAAQAVABcAAQCmAAAALwABAAEAAAAFKrQAGbAAAAACAKcAAAAMAAEAAAAFABoAGwAAAKgAAAAGAAEAAAAfAAEAHAAdAAEApgAAADoAAgACAAAABiortQAZsQAAAAIApwAAABYAAgAAAAYAGgAbAAAAAAAGAB4ADAABAKgAAAAGAAEAAAAfAAEAFgAfAAEApgAAAC8AAQABAAAABSq0ACGsAAAAAgCnAAAADAABAAAABQAaABsAAACoAAAABgABAAAAHwABACIAIwABAKYAAAA6AAIAAgAAAAYqG7UAIbEAAAACAKcAAAAWAAIAAAAGABoAGwAAAAAABgAeAA4AAQCoAAAABgABAAAAHxABACQAJQABAKYAAAA6AAIAAgAAAAYqK7cAKLEAAAACAKcAAAAWAAIAAAAGABoAGwAAAAAABgApACoAAQCoAAAABgABAAAAHxABACsALAABAKYAAAAvAAEAAQAAAAUqtwAvsQAAAAIApwAAAAwAAQAAAAUAGgAbAAAAqAAAAAYAAQAAAB8QAQAwADEAAQCmAAAAOgACAAIAAAAGKiu3ADSxAAAAAgCnAAAAFgACAAAABgAaABsAAAAAAAYANQA2AAEAqAAAAAYAAQAAAB8AAQAmACUAAQCmAAAAOgACAAIAAAAGKiu4ADuxAAAAAgCnAAAAFgACAAAABgAaABsAAAAAAAYAKQAqAAEAqAAAAAYAAQAAAB8AAQAtACwAAQCmAAAALwABAAEAAAAFKrgAPrEAAAACAKcAAAAMAAEAAAAFABoAGwAAAKgAAAAGAAEAAAAfAAEAMgAxAAEApgAAADoAAgACAAAABioruABBsQAAAAIApwAAABYAAgAAAAYAGgAbAAAAAAAGADUANgABAKgAAAAGAAEAAAAfAAEAQgAfAAEApgAAAC8AAQABAAAABSq4AEWsAAAAAgCnAAAADAABAAAABQAaABsAAACoAAAABgABAAAAHxABAEYARwABAKYAAAA6AAIAAgAAAAYqK7cATKwAAAACAKcAAAAWAAIAAAAGABoAGwAAAAAABgBNACoAAQCoAAAABgABAAAAHwABAEoARwABAKYAAAA6AAIAAgAAAAYqK7gAUqwAAAACAKcAAAAWAAIAAAAGABoAGwAAAAAABgBNACoAAQCoAAAABgABAAAAHwABAFMAVAABAKYAAABFAAMAAwAAAAcqKyy4AFesAAAAAgCnAAAAIAADAAAABwAaABsAAAAAAAcAWABZAAEAAAAHAFoAWQACAKgAAAAGAAEAAAAfAAEACwAXAAEApgAAAC8AAQABAAAABSq0AFywAAAAAgCnAAAADAABAAAABQAaABsAAACoAAAABgABAAAAIAABAF0AHQABAKYAAAA6AAIAAgAAAAYqK7UAXLEAAAACAKcAAAAWAAIAAAAGABoAGwAAAAAABgAeAAwAAQCoAAAABgABAAAAIAABAA0AHwABAKYAAAAvAAEAAQAAAAUqtABfrAAAAAIApwAAAAwAAQAAAAUAGgAbAAAAqAAAAAYAAQAAACEAAQBgACMAAQCmAAAAOgACAAIAAAAGKhu1AF+xAAAAAgCnAAAAFgACAAAABgAaABsAAAAAAAYAHgAOAAEAqAAAAAYAAQAAACEAAQAPAB8AAQCmAAAALwABAAEAAAAFKrQAYqwAAAACAKcAAAAMAAEAAAAFABoAGwAAAKgAAAAGAAEAAAAiAAEAYwAjAAEApgAAADoAAgACAAAABiobtQBisQAAAAIApwAAABYAAgAAAAYAGgAbAAAAAAAGAB4ADgABAKgAAAAGAAEAAAAiAAEAEABkAAEApgAAAC8AAQABAAAABSq0AGasAAAAAgCnAAAADAABAAAABQAaABsAAACoAAAABgABAAAAIwABAGcAaAABAKYAAAA6AAIAAgAAAAYqG7UAZrEAAAACAKcAAAAWAAIAAAAGABoAGwAAAAAABgAeABEAAQCoAAAABgABAAAAIwABABIAZAABAKYAAAAvAAEAAQAAAAUqtABqrAAAAAIApwAAAAwAAQAAAAUAGgAbAAAAqAAAAAYAAQAAACQAAQBrAGgAAQCmAAAAOgACAAIAAAAGKhu1AGqxAAAAAgCnAAAAFgACAAAABgAaABsAAAAAAAYAHgARAAEAqAAAAAYAAQAAACQAAQATAGwAAQCmAAAALwABAAEAAAAFKrQAbrAAAAACAKcAAAAMAAEAAAAFABoAGwAAAKgAAAAGAAEAAAAlAAEAbwBwAAEApgAAADoAAgACAAAABiortQBusQAAAAIApwAAABYAAgAAAAYAGgAbAAAAAAAGAB4AFAABAKgAAAAGAAEAAAAlAAEAcQByAAEApgAAAC0AAQABAAAAAxJ0sAAAAAIApwAAAAwAAQAAAAMAGgAbAAAAqAAAAAYAAQAAACYAAQB1ABcAAQCmAAAAOwACAAEAAAARKrYAeRJ6uQCAAgBXKrYAgrAAAAACAKcAAAAMAAEAAAARABoAGwAAAKgAAAAGAAEAAAAnAAEAgwAfAAEApgAAAC8AAQABAAAABSq2AIWsAAAAAgCnAAAADAABAAAABQAaABsAAACoAAAABgABAAAAKAABAIYAHwABAKYAAAAvAAEAAQAAAAUqtgCIrAAAAAIApwAAAAwAAQAAAAUAGgAbAAAAqAAAAAYAAQAAACkAAQCJAB8AAQCmAAAALAABAAEAAAACA6wAAAACAKcAAAAMAAEAAAACABoAGwAAAKgAAAAGAAEAAAAqAAEAigBkAAEApgAAAC8AAQABAAAABSq2AIysAAAAAgCnAAAADAABAAAABQAaABsAAACoAAAABgABAAAAKwABAI0ALAABAKYAAABoAAIAAQAAACQqtgB5Eo+5AIACAFcqtgCRxwAPKrYAk5kAByq4AJWxKrYAkb8AAAADAKcAAAAMAAEAAAAkABoAGwAAAKgAAAAWAAUAAAAtAAwALgATAC8AHgAsAB8ALgCpAAAABAACHgAAAQCWACwAAQCmAAAAewAPAAEAAAA5KrcAmCq4AJwquACeKrsAoFkODg4UAKEPD7cApbUAXCoHtQBfKgW1AGIqA7UAZioEtQBqKgG1AG6xAAAAAgCnAAAADAABAAAAOQAaABsAAACoAAAAHgAHAAAAHwAMACAAHwAhACQAIgApACMALgAkADMAJQADAKoAAAACAAcAqwAAAAsAAQAIAAEACXMACgCsAAAAAwUAAA== diff --git a/tools/AbiScan.java b/tools/AbiScan.java new file mode 100644 index 0000000..59d0184 --- /dev/null +++ b/tools/AbiScan.java @@ -0,0 +1,233 @@ +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + +/** + * Scans a directory of mod jars for constant-pool references into ForgeMultipart's packages. + * + * Usage: java AbiScan.java [selfJarNameFragment...] + * + * Reports, per consumer jar: inherited types, referenced members with exact JVM descriptors, + * other referenced types, and string constants that look like reflective lookups. + */ +public final class AbiScan { + + private static final String[] TARGETS = { "codechicken/multipart", "codechicken/microblock" }; + + /** owner.name descriptor -> jars that reference it. */ + private static final Map> MEMBERS = new TreeMap<>(); + /** type -> jars that extend or implement it. */ + private static final Map> INHERITED = new TreeMap<>(); + /** type -> jars that reference it any other way. */ + private static final Map> TYPES = new TreeMap<>(); + /** string constant -> jars that embed it. */ + private static final Map> STRINGS = new TreeMap<>(); + /** jar -> count of classes touching the targets. */ + private static final Map HITS = new TreeMap<>(); + + public static void main(String[] args) throws IOException { + Path modsDir = Paths.get(args[0]); + List self = new ArrayList<>(); + for (int i = 1; i < args.length; i++) { + self.add(args[i].toLowerCase()); + } + + List jars; + try (var stream = Files.walk(modsDir)) { + jars = stream.filter(p -> p.toString().toLowerCase().endsWith(".jar")).sorted().collect(Collectors.toList()); + } + + int skipped = 0; + for (Path jar : jars) { + String name = jar.getFileName().toString(); + if (self.stream().anyMatch(name.toLowerCase()::contains)) { + skipped++; + continue; + } + scanJar(jar, name); + } + + System.out.println("Scanned " + (jars.size() - skipped) + " jars (" + skipped + " excluded as ForgeMultipart itself)"); + System.out.println(); + + System.out.println("== CONSUMERS =="); + HITS.entrySet().stream() + .sorted(Map.Entry.comparingByValue().reversed()) + .forEach(e -> System.out.println(" " + e.getValue() + "\t" + e.getKey())); + System.out.println(); + + dump("INHERITED TYPES (downstream extends/implements - abstract method descriptors are load-bearing)", INHERITED); + dump("REFERENCED MEMBERS (exact descriptors that must keep linking)", MEMBERS); + dump("OTHER REFERENCED TYPES (new/cast/instanceof/field descriptors)", TYPES); + dump("STRING CONSTANTS (reflection / registration candidates)", STRINGS); + } + + private static void dump(String title, Map> data) { + System.out.println("== " + title + " == (" + data.size() + ")"); + data.entrySet().stream() + .sorted(Comparator.>>comparingInt(e -> -e.getValue().size()) + .thenComparing(Map.Entry::getKey)) + .forEach(e -> System.out.println(" " + e.getKey() + "\n <- " + String.join(", ", e.getValue()))); + System.out.println(); + } + + private static void scanJar(Path jar, String jarName) { + try (ZipFile zip = new ZipFile(jar.toFile())) { + var entries = zip.entries(); + while (entries.hasMoreElements()) { + ZipEntry entry = entries.nextElement(); + if (!entry.getName().endsWith(".class")) { + continue; + } + try (InputStream in = zip.getInputStream(entry)) { + scanClass(new DataInputStream(in), jarName); + } catch (Exception ignored) { + // Unparseable or non-standard class file; not evidence of a reference. + } + } + } catch (IOException ignored) { + System.err.println("skip unreadable jar: " + jarName); + } + } + + private static void scanClass(DataInputStream in, String jarName) throws IOException { + if (in.readInt() != 0xCAFEBABE) { + return; + } + in.readUnsignedShort(); // minor + in.readUnsignedShort(); // major + int count = in.readUnsignedShort(); + + int[] tags = new int[count]; + String[] utf8 = new String[count]; + int[] refA = new int[count]; + int[] refB = new int[count]; + + for (int i = 1; i < count; i++) { + int tag = in.readUnsignedByte(); + tags[i] = tag; + switch (tag) { + case 1 -> utf8[i] = in.readUTF(); + case 7, 8, 16, 19, 20 -> refA[i] = in.readUnsignedShort(); + case 15 -> { in.readUnsignedByte(); refA[i] = in.readUnsignedShort(); } + case 3, 4 -> in.readInt(); + case 5, 6 -> { in.readLong(); i++; } + case 9, 10, 11, 12, 17, 18 -> { refA[i] = in.readUnsignedShort(); refB[i] = in.readUnsignedShort(); } + default -> throw new IOException("bad constant pool tag " + tag); + } + } + + in.readUnsignedShort(); // access_flags + int thisClass = in.readUnsignedShort(); + int superClass = in.readUnsignedShort(); + int interfaceCount = in.readUnsignedShort(); + int[] interfaces = new int[interfaceCount]; + for (int i = 0; i < interfaceCount; i++) { + interfaces[i] = in.readUnsignedShort(); + } + + String owner = className(tags, utf8, refA, thisClass); + if (owner != null && isTarget(owner)) { + return; // a repackaged copy of ForgeMultipart, not a consumer + } + + boolean hit = false; + Set inheritedHere = new TreeSet<>(); + String superName = className(tags, utf8, refA, superClass); + if (superName != null && isTarget(superName)) { + inheritedHere.add(superName); + } + for (int itf : interfaces) { + String name = className(tags, utf8, refA, itf); + if (name != null && isTarget(name)) { + inheritedHere.add(name); + } + } + for (String type : inheritedHere) { + INHERITED.computeIfAbsent(type, k -> new TreeSet<>()).add(jarName); + hit = true; + } + + for (int i = 1; i < count; i++) { + switch (tags[i]) { + case 7 -> { + String name = utf8[refA[i]]; + if (name != null && isTarget(name) && !inheritedHere.contains(strip(name))) { + TYPES.computeIfAbsent(strip(name), k -> new TreeSet<>()).add(jarName); + hit = true; + } + } + case 9, 10, 11 -> { + String ownerName = className(tags, utf8, refA, refA[i]); + if (ownerName == null || !isTarget(ownerName)) { + break; + } + int nat = refB[i]; + String member = utf8[refA[nat]] + " " + utf8[refB[nat]]; + MEMBERS.computeIfAbsent(ownerName + "." + member, k -> new TreeSet<>()).add(jarName); + hit = true; + } + case 8 -> { + String value = utf8[refA[i]]; + if (value != null && (value.contains("codechicken.multipart") || value.contains("codechicken.microblock") + || value.contains("codechicken/multipart") || value.contains("codechicken/microblock"))) { + STRINGS.computeIfAbsent(value, k -> new TreeSet<>()).add(jarName); + hit = true; + } + } + default -> { } + } + } + + if (hit) { + HITS.merge(jarName, 1, Integer::sum); + } + } + + private static String className(int[] tags, String[] utf8, int[] refA, int index) { + if (index <= 0 || index >= tags.length || tags[index] != 7) { + return null; + } + String name = utf8[refA[index]]; + return name == null ? null : strip(name); + } + + /** Array class references are encoded as descriptors; reduce them to the element type. */ + private static String strip(String name) { + int i = 0; + while (i < name.length() && name.charAt(i) == '[') { + i++; + } + if (i == 0) { + return name; + } + String rest = name.substring(i); + if (rest.startsWith("L") && rest.endsWith(";")) { + rest = rest.substring(1, rest.length() - 1); + } + return rest; + } + + private static boolean isTarget(String name) { + String stripped = strip(name); + for (String target : TARGETS) { + if (stripped.startsWith(target + "/")) { + return true; + } + } + return false; + } +}