Skip to content

Commit

Permalink
Re-enable Curios and update Patchouli
Browse files Browse the repository at this point in the history
  • Loading branch information
Mrbysco committed Sep 1, 2024
1 parent 7c5d4c3 commit 63e5f77
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 62 deletions.
19 changes: 13 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'net.neoforged.gradle.userdev' version '7.0.161'
id 'net.neoforged.gradle.userdev' version '7.0.162'
id 'net.darkhax.curseforgegradle' version '1.1.24'
id 'com.modrinth.minotaur' version "2.+"
}
Expand Down Expand Up @@ -75,6 +75,10 @@ repositories {
maven {
url = "https://maven.shedaniel.me/"
}
maven {
name = "OctoStudios"
url = uri("https://maven.octo-studios.com/releases")
}
exclusiveContent {
forRepository {
maven {
Expand Down Expand Up @@ -104,11 +108,14 @@ dependencies {

// implementation "com.blamejared.crafttweaker:CraftTweaker-neoforge-${mc_version}:${crafttweaker_version}"

// implementation "top.theillusivec4.curios:curios-neoforge:${curios_version}+${mc_version}"
compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api"
localRuntime "top.theillusivec4.curios:curios-neoforge:${curios_version}"

compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
localRuntime "vazkii.patchouli:Patchouli:${patchouli_version}"

compileOnly "xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}"
localRuntime "xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}"

compileOnly "curse.maven:jade-324717:5639932" //Jade (WAILA)
localRuntime "curse.maven:jade-324717:5639932" //Jade (WAILA)
Expand Down Expand Up @@ -167,7 +174,7 @@ if (System.getenv().CURSEFORGE_KEY) {
mainFile.changelog = file("$project.rootDir/changelog.md")
mainFile.changelogType = 'markdown'

mainFile.addOptional("jade", "roughly-enough-items", "jei"/*"curios", "the-cactus-mod", "patchouli"*/)
mainFile.addOptional("jade", "roughly-enough-items", "jei", "curios-continuation", "the-cactus-mod", "patchouli")
}
}

Expand All @@ -184,12 +191,12 @@ if (System.getenv().MODRINTH_KEY) {
loaders = ["neoforge"]

dependencies {
// optional.project "curios"
// optional.project "the-cactus-mod"
optional.project "curios-continuation"
optional.project "the-cactus-mod"
optional.project "jade"
optional.project "rei"
optional.project "jei"
// optional.project "patchouli"
optional.project "patchouli"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.debug=false

# Base info
mc_version=1.21.1
neo_version=21.1.31
neo_version=21.1.34
neogradle.subsystems.parchment.minecraftVersion=1.21
neogradle.subsystems.parchment.mappingsVersion=2024.07.28
neogradle.subsystems.conventions.runs.create-default-run-per-type=false
Expand All @@ -24,11 +24,11 @@ version=0.4.9

# Dependencies
jei_minecraft=1.21.1
jei_version=19.8.5.118
jei_version=19.14.1.144
#crafttweaker_version=20.0.19
rei_version=16.0.754
architectury_version=13.0.6
cloth_config_version=14.0.130
#curios_version=7.3.4
patchouli_version=1.21-87-NEOFORGE-SNAPSHOT
patchouli_provider_version=1.21-1.0.11-Snapshot.2
curios_version=9.0.7+1.21
patchouli_version=1.21-87-NEOFORGE
patchouli_provider_version=1.21.1-1.0.11-Snapshot.3
7 changes: 4 additions & 3 deletions src/main/java/com/shynieke/statues/client/ClientHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import net.minecraft.world.phys.Vec3;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.fml.ModList;
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent;
import net.neoforged.neoforge.client.event.EntityRenderersEvent;
Expand Down Expand Up @@ -171,9 +172,9 @@ private double getLocationToAngle(Vec3 location, Entity entityIn) {
Statues.LOGGER.info("Loaded {} translators.", TRANSLATORS.size());
}, "Statues Perks Data Loader").start();

// if (ModList.get().isLoaded("curios")) {
// com.shynieke.statues.compat.curios.client.StatueCurioRenderer.setupRenderer();
// }
if (ModList.get().isLoaded("curios")) {
com.shynieke.statues.compat.curios.client.StatueCurioRenderer.setupRenderer();
}
}

public static void onRegisterMenu(final RegisterMenuScreensEvent event) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
//package com.shynieke.statues.compat.curios.client;
//
//import com.mojang.blaze3d.vertex.PoseStack;
//import com.mojang.math.Axis;
//import com.shynieke.statues.items.StatueBlockItem;
//import net.minecraft.client.Minecraft;
//import net.minecraft.client.model.EntityModel;
//import net.minecraft.client.player.AbstractClientPlayer;
//import net.minecraft.client.renderer.MultiBufferSource;
//import net.minecraft.client.renderer.entity.RenderLayerParent;
//import net.minecraft.client.renderer.entity.player.PlayerRenderer;
//import net.minecraft.client.renderer.texture.OverlayTexture;
//import net.minecraft.core.registries.BuiltInRegistries;
//import net.minecraft.world.entity.LivingEntity;
//import net.minecraft.world.item.Item;
//import net.minecraft.world.item.ItemDisplayContext;
//import net.minecraft.world.item.ItemStack;
//import top.theillusivec4.curios.api.SlotContext;
//import top.theillusivec4.curios.api.client.CuriosRendererRegistry;
//import top.theillusivec4.curios.api.client.ICurioRenderer;
//
//public class StatueCurioRenderer implements ICurioRenderer {
// public static void setupRenderer() {
// for (Item item : BuiltInRegistries.ITEM.stream().toList()) {
// if (item instanceof StatueBlockItem) {
// CuriosRendererRegistry.register(item, StatueCurioRenderer::new);
// }
// }
// }
//
// @Override
// public <T extends LivingEntity, M extends EntityModel<T>> void render(ItemStack stack, SlotContext slotContext, PoseStack poseStack,
// RenderLayerParent<T, M> renderLayerParent, MultiBufferSource bufferSource,
// int light, float limbSwing, float limbSwingAmount, float partialTicks,
// float ageInTicks, float netHeadYaw, float headPitch) {
// poseStack.pushPose();
//
// Minecraft mc = Minecraft.getInstance();
// PlayerRenderer playerrenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().<AbstractClientPlayer>getRenderer(mc.player);
// playerrenderer.getModel().getHead().translateAndRotate(poseStack);
// poseStack.translate(0.0D, -0.25D, 0.0D);
// poseStack.mulPose(Axis.YP.rotationDegrees(180.0F));
// poseStack.scale(0.65F, -0.65F, -0.65F);
//
// mc.getItemRenderer().renderStatic(stack, ItemDisplayContext.HEAD, light, OverlayTexture.NO_OVERLAY, poseStack, bufferSource, mc.level, 0);
// poseStack.popPose();
// }
//}
package com.shynieke.statues.compat.curios.client;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
import com.shynieke.statues.items.StatueBlockItem;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.EntityModel;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.entity.RenderLayerParent;
import net.minecraft.client.renderer.entity.player.PlayerRenderer;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import top.theillusivec4.curios.api.SlotContext;
import top.theillusivec4.curios.api.client.CuriosRendererRegistry;
import top.theillusivec4.curios.api.client.ICurioRenderer;

public class StatueCurioRenderer implements ICurioRenderer {
public static void setupRenderer() {
for (Item item : BuiltInRegistries.ITEM.stream().toList()) {
if (item instanceof StatueBlockItem) {
CuriosRendererRegistry.register(item, StatueCurioRenderer::new);
}
}
}

@Override
public <T extends LivingEntity, M extends EntityModel<T>> void render(ItemStack stack, SlotContext slotContext, PoseStack poseStack,
RenderLayerParent<T, M> renderLayerParent, MultiBufferSource bufferSource,
int light, float limbSwing, float limbSwingAmount, float partialTicks,
float ageInTicks, float netHeadYaw, float headPitch) {
poseStack.pushPose();

Minecraft mc = Minecraft.getInstance();
PlayerRenderer playerrenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().<AbstractClientPlayer>getRenderer(mc.player);
playerrenderer.getModel().getHead().translateAndRotate(poseStack);
poseStack.translate(0.0D, -0.25D, 0.0D);
poseStack.mulPose(Axis.YP.rotationDegrees(180.0F));
poseStack.scale(0.65F, -0.65F, -0.65F);

mc.getItemRenderer().renderStatic(stack, ItemDisplayContext.HEAD, light, OverlayTexture.NO_OVERLAY, poseStack, bufferSource, mc.level, 0);
poseStack.popPose();
}
}

0 comments on commit 63e5f77

Please sign in to comment.