diff --git a/README.md b/README.md index e69de29b..0110f9fb 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,2 @@ +# Fixes +Fixed gear items stacking up to 64 diff --git a/src/main/java/com/thevortex/allthemodium/registry/ArmorRegistries.java b/src/main/java/com/thevortex/allthemodium/registry/ArmorRegistries.java index d6eb6507..dfb39ae9 100644 --- a/src/main/java/com/thevortex/allthemodium/registry/ArmorRegistries.java +++ b/src/main/java/com/thevortex/allthemodium/registry/ArmorRegistries.java @@ -21,24 +21,24 @@ public class ArmorRegistries { @SuppressWarnings("unchecked") public static final Map ALLTHEMODIUM = (EnumMap)Util.make(new EnumMap(ArmorItem.Type.class), (allthemodium) -> { allthemodium.put(ArmorItem.Type.HELMET, 4); - allthemodium.put(ArmorItem.Type.CHESTPLATE, 7); - allthemodium.put(ArmorItem.Type.LEGGINGS, 9); + allthemodium.put(ArmorItem.Type.CHESTPLATE, 9); + allthemodium.put(ArmorItem.Type.LEGGINGS, 7); allthemodium.put(ArmorItem.Type.BOOTS, 4); allthemodium.put(ArmorItem.Type.BODY, 8);}); @SuppressWarnings("unchecked") public static final Map VIBRANIUM = (EnumMap)Util.make(new EnumMap(ArmorItem.Type.class), (vibranium) -> { vibranium.put(ArmorItem.Type.HELMET, 6); - vibranium.put(ArmorItem.Type.CHESTPLATE, 9); - vibranium.put(ArmorItem.Type.LEGGINGS, 11); + vibranium.put(ArmorItem.Type.CHESTPLATE, 11); + vibranium.put(ArmorItem.Type.LEGGINGS, 9); vibranium.put(ArmorItem.Type.BOOTS, 6); vibranium.put(ArmorItem.Type.BODY, 10);}); @SuppressWarnings("unchecked") public static final Map UNOBTAINIUM = (EnumMap)Util.make(new EnumMap(ArmorItem.Type.class), (unobtainium) -> { unobtainium.put(ArmorItem.Type.HELMET, 8); - unobtainium.put(ArmorItem.Type.CHESTPLATE, 11); - unobtainium.put(ArmorItem.Type.LEGGINGS, 13); + unobtainium.put(ArmorItem.Type.CHESTPLATE, 13); + unobtainium.put(ArmorItem.Type.LEGGINGS, 11); unobtainium.put(ArmorItem.Type.BOOTS, 8); unobtainium.put(ArmorItem.Type.BODY, 12);}); @@ -51,4 +51,4 @@ public class ArmorRegistries { public static final DeferredHolder UNOB = ARMOR_MATERIALS.register("unobtainium", () -> new ArmorMaterial(UNOBTAINIUM, 125, SoundEvents.ARMOR_EQUIP_NETHERITE, () -> Ingredient.of(ModRegistry.UNOBTAINIUM_INGOT.get()), List.of(new ArmorMaterial.Layer(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID,"unobtainium"))), 15.0F, 1.0f)); -} +} \ No newline at end of file diff --git a/src/main/java/com/thevortex/allthemodium/registry/ModRegistry.java b/src/main/java/com/thevortex/allthemodium/registry/ModRegistry.java index 75c084b0..de09920c 100644 --- a/src/main/java/com/thevortex/allthemodium/registry/ModRegistry.java +++ b/src/main/java/com/thevortex/allthemodium/registry/ModRegistry.java @@ -103,28 +103,24 @@ public class ModRegistry { // ARMORS - public static final DeferredHolder ALLTHEMODIUM_HELMET = ITEMS.register("allthemodium_helmet", () -> new Allthemodium_Helmet(ArmorRegistries.ATM, EquipmentSlot.HEAD, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder ALLTHEMODIUM_CHESTPLATE = ITEMS.register("allthemodium_chestplate", () -> new Allthemodium_Chestplate(ArmorRegistries.ATM, EquipmentSlot.CHEST, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder ALLTHEMODIUM_LEGGINGS = ITEMS.register("allthemodium_leggings", () -> new Allthemodium_Leggings(ArmorRegistries.ATM, EquipmentSlot.LEGS, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder ALLTHEMODIUM_BOOTS = ITEMS.register("allthemodium_boots", () -> new Allthemodium_Boots(ArmorRegistries.ATM, EquipmentSlot.FEET, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); + public static final DeferredHolder ALLTHEMODIUM_HELMET = ITEMS.register("allthemodium_helmet", () -> new Allthemodium_Helmet(ArmorRegistries.ATM, EquipmentSlot.HEAD, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); + public static final DeferredHolder ALLTHEMODIUM_CHESTPLATE = ITEMS.register("allthemodium_chestplate", () -> new Allthemodium_Chestplate(ArmorRegistries.ATM, EquipmentSlot.CHEST, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); + public static final DeferredHolder ALLTHEMODIUM_LEGGINGS = ITEMS.register("allthemodium_leggings", () -> new Allthemodium_Leggings(ArmorRegistries.ATM, EquipmentSlot.LEGS, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); + public static final DeferredHolder ALLTHEMODIUM_BOOTS = ITEMS.register("allthemodium_boots", () -> new Allthemodium_Boots(ArmorRegistries.ATM, EquipmentSlot.FEET, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); - public static final DeferredHolder VIBRANIUM_HELMET = ITEMS.register("vibranium_helmet", () -> new Allthemodium_Helmet(ArmorRegistries.VIB, EquipmentSlot.HEAD, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder VIBRANIUM_CHESTPLATE = ITEMS.register("vibranium_chestplate", () -> new Allthemodium_Chestplate(ArmorRegistries.VIB, EquipmentSlot.CHEST, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder VIBRANIUM_LEGGINGS = ITEMS.register("vibranium_leggings", () -> new Allthemodium_Leggings(ArmorRegistries.VIB, EquipmentSlot.LEGS, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder VIBRANIUM_BOOTS = ITEMS.register("vibranium_boots", () -> new Allthemodium_Boots(ArmorRegistries.VIB, EquipmentSlot.FEET, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); + public static final DeferredHolder VIBRANIUM_HELMET = ITEMS.register("vibranium_helmet", () -> new Allthemodium_Helmet(ArmorRegistries.VIB, EquipmentSlot.HEAD, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); + public static final DeferredHolder VIBRANIUM_CHESTPLATE = ITEMS.register("vibranium_chestplate", () -> new Allthemodium_Chestplate(ArmorRegistries.VIB, EquipmentSlot.CHEST, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); + public static final DeferredHolder VIBRANIUM_LEGGINGS = ITEMS.register("vibranium_leggings", () -> new Allthemodium_Leggings(ArmorRegistries.VIB, EquipmentSlot.LEGS, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); + public static final DeferredHolder VIBRANIUM_BOOTS = ITEMS.register("vibranium_boots", () -> new Allthemodium_Boots(ArmorRegistries.VIB, EquipmentSlot.FEET, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); - public static final DeferredHolder UNOBTAINIUM_HELMET = ITEMS.register("unobtainium_helmet", () -> new Allthemodium_Helmet(ArmorRegistries.UNOB, EquipmentSlot.HEAD, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder UNOBTAINIUM_CHESTPLATE = ITEMS.register("unobtainium_chestplate", () -> new Allthemodium_Chestplate(ArmorRegistries.UNOB, EquipmentSlot.CHEST, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder UNOBTAINIUM_LEGGINGS = ITEMS.register("unobtainium_leggings", () -> new Allthemodium_Leggings(ArmorRegistries.UNOB, EquipmentSlot.LEGS, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder UNOBTAINIUM_BOOTS = ITEMS.register("unobtainium_boots", () -> new Allthemodium_Boots(ArmorRegistries.UNOB, EquipmentSlot.FEET, new Item.Properties().fireResistant().rarity(Rarity.EPIC))); + public static final DeferredHolder UNOBTAINIUM_HELMET = ITEMS.register("unobtainium_helmet", () -> new Allthemodium_Helmet(ArmorRegistries.UNOB, EquipmentSlot.HEAD, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); + public static final DeferredHolder UNOBTAINIUM_CHESTPLATE = ITEMS.register("unobtainium_chestplate", () -> new Allthemodium_Chestplate(ArmorRegistries.UNOB, EquipmentSlot.CHEST, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); + public static final DeferredHolder UNOBTAINIUM_LEGGINGS = ITEMS.register("unobtainium_leggings", () -> new Allthemodium_Leggings(ArmorRegistries.UNOB, EquipmentSlot.LEGS, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); + public static final DeferredHolder UNOBTAINIUM_BOOTS = ITEMS.register("unobtainium_boots", () -> new Allthemodium_Boots(ArmorRegistries.UNOB, EquipmentSlot.FEET, new Item.Properties().fireResistant().rarity(Rarity.EPIC).stacksTo(1))); - - //Volcano - - public static final DeferredHolder ANCIENT_CAVEVINES_ = PILLARBLOCKS.register("ancient_cavevines", () -> new AncientCaveVines(BlockBehaviour.Properties.of() .randomTicks() .noCollission() @@ -480,7 +476,6 @@ private static RotatedPillarBlock log(DyeColor color1, DyeColor color2) { return new RotatedPillarBlock(BlockBehaviour.Properties.of().strength(2.0F).sound(SoundType.WOOD)); } - public static final DeferredHolder ATM_SWORD = ITEMS.register("allthemodium_sword", () -> new SwordItem(ATMTier.ALLTHEMODIUM, (new Item.Properties()).rarity(Rarity.EPIC).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).attributes(SwordItem.createAttributes(ATMTier.ALLTHEMODIUM, 5, -1.4F)))); public static final DeferredHolder VIB_SWORD = ITEMS.register("vibranium_sword", () -> new SwordItem(ATMTier.VIBRANIUM, (new Item.Properties()).rarity(Rarity.EPIC).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).attributes(SwordItem.createAttributes(ATMTier.VIBRANIUM, 10, -0.4F)))); public static final DeferredHolder UNO_SWORD = ITEMS.register("unobtainium_sword", () -> new SwordItem(ATMTier.UNOBTAINIUM, (new Item.Properties()).rarity(Rarity.EPIC).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).attributes(SwordItem.createAttributes(ATMTier.UNOBTAINIUM, 15, 0.4F)))); @@ -502,17 +497,17 @@ private static RotatedPillarBlock log(DyeColor color1, DyeColor color2) { public static final DeferredHolder UNO_HOE = ITEMS.register("unobtainium_hoe", () -> new HoeItem(ATMTier.UNOBTAINIUM, (new Item.Properties()).rarity(Rarity.EPIC).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).attributes(HoeItem.createAttributes(ATMTier.UNOBTAINIUM, -1, 0.0F)))); - public static final DeferredHolder ATM_MACE = ITEMS.register("allthemodium_mace", () -> new ATMMace(ATMTier.ALLTHEMODIUM,(new Item.Properties()).rarity(Rarity.EPIC).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).component(DataComponents.TOOL, ATMMace.createToolProperties(ATMTier.ALLTHEMODIUM)).attributes(ATMMace.createAttributes(ATMTier.ALLTHEMODIUM)))); - public static final DeferredHolder VIB_MACE = ITEMS.register("vibranium_mace", () -> new ATMMace(ATMTier.VIBRANIUM,(new Item.Properties()).rarity(Rarity.EPIC).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).component(DataComponents.TOOL, ATMMace.createToolProperties(ATMTier.VIBRANIUM)).attributes(ATMMace.createAttributes(ATMTier.VIBRANIUM)))); - public static final DeferredHolder UNO_MACE = ITEMS.register("unobtainium_mace", () -> new ATMMace(ATMTier.UNOBTAINIUM,(new Item.Properties()).rarity(Rarity.EPIC).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).component(DataComponents.TOOL, ATMMace.createToolProperties(ATMTier.UNOBTAINIUM)).attributes(ATMMace.createAttributes(ATMTier.UNOBTAINIUM)))); + public static final DeferredHolder ATM_MACE = ITEMS.register("allthemodium_mace", () -> new ATMMace(ATMTier.ALLTHEMODIUM,(new Item.Properties()).rarity(Rarity.EPIC).stacksTo(1).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).component(DataComponents.TOOL, ATMMace.createToolProperties(ATMTier.ALLTHEMODIUM)).attributes(ATMMace.createAttributes(ATMTier.ALLTHEMODIUM)))); + public static final DeferredHolder VIB_MACE = ITEMS.register("vibranium_mace", () -> new ATMMace(ATMTier.VIBRANIUM,(new Item.Properties()).rarity(Rarity.EPIC).stacksTo(1).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).component(DataComponents.TOOL, ATMMace.createToolProperties(ATMTier.VIBRANIUM)).attributes(ATMMace.createAttributes(ATMTier.VIBRANIUM)))); + public static final DeferredHolder UNO_MACE = ITEMS.register("unobtainium_mace", () -> new ATMMace(ATMTier.UNOBTAINIUM,(new Item.Properties()).rarity(Rarity.EPIC).stacksTo(1).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).component(DataComponents.TOOL, ATMMace.createToolProperties(ATMTier.UNOBTAINIUM)).attributes(ATMMace.createAttributes(ATMTier.UNOBTAINIUM)))); - public static final DeferredHolder ATM_BOW = ITEMS.register("allthemodium_bow", () -> new ATMBow((new Item.Properties()).fireResistant().rarity(Rarity.EPIC))); + public static final DeferredHolder ATM_BOW = ITEMS.register("allthemodium_bow", () -> new ATMBow((new Item.Properties()).fireResistant().rarity(Rarity.EPIC).stacksTo(1))); - public static final DeferredHolder UNO_BOW = ITEMS.register("unobtainium_crossbow", () -> new Unobow((new Item.Properties()).fireResistant().rarity(Rarity.EPIC))); + public static final DeferredHolder UNO_BOW = ITEMS.register("unobtainium_crossbow", () -> new Unobow((new Item.Properties()).fireResistant().rarity(Rarity.EPIC).stacksTo(1))); public static final DeferredHolder VIB_SHIELD = ITEMS.register("vibranium_shield", () -> new Vib_Shield((new Item.Properties()).fireResistant().stacksTo(1).rarity(Rarity.EPIC))); - public static final DeferredHolder ALLOY_TRIDENT = ITEMS.register("alloy_trident", () -> new ATMTrident((new Item.Properties()).fireResistant().rarity(Rarity.EPIC).attributes(ATMTrident.createAttributes()).component(DataComponents.UNBREAKABLE, new Unbreakable(true)).component(DataComponents.TOOL, ATMTrident.createToolProperties()))); + public static final DeferredHolder ALLOY_TRIDENT = ITEMS.register("alloy_trident", () -> new ATMTrident((new Item.Properties()).fireResistant().rarity(Rarity.EPIC).stacksTo(1).attributes(ATMTrident.createAttributes()).component(DataComponents.UNBREAKABLE, new Unbreakable(true)).component(DataComponents.TOOL, ATMTrident.createToolProperties()))); public static final DeferredHolder,EntityType> ALLOY_TRIDENT_ENTITY = ENTITIES.register("alloy_trident", () -> EntityType.Builder.of(ThrownATMTrident::new, MobCategory.MISC).sized(0.5F, 0.5F).clientTrackingRange(4).updateInterval(10).build("alloy_trident")); public static final DeferredHolder ALLOY_SWORD = ITEMS.register("alloy_sword", () -> new SwordItem(ATMTier.ALLOY, new Item.Properties().rarity(Rarity.EPIC).fireResistant().component(DataComponents.UNBREAKABLE, new Unbreakable(true)).attributes(SwordItem.createAttributes(ATMTier.ALLOY, 3, 2.9F))));