Skip to content

render traveller accessories from Baubles slots when Tinker tab is disabled #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dream-Master merged 2 commits into from
Jun 7, 2026
+65 −39
Merged

render traveller accessories from Baubles slots when Tinker tab is disabled #291

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c99d9fa
render traveller accessories from Baubles slots when Tinker tab is di…
Eldrinn-Elantey May 30, 2026
a82100b
Merge branch 'master' into fix/render-traveller-accessories-baubles
Ethryan Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 65 additions & 39 deletions src/main/java/tconstruct/armor/ArmorProxyClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,50 +341,76 @@ void renderArmorExtras(RenderPlayerEvent.SetArmorModel event) {
float limbSwing = player.prevLimbSwingAmount
+ (player.limbSwingAmount - player.prevLimbSwingAmount) * partialTick;
float limbSwingMod = player.limbSwing - player.limbSwingAmount * (1.0F - partialTick);
// TPlayerStats stats = TPlayerStats.get(player);
ArmorExtended armor = ArmorProxyClient.armorExtended; // TODO: Do this for every player, not just the client
if (armor != null && armor.inventory[1] != null) {
if (getTranslucencyLevel(armor.inventory[1]) != 2
&& !(player.isInvisible() && getTranslucencyLevel(armor.inventory[1]) > 0)) {
Item item = armor.inventory[1].getItem();
ModelBiped model = item.getArmorModel(player, armor.inventory[1], 4);

if (item instanceof IAccessoryModel) {
this.mc.getTextureManager()
.bindTexture(((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1));
model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick);
model.render(
player,
limbSwingMod,
limbSwing,
pitch,
yawRotation - yawOffset,
bodyRotation,
zeropointsixtwofive);
if (PHConstruct.enableTinkerInventoryTab) {
ArmorExtended armor = ArmorProxyClient.armorExtended;
if (armor != null && armor.inventory[1] != null) {
if (getTranslucencyLevel(armor.inventory[1]) != 2
&& !(player.isInvisible() && getTranslucencyLevel(armor.inventory[1]) > 0)) {
Item item = armor.inventory[1].getItem();
ModelBiped model = item.getArmorModel(player, armor.inventory[1], 4);

if (item instanceof IAccessoryModel) {
this.mc.getTextureManager()
.bindTexture(((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1));
model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick);
model.render(
player,
limbSwingMod,
limbSwing,
pitch,
yawRotation - yawOffset,
bodyRotation,
zeropointsixtwofive);
}
}
}
}

if (armor != null && armor.inventory[3] != null) {
if (getTranslucencyLevel(armor.inventory[3]) != 2
&& !(player.isInvisible() && getTranslucencyLevel(armor.inventory[3]) > 0)) {
Item item = armor.inventory[3].getItem();
ModelBiped model = item.getArmorModel(player, armor.inventory[3], 5);

if (item instanceof IAccessoryModel) {
this.mc.getTextureManager()
.bindTexture(((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1));
model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick);
model.render(
player,
limbSwingMod,
limbSwing,
pitch,
yawRotation - yawOffset,
bodyRotation,
zeropointsixtwofive);
if (armor != null && armor.inventory[3] != null) {
if (getTranslucencyLevel(armor.inventory[3]) != 2
&& !(player.isInvisible() && getTranslucencyLevel(armor.inventory[3]) > 0)) {
Item item = armor.inventory[3].getItem();
ModelBiped model = item.getArmorModel(player, armor.inventory[3], 5);

if (item instanceof IAccessoryModel) {
this.mc.getTextureManager()
.bindTexture(((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1));
model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick);
model.render(
player,
limbSwingMod,
limbSwing,
pitch,
yawRotation - yawOffset,
bodyRotation,
zeropointsixtwofive);
}
}
}
} else {
ItemStack[] baubles = tconstruct.compat.BaublesHelper.getBaubleStacks(player);
if (baubles == null) return;

for (int i = 0; i < baubles.length; i++) {
ItemStack stack = baubles[i];
if (stack == null) continue;
Item item = stack.getItem();
if (!(item instanceof IAccessoryModel)) continue;
if (getTranslucencyLevel(stack) == 2) continue;
if (player.isInvisible() && getTranslucencyLevel(stack) > 0) continue;

ModelBiped model = item.getArmorModel(player, stack, i);
if (model == null) continue;
this.mc.getTextureManager().bindTexture(((IAccessoryModel) item).getWearbleTexture(player, stack, i));
model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick);
model.render(
player,
limbSwingMod,
limbSwing,
pitch,
yawRotation - yawOffset,
bodyRotation,
zeropointsixtwofive);
}
}
}

Expand Down