From 9375a15713a34ddd2eafa80dded848f40ab164a8 Mon Sep 17 00:00:00 2001 From: RyanTLG <78032176+RyanTLG@users.noreply.github.com> Date: Tue, 1 Mar 2022 18:38:59 +0200 Subject: [PATCH] get high --- gradle.properties | 6 ++-- .../java/net/fabricmc/ryantlg/gamermod.java | 3 ++ .../ryantlg/items/itemsByCrop/weemItems.java | 3 +- .../effectClasses/highStatusEffect.java | 34 +++++++++++++++++++ .../ryantlg/statusEffects/statusEffects.java | 19 +++++++++++ .../resources/assets/gamermod/lang/en_us.json | 3 +- src/main/resources/fabric.mod.json | 2 +- 7 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 src/main/java/net/fabricmc/ryantlg/statusEffects/effectClasses/highStatusEffect.java create mode 100644 src/main/java/net/fabricmc/ryantlg/statusEffects/statusEffects.java diff --git a/gradle.properties b/gradle.properties index a092f11..dbe38cc 100755 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop minecraft_version=1.18.1 - yarn_mappings=1.18.1+build.1 - loader_version=0.12.12 + yarn_mappings=1.18.1+build.22 + loader_version=0.13.3 # Mod Properties mod_version = 0.6.1 @@ -13,5 +13,5 @@ org.gradle.jvmargs=-Xmx1G archives_base_name = GamerMod # Dependencies - fabric_version=0.46.0+1.18 + fabric_version=0.46.4+1.18 fabric_shield_lib_version=1.4.5-1.18 diff --git a/src/main/java/net/fabricmc/ryantlg/gamermod.java b/src/main/java/net/fabricmc/ryantlg/gamermod.java index 93f5e2f..e8ea2a3 100755 --- a/src/main/java/net/fabricmc/ryantlg/gamermod.java +++ b/src/main/java/net/fabricmc/ryantlg/gamermod.java @@ -19,6 +19,7 @@ import net.fabricmc.ryantlg.items.miscItems.fabricOfReality; import net.fabricmc.ryantlg.items.tools.omniumTools; import net.fabricmc.ryantlg.items.tools.oriumTools; import net.fabricmc.ryantlg.lootTables.grassVanillaWeem; +import net.fabricmc.ryantlg.statusEffects.statusEffects; import net.fabricmc.ryantlg.worldGeneration.OmniumOreGen; import net.fabricmc.ryantlg.worldGeneration.OriumOreGen; import net.minecraft.item.ItemGroup; @@ -91,6 +92,8 @@ public class gamermod implements ModInitializer { fabricOfReality.register(); + statusEffects.register(); + jeremiumMetals.register(); } diff --git a/src/main/java/net/fabricmc/ryantlg/items/itemsByCrop/weemItems.java b/src/main/java/net/fabricmc/ryantlg/items/itemsByCrop/weemItems.java index dc4f28a..a2ba109 100755 --- a/src/main/java/net/fabricmc/ryantlg/items/itemsByCrop/weemItems.java +++ b/src/main/java/net/fabricmc/ryantlg/items/itemsByCrop/weemItems.java @@ -4,6 +4,7 @@ import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.ryantlg.gamermod; import net.fabricmc.ryantlg.itemClasses.BreemItem; import net.fabricmc.ryantlg.itemClasses.WeemItem; +import net.fabricmc.ryantlg.statusEffects.statusEffects; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; @@ -31,7 +32,7 @@ public class weemItems { .meat() .snack() .statusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 20*7), 1f) - .statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*8), 1f) + .statusEffect(new StatusEffectInstance(statusEffects.HIGH, 20*8), 1f) .build() )); diff --git a/src/main/java/net/fabricmc/ryantlg/statusEffects/effectClasses/highStatusEffect.java b/src/main/java/net/fabricmc/ryantlg/statusEffects/effectClasses/highStatusEffect.java new file mode 100644 index 0000000..932f0d8 --- /dev/null +++ b/src/main/java/net/fabricmc/ryantlg/statusEffects/effectClasses/highStatusEffect.java @@ -0,0 +1,34 @@ +package net.fabricmc.ryantlg.statusEffects.effectClasses; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectCategory; +import net.minecraft.entity.player.PlayerEntity; + +public class highStatusEffect extends StatusEffect{ + public highStatusEffect() { + super( + StatusEffectCategory.BENEFICIAL, + 0x3dad51 + ); + } + + @Override + public boolean canApplyUpdateEffect(int duration, int amplifier) { + return true; + } + + @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); + } + } + +} diff --git a/src/main/java/net/fabricmc/ryantlg/statusEffects/statusEffects.java b/src/main/java/net/fabricmc/ryantlg/statusEffects/statusEffects.java new file mode 100644 index 0000000..4624d18 --- /dev/null +++ b/src/main/java/net/fabricmc/ryantlg/statusEffects/statusEffects.java @@ -0,0 +1,19 @@ +package net.fabricmc.ryantlg.statusEffects; + +import net.fabricmc.ryantlg.gamermod; +import net.fabricmc.ryantlg.statusEffects.effectClasses.highStatusEffect; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class statusEffects { + + public static final StatusEffect HIGH = new highStatusEffect(); + + public static void register() { + Registry.register(Registry.STATUS_EFFECT, new Identifier("gamermod", "high"), HIGH); + + gamermod.LOGGER.info("statusEffects Loaded"); + } + +} diff --git a/src/main/resources/assets/gamermod/lang/en_us.json b/src/main/resources/assets/gamermod/lang/en_us.json index feb865a..9a230d0 100755 --- a/src/main/resources/assets/gamermod/lang/en_us.json +++ b/src/main/resources/assets/gamermod/lang/en_us.json @@ -48,6 +48,7 @@ "item.gamermod.orium_sword": "Orium Sword", "item.gamermod.orium_pickaxe": "Orium Pickaxe", "item.gamermod.fabric_of_reality.tooltip": "Warning: has a chance to get §o§l§4RIPPED§r.", - "item.gamermod.fabric_of_reality": "Fabric of Reality" + "item.gamermod.fabric_of_reality": "Fabric of Reality", + "effect.gamermod.high": "High" } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3d20a78..791e317 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -37,6 +37,6 @@ "java": ">=17" }, "suggests": { - "another-mod": "*" + "darkevolution": "1.18.*-*" } }