From 90585d57d27e4110d2003b6f7d8d14de02e800c4 Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Mon, 25 Sep 2023 20:48:25 +0200 Subject: [PATCH] Update to 1.20.2 [build] [publish] --- build.gradle | 2 +- changelog.md | 2 +- .../mrbysco/justenoughprofessions/RenderHelper.java | 2 +- .../justenoughprofessions/jei/ProfessionCategory.java | 2 +- .../justenoughprofessions/jei/ProfessionWrapper.java | 5 ++--- common/src/main/resources/pack.mcmeta | 2 +- fabric/src/main/resources/fabric.mod.json | 4 ++-- forge/src/main/resources/META-INF/mods.toml | 8 ++++---- gradle.properties | 10 +++++----- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index cdc500c..02f26bc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' apply(false) + id 'fabric-loom' version '1.3-SNAPSHOT' apply(false) id 'net.minecraftforge.gradle' version '[6.0,6.2)' apply(false) id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply(false) id("org.spongepowered.mixin") version "0.7-SNAPSHOT" apply(false) diff --git a/changelog.md b/changelog.md index 8ec6271..1a907d0 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1 @@ -* Initial update to 1.20 \ No newline at end of file +* Initial update to 1.20.2 \ No newline at end of file diff --git a/common/src/main/java/com/mrbysco/justenoughprofessions/RenderHelper.java b/common/src/main/java/com/mrbysco/justenoughprofessions/RenderHelper.java index 3a75cbf..5907e0e 100644 --- a/common/src/main/java/com/mrbysco/justenoughprofessions/RenderHelper.java +++ b/common/src/main/java/com/mrbysco/justenoughprofessions/RenderHelper.java @@ -26,7 +26,7 @@ public static void renderEntity(GuiGraphics guiGraphics, int x, int y, double sc livingEntity.yHeadRot = livingEntity.getYRot(); livingEntity.yHeadRotO = livingEntity.getYRot(); - poseStack.translate(0.0F, livingEntity.getMyRidingOffset(), 0.0F); + poseStack.translate(0.0F, livingEntity.getMyRidingOffset(livingEntity), 0.0F); EntityRenderDispatcher entityRenderDispatcher = Minecraft.getInstance().getEntityRenderDispatcher(); entityRenderDispatcher.overrideCameraOrientation(new Quaternionf(0.0F, 0.0F, 0.0F, 1.0F)); entityRenderDispatcher.setRenderShadow(false); diff --git a/common/src/main/java/com/mrbysco/justenoughprofessions/jei/ProfessionCategory.java b/common/src/main/java/com/mrbysco/justenoughprofessions/jei/ProfessionCategory.java index 7d07a29..e542c5f 100644 --- a/common/src/main/java/com/mrbysco/justenoughprofessions/jei/ProfessionCategory.java +++ b/common/src/main/java/com/mrbysco/justenoughprofessions/jei/ProfessionCategory.java @@ -65,7 +65,7 @@ public void draw(ProfessionWrapper professionWrapper, IRecipeSlotsView recipeSlo this.slotDrawable.draw(guiGraphics, 75, 22); // Draw entity - professionWrapper.drawInfo(getBackground().getWidth(), getBackground().getHeight(), guiGraphics, mouseX, mouseY); + professionWrapper.drawInfo(professionWrapper, getBackground().getWidth(), getBackground().getHeight(), guiGraphics, mouseX, mouseY); // Draw entity name PoseStack poseStack = guiGraphics.pose(); poseStack.pushPose(); diff --git a/common/src/main/java/com/mrbysco/justenoughprofessions/jei/ProfessionWrapper.java b/common/src/main/java/com/mrbysco/justenoughprofessions/jei/ProfessionWrapper.java index 13b5923..cc98a9d 100644 --- a/common/src/main/java/com/mrbysco/justenoughprofessions/jei/ProfessionWrapper.java +++ b/common/src/main/java/com/mrbysco/justenoughprofessions/jei/ProfessionWrapper.java @@ -1,6 +1,5 @@ package com.mrbysco.justenoughprofessions.jei; -import com.mojang.blaze3d.vertex.PoseStack; import com.mrbysco.justenoughprofessions.RenderHelper; import com.mrbysco.justenoughprofessions.platform.Services; import mezz.jei.api.recipe.category.extensions.IRecipeCategoryExtension; @@ -11,7 +10,7 @@ import java.util.List; -public record ProfessionWrapper(ProfessionEntry entry) implements IRecipeCategoryExtension { +public record ProfessionWrapper(ProfessionEntry entry) implements IRecipeCategoryExtension { public ResourceLocation getProfessionName() { return Services.PLATFORM.getProfessionKey(entry.profession()); @@ -22,7 +21,7 @@ public List getBlockStacks() { } @Override - public void drawInfo(int recipeWidth, int recipeHeight, GuiGraphics guiGraphics, double mouseX, double mouseY) { + public void drawInfo(ProfessionWrapper recipe, int recipeWidth, int recipeHeight, GuiGraphics guiGraphics, double mouseX, double mouseY) { Villager entityVillager = entry.getVillagerEntity(); if (entityVillager != null) { RenderHelper.renderEntity(guiGraphics, 22, 62, 25.0F, diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta index e6bad27..a859d5c 100644 --- a/common/src/main/resources/pack.mcmeta +++ b/common/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "${mod_name} resources", - "pack_format": 15 + "pack_format": 18 } } \ No newline at end of file diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index c92fba0..ab8cba7 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -26,9 +26,9 @@ "depends": { "fabricloader": ">=0.14", "fabric": "*", - "minecraft": ">=1.20.1", + "minecraft": "~1.20.2", "java": ">=17", - "jei": ">=15.0.0.12" + "jei": ">=16.0.0.28" } } \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index d08faee..83fe8be 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[47,)" +loaderVersion="[48,)" issueTrackerURL="https://github.com/Mrbysco/JustEnoughProfessions/issues" license="MIT" @@ -16,18 +16,18 @@ Adds info about professions to JEI [[dependencies.justenoughprofessions]] modId="jei" mandatory=true -versionRange="[15.0.0.12,)" +versionRange="[16.0.0.28,)" ordering="NONE" side="BOTH" [[dependencies.justenoughprofessions]] modId="forge" mandatory=true -versionRange="[47.0.1,)" +versionRange="[48.0.1,)" ordering="NONE" side="BOTH" [[dependencies.justenoughprofessions]] modId="minecraft" mandatory=true -versionRange="[1.20.1,1.21)" +versionRange="[1.20.2,1.21)" ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d62a8e2..b54b37f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,15 @@ # Project -version=3.0.1 +version=3.1.0 group=com.mrbysco.justenoughprofessions # Common -minecraft_version=1.20.1 +minecraft_version=1.20.2 # Forge -forge_version=47.1.3 +forge_version=48.0.1 # Fabric -fabric_version=0.87.0+1.20.1 +fabric_version=0.89.2+1.20.2 fabric_loader_version=0.14.22 # Mod options @@ -26,4 +26,4 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Dependencies -jei_version=15.2.0.23 \ No newline at end of file +jei_version=16.0.0.28 \ No newline at end of file