Forgot a couple patches

kettingpowered · Feb 24, 2025 · 2f71c77 · 2f71c77
1 parent a2ae1c8
commit 2f71c77
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 22 deletions.
diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemBlockRenderTypes.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemBlockRenderTypes.java.patch
@@ -52,16 +52,23 @@
     public static RenderType getRenderType(ItemStack p_109280_, boolean p_109281_) {
        Item item = p_109280_.getItem();
        if (item instanceof BlockItem) {
-@@ -365,8 +_,73 @@
+@@ -365,11 +_,79 @@
     }
 
     public static RenderType getRenderLayer(FluidState p_109288_) {
 -      RenderType rendertype = TYPE_BY_FLUID.get(p_109288_.getType());
 +      RenderType rendertype = FLUID_RENDER_TYPES.get(net.minecraftforge.registries.ForgeRegistries.FLUIDS.getDelegateOrThrow(p_109288_.getType()));
        return rendertype != null ? rendertype : RenderType.solid();
+    }
+
+    public static void setFancy(boolean p_109292_) {
+       renderCutout = p_109292_;
 +   }
 +
-+   // FORGE START
++   /** Forge: Check if we are running in {@linkplain net.minecraft.client.Minecraft#useFancyGraphics() fancy graphics} to account for fast graphics render types */
++   public static boolean isFancy() {
++      return renderCutout;
++   }
 +
 +   private static final net.minecraftforge.client.ChunkRenderTypeSet CUTOUT_MIPPED = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.cutoutMipped());
 +   private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.solid());
@@ -79,7 +86,7 @@
 +   });
 +
 +   /** @deprecated Use {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)}. */
-+   @Deprecated(since = "1.19")
++   @Deprecated(since = "1.21.4", forRemoval = true)
 +   public static net.minecraftforge.client.ChunkRenderTypeSet getRenderLayers(BlockState state) {
 +      Block block = state.getBlock();
 +      if (block instanceof LeavesBlock) {
@@ -90,20 +97,20 @@
 +   }
 +
 +   /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+   @Deprecated(since = "1.19")
++   @Deprecated(since = "1.21.4", forRemoval = true)
 +   public static void setRenderLayer(Block block, RenderType type) {
 +      com.google.common.base.Preconditions.checkArgument(type.getChunkLayerId() >= 0, "The argument must be a valid chunk render type returned by RenderType#chunkBufferLayers().");
 +      setRenderLayer(block, net.minecraftforge.client.ChunkRenderTypeSet.of(type));
 +   }
 +
 +   /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+   @Deprecated(since = "1.19")
++   @Deprecated(since = "1.21.4", forRemoval = true)
 +   public static synchronized void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) {
 +      setRenderLayer(block, createSetFromPredicate(predicate));
 +   }
 +
 +   /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
-+   @Deprecated(since = "1.19")
++   @Deprecated(since = "1.21.4", forRemoval = true)
 +   public static synchronized void setRenderLayer(Block block, net.minecraftforge.client.ChunkRenderTypeSet layers) {
 +      checkClientLoading();
 +      BLOCK_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), layers);
@@ -125,5 +132,4 @@
 +   private static net.minecraftforge.client.ChunkRenderTypeSet createSetFromPredicate(java.util.function.Predicate<RenderType> predicate) {
 +      return net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.chunkBufferLayers().stream().filter(predicate).toArray(RenderType[]::new));
     }
-
-    public static void setFancy(boolean p_109292_) {
+ }
diff --git a/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java.patch b/patches/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java.patch
@@ -1,39 +1,81 @@
 --- a/net/minecraft/client/resources/model/SimpleBakedModel.java
 +++ b/net/minecraft/client/resources/model/SimpleBakedModel.java
-@@ -26,8 +_,17 @@
+@@ -26,8 +_,44 @@
     protected final TextureAtlasSprite particleIcon;
     protected final ItemTransforms transforms;
     protected final ItemOverrides overrides;
++   /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
 +   protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypes;
++   /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
++   protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypesFast;
++   /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
 +   protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypes;
++   /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
++   protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypesFast;
++   /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FABULOUS fabulous graphics} */
 +   protected final List<net.minecraft.client.renderer.RenderType> fabulousItemRenderTypes;
++   /** Forge: If this model's {@linkplain #blockRenderTypes block render types} are rendering cutout, to account for older leaves model JSONs */
++   protected final boolean isRenderingCutout;
 
-+   /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
++   /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
 +   @Deprecated
     public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_) {
 +      this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, net.minecraftforge.client.RenderTypeGroup.EMPTY);
 +   }
 +
