From 352ed65dc4d2e0dd057703babc2ae2be1bd0c97a Mon Sep 17 00:00:00 2001 From: "yrsegal@gmail.com" Date: Fri, 8 Apr 2022 17:52:03 -0400 Subject: [PATCH] amethyst shards are halved not reduced --- .../amethyst_cluster_shard_reducer.json | 4 ++-- .../lootmods/AmethystShardReducerModifier.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/generated/resources/data/hexcasting/loot_modifiers/amethyst_cluster_shard_reducer.json b/src/generated/resources/data/hexcasting/loot_modifiers/amethyst_cluster_shard_reducer.json index da75df59..393debae 100644 --- a/src/generated/resources/data/hexcasting/loot_modifiers/amethyst_cluster_shard_reducer.json +++ b/src/generated/resources/data/hexcasting/loot_modifiers/amethyst_cluster_shard_reducer.json @@ -18,6 +18,6 @@ } } ], - "delta": -2, + "delta": 0.5, "type": "hexcasting:amethyst_shard_reducer" -} \ No newline at end of file +} diff --git a/src/main/java/at/petrak/hexcasting/datagen/lootmods/AmethystShardReducerModifier.java b/src/main/java/at/petrak/hexcasting/datagen/lootmods/AmethystShardReducerModifier.java index e676b540..c45c89b5 100644 --- a/src/main/java/at/petrak/hexcasting/datagen/lootmods/AmethystShardReducerModifier.java +++ b/src/main/java/at/petrak/hexcasting/datagen/lootmods/AmethystShardReducerModifier.java @@ -14,11 +14,11 @@ import org.jetbrains.annotations.NotNull; import java.util.List; public class AmethystShardReducerModifier extends LootModifier { - private final int delta; + private final double modifier; - public AmethystShardReducerModifier(int delta, LootItemCondition[] conditions) { + public AmethystShardReducerModifier(double modifier, LootItemCondition[] conditions) { super(conditions); - this.delta = delta; + this.modifier = modifier; } @NotNull @@ -26,7 +26,7 @@ public class AmethystShardReducerModifier extends LootModifier { protected List doApply(List generatedLoot, LootContext context) { for (var stack : generatedLoot) { if (stack.is(Items.AMETHYST_SHARD)) { - stack.grow(this.delta); + stack.shrink((int) (stack.getCount() * modifier)); } } return generatedLoot; @@ -36,14 +36,14 @@ public class AmethystShardReducerModifier extends LootModifier { @Override public AmethystShardReducerModifier read(ResourceLocation location, JsonObject json, LootItemCondition[] conditions) { - var delta = GsonHelper.getAsInt(json, "delta"); - return new AmethystShardReducerModifier(delta, conditions); + var modifier = GsonHelper.getAsDouble(json, "modifier"); + return new AmethystShardReducerModifier(modifier, conditions); } @Override public JsonObject write(AmethystShardReducerModifier instance) { var obj = this.makeConditions(instance.conditions); - obj.addProperty("delta", instance.delta); + obj.addProperty("modifier", instance.modifier); return obj; } }