Skip to content

Commit 6c35804

Browse files
committed
Some fixes
1 parent df23534 commit 6c35804

File tree

5 files changed

+18
-26
lines changed

5 files changed

+18
-26
lines changed
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
if (${input$entity}.getCapability(ForgeCapabilities.ITEM_HANDLER, null) instanceof IItemHandler _modHandlerIter) {
2-
for(int _idx = 0; _idx < _modHandlerIter.getSlots(); _idx++) {
3-
ItemStack itemstackiterator = _modHandlerIter.getStackInSlot(_idx).copy();
4-
${statement$foreach}
1+
{
2+
AtomicReference<IItemHandler> _iitemhandlerref = new AtomicReference<>();
3+
${input$entity}.getCapability(ForgeCapabilities.ITEM_HANDLER, null).ifPresent(_iitemhandlerref::set);
4+
if (_iitemhandlerref.get() != null) {
5+
for(int _idx = 0; _idx < _iitemhandlerref.get().getSlots(); _idx++) {
6+
ItemStack itemstackiterator = _iitemhandlerref.get().getStackInSlot(_idx).copy();
7+
${statement$foreach}
8+
}
59
}
610
}

src/main/resources/forge-1.19.4/procedures/spawn_entity_with_rotation.java.ftl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
if (world instanceof ServerLevel _level) {
44
Entity entityToSpawn = new ${generator.map(field$entity, "entities", 0)}(${entity}, _level);
55
entityToSpawn.moveTo(${input$x}, ${input$y}, ${input$z}, ${opt.toFloat(input$yaw)}, ${opt.toFloat(input$pitch)});
6-
entityToSpawn.setYBodyRot(${opt.toFloat(input$yaw)});
7-
entityToSpawn.setYHeadRot(${opt.toFloat(input$yaw)});
6+
<#if input$yaw != "/*@int*/0">
7+
entityToSpawn.setYBodyRot(${opt.toFloat(input$yaw)});
8+
entityToSpawn.setYHeadRot(${opt.toFloat(input$yaw)});
9+
</#if>
810

911
if (entityToSpawn instanceof Mob _mobToSpawn)
1012
_mobToSpawn.finalizeSpawn(_level, _level.getCurrentDifficultyAt(entityToSpawn.blockPosition()), MobSpawnType.MOB_SUMMONED, null, null);

src/main/resources/forge-1.19.4/procedures/spawn_entity_with_rotation_velocity.java.ftl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
if (world instanceof ServerLevel _level) {
44
Entity entityToSpawn = new ${generator.map(field$entity, "entities", 0)}(${entity}, _level);
55
entityToSpawn.moveTo(${input$x}, ${input$y}, ${input$z}, ${opt.toFloat(input$yaw)}, ${opt.toFloat(input$pitch)});
6-
entityToSpawn.setYBodyRot(${opt.toFloat(input$yaw)});
7-
entityToSpawn.setYHeadRot(${opt.toFloat(input$yaw)});
6+
<#if input$yaw != "/*@int*/0">
7+
entityToSpawn.setYBodyRot(${opt.toFloat(input$yaw)});
8+
entityToSpawn.setYHeadRot(${opt.toFloat(input$yaw)});
9+
</#if>
10+
811
entityToSpawn.setDeltaMovement(${input$vx}, ${input$vy}, ${input$vz});
912

1013
if (entityToSpawn instanceof Mob _mobToSpawn)

src/main/resources/forge-1.19.4/templates/json/block_cmodel_obj.json.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"parent": "forge:item/default",
33
"loader": "forge:composite",
4-
"render_type": "${data.getRenderType()}",
54
"children": {
65
"part1": {
76
"loader": "forge:obj",
7+
"render_type": "${data.getRenderType()}",
88
"model": "${modid}:models/item/${data.customModelName.split(":")[0]}.obj",
99
"emissive_ambient": true
1010
<#if data.getTextureMap()??>,

src/main/resources/forge-1.19.4/triggers/entity_switch_hand.java.ftl

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)