This commit is contained in:
RyanTLG
2022-03-01 18:38:59 +02:00
parent b41c02455b
commit 9375a15713
7 changed files with 64 additions and 6 deletions

View File

@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.18.1 minecraft_version=1.18.1
yarn_mappings=1.18.1+build.1 yarn_mappings=1.18.1+build.22
loader_version=0.12.12 loader_version=0.13.3
# Mod Properties # Mod Properties
mod_version = 0.6.1 mod_version = 0.6.1
@@ -13,5 +13,5 @@ org.gradle.jvmargs=-Xmx1G
archives_base_name = GamerMod archives_base_name = GamerMod
# Dependencies # Dependencies
fabric_version=0.46.0+1.18 fabric_version=0.46.4+1.18
fabric_shield_lib_version=1.4.5-1.18 fabric_shield_lib_version=1.4.5-1.18

View File

@@ -19,6 +19,7 @@ import net.fabricmc.ryantlg.items.miscItems.fabricOfReality;
import net.fabricmc.ryantlg.items.tools.omniumTools; import net.fabricmc.ryantlg.items.tools.omniumTools;
import net.fabricmc.ryantlg.items.tools.oriumTools; import net.fabricmc.ryantlg.items.tools.oriumTools;
import net.fabricmc.ryantlg.lootTables.grassVanillaWeem; import net.fabricmc.ryantlg.lootTables.grassVanillaWeem;
import net.fabricmc.ryantlg.statusEffects.statusEffects;
import net.fabricmc.ryantlg.worldGeneration.OmniumOreGen; import net.fabricmc.ryantlg.worldGeneration.OmniumOreGen;
import net.fabricmc.ryantlg.worldGeneration.OriumOreGen; import net.fabricmc.ryantlg.worldGeneration.OriumOreGen;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
@@ -91,6 +92,8 @@ public class gamermod implements ModInitializer {
fabricOfReality.register(); fabricOfReality.register();
statusEffects.register();
jeremiumMetals.register(); jeremiumMetals.register();
} }

View File

@@ -4,6 +4,7 @@ import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.fabricmc.ryantlg.gamermod; import net.fabricmc.ryantlg.gamermod;
import net.fabricmc.ryantlg.itemClasses.BreemItem; import net.fabricmc.ryantlg.itemClasses.BreemItem;
import net.fabricmc.ryantlg.itemClasses.WeemItem; import net.fabricmc.ryantlg.itemClasses.WeemItem;
import net.fabricmc.ryantlg.statusEffects.statusEffects;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.item.FoodComponent; import net.minecraft.item.FoodComponent;
@@ -31,7 +32,7 @@ public class weemItems {
.meat() .meat()
.snack() .snack()
.statusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 20*7), 1f) .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() .build()
)); ));

View File

@@ -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);
}
}
}

View File

@@ -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");
}
}

View File

@@ -48,6 +48,7 @@
"item.gamermod.orium_sword": "Orium Sword", "item.gamermod.orium_sword": "Orium Sword",
"item.gamermod.orium_pickaxe": "Orium Pickaxe", "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.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"
} }

View File

@@ -37,6 +37,6 @@
"java": ">=17" "java": ">=17"
}, },
"suggests": { "suggests": {
"another-mod": "*" "darkevolution": "1.18.*-*"
} }
} }