Skip to content

Commit c0d0367

Browse files
mezzmezz
committed
Update to 1.21.4
1 parent 28eb51f commit c0d0367

File tree

254 files changed

+2441
-3934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+2441
-3934
lines changed

‎Common/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
// gradle.properties
1212
val jUnitVersion: String by extra
1313
val minecraftVersion: String by extra
14-
val neoformTimestamp: String by extra
14+
val neoformVersionAndTimestamp: String by extra
1515
val modId: String by extra
1616
val modJavaVersion: String by extra
1717

@@ -30,7 +30,7 @@ dependencyProjects.forEach {
3030
}
3131

3232
neoForge {
33-
neoFormVersion = "$minecraftVersion-$neoformTimestamp"
33+
neoFormVersion = neoformVersionAndTimestamp
3434
addModdingDependenciesTo(sourceSets.test.get())
3535
}
3636

‎Common/src/main/java/mezz/jei/common/Constants.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package mezz.jei.common;
22

33
import mezz.jei.api.constants.ModIds;
4-
import mezz.jei.api.recipe.RecipeType;
4+
import mezz.jei.api.recipe.types.IRecipeType;
55
import net.minecraft.resources.ResourceLocation;
66

77
public final class Constants {
8-
public static final RecipeType<?> UNIVERSAL_RECIPE_TRANSFER_TYPE = RecipeType.create(ModIds.JEI_ID, "universal_recipe_transfer_handler", Object.class);
8+
public static final IRecipeType<?> UNIVERSAL_RECIPE_TRANSFER_TYPE = IRecipeType.create(ModIds.JEI_ID, "universal_recipe_transfer_handler", Object.class);
99
public static final ResourceLocation LOCATION_JEI_GUI_TEXTURE_ATLAS = ResourceLocation.fromNamespaceAndPath(ModIds.JEI_ID, "textures/atlas/gui.png");
1010

1111
private Constants() {

‎Common/src/main/java/mezz/jei/common/Internal.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import mezz.jei.common.network.IConnectionToServer;
1212
import net.minecraft.client.Minecraft;
1313
import net.minecraft.client.renderer.texture.TextureManager;
14+
import net.minecraft.world.item.crafting.RecipeMap;
1415
import org.jetbrains.annotations.Nullable;
1516

1617
import java.util.Optional;
@@ -31,6 +32,7 @@ public final class Internal {
3132
private static IJeiClientConfigs jeiClientConfigs;
3233
@Nullable
3334
private static IJeiRuntime jeiRuntime;
35+
private static RecipeMap clientSyncedRecipes = RecipeMap.EMPTY;
3436
private static final JeiFeatures jeiFeatures = new JeiFeatures();
3537

3638
private Internal() {
@@ -98,4 +100,12 @@ public static IJeiRuntime getJeiRuntime() {
98100

99101
return jeiRuntime;
100102
}
103+
104+
public static void setClientSyncedRecipes(RecipeMap clientSyncedRecipes) {
105+
Internal.clientSyncedRecipes = clientSyncedRecipes;
106+
}
107+
108+
public static RecipeMap getClientSyncedRecipes() {
109+
return clientSyncedRecipes;
110+
}
101111
}

‎Common/src/main/java/mezz/jei/common/config/file/serializers/LegacyTypedIngredientSerializer.java‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎Common/src/main/java/mezz/jei/common/gui/elements/DrawableNineSliceTexture.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import mezz.jei.common.gui.textures.JeiSpriteUploader;
1212
import mezz.jei.common.util.ImmutableRect2i;
1313
import net.minecraft.client.gui.GuiGraphics;
14-
import net.minecraft.client.renderer.GameRenderer;
14+
import net.minecraft.client.renderer.CoreShaders;
1515
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
1616
import net.minecraft.resources.ResourceLocation;
1717
import org.joml.Matrix4f;
@@ -56,7 +56,7 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int width, i
5656
int textureWidth = this.width;
5757
int textureHeight = this.height;
5858

59-
RenderSystem.setShader(GameRenderer::getPositionTexShader);
59+
RenderSystem.setShader(CoreShaders.POSITION_TEX);
6060
RenderSystem.setShaderTexture(0, Constants.LOCATION_JEI_GUI_TEXTURE_ATLAS);
6161

6262
float uMin = sprite.getU0();

‎Common/src/main/java/mezz/jei/common/gui/elements/DrawableResource.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package mezz.jei.common.gui.elements;
22

33
import com.mojang.blaze3d.systems.RenderSystem;
4-
import com.mojang.blaze3d.vertex.BufferUploader;
5-
import net.minecraft.client.gui.GuiGraphics;
6-
import com.mojang.blaze3d.vertex.VertexFormat;
74
import com.mojang.blaze3d.vertex.BufferBuilder;
8-
import com.mojang.blaze3d.vertex.Tesselator;
5+
import com.mojang.blaze3d.vertex.BufferUploader;
96
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
10-
import net.minecraft.client.renderer.GameRenderer;
11-
import net.minecraft.resources.ResourceLocation;
12-
7+
import com.mojang.blaze3d.vertex.Tesselator;
8+
import com.mojang.blaze3d.vertex.VertexFormat;
139
import mezz.jei.api.gui.drawable.IDrawableStatic;
10+
import net.minecraft.client.gui.GuiGraphics;
11+
import net.minecraft.client.renderer.CoreShaders;
12+
import net.minecraft.resources.ResourceLocation;
1413
import org.joml.Matrix4f;
1514

1615
public class DrawableResource implements IDrawableStatic {
@@ -61,7 +60,7 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset) {
6160

6261
@Override
6362
public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int maskTop, int maskBottom, int maskLeft, int maskRight) {
64-
RenderSystem.setShader(GameRenderer::getPositionTexShader);
63+
RenderSystem.setShader(CoreShaders.POSITION_TEX);
6564
RenderSystem.setShaderTexture(0, this.resourceLocation);
6665

6766
int x = xOffset + this.paddingLeft + maskLeft;

‎Common/src/main/java/mezz/jei/common/gui/elements/DrawableSprite.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.mojang.blaze3d.vertex.Tesselator;
99
import mezz.jei.common.Constants;
1010
import mezz.jei.common.gui.textures.JeiSpriteUploader;
11-
import net.minecraft.client.renderer.GameRenderer;
11+
import net.minecraft.client.renderer.CoreShaders;
1212
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
1313
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
1414
import net.minecraft.resources.ResourceLocation;
@@ -63,7 +63,7 @@ public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset, int maskTop,
6363
int textureWidth = this.width;
6464
int textureHeight = this.height;
6565

66-
RenderSystem.setShader(GameRenderer::getPositionTexShader);
66+
RenderSystem.setShader(CoreShaders.POSITION_TEX);
6767
RenderSystem.setShaderTexture(0, Constants.LOCATION_JEI_GUI_TEXTURE_ATLAS);
6868

6969
maskTop += trimTop;

‎Common/src/main/java/mezz/jei/common/platform/IPlatformItemStackHelper.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
package mezz.jei.common.platform;
22

3+
import net.minecraft.core.component.DataComponents;
34
import net.minecraft.network.chat.Component;
45
import net.minecraft.world.entity.player.Player;
56
import net.minecraft.world.item.ItemStack;
7+
import net.minecraft.world.item.component.ItemAttributeModifiers;
8+
import net.minecraft.world.item.crafting.RecipeType;
9+
import net.minecraft.world.level.block.entity.FuelValues;
610
import org.jetbrains.annotations.Nullable;
711

812
import java.util.List;
913
import java.util.Optional;
1014

1115
public interface IPlatformItemStackHelper {
12-
int getBurnTime(ItemStack itemStack);
16+
int getBurnTime(ItemStack itemStack, RecipeType<?> recipeType, FuelValues fuelValues);
1317

1418
boolean isBookEnchantable(ItemStack stack, ItemStack book);
1519

1620
Optional<String> getCreatorModId(ItemStack stack);
1721

1822
List<Component> getTestTooltip(@Nullable Player player, ItemStack itemStack);
23+
24+
default ItemAttributeModifiers getItemAttributeModifiers(ItemStack stack) {
25+
return stack.getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY);
26+
}
1927
}

‎Common/src/main/java/mezz/jei/common/platform/IPlatformRecipeHelper.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
import net.minecraft.world.item.crafting.SmithingRecipe;
99

1010
import java.util.List;
11+
import java.util.Optional;
1112

1213
public interface IPlatformRecipeHelper {
13-
Ingredient getBase(SmithingRecipe recipe);
14-
Ingredient getAddition(SmithingRecipe recipe);
15-
Ingredient getTemplate(SmithingRecipe recipe);
14+
Optional<Ingredient> getBase(SmithingRecipe recipe);
15+
Optional<Ingredient> getAddition(SmithingRecipe recipe);
16+
Optional<Ingredient> getTemplate(SmithingRecipe recipe);
1617

1718
List<IJeiBrewingRecipe> getBrewingRecipes(IIngredientManager ingredientManager, IVanillaRecipeFactory vanillaRecipeFactory, PotionBrewing potionBrewing);
19+
20+
String[] shrinkShapedRecipePattern(List<String> pattern);
1821
}

‎Common/src/main/java/mezz/jei/common/platform/IPlatformRenderHelper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.mojang.blaze3d.platform.NativeImage;
44
import com.mojang.datafixers.util.Either;
55
import net.minecraft.client.Minecraft;
6-
import net.minecraft.client.color.item.ItemColors;
76
import net.minecraft.client.gui.Font;
87
import net.minecraft.client.gui.GuiGraphics;
8+
import net.minecraft.client.renderer.MultiBufferSource;
99
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
1010
import net.minecraft.client.resources.model.BakedModel;
1111
import net.minecraft.network.chat.Component;
@@ -25,13 +25,13 @@ public interface IPlatformRenderHelper {
2525

2626
TextureAtlasSprite getParticleIcon(BakedModel bakedModel);
2727

28-
ItemColors getItemColors();
29-
3028
Optional<NativeImage> getMainImage(TextureAtlasSprite sprite);
3129

3230
void renderTooltip(GuiGraphics guiGraphics, List<Either<FormattedText, TooltipComponent>> elements, int x, int y, Font font, ItemStack stack);
3331

3432
Component getName(TagKey<?> tagKey);
3533

3634
BakedModel createLimitedQuadItemModel(BakedModel bakedModel);
35+
36+
MultiBufferSource getBufferSource(GuiGraphics guiGraphics);
3737
}

0 commit comments

Comments
 (0)