Update to 1.20.2 [build] [publish]

Mrbysco · Sep 25, 2023 · 90585d5 · 90585d5
1 parent f96b0a1
commit 90585d5
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 19 deletions.
diff --git 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
@@ -1 +1 @@
-* Initial update to 1.20
+* Initial update to 1.20.2
diff --git 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
@@ -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
@@ -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<ProfessionWrapper> {
 
 	public ResourceLocation getProfessionName() {
 		return Services.PLATFORM.getProfessionKey(entry.profession());
@@ -22,7 +21,7 @@ public List<ItemStack> 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
@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "${mod_name} resources",
-        "pack_format": 15
+        "pack_format": 18
     }
 }
diff --git 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"
   }
 }
 
diff --git 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"
diff --git 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
+jei_version=16.0.0.28