Skip to content

Commit c9e187c

Browse files
committed
Fix
1 parent d3dba64 commit c9e187c

File tree

9 files changed

+12
-13
lines changed

9 files changed

+12
-13
lines changed

src/main/resources/neoforge-1.20.4/procedures/entity_add_modifier.java.ftl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
<#include "mcelements.ftl">
21
<#assign attr = generator.map(field$attribute, "attributes")>
32
if (${input$entity} instanceof LivingEntity _entity) {
4-
AttributeModifier modifier = new AttributeModifier(${toResourceLocation('"' + modid + ':' + field$name + '"')}, ${input$value}, AttributeModifier.Operation.${field$operation});
5-
if (!_entity.getAttribute(${attr}).hasModifier(modifier.id())) {
3+
AttributeModifier modifier = new AttributeModifier(${'"' + modid + ':' + field$name + '"'}, ${input$value}, AttributeModifier.Operation.${field$operation?replace("ADD_VALUE", "ADDITION")?replace("ADD_MULTIPLIED_BASE", "MULTIPLY_BASE")?replace("ADD_MULTIPLIED_TOTAL", "MULTIPLY_TOTAL")});
4+
if (_entity.getAttribute(${attr}).getModifiers().stream().noneMatch((e) -> e.name().equals(modifier.name()))) {
65
<#if field$permanent == "TRUE">
76
_entity.getAttribute(${attr}).addPermanentModifier(modifier);
87
<#else>
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
<#include "mcelements.ftl">
21
(${input$entity} instanceof LivingEntity _livingEntity${cbi} && _livingEntity${cbi}.getAttribute(${generator.map(field$attribute, "attributes")})
3-
.hasModifier(${toResourceLocation('"' + modid + ':' + field$name + '"')}))
2+
.getModifiers().stream().anyMatch((e) -> e.name().equals(${'"' + modid + ':' + field$name + '"'})))
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<#include "mcelements.ftl">
21
if (${input$entity} instanceof LivingEntity _entity) {
3-
_entity.getAttribute(${generator.map(field$attribute, "attributes")}).removeModifier(${toResourceLocation('"' + modid + ':' + field$name + '"')});
2+
_entity.getAttribute(${generator.map(field$attribute, "attributes")}).getModifiers().forEach((_attribute) -> {
3+
if(_attribute.name().equals(${'"' + modid + ':' + field$name + '"'})) _entity.getAttribute(${generator.map(field$attribute, "attributes")}).removeModifier(_attribute);
4+
});
45
}

src/main/resources/neoforge-1.20.4/templates/gui/gui_container.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public class ${name}Menu extends AbstractContainerMenu implements ${JavaModName}
306306

307307
<#if hasProcedure(data.onTick)>
308308
@SubscribeEvent public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
309-
Player entity = event.getEntity();
309+
Player entity = event.player;
310310
if(event.phase == TickEvent.Phase.END && entity.containerMenu instanceof ${name}Menu menu) {
311311
Level world = menu.world;
312312
double x = menu.x;

src/main/resources/neoforge-1.20.4/templates/gui/gui_msg_menustate.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ package ${package}.network;
6767
buffer.writeUtf((String) elementState);
6868
} else if (elementType == 1) {
6969
buffer.writeBoolean((boolean) elementState);
70-
} else if (message.elementType == 2 && message.elementState instanceof Number n) {
70+
} else if (elementType == 2 && elementState instanceof Number n) {
7171
buffer.writeDouble(n.doubleValue());
7272
}
7373
}

src/main/resources/neoforge-1.20.4/templates/gui/gui_msg_slider.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ package ${package}.network;
5555

5656
public static void handleData(final ${name}SliderMessage message, final PlayPayloadContext context) {
5757
if (context.flow() == PacketFlow.SERVERBOUND) {
58-
context.workHandler().submitAsync(() -> handleSliderAction(context.player(), message.sliderID, message.x, message.y, message.z, message.value)).exceptionally(e -> {
58+
context.workHandler().submitAsync(() -> handleSliderAction(context.player().get(), message.sliderID, message.x, message.y, message.z, message.value)).exceptionally(e -> {
5959
context.packetHandler().disconnect(Component.literal(e.getMessage()));
6060
return null;
6161
});

src/main/resources/neoforge-1.20.4/templates/gui/gui_window.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public class ${name}Screen extends AbstractContainerScreen<${name}Menu> implemen
343343
if (!menuStateUpdateActive)
344344
menu.sendMenuStateUpdate(entity, 2, "${component.getName()}", this.getValue(), false);
345345
<#if hasProcedure(component.whenSliderMoves)>
346-
PacketDistributor.SERVER.with().send(new ${name}SliderMessage(${slid}, x, y, z, this.getValue()));
346+
PacketDistributor.SERVER.noArg().send(new ${name}SliderMessage(${slid}, x, y, z, this.getValue()));
347347
${name}SliderMessage.handleSliderAction(entity, ${btid}, x, y, z, this.getValue());
348348
</#if>
349349
}

src/main/resources/neoforge-1.20.4/triggers/entity_change_equipment.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<#include "procedures.java.ftl">
2-
@EventBusSubscriber public class ${name}Procedure {
2+
@Mod.EventBusSubscriber public class ${name}Procedure {
33
@SubscribeEvent public static void whenEntityChangeEquipment(LivingEquipmentChangeEvent event) {
44
<#assign dependenciesCode>
55
<@procedureDependenciesCode dependencies, {

src/main/resources/neoforge-1.20.4/triggers/entity_switch_hand.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<#include "procedures.java.ftl">
2-
@EventBusSubscriber public class ${name}Procedure {
2+
@Mod.EventBusSubscriber public class ${name}Procedure {
33
@SubscribeEvent public static void whenEntitySwitchHand(LivingSwapItemsEvent.Hands event) {
44
<#assign dependenciesCode>
55
<@procedureDependenciesCode dependencies, {

0 commit comments

Comments
 (0)