From 7b02c2733da115a122dfc865f3401a1264d0f107 Mon Sep 17 00:00:00 2001 From: RyanTLG <78032176+RyanTLG@users.noreply.github.com> Date: Sat, 7 May 2022 17:34:49 +0200 Subject: [PATCH] did stuff --- CHANGELOG | 6 +++++- gradle.properties | 2 +- .../net/arcmods/ryantlg/items/itemsByCrop/weemItems.java | 2 +- .../net/arcmods/ryantlg/statusEffects/GamerEffects.java | 6 +++--- .../statusEffects/effectClasses/highStatusEffect.java | 6 +----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5128e0c..db706a9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,4 +13,8 @@ - renamed strong bow to Gamer Bow - added textures for Gamer Bow - added crafting recipe for Gamer Bow -- fully implemented Gamer Bow \ No newline at end of file +- fully implemented Gamer Bow + +## 1.18.1-1.1.1-unstable +- fixed weem stacking to 85 (maybe) +- nerfed high effect \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c03d2aa..3509faa 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx4G loader_version=0.12.12 # Mod Properties - mod_version = 1.18.1-1.1.0-stable + mod_version = 1.18.1-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..22698de 100755 --- a/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java +++ b/src/main/java/net/arcmods/ryantlg/items/itemsByCrop/weemItems.java @@ -18,7 +18,7 @@ public class weemItems { //main items //================================================================================================================ - public static final Item WEEM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(128)); + public static final Item WEEM = new Item(new Item.Settings().group(gameritems.CHING).maxCount(64)); // foods //================================================================================================================ diff --git a/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java b/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java index 6fe7b96..bb6e86b 100644 --- a/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java +++ b/src/main/java/net/arcmods/ryantlg/statusEffects/GamerEffects.java @@ -2,7 +2,7 @@ package net.arcmods.ryantlg.statusEffects; import net.arcmods.ryantlg.gameritems; import net.arcmods.ryantlg.statusEffects.effectClasses.highStatusEffect; -import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect; +//import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -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(); } }