diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index fbab317994..71a5bdd285 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider FIELD field_11280 SHA1 Lcom/google/common/hash/HashFunction; METHOD method_10319 run (Lnet/minecraft/class_2408;)V + ARG 1 cache METHOD method_10320 writeToPath (Lcom/google/gson/Gson;Lnet/minecraft/class_2408;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V ARG 0 gson ARG 1 cache diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index d23ef81e73..abc06f42c0 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -1,12 +1,422 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGenerator - FIELD field_22830 blockStateWriter Ljava/util/function/Consumer; - FIELD field_22831 modelWriter Ljava/util/function/BiConsumer; + FIELD field_22830 blockStateCollector Ljava/util/function/Consumer; + FIELD field_22831 modelCollector Ljava/util/function/BiConsumer; + FIELD field_22832 simpleItemModelExemptionCollector Ljava/util/function/Consumer; + METHOD (Ljava/util/function/Consumer;Ljava/util/function/BiConsumer;Ljava/util/function/Consumer;)V + ARG 1 blockStateCollector + ARG 2 modelCollector + ARG 3 simpleItemModelExemptionCollector + METHOD method_25508 registerChorusPlant ()V + METHOD method_25509 registerComposter ()V + METHOD method_25510 registerDaylightDetector ()V + METHOD method_25511 registerEndRod ()V + METHOD method_25512 registerFarmland ()V + METHOD method_25513 registerFire ()V + METHOD method_25514 registerSoulFire ()V + METHOD method_25515 registerFrostedIce ()V + METHOD method_25516 registerTopSoils ()V + METHOD method_25517 registerCocoa ()V + METHOD method_25518 registerGrassPath ()V + METHOD method_25519 registerHopper ()V + METHOD method_25520 registerIronBars ()V + METHOD method_25521 registerLever ()V + METHOD method_25522 registerLilyPad ()V + METHOD method_25523 registerNetherPortal ()V + METHOD method_25524 registerNetherrack ()V + METHOD method_25525 registerObserver ()V + METHOD method_25526 registerPistons ()V + METHOD method_25527 registerPistonHead ()V + METHOD method_25528 registerScaffolding ()V + METHOD method_25529 registerRedstoneLamp ()V + METHOD method_25530 registerRedstoneTorch ()V + METHOD method_25531 registerRepeater ()V + METHOD method_25532 registerSeaPickle ()V + METHOD method_25533 registerSnows ()V + METHOD method_25534 register ()V + METHOD method_25535 getBambooBlockStateVariants (I)Ljava/util/List; + ARG 1 age + METHOD method_25536 getTurtleEggModel (ILjava/lang/String;Lnet/minecraft/class_4944;)Lnet/minecraft/class_2960; + ARG 1 eggs + ARG 2 prefix + ARG 3 texture + METHOD method_25537 registerItemModel (Lnet/minecraft/class_1792;)V + ARG 1 item + METHOD method_25538 registerParentedItemModel (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;)V + ARG 1 item + ARG 2 parentModelId + METHOD method_25540 excludeFromSimpleItemModelGeneration (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25542 registerBuiltinWithParticle (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)V + ARG 1 block + ARG 2 particleSource METHOD method_25543 registerStateWithModelReference (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V ARG 1 block ARG 2 modelReference + METHOD method_25544 registerCoral (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 coral + ARG 2 deadCoral + ARG 3 coralBlock + ARG 4 deadCoralBlock + ARG 5 coralFan + ARG 6 deadCoralFan + ARG 7 coralWallFan + ARG 8 deadCoralWallFan + METHOD method_25545 registerFlowerPotPlant (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;)V + ARG 1 plantBlock + ARG 2 flowerPotBlock + ARG 3 tintType + METHOD method_25546 registerCubeWithCustomTexture (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Ljava/util/function/BiFunction;)V + ARG 1 block + ARG 2 otherTextureSource + ARG 3 textureFactory + METHOD method_25547 registerCrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2769;[I)V + ARG 1 crop + ARG 2 ageProperty + ARG 3 ageTextureIndices + METHOD method_25548 registerTintableCross (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;)V + ARG 1 block + ARG 2 tintType + METHOD method_25549 registerTintableCross (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;Lnet/minecraft/class_4944;)V + ARG 1 block + ARG 2 tintType + ARG 3 texture + METHOD method_25550 registerNorthDefaultHorizontalRotatable (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;)V + ARG 1 block + ARG 2 texture + METHOD method_25551 registerSingleton (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V + ARG 1 block + ARG 2 texture + ARG 3 model + METHOD method_25553 registerAxisRotated (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V + ARG 1 block + ARG 2 modelFactory + METHOD method_25554 registerAxisRotated (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;Lnet/minecraft/class_4946$class_4947;)V + ARG 1 block + ARG 2 verticalModelFactory + ARG 3 horizontalModelFactory + METHOD method_25555 registerTexturePool (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946;)Lnet/minecraft/class_4910$class_4912; + ARG 1 block + ARG 2 model + METHOD method_25556 registerItemModel (Lnet/minecraft/class_2248;Ljava/lang/String;)V + ARG 1 block + ARG 2 textureSuffix + METHOD method_25557 createSubModel (Lnet/minecraft/class_2248;Ljava/lang/String;Lnet/minecraft/class_4942;Ljava/util/function/Function;)Lnet/minecraft/class_2960; + ARG 1 block + ARG 2 suffix + ARG 3 model + ARG 4 textureFactory + METHOD method_25558 registerBeehive (Lnet/minecraft/class_2248;Ljava/util/function/Function;)V + ARG 1 beehive + ARG 2 textureGetter + METHOD method_25560 registerTopSoil (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_4935;)V + ARG 1 topSoil + ARG 2 modelId + ARG 3 snowyVariant + METHOD method_25561 registerPiston (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;)V + ARG 1 piston + ARG 2 extendedModelId + ARG 3 texture + METHOD method_25565 createBooleanModelMap (Lnet/minecraft/class_2746;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4926; + ARG 0 property + ARG 1 trueModel + ARG 2 falseModel + METHOD method_25566 createValueFencedModelMap (Lnet/minecraft/class_2769;Ljava/lang/Comparable;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4926; + ARG 0 property + ARG 1 fence + ARG 2 higherOrEqualModelId + ARG 3 lowerModelId + METHOD method_25572 fillDoorVariantMap (Lnet/minecraft/class_4926$class_4930;Lnet/minecraft/class_2756;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4926$class_4930; + ARG 0 variantMap + ARG 1 targetHalf + ARG 2 regularModel + ARG 3 hingeModel + METHOD method_25574 registerTexturePool (Lnet/minecraft/class_4944;)Lnet/minecraft/class_4910$class_4912; + ARG 1 texture + METHOD method_25576 registerRandomHorizontalRotations (Lnet/minecraft/class_4946$class_4947;[Lnet/minecraft/class_2248;)V + ARG 1 modelFactory + ARG 2 blocks + METHOD method_25581 getTurtleEggModel (Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/class_2960; + ARG 1 eggs + ARG 2 hatch + METHOD method_25583 buildBlockStateVariants (Ljava/util/List;Ljava/util/function/UnaryOperator;)Ljava/util/List; + ARG 0 modelIds + ARG 1 processor + METHOD method_25584 createModelVariantWithRandomHorizontalRotations (Lnet/minecraft/class_2960;)[Lnet/minecraft/class_4935; + ARG 0 modelId + METHOD method_25585 registerBuiltin (Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; + ARG 1 modelId + ARG 2 particleBlock + METHOD method_25590 registerStonecutter ()V + METHOD method_25591 registerStructureBlock ()V + METHOD method_25592 registerSweetBerryBush ()V + METHOD method_25593 registerTripwire ()V + METHOD method_25594 registerTripwireHook ()V + METHOD method_25595 registerTurtleEgg ()V + METHOD method_25596 registerVine ()V + METHOD method_25597 registerMagmaBlock ()V + METHOD method_25598 registerInfestedStone ()V + METHOD method_25599 createNorthDefaultHorizontalRotationStates ()Lnet/minecraft/class_4926; + METHOD method_25600 registerItemModel (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25601 registerCoralFan (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 coralFanBlock + ARG 2 coralWallFanBlock + METHOD method_25602 registerPlantPart (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;)V + ARG 1 plant + ARG 2 plantStem + ARG 3 tintType + METHOD method_25603 registerTintableCrossBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;)V + ARG 1 block + ARG 2 tintType + METHOD method_25604 registerTintableCrossBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;Lnet/minecraft/class_4944;)V + ARG 1 block + ARG 2 tintType + ARG 3 crossTexture + METHOD method_25605 registerNorthDefaultHorizontalRotated (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V + ARG 1 block + ARG 2 modelFactory + METHOD method_25609 createDoorBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 doorBlock + ARG 1 bottomModelId + ARG 2 bottomHingeModelId + ARG 3 topModelId + ARG 4 topHingeModelId + METHOD method_25614 registerSouthDefaultHorizontalFacing (Lnet/minecraft/class_4946$class_4947;[Lnet/minecraft/class_2248;)V + ARG 1 modelFactory + ARG 2 blocks + METHOD method_25618 createSouthDefaultHorizontalRotationStates ()Lnet/minecraft/class_4926; + METHOD method_25619 registerMirrorable (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25620 registerGourd (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 stemBlock + ARG 2 attachedStemBlock + METHOD method_25621 registerDoubleBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;)V + ARG 1 doubleBlock + ARG 2 tintType + METHOD method_25622 registerSingleton (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V + ARG 1 block + ARG 2 modelFactory + METHOD method_25623 registerParentedItemModel (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)V + ARG 1 block + ARG 2 parentModelId + METHOD method_25626 createFenceGateBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 fenceGateBlock + ARG 1 openModelId + ARG 2 closedModelId + ARG 3 openWallModelId + ARG 4 closedWallModelId + METHOD method_25630 createEastDefaultHorizontalRotationStates ()Lnet/minecraft/class_4926; + METHOD method_25631 registerRotatable (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25632 registerBuiltin (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; + ARG 1 block + ARG 2 particleBlock + METHOD method_25633 registerTexturePool (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)Lnet/minecraft/class_4910$class_4912; + ARG 1 block + ARG 2 modelFactory + METHOD method_25634 createBlockStateWithRandomHorizontalRotations (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4925; + ARG 0 block + ARG 1 modelId + METHOD method_25636 createWallBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 wallBlock + ARG 1 postModelId + ARG 2 lowSideModelId + ARG 3 tallSideModelId + METHOD method_25640 createNorthDefaultRotationStates ()Lnet/minecraft/class_4926; + METHOD method_25641 registerSimpleCubeAll (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25642 registerCarpet (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 wool + ARG 2 carpet + METHOD method_25643 registerUpDefaultFacing (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V + ARG 1 block + ARG 2 modelFactory + METHOD method_25644 createSingletonBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4925; + ARG 0 block + ARG 1 modelId + METHOD method_25645 createBlockStateWithTwoModelAndRandomInversion (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4925; + ARG 0 block + ARG 1 firstModelId + ARG 2 secondModelId + METHOD method_25646 createStairsBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 stairsBlock + ARG 1 innerModelId + ARG 2 regularModelId + ARG 3 outerModelId + METHOD method_25649 createAxisRotatedVariantMap ()Lnet/minecraft/class_4926; + METHOD method_25650 registerCubeAllModelTexturePool (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 block + METHOD method_25651 registerGlassPane (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 glass + ARG 2 glassPane + METHOD method_25652 registerCooker (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V + ARG 1 cooker + ARG 2 modelFactory + METHOD method_25653 createAxisRotatedBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 block + ARG 1 modelId + METHOD method_25654 createButtonBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 buttonBlock + ARG 1 regularModelId + ARG 2 pressedModelId + METHOD method_25655 createOrientableTrapdoorBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 trapdoorBlock + ARG 1 topModelId + ARG 2 bottomModelId + ARG 3 openModelId + METHOD method_25657 registerSunflower ()V + METHOD method_25658 registerDoor (Lnet/minecraft/class_2248;)V + ARG 1 doorBlock + METHOD method_25659 registerCubeColumn (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 block + ARG 2 endTexture + METHOD method_25660 registerBuiltinWithParticle (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)V + ARG 1 block + ARG 2 particleSource + METHOD method_25661 createFenceBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 fenceBlock + ARG 1 postModelId + ARG 2 sideModelId + METHOD method_25662 createTrapdoorBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 trapdoorBlock + ARG 1 topModelId + ARG 2 bottomModelId + ARG 3 openModelId + METHOD method_25664 registerTallSeagrass ()V + METHOD method_25665 registerOrientableTrapdoor (Lnet/minecraft/class_2248;)V + ARG 1 trapdoorBlock + METHOD method_25666 registerPressurePlate (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 pressurePlate + ARG 2 textureSource + METHOD method_25667 createAxisRotatedBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 block + ARG 1 verticalModelId + ARG 2 horizontalModelId + METHOD method_25668 createSlabBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 slabBlock + ARG 1 bottomModelId + ARG 2 topModelId + ARG 3 fullModelId + METHOD method_25670 registerBamboo ()V + METHOD method_25671 registerTrapdoor (Lnet/minecraft/class_2248;)V + ARG 1 trapdoorBlock + METHOD method_25672 registerInfested (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 modelSource + ARG 2 infested + METHOD method_25673 createPressurePlateBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4917; + ARG 0 pressurePlateBlock + ARG 1 upModelId + ARG 2 downModelId + METHOD method_25675 createUpDefaultFacingVariantMap ()Lnet/minecraft/class_4926; + METHOD method_25676 registerLog (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4914; + ARG 1 logBlock + METHOD method_25677 registerTorch (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 torch + ARG 2 wallTorch + METHOD method_25678 registerDoubleBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 1 block + ARG 2 upperHalfModelId + ARG 3 lowerHalfModelId + METHOD method_25680 registerBarrel ()V METHOD method_25681 registerSimpleState (Lnet/minecraft/class_2248;)V ARG 1 block + METHOD method_25682 registerBed (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 bed + ARG 2 particleSource + METHOD method_25684 registerBell ()V + METHOD method_25685 registerTurnableRail (Lnet/minecraft/class_2248;)V + ARG 1 rail + METHOD method_25686 registerRoots (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 root + ARG 2 pottedRoot + METHOD method_25687 registerGrindstone ()V + METHOD method_25688 registerStraightRail (Lnet/minecraft/class_2248;)V + ARG 1 rail + METHOD method_25689 registerCampfire ()V METHOD method_25690 registerCommandBlock (Lnet/minecraft/class_2248;)V - ARG 1 block + ARG 1 commandBlock + METHOD method_25691 registerBookshelf ()V METHOD method_25692 registerAnvil (Lnet/minecraft/class_2248;)V + ARG 1 anvil + METHOD method_25693 registerRedstone ()V + METHOD method_25694 registerMushroomBlock (Lnet/minecraft/class_2248;)V + ARG 1 mushroomBlock + METHOD method_25695 registerComparator ()V + METHOD method_25696 registerFurnaceLikeOrientable (Lnet/minecraft/class_2248;)V ARG 1 block + METHOD method_25697 registorSmoothStone ()V + METHOD method_25698 registerNetherrackBottomCustomTop (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25699 registerBrewingStand ()V + METHOD method_25700 getFireFloorModels (Lnet/minecraft/class_2248;)Ljava/util/List; + ARG 1 texture + METHOD method_25701 registerCake ()V + METHOD method_25702 getFireSideModels (Lnet/minecraft/class_2248;)Ljava/util/List; + ARG 1 texture + METHOD method_25703 registerCartographyTable ()V + METHOD method_25704 getFireUpModels (Lnet/minecraft/class_2248;)Ljava/util/List; + ARG 1 texture + METHOD method_25705 registerSmithingTable ()V + METHOD method_25706 registerLantern (Lnet/minecraft/class_2248;)V + ARG 1 lantern + METHOD method_25707 registerPumpkins ()V + METHOD method_25708 registerNorthDefaultHorizontalRotation (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25709 registerCauldron ()V + METHOD method_25710 registerShulkerBox (Lnet/minecraft/class_2248;)V + ARG 1 shulkerBox + METHOD method_25711 registerChorusFlower ()V + METHOD method_25712 registerEndPortalFrame ()V + METHOD method_26279 registerRespawnAnchor ()V + CLASS class_4911 BuiltinModelPool + FIELD field_22835 modelId Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V + ARG 2 modelId + ARG 3 block + METHOD method_25713 includeWithItem (Lnet/minecraft/class_4942;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; + ARG 1 model + ARG 2 blocks + METHOD method_25714 includeWithItem ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; + ARG 1 blocks + METHOD method_25715 includeWithoutItem ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4911; + ARG 1 blocks + CLASS class_4912 BlockTexturePool + FIELD field_22837 texture Lnet/minecraft/class_4944; + FIELD field_22838 baseModelId Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_4944;)V + ARG 2 texture + METHOD method_25716 button (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 buttonBlock + METHOD method_25717 sign (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 signBlock + ARG 2 wallSignBlock + METHOD method_25718 base (Lnet/minecraft/class_2248;Lnet/minecraft/class_4942;)Lnet/minecraft/class_4910$class_4912; + ARG 1 block + ARG 2 model + METHOD method_25719 base (Ljava/util/function/Function;)Lnet/minecraft/class_4910$class_4912; + ARG 1 modelFactory + METHOD method_25720 wall (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 wallBlock + METHOD method_25721 fence (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 fenceBlock + METHOD method_25722 fenceGate (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 fenceGateBlock + METHOD method_25723 pressurePlate (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 pressurePlateBlock + METHOD method_25724 slab (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 slabBlock + METHOD method_25725 stairs (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 stairsBlock + CLASS class_4913 TintType + METHOD method_25726 getCrossModel ()Lnet/minecraft/class_4942; + METHOD method_25727 getFlowerPotCrossModel ()Lnet/minecraft/class_4942; + CLASS class_4914 LogTexturePool + FIELD field_22843 texture Lnet/minecraft/class_4944; + METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_4944;)V + ARG 2 texture + METHOD method_25728 wood (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4914; + ARG 1 woodBlock + METHOD method_25729 stem (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4914; + ARG 1 stemBlock + METHOD method_25730 log (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4914; + ARG 1 logBlock diff --git a/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping b/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping index a47b36070d..b6221dfdca 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping @@ -9,3 +9,4 @@ CLASS net/minecraft/class_4935 net/minecraft/data/client/model/BlockStateVariant ARG 1 key ARG 2 value METHOD method_25829 toJson (Ljava/util/List;)Lcom/google/gson/JsonElement; + ARG 0 variants diff --git a/mappings/net/minecraft/data/client/model/Model.mapping b/mappings/net/minecraft/data/client/model/Model.mapping index d621e187e5..88db699f9c 100644 --- a/mappings/net/minecraft/data/client/model/Model.mapping +++ b/mappings/net/minecraft/data/client/model/Model.mapping @@ -7,12 +7,22 @@ CLASS net/minecraft/class_4942 net/minecraft/data/client/model/Model ARG 2 variant ARG 3 requiredTextures METHOD method_25846 upload (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 1 block + ARG 2 texture + ARG 3 modelCollector METHOD method_25847 upload (Lnet/minecraft/class_2248;Ljava/lang/String;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 1 block ARG 2 suffix + ARG 3 texture + ARG 4 modelCollector METHOD method_25850 createTextureMap (Lnet/minecraft/class_4944;)Ljava/util/Map; + ARG 1 texture METHOD method_25852 upload (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; ARG 1 id ARG 2 texture - ARG 3 writer + ARG 3 modelCollector METHOD method_25853 uploadWithoutVariant (Lnet/minecraft/class_2248;Ljava/lang/String;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 1 block ARG 2 suffix + ARG 3 texture + ARG 4 modelCollector diff --git a/mappings/net/minecraft/data/client/model/Texture.mapping b/mappings/net/minecraft/data/client/model/Texture.mapping index 17faeffb55..8e2732b54e 100644 --- a/mappings/net/minecraft/data/client/model/Texture.mapping +++ b/mappings/net/minecraft/data/client/model/Texture.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/model/Texture FIELD field_22997 entries Ljava/util/Map; FIELD field_22998 inherited Ljava/util/Set; - METHOD method_25860 getModelId (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2960; + METHOD method_25860 getId (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2960; ARG 0 block METHOD method_25861 getInherited ()Ljava/util/stream/Stream; METHOD method_25862 particle (Lnet/minecraft/class_1792;)Lnet/minecraft/class_4944; ARG 0 item - METHOD method_25863 getSubModelId (Lnet/minecraft/class_1792;Ljava/lang/String;)Lnet/minecraft/class_2960; + METHOD method_25863 getSubId (Lnet/minecraft/class_1792;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 item ARG 1 suffix METHOD method_25864 all (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; @@ -14,7 +14,7 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/model/Texture METHOD method_25865 stemAndUpper (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; ARG 0 stem ARG 1 upper - METHOD method_25866 getSubModelId (Lnet/minecraft/class_2248;Ljava/lang/String;)Lnet/minecraft/class_2960; + METHOD method_25866 getSubId (Lnet/minecraft/class_2248;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 block ARG 1 suffix METHOD method_25867 getTexture (Lnet/minecraft/class_4945;)Lnet/minecraft/class_2960; @@ -39,14 +39,14 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/model/Texture ARG 2 child METHOD method_25875 all (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; ARG 0 id - METHOD method_25876 getModelId (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2960; + METHOD method_25876 getId (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2960; ARG 0 item METHOD method_25877 cross (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; ARG 0 block METHOD method_25878 frontSideWithCustomBottom (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; ARG 0 block ARG 1 bottom - METHOD method_25879 copyAndAnd (Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + METHOD method_25879 copyAndAdd (Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; ARG 1 key ARG 2 id METHOD method_25880 cross (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; diff --git a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping index fb28b38639..5763a658e1 100644 --- a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping @@ -14,4 +14,17 @@ CLASS net/minecraft/class_4925 net/minecraft/data/client/model/VariantsBlockStat METHOD method_25771 create (Lnet/minecraft/class_2248;[Lnet/minecraft/class_4935;)Lnet/minecraft/class_4925; ARG 0 block ARG 1 variants + METHOD method_25775 coordinate (Lnet/minecraft/class_4926;)Lnet/minecraft/class_4925; + COMMENT Appends a block state variant map to this block state information. + COMMENT + COMMENT

A block state variant map defines some of the variant settings based + COMMENT on a defined set of properties in the block state, such as the model + COMMENT of the block state is determined by a coordinated map of power and + COMMENT machine type property, and the y rotation determined by a facing + COMMENT property, etc. + COMMENT + COMMENT @return this block state file + ARG 1 map + COMMENT the variant map to contribute property to variant settings + COMMENT mappings to the block state file METHOD method_25777 intersect (Ljava/util/List;Ljava/util/List;)Ljava/util/List; diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index ef5c97e0a3..8fc7896494 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -150,6 +150,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_22032 WARPED_PLANKS Lnet/minecraft/class_1792; FIELD field_22420 TARGET Lnet/minecraft/class_1792; FIELD field_22421 CRYING_OBSIDIAN Lnet/minecraft/class_1792; + FIELD field_23141 RESPAWN_ANCHOR Lnet/minecraft/class_1792; FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792;