++   /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup for fast graphics} **/
++   @Deprecated(forRemoval = true, since = "1.21.4")
 +   public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_, net.minecraftforge.client.RenderTypeGroup renderTypes) {
++      this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
++   }
++
++   /** Constructor with {@link net.minecraftforge.client.RenderTypeGroup RenderTypeGroup} for fancy and fast graphics. Preferred over {@link net.minecraft.client.renderer.ItemBlockRenderTypes#setRenderLayer(net.minecraft.world.level.block.Block, net.minecraft.client.renderer.RenderType) ItemBlockRenderTypes.setRenderLayer(Block, RenderType)}. */
++   public SimpleBakedModel(
++           List<BakedQuad> p_119489_,
++           Map<Direction, List<BakedQuad>> p_119490_,
++           boolean p_119491_,
++           boolean p_119492_,
++           boolean p_119493_,
++           TextureAtlasSprite p_119494_,
++           ItemTransforms p_119495_,
++           ItemOverrides p_119496_,
++           net.minecraftforge.client.RenderTypeGroup renderTypes,
++           net.minecraftforge.client.RenderTypeGroup renderTypesFast
++   ) {
        this.unculledFaces = p_119489_;
        this.culledFaces = p_119490_;
        this.hasAmbientOcclusion = p_119491_;
-@@ -36,6 +_,9 @@
+@@ -36,6 +_,15 @@
        this.particleIcon = p_119494_;
        this.transforms = p_119495_;
        this.overrides = p_119496_;
-+      this.blockRenderTypes = !renderTypes.isEmpty() ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
-+      this.itemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entity()) : null;
-+      this.fabulousItemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entityFabulous()) : null;
++
++      boolean hasRenderTypes = renderTypes != null && !renderTypes.isEmpty();
++      boolean hasRenderTypesFast = renderTypesFast != null && !renderTypesFast.isEmpty();
++      this.blockRenderTypes = hasRenderTypes ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
++      this.blockRenderTypesFast = hasRenderTypesFast ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypesFast.block()) : null;
++      this.itemRenderTypes = hasRenderTypes ? List.of(renderTypes.entity()) : null;
++      this.itemRenderTypesFast = hasRenderTypesFast ? List.of(renderTypesFast.entity()) : null;
++      this.fabulousItemRenderTypes = hasRenderTypes ? List.of(renderTypes.entityFabulous()) : null;
++      this.isRenderingCutout = hasRenderTypes && (renderTypes.block() == net.minecraft.client.renderer.RenderType.cutout() || renderTypes.block() == net.minecraft.client.renderer.RenderType.cutoutMipped());
     }
 
     public List<BakedQuad> getQuads(@Nullable BlockState p_235054_, @Nullable Direction p_235055_, RandomSource p_235056_) {
-@@ -70,6 +_,25 @@
+@@ -70,6 +_,40 @@
        return this.overrides;
     }
 
++   private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID_BLOCK = net.minecraftforge.client.ChunkRenderTypeSet.of(net.minecraft.client.renderer.RenderType.solid());
++   private static final List<net.minecraft.client.renderer.RenderType> SOLID_BLOCK_ITEM = List.of(net.minecraft.client.renderer.RenderType.solid());
++
 +   @Override
 +   public net.minecraftforge.client.ChunkRenderTypeSet getRenderTypes(@org.jetbrains.annotations.NotNull BlockState state, @org.jetbrains.annotations.NotNull RandomSource rand, @org.jetbrains.annotations.NotNull net.minecraftforge.client.model.data.ModelData data) {
++      if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
++         if (blockRenderTypesFast != null)
++            return blockRenderTypesFast;
++         if (isRenderingCutout && state.getBlock() instanceof net.minecraft.world.level.block.LeavesBlock)
++            return SOLID_BLOCK;
++      }
 +      if (blockRenderTypes != null)
 +         return blockRenderTypes;
 +      return BakedModel.super.getRenderTypes(state, rand, data);
