Repo-Mirror/HibiscusCommons
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HibiscusCommons.git synced 2025-12-19 15:09:26 +00:00
Code Issues Releases Activity

feat: attribute modifiers now included in scale

Browse Source
This commit is contained in:
Logan
2025-08-27 10:52:13 -05:00
parent cd7ef3a85a
commit 06204eb7d9
7 changed files with 82 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/me/lojosho/hibiscuscommons/packets/wrapper/PlayerScaleWrapper.java
View File

@@ -8,9 +8,12 @@ public class PlayerScaleWrapper {
private final int entityId; private final int entityId;
@Getter @Getter
private final double scale; private final double scale;
@Getter
private final double base;
public PlayerScaleWrapper(int entityId, double scale) { public PlayerScaleWrapper(int entityId, double base, double scale) {
this.entityId = entityId; this.entityId = entityId;
this.scale = scale; this.scale = scale;
this.base = base;
} }
} }

14
v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPacketChannel.java
View File

@@ -13,6 +13,7 @@ import me.lojosho.hibiscuscommons.util.MessagesUtil;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.*; import net.minecraft.network.protocol.game.*;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.ClickType;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
@@ -183,7 +184,18 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
} }
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), nmsScaleAttribute.base());
final double base = nmsScaleAttribute.base();
double total = base;
for (AttributeModifier modifier : nmsScaleAttribute.modifiers()) {
switch (modifier.operation()) {
case ADD_VALUE -> total += modifier.amount();
case ADD_MULTIPLIED_BASE -> total += modifier.amount() * nmsScaleAttribute.base();
case ADD_MULTIPLIED_TOTAL -> total += modifier.amount() * total;
}
}
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), base, total);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper); PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper);

14
v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPacketChannel.java
View File

@@ -13,6 +13,7 @@ import me.lojosho.hibiscuscommons.util.MessagesUtil;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.*; import net.minecraft.network.protocol.game.*;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.ClickType;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
@@ -183,7 +184,18 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
} }
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), nmsScaleAttribute.base());
final double base = nmsScaleAttribute.base();
double total = base;
for (AttributeModifier modifier : nmsScaleAttribute.modifiers()) {
switch (modifier.operation()) {
case ADD_VALUE -> total += modifier.amount();
case ADD_MULTIPLIED_BASE -> total += modifier.amount() * nmsScaleAttribute.base();
case ADD_MULTIPLIED_TOTAL -> total += modifier.amount() * total;
}
}
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), base, total);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper); PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper);

14
v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPacketChannel.java
View File

@@ -13,6 +13,7 @@ import me.lojosho.hibiscuscommons.util.MessagesUtil;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.*; import net.minecraft.network.protocol.game.*;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.ClickType;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
@@ -183,7 +184,18 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
} }
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), nmsScaleAttribute.base());
final double base = nmsScaleAttribute.base();
double total = base;
for (AttributeModifier modifier : nmsScaleAttribute.modifiers()) {
switch (modifier.operation()) {
case ADD_VALUE -> total += modifier.amount();
case ADD_MULTIPLIED_BASE -> total += modifier.amount() * nmsScaleAttribute.base();
case ADD_MULTIPLIED_TOTAL -> total += modifier.amount() * total;
}
}
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), base, total);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper); PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper);

14
v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPacketChannel.java
View File

@@ -13,6 +13,7 @@ import me.lojosho.hibiscuscommons.util.MessagesUtil;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.*; import net.minecraft.network.protocol.game.*;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.ClickType;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
@@ -183,7 +184,18 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
} }
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), nmsScaleAttribute.base());
final double base = nmsScaleAttribute.base();
double total = base;
for (AttributeModifier modifier : nmsScaleAttribute.modifiers()) {
switch (modifier.operation()) {
case ADD_VALUE -> total += modifier.amount();
case ADD_MULTIPLIED_BASE -> total += modifier.amount() * nmsScaleAttribute.base();
case ADD_MULTIPLIED_TOTAL -> total += modifier.amount() * total;
}
}
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), base, total);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper); PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper);

14
v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPacketChannel.java
View File

@@ -12,6 +12,7 @@ import me.lojosho.hibiscuscommons.plugins.SubPlugins;
import me.lojosho.hibiscuscommons.util.MessagesUtil; import me.lojosho.hibiscuscommons.util.MessagesUtil;
import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.*; import net.minecraft.network.protocol.game.*;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.ClickType;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
@@ -182,7 +183,18 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
} }
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), nmsScaleAttribute.base());
final double base = nmsScaleAttribute.base();
double total = base;
for (AttributeModifier modifier : nmsScaleAttribute.modifiers()) {
switch (modifier.operation()) {
case ADD_VALUE -> total += modifier.amount();
case ADD_MULTIPLIED_BASE -> total += modifier.amount() * nmsScaleAttribute.base();
case ADD_MULTIPLIED_TOTAL -> total += modifier.amount() * total;
}
}
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), base, total);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper); PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper);

14
v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPacketChannel.java
View File

@@ -12,6 +12,7 @@ import me.lojosho.hibiscuscommons.plugins.SubPlugins;
import me.lojosho.hibiscuscommons.util.MessagesUtil; import me.lojosho.hibiscuscommons.util.MessagesUtil;
import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.*; import net.minecraft.network.protocol.game.*;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.ClickType;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
@@ -182,7 +183,18 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
} }
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), nmsScaleAttribute.base());
final double base = nmsScaleAttribute.base();
double total = base;
for (AttributeModifier modifier : nmsScaleAttribute.modifiers()) {
switch (modifier.operation()) {
case ADD_VALUE -> total += modifier.amount();
case ADD_MULTIPLIED_BASE -> total += modifier.amount() * nmsScaleAttribute.base();
case ADD_MULTIPLIED_TOTAL -> total += modifier.amount() * total;
}
}
PlayerScaleWrapper wrapper = new PlayerScaleWrapper(packet.getEntityId(), base, total);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper); PacketAction pluginAction = plugin.getPacketInterface().readPlayerScale(player, wrapper);