Skip to content

Commit 3003993

Browse files
authored
Fix toolbelt copper credit bug (GregTechCEu#2892)
1 parent 927d17a commit 3003993

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,14 @@ public boolean shouldCauseReequipAnimation(@NotNull ItemStack oldStack, @NotNull
264264
return false;
265265
}
266266

267+
@Override
268+
public int getMetadata(ItemStack stack) {
269+
ItemStack selected = getHandler(stack).getSelectedStack();
270+
if (!selected.isEmpty()) {
271+
return selected.getItem().getMetadata(selected);
272+
} else return super.getMetadata(stack);
273+
}
274+
267275
@Override
268276
public boolean isDamaged(@NotNull ItemStack stack) {
269277
ItemStack selected = getHandler(stack).getSelectedStack();

src/main/java/gregtech/common/items/ToolItems.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import gregtech.core.sound.GTSoundEvents;
1010

1111
import net.minecraft.client.Minecraft;
12+
import net.minecraft.client.renderer.block.model.ModelBakery;
1213
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
1314
import net.minecraft.enchantment.EnumEnchantmentType;
1415
import net.minecraft.entity.monster.EntityGolem;
@@ -374,7 +375,14 @@ public static IGTTool register(@NotNull IGTTool tool) {
374375
}
375376

376377
public static void registerModels() {
377-
TOOLS.forEach(tool -> ModelLoader.setCustomModelResourceLocation(tool.get(), 0, tool.getModelLocation()));
378+
for (IGTTool tool : TOOLS) {
379+
if (tool == TOOLBELT) {
380+
ModelLoader.setCustomMeshDefinition(tool.get(), s -> tool.getModelLocation());
381+
ModelBakery.registerItemVariants(tool.get(), tool.getModelLocation());
382+
} else {
383+
ModelLoader.setCustomModelResourceLocation(tool.get(), 0, tool.getModelLocation());
384+
}
385+
}
378386
}
379387

380388
@SideOnly(Side.CLIENT)

0 commit comments

Comments
 (0)