@@ -42,34 +84,68 @@
 +   @Override
 +   public List<net.minecraft.client.renderer.RenderType> getRenderTypes(net.minecraft.world.item.ItemStack itemStack, boolean fabulous) {
 +      if (!fabulous) {
++         if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
++            if (itemRenderTypesFast != null)
++               return itemRenderTypesFast;
++            if (isRenderingCutout && itemStack.getItem() instanceof net.minecraft.world.item.BlockItem blockItem && blockItem.getBlock() instanceof net.minecraft.world.level.block.LeavesBlock)
++               return SOLID_BLOCK_ITEM;
++         }
 +         if (itemRenderTypes != null)
-+             return itemRenderTypes;
++            return itemRenderTypes;
 +      } else {
 +         if (fabulousItemRenderTypes != null)
-+             return fabulousItemRenderTypes;
++            return fabulousItemRenderTypes;
 +      }
 +      return BakedModel.super.getRenderTypes(itemStack, fabulous);
 +   }
 +
     @OnlyIn(Dist.CLIENT)
     public static class Builder {
        private final List<BakedQuad> unculledFaces = Lists.newArrayList();
-@@ -116,11 +_,17 @@
+@@ -116,11 +_,45 @@
           return this;
        }
 
 +      /** @deprecated Forge: Use {@linkplain #build(net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
 +      @Deprecated
        public BakedModel build() {
-+         return build(net.minecraftforge.client.RenderTypeGroup.EMPTY);
++         return build(net.minecraftforge.client.RenderTypeGroup.EMPTY, net.minecraftforge.client.RenderTypeGroup.EMPTY);
 +      }
 +
++      /**
++       * Builds with the render type to be used for this model, which will be used for any graphics setting.
++       * <p>
++       * If you need to set a specific render type for
++       * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}, consider using
++       * {@link #build(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
++       * renderTypes(RenderTypeGroup, RenderTypeGroup)} instead which allows choosing render types for both fancy and
++       * fast graphics.
++       *
++       * @apiNote If this model is for {@linkplain net.minecraft.world.level.block.LeavesBlock leaves} and if the
++       * given render type is either {@linkplain net.minecraft.client.renderer.RenderType#cutout() cutout} or
++       * {@linkplain net.minecraft.client.renderer.RenderType#cutoutMipped() cutout mipped}, it will be overridden
++       * with {@linkplain net.minecraft.client.renderer.RenderType#solid() solid} when fast graphics is enabled.
++       * @see #build(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
++       * renderTypes(RenderTypeGroup, RenderTypeGroup)
++       */
 +      public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes) {
++         return this.build(renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
++      }
++
++      /**
++       * Builds with the render types to be used for this model: one for
++       * {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} and one for
++       * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}.
++       *
++       * @see #build(net.minecraftforge.client.RenderTypeGroup)
++       */
++      public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes, net.minecraftforge.client.RenderTypeGroup renderTypesFast) {
           if (this.particleIcon == null) {
              throw new RuntimeException("Missing particle!");
           } else {
 -            return new SimpleBakedModel(this.unculledFaces, this.culledFaces, this.hasAmbientOcclusion, this.usesBlockLight, this.isGui3d, this.particleIcon, this.transforms, this.overrides);
-+            return new SimpleBakedModel(this.unculledFaces, this.culledFaces, this.hasAmbientOcclusion, this.usesBlockLight, this.isGui3d, this.particleIcon, this.transforms, this.overrides, renderTypes);
++            // Forge: Account for render types in model JSONs
++            return new SimpleBakedModel(this.unculledFaces, this.culledFaces, this.hasAmbientOcclusion, this.usesBlockLight, this.isGui3d, this.particleIcon, this.transforms, this.overrides, renderTypes, renderTypesFast);
           }
        }
     }
diff --git a/patches/minecraft/net/minecraft/world/item/AxeItem.java.patch b/patches/minecraft/net/minecraft/world/item/AxeItem.java.patch
@@ -15,7 +15,7 @@
        ItemStack itemstack = p_40529_.getItemInHand();
        Optional<BlockState> optional3 = Optional.empty();
        if (optional.isPresent()) {
-@@ -71,9 +_,20 @@
+@@ -71,9 +_,25 @@
        }
     }
 
@@ -34,5 +34,10 @@
 +   @Override
 +   public boolean canPerformAction(ItemStack stack, net.minecraftforge.common.ToolAction toolAction) {
 +      return net.minecraftforge.common.ToolActions.DEFAULT_AXE_ACTIONS.contains(toolAction);
++   }
++
++   @Override
++   public boolean canDisableShield(ItemStack stack, ItemStack shield, net.minecraft.world.entity.LivingEntity entity, net.minecraft.world.entity.LivingEntity attacker) {
++      return true;
     }
  }
diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java b/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java
@@ -692,7 +692,7 @@ default net.minecraftforge.common.capabilities.ICapabilityProvider initCapabilit
      */
     default boolean canDisableShield(ItemStack stack, ItemStack shield, LivingEntity entity, LivingEntity attacker)
     {
-        return this instanceof AxeItem;
+        return attacker.canDisableShield();
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         default boolean canDisableShield(ItemStack stack, ItemStack shield, LivingEntity entity, LivingEntity attacker)
         {
-            return this instanceof AxeItem;
+            return attacker.canDisableShield();
         }
         /**
@@ Expand Down @@