Skip to content

Commit dc4bb19

Browse files
committed
remove lead eating mechanic
1 parent fc35c1d commit dc4bb19

File tree

7 files changed

+3
-38
lines changed

7 files changed

+3
-38
lines changed

src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-09-17T12:51:06.9601625 Oreganized Item Tags
1+
// 1.20.1 2024-09-20T10:43:10.6795167 Oreganized Item Tags
22
3a2cbf8d34e9bde2e22d59d4437fa80361d53291 data/farmersdelight/tags/items/tools/knives.json
33
d8d286ea76e30a635512bc93d68815770003ff41 data/forge/tags/items/buckets/molten_lead.json
44
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/items/glass.json
@@ -48,7 +48,6 @@ a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/items/walls.json
4848
f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/items/crystal_glass_panes.json
4949
bf2ad799074f5c44acee490bdf3d3ae81d56997b data/oreganized/tags/items/gargoyle_snack.json
5050
4d89056c908550931c1f2008f9817f5d3ff7aa68 data/oreganized/tags/items/has_kinetic_damage.json
51-
f7810c755845dc955112f7b0cedf68260ad693cc data/oreganized/tags/items/lead_source.json
5251
376b7c9ff449a4b98cb7b1f65b47d658c4e39428 data/oreganized/tags/items/lighter_than_lead.json
5352
3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/items/stone_types/glance.json
5453
3d43625006347afbc2d100972433d9af9db7ac3e data/shieldexp/tags/items/shields.json

src/generated/resources/data/oreganized/advancements/story/profound_brain_damage.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"effects": {
77
"oreganized:stunning": {
88
"amplifier": {
9-
"max": 4
9+
"max": 6
1010
}
1111
}
1212
}

src/generated/resources/data/oreganized/tags/items/lead_source.json

-9
This file was deleted.

src/main/java/galena/oreganized/data/OAdvancements.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package galena.oreganized.data;
22

33
import galena.oreganized.Oreganized;
4-
import galena.oreganized.content.effect.StunningEffect;
54
import galena.oreganized.data.provider.OLangProvider;
65
import galena.oreganized.index.OBlocks;
76
import galena.oreganized.index.OCriteriaTriggers;
@@ -72,7 +71,7 @@ public void generate(@Nullable HolderLookup.Provider provider, Consumer<Advancem
7271
.display(info(OItems.MOLTEN_LEAD_BUCKET.get(), "profound_brain_damage", FrameType.TASK,
7372
"Profound Brain Damage", "Let your health reach half a heart while having the Brain Damage effect"))
7473
.addCriterion("stunned", EffectsChangedTrigger.TriggerInstance.hasEffects(MobEffectsPredicate.effects()
75-
.and(OEffects.STUNNING.get(), new MobEffectsPredicate.MobEffectInstancePredicate(MinMaxBounds.Ints.atMost(StunningEffect.MAX_AMPLIFIER / 2), MinMaxBounds.Ints.ANY, null, null))))
74+
.and(OEffects.STUNNING.get(), new MobEffectsPredicate.MobEffectInstancePredicate(MinMaxBounds.Ints.atMost(6), MinMaxBounds.Ints.ANY, null, null))))
7675
.save(consumer, "oreganized:story/profound_brain_damage");
7776

7877
var obtainSilver = Advancement.Builder.advancement()

src/main/java/galena/oreganized/data/OItemTags.java

-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ public String getName() {
3535
@Override
3636
protected void addTags(HolderLookup.Provider provider) {
3737
// Oreganized
38-
tag(LEAD_SOURCE).addTags(INGOTS_LEAD, NUGGETS_LEAD, ORES_LEAD).add(
39-
OItems.BUSH_HAMMER.get(), OItems.MOLTEN_LEAD_BUCKET.get()
40-
);
4138
copy(OTags.Blocks.CRYSTAL_GLASS, CRYSTAL_GLASS);
4239
copy(OTags.Blocks.CRYSTAL_GLASS_PANES, CRYSTAL_GLASS_PANES);
4340
tag(LIGHTER_THAN_LEAD).add(Items.IRON_BOOTS);

src/main/java/galena/oreganized/index/OTags.java

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public class OTags {
1818

1919
public static class Items {
2020

21-
public static final TagKey<Item> LEAD_SOURCE = tag("lead_source");
2221
public static final TagKey<Item> CRYSTAL_GLASS = tag("crystal_glass");
2322
public static final TagKey<Item> CRYSTAL_GLASS_PANES = tag("crystal_glass_panes");
2423
public static final TagKey<Item> LIGHTER_THAN_LEAD = tag("lighter_than_lead");

src/main/java/galena/oreganized/world/event/PlayerEvents.java

-20
Original file line numberDiff line numberDiff line change
@@ -109,26 +109,6 @@ public static void blockItemInteractions(final PlayerInteractEvent.RightClickBlo
109109
}
110110
}
111111

112-
@SubscribeEvent
113-
public static void finishUsingItem(final LivingEntityUseItemEvent.Finish event) {
114-
LivingEntity entity = event.getEntity();
115-
ItemStack itemStack = event.getItem();
116-
if (itemStack.isEdible()) {
117-
boolean leadPoisoning = entity.isInFluidType(OFluids.MOLTEN_LEAD_TYPE.get());
118-
if (entity instanceof Player player) {
119-
for (int i = 0; i < 9; i++) {
120-
if (player.getInventory().items.get(i).is(OTags.Items.LEAD_SOURCE))
121-
leadPoisoning = true;
122-
}
123-
}
124-
if ((entity.getOffhandItem().is(OTags.Items.LEAD_SOURCE) || leadPoisoning) && OreganizedConfig.COMMON.leadPoisining.get()) {
125-
if (OreganizedConfig.stunningFromConfig())
126-
entity.addEffect(new MobEffectInstance(OEffects.STUNNING.get(), 40 * 20));
127-
entity.addEffect(new MobEffectInstance(MobEffects.POISON, 200));
128-
}
129-
}
130-
}
131-
132112
@SubscribeEvent
133113
public static void tickPlayer(final TickEvent.PlayerTickEvent event) {
134114
if (event.phase == TickEvent.Phase.START) return;

0 commit comments

Comments
 (0)