diff --git a/CHANGELOG b/CHANGELOG index e7f3100..0144206 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,4 +11,8 @@ - for all i care this shit looks stable to me ## 1.18.2-1.1.0-stable -- ported gamer bow to 1.18.2 \ No newline at end of file +- ported gamer bow to 1.18.2 + +## 1.18.2-1.1.0-stable +- fixed weem stacking to 85 (maybe) +- nerfed high effect \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4819711..6156ec5 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx6G loader_version=0.13.2 # Mod Properties - mod_version = 1.18.2-1.1.0-stable + mod_version = 1.18.2-1.1.1-unstable maven_group = ryantlg.GamerItems.mod archives_base_name = GamerItems diff --git a/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java b/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java index b44d3c3..22ff0f5 100755 --- a/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java +++ b/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java @@ -34,7 +34,7 @@ public class weemItems { .statusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 20*7), 1f) .statusEffect(new StatusEffectInstance(GamerEffects.HIGH, 20*8), 1f) .build() - )); + ).maxCount(64)); public static final Item WEEM_APPLE = new WeemItem(new FabricItemSettings().group(gameritems.CHING) .food( diff --git a/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java b/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java index 6fe7b96..304359a 100644 --- a/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java +++ b/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java @@ -11,12 +11,12 @@ public class GamerEffects { public static final StatusEffect HIGH = new highStatusEffect(); - public static final StatusEffect JEREMYD = new jeremydStatusEffect(); + //public static final StatusEffect JEREMYD = new jeremydStatusEffect(); public static void register() { Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "high"), HIGH); - Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD); + //Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD); gameritems.LOGGER.info("statusEffects Loaded"); } diff --git a/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java b/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java index 118a6ed..301e9d4 100644 --- a/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java +++ b/src/main/java/net/arcmods/ryantlg/statusEffects/effectClasses/highStatusEffect.java @@ -1,7 +1,7 @@ package net.arcmods.ryantlg.statusEffects.effectClasses; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.damage.DamageSource; +//import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectCategory; import net.minecraft.entity.player.PlayerEntity; @@ -22,13 +22,9 @@ public class highStatusEffect extends StatusEffect{ @Override public void applyUpdateEffect(LivingEntity entity, int amplifier) { if (entity instanceof PlayerEntity) { - ((PlayerEntity) entity).addExperience(0 << amplifier); ((PlayerEntity) entity).getFallSounds(); ((PlayerEntity) entity).disableShield(true); ((PlayerEntity) entity).dismountVehicle(); - ((PlayerEntity) entity).damage(DamageSource.FALL, (float) 0.01); - ((PlayerEntity) entity).heal(3 << amplifier); - ((PlayerEntity) entity).getFallSounds(); } }