Skip to content

Commit aaec202

Browse files
committed
Some fixes
1 parent 4fa014f commit aaec202

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,2 @@
11
<#include "mcitems.ftl">
2-
<#if field$item_type == "Sword">
3-
(${mappedMCItemToItemStackCode(input$item)}.is(ItemTags.SWORDS))
4-
<#elseif field$item_type == "Pickaxe">
5-
(${mappedMCItemToItemStackCode(input$item)}.is(ItemTags.PICKAXES))
6-
<#else>
7-
(${mappedMCItemToItem(input$item)} instanceof ${generator.map(field$item_type, "itemtypes")}Item)
8-
</#if>
2+
(${mappedMCItemToItem(input$item)} instanceof ${generator.map(field$item_type, "itemtypes")}Item)

src/main/resources/forge-1.19.2/templates/item/item_renderer.java.ftl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ package ${package}.client.renderer.item;
7373
<#list data.getModels() as model>
7474
<#if model.hasCustomJAVAModel()>
7575
if (<#list model.stateMap.entrySet() as entry>
76-
ItemProperties.getProperty(itemstack, new ResourceLocation("${generator.map(entry.getKey().getPrefixedName(registryname + "_"), "itemproperties")}"))
76+
ItemProperties.getProperty(itemstack.getItem(), new ResourceLocation("${generator.map(entry.getKey().getPrefixedName(registryname + "_"), "itemproperties")}"))
7777
.call(itemstack, Minecraft.getInstance().level, Minecraft.getInstance().player, 0) >= ${entry.getValue()?is_boolean?then(entry.getValue()?then("1", "0"), entry.getValue())}
7878
<#sep> && </#list>) {
7979
model = models.get(${model?index + 1});
@@ -86,7 +86,7 @@ package ${package}.client.renderer.item;
8686
poseStack.pushPose();
8787
Minecraft.getInstance().getItemRenderer().getModel(this.transformSource, null, null, 0).applyTransform(displayContext, poseStack, isLeftHand(displayContext));
8888
poseStack.translate(0.5, isInventory(displayContext) ? 1.5 : 2, 0.5);
89-
poseStack.mulPose(Axis.ZP.rotationDegrees(180.0F));
89+
poseStack.mulPose(Vector3f.ZP.rotationDegrees(180.0F));
9090
poseStack.scale(1, 1, displayContext == ItemTransforms.TransformType.GUI ? -1 : 1);
9191
VertexConsumer vertexConsumer = ItemRenderer.getFoilBufferDirect(bufferSource, model.renderType(texture), false, itemstack.hasFoil());
9292
<#if data.hasCustomJAVAModel() && data.animations?has_content>

src/main/resources/forge-1.19.2/tool.definition.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ templates:
2525
name: "@MODASSETSROOT/models/item/@registryname_0.json"
2626

2727
tags:
28-
- tag: ITEMS:minecraft:pickaxes
28+
- tag: ITEMS:forge:tools/pickaxes
2929
condition_any:
3030
- "toolType %= Pickaxe"
3131
- "toolType %= Special"
3232
- "toolType %= MultiTool"
33-
- tag: ITEMS:minecraft:axes
33+
- tag: ITEMS:forge:tools/axes
3434
condition_any:
3535
- "toolType %= Axe"
3636
- "toolType %= MultiTool"
37-
- tag: ITEMS:minecraft:swords
37+
- tag: ITEMS:forge:tools/swords
3838
condition_any:
3939
- "toolType %= Sword"
4040
- "toolType %= MultiTool"
41-
- tag: ITEMS:minecraft:shovels
41+
- tag: ITEMS:forge:tools/shovels
4242
condition: "toolType %= Spade"
43-
- tag: ITEMS:minecraft:hoes
43+
- tag: ITEMS:forge:tools/hoes
4444
condition: "toolType %= Hoe"
4545

4646
localizationkeys:

0 commit comments

Comments
 (0)