From 8dcaf75f132303b87cf04aeee950f6eb41582443 Mon Sep 17 00:00:00 2001 From: yakyakyakyak Date: Sun, 7 Feb 2021 20:56:38 +1100 Subject: [PATCH] made a few changes --- gradle.properties | 2 +- src/main/java/net/fabricmc/Config.java | 6 ---- .../ArmorMaterials/DragonArmorMaterial.java | 11 ------- .../ArmorMaterials/GlitchArmorMaterial.java | 31 +++++++++++++++++++ .../java/net/fabricmc/example/Config.java | 7 +++++ .../net/fabricmc/example/RegisterItems.java | 13 ++++++++ 6 files changed, 52 insertions(+), 18 deletions(-) delete mode 100644 src/main/java/net/fabricmc/Config.java delete mode 100644 src/main/java/net/fabricmc/example/ArmorMaterials/DragonArmorMaterial.java create mode 100644 src/main/java/net/fabricmc/example/ArmorMaterials/GlitchArmorMaterial.java create mode 100644 src/main/java/net/fabricmc/example/Config.java create mode 100644 src/main/java/net/fabricmc/example/RegisterItems.java diff --git a/gradle.properties b/gradle.properties index 9206cc0..52a8041 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G # Mod Properties mod_version = 1.0.0 - maven_group = com.refsonyak.griegtech + maven_group = com.refsonyak.griegtech.group archives_base_name = griegtech-mod # Dependencies diff --git a/src/main/java/net/fabricmc/Config.java b/src/main/java/net/fabricmc/Config.java deleted file mode 100644 index cf353c4..0000000 --- a/src/main/java/net/fabricmc/Config.java +++ /dev/null @@ -1,6 +0,0 @@ -public class config { - public static class DragonArmor { - public static final int[] BASE_DURABILITY = new int[] {17, 19, 20, 15}; - private static final int[] PROTECTION_VALUES = new int[] {5, 8, 10, 5}; - } -} \ No newline at end of file diff --git a/src/main/java/net/fabricmc/example/ArmorMaterials/DragonArmorMaterial.java b/src/main/java/net/fabricmc/example/ArmorMaterials/DragonArmorMaterial.java deleted file mode 100644 index 09aebe7..0000000 --- a/src/main/java/net/fabricmc/example/ArmorMaterials/DragonArmorMaterial.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.fabricmc.example; - -import net.fabricmc.config; - -public class DragonArmorMaterial implements ArmorMaterial { - - @Override - public int getDurability(EquipmentSlot slot) { - return config.DragonArmor.BASE_DURABILITY[slot.getEntitySlotId()] * ; - } -} \ No newline at end of file diff --git a/src/main/java/net/fabricmc/example/ArmorMaterials/GlitchArmorMaterial.java b/src/main/java/net/fabricmc/example/ArmorMaterials/GlitchArmorMaterial.java new file mode 100644 index 0000000..df7c3ea --- /dev/null +++ b/src/main/java/net/fabricmc/example/ArmorMaterials/GlitchArmorMaterial.java @@ -0,0 +1,31 @@ +package net.fabricmc.example; + +import net.fabricmc.config; + +public class GlitchedArmorMaterial implements ArmorMaterial { + + @Override + public int getDurability(EquipmentSlot slot) { + return config.GlitchedArmor.BASE_DURABILITY[slot.getEntitySlotId()]; + } + + @Override + public int getProtectionAmount(EquipmentSlot slot) { + return config.GlitchedArmor.PROTECTION_VALUES[slot.getEntitySlotId()]; + } + + @Override + public int getEnchantability() { + return config.GlitchedArmor.ENCHANTABILITY; + } + + @Override + public SoundEvent getEquipSound() { + return SoundEvents.ITEM_ARMOR_EQUIP_LEATHER; + } + + @Override + public Ingredient getRepairIngredient() { + return Ingredient.ofItems(RegisterItems.); + } +} \ No newline at end of file diff --git a/src/main/java/net/fabricmc/example/Config.java b/src/main/java/net/fabricmc/example/Config.java new file mode 100644 index 0000000..b2e2a8c --- /dev/null +++ b/src/main/java/net/fabricmc/example/Config.java @@ -0,0 +1,7 @@ +public class config { + public static class GlitchedArmor { + public static final int[] BASE_DURABILITY = new int[] {17, 19, 20, 15}; + public static final int[] PROTECTION_VALUES = new int[] {5, 8, 10, 5}; + public static final int ENCHANTABILITY = 50; + } +} \ No newline at end of file diff --git a/src/main/java/net/fabricmc/example/RegisterItems.java b/src/main/java/net/fabricmc/example/RegisterItems.java new file mode 100644 index 0000000..35ee886 --- /dev/null +++ b/src/main/java/net/fabricmc/example/RegisterItems.java @@ -0,0 +1,13 @@ +public class RegisterItems { + public static final ArmorMaterial GlitchArmorMaterial = new CustomArmorMaterial(); + public static final Item GLITCH_MATERIAL = new CustomMaterialItem(new Item.Settings().group(GriegTech.GRIEGTECH_GROUP)); + // If you made a new material, this is where you would note it. + public static final Item CUSTOM_MATERIAL_HELMET = new ArmorItem(CustomArmorMaterial, + EquipmentSlot.HEAD, new Item.Settings().group(ExampleMod.EXAMPLE_MOD_GROUP)); + public static final Item CUSTOM_MATERIAL_CHESTPLATE = new ArmorItem(CustomArmorMaterial, + EquipmentSlot.CHEST, new Item.Settings().group(ExampleMod.EXAMPLE_MOD_GROUP)); + public static final Item CUSTOM_MATERIAL_LEGGINGS = new ArmorItem(CustomArmorMaterial, + EquipmentSlot.LEGS, new Item.Settings().group(ExampleMod.EXAMPLE_MOD_GROUP)); + public static final Item CUSTOM_MATERIAL_BOOTS = new ArmorItem(CustomArmorMaterial, + EquipmentSlot.FEET, new Item.Settings().group(ExampleMod.EXAMPLE_MOD_GROUP)); +} \ No newline at end of file