Skip to content

Commit

Permalink
Rename Crafter to CrafterBlock (#537)
Browse files Browse the repository at this point in the history
  • Loading branch information
@IotaBread
IotaBread authored Jan 23, 2024
1 parent 3675f71 commit 4a9fc2e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/Crafter.mapping → .../net/minecraft/block/CrafterBlock.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_dmnruvyr net/minecraft/block/Crafter
CLASS net/minecraft/unmapped/C_dmnruvyr net/minecraft/block/CrafterBlock
FIELD f_agoiltbq TRIGGER_DELAY I
FIELD f_lebcsueu TRIGGERED Lnet/minecraft/unmapped/C_xhwijdsd;
FIELD f_lefdstyp MAX_CRAFTING_TICKS I
Expand Down

1 comment on commit 4a9fc2e

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 4a9fc2e, 5 file(s) were updated with 8 line(s) added and 8 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-01-23 19:58:57.717701632 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-01-23 19:57:55.537540619 +0000
@@ -11471,7 +11471,7 @@
     * @mapping {@literal named CRAFTER Lnet/minecraft/block/Blocks;CRAFTER:Lnet/minecraft/block/Block;}
     */
    public static final Block CRAFTER = register(
-      "crafter", new Crafter(AbstractBlock.Settings.create().mapColor(MapColor.STONE).strength(1.5F, 3.5F).requiredFlags(FeatureFlags.UPDATE_1_21))
+      "crafter", new CrafterBlock(AbstractBlock.Settings.create().mapColor(MapColor.STONE).strength(1.5F, 3.5F).requiredFlags(FeatureFlags.UPDATE_1_21))
    );
    /**
     * @mapping {@literal hashed f_dypxpaqu Lnet/minecraft/unmapped/C_jricjyva;f_dypxpaqu:Lnet/minecraft/unmapped/C_mmxmpdoq;}
diff -bur namedTargetSrc/net/minecraft/block/BlockTypes.java namedSrc/net/minecraft/block/BlockTypes.java
--- namedTargetSrc/net/minecraft/block/BlockTypes.java	2024-01-23 19:58:57.785701810 +0000
+++ namedSrc/net/minecraft/block/BlockTypes.java	2024-01-23 19:57:55.649540922 +0000
@@ -98,7 +98,7 @@
       Registry.register(registry, "coral_fan", CoralFanBlock.CODEC);
       Registry.register(registry, "coral_plant", CoralBlock.CODEC);
       Registry.register(registry, "coral_wall_fan", CoralWallFanBlock.CODEC);
-      Registry.register(registry, "crafter", Crafter.CODEC);
+      Registry.register(registry, "crafter", CrafterBlock.CODEC);
       Registry.register(registry, "crafting_table", CraftingTableBlock.CODEC);
       Registry.register(registry, "crop", CropBlock.CODEC);
       Registry.register(registry, "crying_obsidian", CryingObsidianBlock.CODEC);
Only in namedSrc/net/minecraft/block: CrafterBlock.java
Only in namedTargetSrc/net/minecraft/block: Crafter.java
diff -bur namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-01-23 19:58:57.841701957 +0000
+++ namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-01-23 19:57:55.725541126 +0000
@@ -5,7 +5,7 @@
 import it.unimi.dsi.fastutil.ints.IntList;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.Crafter;
+import net.minecraft.block.CrafterBlock;
 import net.minecraft.client.gui.screen.ingame.CrafterScreen;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -385,7 +385,7 @@
       if (i >= 0) {
          crafterBlockEntity.craftingTicksRemaining = i;
          if (i == 0) {
-            world.setBlockState(pos, state.with(Crafter.CRAFTING, Boolean.valueOf(false)), Block.NOTIFY_ALL);
+            world.setBlockState(pos, state.with(CrafterBlock.CRAFTING, Boolean.valueOf(false)), Block.NOTIFY_ALL);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java	2024-01-23 19:58:57.761701747 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java	2024-01-23 19:57:55.609540813 +0000
@@ -1,6 +1,6 @@
 package net.minecraft.client.gui.screen.ingame;
 
-import net.minecraft.block.Crafter;
+import net.minecraft.block.CrafterBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.CraftingInventory;
@@ -192,7 +192,7 @@
       PlayerEntity lv2 = this.player;
       if (lv2 instanceof ServerPlayerEntity lv) {
          World lv2x = lv.getWorld();
-         ItemStack lv3 = (ItemStack)Crafter.getCraftingRecipe(lv2x, this.inventory)
+         ItemStack lv3 = (ItemStack)CrafterBlock.getCraftingRecipe(lv2x, this.inventory)
             .map(arg2 -> arg2.craft(this.inventory, lv2.getRegistryManager()))
             .orElse(ItemStack.EMPTY);
          this.f_yiamcegp.setStack(0, lv3);
diff -bur namedTargetSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java namedSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java	2024-01-23 19:58:57.761701747 +0000
+++ namedSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java	2024-01-23 19:57:55.613540825 +0000
@@ -25,7 +25,7 @@
 import java.util.stream.IntStream;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.Crafter;
+import net.minecraft.block.CrafterBlock;
 import net.minecraft.block.MangrovePropaguleBlock;
 import net.minecraft.block.PitcherCropBlock;
 import net.minecraft.block.SnifferEggBlock;
@@ -2918,7 +2918,7 @@
                      .register(orientation -> this.addJigsawOrientationToVariant(orientation, BlockStateVariant.create()))
                )
                .coordinate(
-                  BlockStateVariantMap.create(Properties.TRIGGERED, Crafter.CRAFTING)
+                  BlockStateVariantMap.create(Properties.TRIGGERED, CrafterBlock.CRAFTING)
                      .register(false, false, BlockStateVariant.create().put(VariantSettings.MODEL, lv))
                      .register(true, true, BlockStateVariant.create().put(VariantSettings.MODEL, lv4))
                      .register(true, false, BlockStateVariant.create().put(VariantSettings.MODEL, lv2))

Please sign in to comment.