mna
This commit is contained in:
@@ -26,4 +26,7 @@ If you find an issue or bug in the mod or just have a general suggestion you can
|
||||
|
||||
### AAAAAAAAAAAAAAAa
|
||||
|
||||
[aaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA](https://github.com/RyanTLG/GamerItems/blob/1-18-1/unstable/AAAAAAAAAAAAAAAa)
|
||||
[aaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA](https://github.com/RyanTLG/GamerItems/blob/1-18-1/unstable/AAAAAAAAAAAAAAAa)
|
||||
|
||||
## NOTICE
|
||||
due to my lack of an attention span, i will no longer be updating or maintaining 1.18 versions, this is a final decision. I will also not support any versions up from 1.19 (pre chat reporting and account banning). Anyone willing to update 1.18 branches or add branches for older/newer minecraft versions are welcome to ask me [here]()
|
||||
@@ -0,0 +1,61 @@
|
||||
package net.arcmods.ryantlg.armourMaterials;
|
||||
|
||||
import net.arcmods.ryantlg.items.metalItems.oriumMetals;
|
||||
import net.minecraft.entity.EquipmentSlot;
|
||||
import net.minecraft.item.ArmorMaterial;
|
||||
import net.minecraft.recipe.Ingredient;
|
||||
import net.minecraft.sound.SoundEvent;
|
||||
import net.minecraft.sound.SoundEvents;
|
||||
|
||||
public class stupidiumArmorMaterial implements ArmorMaterial {
|
||||
// {boots, leggings, chestplate, helmet}
|
||||
private static final int[] BASE_DURABILITY = new int[] {43, 60, 75, 49};
|
||||
private static final int[] PROTECTION_VALUES = new int[] {4, 7, 9, 4};
|
||||
|
||||
// In which A is helmet, B chestplate, C leggings and D boots.
|
||||
// For reference, Leather uses {1, 2, 3, 1}, and Diamond/Netherite {3, 6, 8, 3}
|
||||
// {A, C, B, D}
|
||||
|
||||
@Override
|
||||
public int getDurability(EquipmentSlot slot) {
|
||||
return BASE_DURABILITY[slot.getEntitySlotId()] * 10;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getProtectionAmount(EquipmentSlot slot) {
|
||||
return PROTECTION_VALUES[slot.getEntitySlotId()];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getEnchantability() {
|
||||
return 22;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SoundEvent getEquipSound() {
|
||||
return SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Ingredient getRepairIngredient() {
|
||||
return Ingredient.ofItems(oriumMetals.ORIUM);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
// Must be all lowercase
|
||||
return "orium";
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getToughness() {
|
||||
return 2.0F;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getKnockbackResistance() {
|
||||
return 0.0F;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package net.arcmods.ryantlg.customToolItemClasses.stupidium;
|
||||
|
||||
import net.minecraft.item.AxeItem;
|
||||
import net.minecraft.item.ToolMaterial;
|
||||
|
||||
public class StupidiumAxeItem extends AxeItem {
|
||||
|
||||
public StupidiumAxeItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
|
||||
super(material, attackDamage, attackSpeed, settings);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package net.arcmods.ryantlg.customToolItemClasses.stupidium;
|
||||
|
||||
import net.minecraft.item.BowItem;
|
||||
import net.arcmods.ryantlg.statusEffects.GamerEffects;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.effect.StatusEffectInstance;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class StupidiumBowItem extends BowItem{
|
||||
|
||||
public StupidiumBowItem(Settings settings) {
|
||||
super(settings);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean postHit(ItemStack stack, LivingEntity attackee, LivingEntity attacker) {
|
||||
attackee.addStatusEffect(new StatusEffectInstance(GamerEffects.STUPID, 20*5, 0), attacker);
|
||||
return super.postHit(stack, attackee, attacker);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package net.arcmods.ryantlg.customToolItemClasses.stupidium;
|
||||
|
||||
import net.minecraft.item.HoeItem;
|
||||
import net.minecraft.item.ToolMaterial;
|
||||
|
||||
public class StupidiumHoeItem extends HoeItem{
|
||||
|
||||
public StupidiumHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
|
||||
super(material, attackDamage, attackSpeed, settings);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package net.arcmods.ryantlg.customToolItemClasses.stupidium;
|
||||
|
||||
import net.minecraft.item.PickaxeItem;
|
||||
import net.minecraft.item.ToolMaterial;
|
||||
|
||||
public class StupidiumPickaxeItem extends PickaxeItem{
|
||||
|
||||
public StupidiumPickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
|
||||
super(material, attackDamage, attackSpeed, settings);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package net.arcmods.ryantlg.customToolItemClasses.stupidium;
|
||||
|
||||
import net.minecraft.item.ShovelItem;
|
||||
import net.minecraft.item.ToolMaterial;
|
||||
|
||||
public class StupidiumShovelItem extends ShovelItem{
|
||||
|
||||
public StupidiumShovelItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
|
||||
super(material, attackDamage, attackSpeed, settings);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package net.arcmods.ryantlg.customToolItemClasses.stupidium;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.effect.StatusEffectInstance;
|
||||
import net.arcmods.ryantlg.statusEffects.GamerEffects;
|
||||
import net.minecraft.client.item.TooltipContext;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.SwordItem;
|
||||
import net.minecraft.item.ToolMaterial;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class StupidiumSwordItem extends SwordItem {
|
||||
public StupidiumSwordItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
|
||||
super(material, attackDamage, attackSpeed, settings);
|
||||
}
|
||||
@Override
|
||||
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||
tooltip.add(Text.translatable("item.gameritems.stupidium_tools.tooltip").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC) );
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean postHit(ItemStack stack, LivingEntity attackee, LivingEntity attacker) {
|
||||
attackee.addStatusEffect(new StatusEffectInstance(GamerEffects.STUPID, 20*6, 0), attacker);
|
||||
return super.postHit(stack, attackee, attacker);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package net.arcmods.ryantlg.damageSources;
|
||||
|
||||
import net.minecraft.entity.damage.DamageSource;
|
||||
|
||||
public class stupidDamageSource extends DamageSource {
|
||||
|
||||
protected stupidDamageSource() {
|
||||
super("dumb");
|
||||
}
|
||||
|
||||
public static final DamageSource STUPID = (new stupidDamageSource().setBypassesArmor());
|
||||
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ import net.arcmods.ryantlg.items.armour.notArmour;
|
||||
import net.arcmods.ryantlg.items.armour.omniumArmour;
|
||||
import net.arcmods.ryantlg.items.armour.oriumArmour;
|
||||
import net.arcmods.ryantlg.items.bows.gamerBow;
|
||||
// import net.arcmods.ryantlg.items.bows.stupidBow;
|
||||
import net.arcmods.ryantlg.items.itemsByCrop.weemItems;
|
||||
import net.arcmods.ryantlg.items.metalItems.jeremiumMetals;
|
||||
import net.arcmods.ryantlg.items.metalItems.omniumMetals;
|
||||
@@ -100,6 +101,7 @@ public class gameritems implements ModInitializer {
|
||||
|
||||
notArmour.register();
|
||||
gamerBow.register();
|
||||
// stupidBow.register(); // incomplete: lazy
|
||||
|
||||
evadeEnchantment.register();
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package net.arcmods.ryantlg.itemClasses;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.item.TooltipContext;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
import net.minecraft.util.Formatting;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class StupidiumItem extends Item {
|
||||
|
||||
public StupidiumItem(Settings settings) {
|
||||
super(settings);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendTooltip(ItemStack itemStack, World world, List<Text> tooltip, TooltipContext tooltipContext) {
|
||||
|
||||
tooltip.add(Text.translatable("item.gameritems.stupidium.tooltip").formatted(Formatting.LIGHT_PURPLE, Formatting.ITALIC) );
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
19
src/main/java/net/arcmods/ryantlg/items/bows/stupidBow.java
Normal file
19
src/main/java/net/arcmods/ryantlg/items/bows/stupidBow.java
Normal file
@@ -0,0 +1,19 @@
|
||||
package net.arcmods.ryantlg.items.bows;
|
||||
|
||||
import net.arcmods.ryantlg.gameritems;
|
||||
import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumBowItem;
|
||||
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
public class stupidBow {
|
||||
|
||||
public static final Item STUPID_BOW = new StupidiumBowItem(new FabricItemSettings().group(gameritems.CHING).maxCount(1).fireproof().maxDamage(458));
|
||||
|
||||
public static void register(){
|
||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "stupid_bow"), STUPID_BOW);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package net.arcmods.ryantlg.items.metalItems;
|
||||
|
||||
import net.arcmods.ryantlg.gameritems;
|
||||
import net.arcmods.ryantlg.itemClasses.StupidiumItem;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.Rarity;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
public class stupidiumMetals {
|
||||
|
||||
public static final Item STUPIDIUM = new StupidiumItem(new Item.Settings().group(gameritems.CHING).maxCount(64).rarity(Rarity.UNCOMMON));
|
||||
public static final Item RAW_STUPIDIUM = new StupidiumItem(new Item.Settings().group(gameritems.CHING).maxCount(64).rarity(Rarity.UNCOMMON));
|
||||
|
||||
public static void register() {
|
||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_ingot"), STUPIDIUM);
|
||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "raw_stupidium"), RAW_STUPIDIUM);
|
||||
|
||||
gameritems.LOGGER.info("stupidiumMetals loaded");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package net.arcmods.ryantlg.items.tools;
|
||||
|
||||
import net.arcmods.ryantlg.gameritems;
|
||||
import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumAxeItem;
|
||||
import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumHoeItem;
|
||||
import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumPickaxeItem;
|
||||
import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumShovelItem;
|
||||
import net.arcmods.ryantlg.customToolItemClasses.stupidium.StupidiumSwordItem;
|
||||
import net.arcmods.ryantlg.toolMaterials.stupidiumToolMaterial;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ToolItem;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.Rarity;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
public class stupidiumTools {
|
||||
|
||||
public static ToolItem STUPID_SWORD = new StupidiumSwordItem(stupidiumToolMaterial.INSTANCE, 6, -2.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
|
||||
public static ToolItem STUPID_PICKAXE = new StupidiumPickaxeItem(stupidiumToolMaterial.INSTANCE, -3, -2.8F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
|
||||
public static ToolItem STUPID_SHOVEL = new StupidiumShovelItem(stupidiumToolMaterial.INSTANCE, -2.5F, -3.0F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
|
||||
public static ToolItem STUPID_AXE = new StupidiumAxeItem(stupidiumToolMaterial.INSTANCE, 7, -2.2F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
|
||||
public static ToolItem STUPID_HOE = new StupidiumHoeItem(stupidiumToolMaterial.INSTANCE, -9, -3.2F, new Item.Settings().fireproof().group(gameritems.THING).rarity(Rarity.RARE));
|
||||
|
||||
public static void register() {
|
||||
|
||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_sword"), STUPID_SWORD);
|
||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_pickaxe"), STUPID_PICKAXE);
|
||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_shovel"), STUPID_SHOVEL);
|
||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_axe"), STUPID_AXE);
|
||||
Registry.register(Registry.ITEM, new Identifier("gameritems", "stupidium_hoe"), STUPID_HOE);
|
||||
|
||||
gameritems.LOGGER.info("stupidiumTools loaded");
|
||||
}
|
||||
}
|
||||
@@ -2,6 +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.stupidStatusEffect;
|
||||
//import net.arcmods.ryantlg.statusEffects.effectClasses.jeremydStatusEffect;
|
||||
import net.minecraft.entity.effect.StatusEffect;
|
||||
import net.minecraft.util.Identifier;
|
||||
@@ -10,11 +11,13 @@ import net.minecraft.util.registry.Registry;
|
||||
public class GamerEffects {
|
||||
|
||||
public static final StatusEffect HIGH = new highStatusEffect();
|
||||
public static final StatusEffect STUPID = new stupidStatusEffect();
|
||||
|
||||
//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", "stupid"), STUPID);
|
||||
|
||||
//Registry.register(Registry.STATUS_EFFECT, new Identifier("gameritems", "jeremyd"), JEREMYD);
|
||||
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package net.arcmods.ryantlg.statusEffects.effectClasses;
|
||||
|
||||
import net.arcmods.ryantlg.damageSources.stupidDamageSource;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.effect.StatusEffect;
|
||||
import net.minecraft.entity.effect.StatusEffectCategory;
|
||||
|
||||
public class stupidStatusEffect extends StatusEffect {
|
||||
public stupidStatusEffect() {
|
||||
super(
|
||||
StatusEffectCategory.HARMFUL,
|
||||
0x3be012
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canApplyUpdateEffect(int duration, int amplifier) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applyUpdateEffect(LivingEntity entity, int amplifier) {
|
||||
|
||||
entity.damage(stupidDamageSource.STUPID, 1);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package net.arcmods.ryantlg.toolMaterials;
|
||||
|
||||
import net.arcmods.ryantlg.items.metalItems.stupidiumMetals;
|
||||
import net.minecraft.item.ToolMaterial;
|
||||
import net.minecraft.recipe.Ingredient;
|
||||
|
||||
public class stupidiumToolMaterial implements ToolMaterial {
|
||||
|
||||
public static final stupidiumToolMaterial INSTANCE = new stupidiumToolMaterial();
|
||||
|
||||
@Override
|
||||
public int getDurability() {
|
||||
return 1530;
|
||||
}
|
||||
@Override
|
||||
public float getMiningSpeedMultiplier() {
|
||||
return 10.0F;
|
||||
}
|
||||
@Override
|
||||
public float getAttackDamage() {
|
||||
return 10.0F;
|
||||
}
|
||||
@Override
|
||||
public int getMiningLevel() {
|
||||
return 4;
|
||||
}
|
||||
@Override
|
||||
public int getEnchantability() {
|
||||
return 27;
|
||||
}
|
||||
@Override
|
||||
public Ingredient getRepairIngredient() {
|
||||
return Ingredient.ofItems(stupidiumMetals.STUPIDIUM);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -71,6 +71,9 @@
|
||||
"block.gameritems.deepslate_orium_ore": "Deepslate Orium Ore",
|
||||
"item.gameritems.gamer_bow": "Gamer Bow",
|
||||
"enchantment.gameritems.evade": "Evade",
|
||||
"block.gameritems.weem_hay_block": "Weem Hay Bale"
|
||||
"block.gameritems.weem_hay_block": "Weem Hay Bale",
|
||||
"item.gameritems.stupidium.tooltip": "No brain here.",
|
||||
"death.attack.dumb": "%1$s didn't know how to breathe.",
|
||||
"effect.gameritems.stupid": "Stupid"
|
||||
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
19
src/main/resources/data/gameritems/loot_tables/blocks/weem_haybale.json
Executable file
19
src/main/resources/data/gameritems/loot_tables/blocks/weem_haybale.json
Executable file
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "gameritems:weem_hay_block"
|
||||
}
|
||||
],
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,18 +1,18 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
" #X",
|
||||
"#SX",
|
||||
" #X"
|
||||
"ESX",
|
||||
"SEX",
|
||||
"ESX"
|
||||
],
|
||||
"key": {
|
||||
"#": {
|
||||
"S": {
|
||||
"item": "minecraft:stick"
|
||||
},
|
||||
"X": {
|
||||
"item": "minecraft:string"
|
||||
},
|
||||
"S": {
|
||||
"E": {
|
||||
"item": "minecraft:light_blue_dye"
|
||||
}
|
||||
},
|
||||
|
||||
12
src/main/resources/data/gameritems/recipes/weem.json
Normal file
12
src/main/resources/data/gameritems/recipes/weem.json
Normal file
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "gameritems:weem_hay_block"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "gameritems:weem",
|
||||
"count": 9
|
||||
}
|
||||
}
|
||||
17
src/main/resources/data/gameritems/recipes/weem_haybale.json
Normal file
17
src/main/resources/data/gameritems/recipes/weem_haybale.json
Normal file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
"FFF",
|
||||
"FFF",
|
||||
"FFF"
|
||||
],
|
||||
"key": {
|
||||
"F": {
|
||||
"item": "gameritems:weem"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
"item": "gameritems:weem_hay_block",
|
||||
"count": 1
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user