From 3befd1c9c209794259b4103e6642cbc7aa5bb896 Mon Sep 17 00:00:00 2001 From: Sunskimmer82 <92886026+Sunskimmer822@users.noreply.github.com> Date: Mon, 20 Feb 2023 18:52:51 -0800 Subject: [PATCH] refactor for 1.19.3 and maybe break some things in the process --- gradle.properties | 10 +- .../serenas/shitmod/LivingEntityMixin.java | 22 -- .../java/net/serenas/shitmod/Shitmod.java | 250 +++++++++++------- .../shitmod/explosionAspectEnchantment.java | 6 +- .../shitmod/explosiveThornsEnchantment.java | 5 +- src/main/java/net/serenas/shitmod/glock.java | 2 +- .../shitmod/rockWithAStringAround.java | 2 - .../java/net/serenas/shitmod/testHammer.java | 3 +- src/main/resources/fabric.mod.json | 6 +- .../resources/serenas-shitmod.mixins.json | 14 - 10 files changed, 171 insertions(+), 149 deletions(-) delete mode 100644 src/main/java/net/serenas/shitmod/LivingEntityMixin.java delete mode 100644 src/main/resources/serenas-shitmod.mixins.json diff --git a/gradle.properties b/gradle.properties index 51c2e43..90ca92e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx6G # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.19 -yarn_mappings=1.19+build.4 -loader_version=0.14.8 +minecraft_version=1.19.3 +yarn_mappings=1.19.3+build.5 +loader_version=0.14.14 #Fabric api -fabric_version=0.57.0+1.19 +fabric_version=0.74.0+1.19.3 # Mod Properties mod_version = 1.7.0 - maven_group = com.serenas.shitmod + maven_group = net.serenas.shitmod archives_base_name = serenas-shitmod diff --git a/src/main/java/net/serenas/shitmod/LivingEntityMixin.java b/src/main/java/net/serenas/shitmod/LivingEntityMixin.java deleted file mode 100644 index 437060a..0000000 --- a/src/main/java/net/serenas/shitmod/LivingEntityMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.serenas.shitmod; - -import java.util.Random; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.damage.DamageSource; - -@Mixin(LivingEntity.class) -public class LivingEntityMixin { - @Inject(at = @At("HEAD"), method = "Lnet/minecraft/entity/LivingEntity;modifyAppliedDamage(Lnet/minecraft/entity/damage/DamageSource;F)F") -private void injectMethod(DamageSource source, Float amount, CallbackInfo info) { - int rand = new Random().nextInt(5); - if (rand == 4) { - amount = 0f; - } -} -} diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index e9e6fc4..12bf159 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -1,8 +1,14 @@ package net.serenas.shitmod; +import java.lang.reflect.Array; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentTarget; @@ -14,216 +20,266 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemGroups; import net.minecraft.item.ItemStack; import net.minecraft.item.PickaxeItem; import net.minecraft.item.ShovelItem; import net.minecraft.item.ToolItem; import net.minecraft.item.ToolMaterials; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; -import net.minecraft.util.registry.Registry; public class Shitmod implements ModInitializer { - public static final ItemGroup CHARMS_GROUP = FabricItemGroupBuilder.build( - new Identifier("shitmod", "charms"), - () -> new ItemStack(Shitmod.KINGSOUL_CHARM)); + public static final Logger LOGGER = LoggerFactory.getLogger("shitmod"); - public static final ItemGroup GENERAL_GROUP = FabricItemGroupBuilder.build( - new Identifier("shitmod", "general"), - () -> new ItemStack(Shitmod.PP)); + public Integer a; + public Integer b; + public Integer c; + public Integer d; - public static final ItemGroup TOOLS_GROUP = FabricItemGroupBuilder.build( - new Identifier("shitmod", "tools"), - () -> new ItemStack(Shitmod.BLAZE_METAL_SHOVEL)); + public static final ItemGroup CHARMS_GROUP = FabricItemGroup.builder( + new Identifier("shitmod", "charms")) + .icon(() -> new ItemStack(Shitmod.KINGSOUL_CHARM)) + .build(); - public static final Item PP = new FabricItem(new Item.Settings().group(Shitmod.GENERAL_GROUP)); + public static final ItemGroup GENERAL_GROUP = FabricItemGroup.builder( + new Identifier("shitmod", "general")) + .icon(() -> new ItemStack(Shitmod.PP)) + .build(); + + public static final ItemGroup TOOLS_GROUP = FabricItemGroup.builder( + new Identifier("shitmod", "tools")) + .icon(() -> new ItemStack(Shitmod.BLAZE_METAL_SHOVEL)) + .build(); + + public static final Item PP = new FabricItem(new FabricItemSettings()); public static final Block FABRIC_BLOCK = new FabricBlock(); - public static final Item HAUSBOMMER_ITEM = new Hausbommer(new Item.Settings().group(Shitmod.GENERAL_GROUP)); + public static final Item HAUSBOMMER_ITEM = new Hausbommer(new Item.Settings()); public static final StatusEffect LEAN_EFFECT = new LeanStatusEffect(); - public static final Item LEAN = new Lean(new Item.Settings().group(ItemGroup.FOOD).rarity(Rarity.UNCOMMON).food(new FoodComponent.Builder().hunger(20).saturationModifier(10f).snack().meat().alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.WEAKNESS, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.BLINDNESS, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.NAUSEA, 20*60), 1f).statusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 20*60, 2), 1f).statusEffect(new StatusEffectInstance(StatusEffects.POISON, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.GLOWING, 20*60), 1f).statusEffect(new StatusEffectInstance(StatusEffects.MINING_FATIGUE, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 20*60, 3), 1f).build())); + public static final Item LEAN = new Lean(new Item.Settings().rarity(Rarity.UNCOMMON).food(new FoodComponent.Builder().hunger(20).saturationModifier(10f).snack().meat().alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.WEAKNESS, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.BLINDNESS, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.NAUSEA, 20*60), 1f).statusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 20*60, 2), 1f).statusEffect(new StatusEffectInstance(StatusEffects.POISON, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.GLOWING, 20*60), 1f).statusEffect(new StatusEffectInstance(StatusEffects.MINING_FATIGUE, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 20*60, 3), 1f).build())); public static final StatusEffect EXP = new ExpStatusEffect(); - public static final Item ORANGE_JUICE = new OrangeJuice(new Item.Settings().group(ItemGroup.FOOD).rarity(Rarity.EPIC).food(new FoodComponent.Builder().hunger(200).saturationModifier(10f).snack().meat().alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 20*120, 20), 1f).statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 20*120), 1f).statusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 20*120, 3), 1f).statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20*120, 2), 1f).build())); + public static final Item ORANGE_JUICE = new OrangeJuice(new Item.Settings().rarity(Rarity.EPIC).food(new FoodComponent.Builder().hunger(200).saturationModifier(10f).snack().meat().alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 20*120, 20), 1f).statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 20*120), 1f).statusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 20*120, 3), 1f).statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20*120, 2), 1f).build())); - public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); + public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().maxDamage(500).fireproof()); - public static final Item STALWART_SHELL_CHARM = new stalwartShell(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); + public static final Item STALWART_SHELL_CHARM = new stalwartShell(new Item.Settings().maxDamage(500).fireproof()); - public static final Item FRAGILE_HEART_CHARM = new fragileHeartCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(100).fireproof()); + public static final Item FRAGILE_HEART_CHARM = new fragileHeartCharm(new Item.Settings().maxDamage(100).fireproof()); - public static final Item UNBREAKABLE_HEART_CHARM = new unbreakableHeartCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).fireproof().maxCount(1)); + public static final Item UNBREAKABLE_HEART_CHARM = new unbreakableHeartCharm(new Item.Settings().fireproof().maxCount(1)); - public static final Item FRAGILE_STRENGTH_CHARM = new fragileStrengthCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(100).fireproof()); + public static final Item FRAGILE_STRENGTH_CHARM = new fragileStrengthCharm(new Item.Settings().maxDamage(100).fireproof()); - public static final Item UNBREAKABLE_STRENGTH_CHARM = new unbreakableStrengthCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).fireproof().maxCount(1)); + public static final Item UNBREAKABLE_STRENGTH_CHARM = new unbreakableStrengthCharm(new Item.Settings().fireproof().maxCount(1)); - public static final Item TOTEM_OF_EQUIVALENCY = new totemOfEquivalency(new Item.Settings().group(Shitmod.GENERAL_GROUP).maxCount(1)); + public static final Item TOTEM_OF_EQUIVALENCY = new totemOfEquivalency(new Item.Settings().maxCount(1)); - public static final Item ROCK_WITH_A_STRING_TIED_AROUND = new rockWithAStringAround(new Item.Settings().group(Shitmod.GENERAL_GROUP).maxCount(1)); + public static final Item ROCK_WITH_A_STRING_TIED_AROUND = new rockWithAStringAround(new Item.Settings().maxCount(1)); - public static final Item KINGSOUL_LEFT = new kingsoulLeft(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxCount(1)); + public static final Item KINGSOUL_LEFT = new kingsoulLeft(new Item.Settings().maxCount(1)); - public static final Item KINGSOUL_RIGHT = new kingsoulRight(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxCount(1)); + public static final Item KINGSOUL_RIGHT = new kingsoulRight(new Item.Settings().maxCount(1)); - public static final ToolItem BLAZE_METAL_SWORD = new blazeMetalSword(blazeMetalMaterial.INSTANCE, 5, 3f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(8000)); + public static final ToolItem BLAZE_METAL_SWORD = new blazeMetalSword(blazeMetalMaterial.INSTANCE, 5, 3f, new Item.Settings().maxDamage(8000)); - public static final ToolItem BLAZE_METAL_PICKAXE = new blazeMetalPickaxe(blazeMetalMaterial.INSTANCE, 1, -0.5f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(8000)); + public static final ToolItem BLAZE_METAL_PICKAXE = new blazeMetalPickaxe(blazeMetalMaterial.INSTANCE, 1, -0.5f, new Item.Settings().maxDamage(8000)); - public static final ToolItem BLAZE_METAL_AXE = new blazeMetalAxe(blazeMetalMaterial.INSTANCE, 8.0f, -1.0f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(8000)); + public static final ToolItem BLAZE_METAL_AXE = new blazeMetalAxe(blazeMetalMaterial.INSTANCE, 8.0f, -1.0f, new Item.Settings().maxDamage(8000)); - public static final ToolItem BLAZE_METAL_SHOVEL = new ShovelItem(blazeMetalMaterial.INSTANCE, 1f, 3.0f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(8000)); + public static final ToolItem BLAZE_METAL_SHOVEL = new ShovelItem(blazeMetalMaterial.INSTANCE, 1f, 3.0f, new Item.Settings().maxDamage(8000)); - public static final ToolItem BLAZE_METAL_HOE = new blazeMetalHoe(blazeMetalMaterial.INSTANCE, -4, 1f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(8000)); + public static final ToolItem BLAZE_METAL_HOE = new blazeMetalHoe(blazeMetalMaterial.INSTANCE, -4, 1f, new Item.Settings().maxDamage(8000)); - public static final Item BLAZE_METAL_INGOT = new blazeMetalIngot(new Item.Settings().group(Shitmod.GENERAL_GROUP)); + public static final Item BLAZE_METAL_INGOT = new blazeMetalIngot(new Item.Settings()); public static final Enchantment EXPLOSION_ASPECT = new explosionAspectEnchantment(); public static final Enchantment EXPLOSIVE_THORNS = new explosiveThornsEnchantment(Enchantment.Rarity.RARE, EnchantmentTarget.WEARABLE, new EquipmentSlot[] {EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.LEGS, EquipmentSlot.FEET}); - public static final Item REINFORCED_BLAZE_METAL_INGOT = new reinforcedBlazeMetalIngot(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final Item REINFORCED_BLAZE_METAL_INGOT = new reinforcedBlazeMetalIngot(new Item.Settings().fireproof()); - public static final Item BLAZE_METAL_SWORD_CASING = new blazeMetalSwordCasing(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final Item BLAZE_METAL_SWORD_CASING = new blazeMetalSwordCasing(new Item.Settings().fireproof()); - public static final Item BLAZE_METAL_PICKAXE_CASING = new blazeMetalPickaxeCasing(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final Item BLAZE_METAL_PICKAXE_CASING = new blazeMetalPickaxeCasing(new Item.Settings().fireproof()); - public static final Item BLAZE_METAL_AXE_CASING = new blazeMetalAxeCasing(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final Item BLAZE_METAL_AXE_CASING = new blazeMetalAxeCasing(new Item.Settings().fireproof()); - public static final Item BLAZE_METAL_SHOVEL_CASING = new blazeMetalShovelCasing(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final Item BLAZE_METAL_SHOVEL_CASING = new blazeMetalShovelCasing(new Item.Settings().fireproof()); - public static final Item BLAZE_METAL_HOE_CASING = new blazeMetalHoeCasing(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final Item BLAZE_METAL_HOE_CASING = new blazeMetalHoeCasing(new Item.Settings().fireproof()); - public static final Item POTATO_CHIPS = new potatoChips(new Item.Settings().group(ItemGroup.FOOD).maxCount(69)); + public static final Item POTATO_CHIPS = new potatoChips(new Item.Settings().maxCount(69)); - public static final Item PULVERIZED_BLAZE_METAL = new pulverizedBlazeMetal(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final Item PULVERIZED_BLAZE_METAL = new pulverizedBlazeMetal(new Item.Settings().fireproof()); - public static final Item SEARED_GOLD_INGOT = new searedGoldIngot(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final Item SEARED_GOLD_INGOT = new searedGoldIngot(new Item.Settings().fireproof()); - public static final Item PULVERIZED_NETHERITE = new pulverizedNetherite(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final Item PULVERIZED_NETHERITE = new pulverizedNetherite(new Item.Settings().fireproof()); - public static final ToolItem COPPER_SWORD = new copperSword(copperMaterial.INSTANCE, 2, -2.4f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + public static final ToolItem COPPER_SWORD = new copperSword(copperMaterial.INSTANCE, 2, -2.4f, new Item.Settings().maxDamage(250)); - public static final ToolItem COPPER_PICKAXE = new copperPickaxe(copperMaterial.INSTANCE, 0, -2.8f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + public static final ToolItem COPPER_PICKAXE = new copperPickaxe(copperMaterial.INSTANCE, 0, -2.8f, new Item.Settings().maxDamage(250)); - public static final ToolItem COPPER_AXE = new copperAxe(copperMaterial.INSTANCE, 5, -3.1f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + public static final ToolItem COPPER_AXE = new copperAxe(copperMaterial.INSTANCE, 5, -3.1f, new Item.Settings().maxDamage(250)); - public static final ToolItem COPPER_SHOVEL = new copperShovel(copperMaterial.INSTANCE, 0.5f, -3f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + public static final ToolItem COPPER_SHOVEL = new copperShovel(copperMaterial.INSTANCE, 0.5f, -3f, new Item.Settings().maxDamage(250)); - public static final ToolItem COPPER_HOE = new copperHoe(copperMaterial.INSTANCE, -3, -1f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + public static final ToolItem COPPER_HOE = new copperHoe(copperMaterial.INSTANCE, -3, -1f, new Item.Settings().maxDamage(250)); - public static final Item GLOCK = new glock(new FabricItemSettings().group(Shitmod.TOOLS_GROUP).maxDamage(1000).rarity(Rarity.EPIC)); + public static final Item GLOCK = new glock(new FabricItemSettings().maxDamage(1000).rarity(Rarity.EPIC)); - public static final SoundEvent GLOCK_NOISE = new SoundEvent(new Identifier("shitmod:glock_noise")); + public static final Identifier GLOCK_NOISE_ID = new Identifier("shitmod:glock_noise"); + + public static final SoundEvent GLOCK_NOISE_EVENT = SoundEvent.of(GLOCK_NOISE_ID); public static final Enchantment LIFESTEAL = new lifeStealEnchantment(Enchantment.Rarity.RARE, EnchantmentTarget.WEAPON, new EquipmentSlot[] {EquipmentSlot.MAINHAND}); - public static final PickaxeItem HAMMER = new testHammer(ToolMaterials.NETHERITE, 3, -1, new Item.Settings().group(Shitmod.TOOLS_GROUP).fireproof().maxDamage(2031)); + public static final PickaxeItem HAMMER = new testHammer(ToolMaterials.NETHERITE, 3, -1, new Item.Settings().fireproof().maxDamage(2031)); public static final StatusEffect BERSERK = new berserkEffect(); - public static final Item BERSERKER_TOTEM = new berserkerTotem(new FabricItemSettings().group(Shitmod.GENERAL_GROUP).maxDamage(512).rarity(Rarity.EPIC)); + public static final Item BERSERKER_TOTEM = new berserkerTotem(new FabricItemSettings().maxDamage(512).rarity(Rarity.EPIC)); @Override public void onInitialize() { - Registry.register(Registry.ITEM, new Identifier("shitmod", "pp"), PP); + LOGGER.info("Shitmod has been initialized."); - Registry.register(Registry.BLOCK, new Identifier("shitmod", "gay_block"), FABRIC_BLOCK); - Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_block"), new BlockItem(FABRIC_BLOCK, new FabricItemSettings().group(ItemGroup.MISC))); + ItemStack[] generalItems = {Shitmod.PP.getDefaultStack(),Shitmod.HAUSBOMMER_ITEM.getDefaultStack(),Shitmod.TOTEM_OF_EQUIVALENCY.getDefaultStack(),Shitmod.ROCK_WITH_A_STRING_TIED_AROUND.getDefaultStack(),Shitmod.REINFORCED_BLAZE_METAL_INGOT.getDefaultStack(),Shitmod.BLAZE_METAL_SWORD_CASING.getDefaultStack(),Shitmod.BLAZE_METAL_PICKAXE_CASING.getDefaultStack(),Shitmod.BLAZE_METAL_AXE_CASING.getDefaultStack(),Shitmod.BLAZE_METAL_SHOVEL_CASING.getDefaultStack(),Shitmod.BLAZE_METAL_HOE_CASING.getDefaultStack(),Shitmod.PULVERIZED_BLAZE_METAL.getDefaultStack(),Shitmod.SEARED_GOLD_INGOT.getDefaultStack(),Shitmod.PULVERIZED_NETHERITE.getDefaultStack(),Shitmod.BERSERKER_TOTEM.getDefaultStack()}; + + ItemStack[] foodItems = {Shitmod.LEAN.getDefaultStack(),Shitmod.ORANGE_JUICE.getDefaultStack(),Shitmod.POTATO_CHIPS.getDefaultStack()}; - Registry.register(Registry.ITEM, new Identifier("shitmod", "hausbommer"), HAUSBOMMER_ITEM); + ItemStack[] charmItems = {Shitmod.KINGSOUL_CHARM.getDefaultStack(),Shitmod.KINGSOUL_LEFT.getDefaultStack(),Shitmod.KINGSOUL_RIGHT.getDefaultStack(),Shitmod.STALWART_SHELL_CHARM.getDefaultStack(),Shitmod.FRAGILE_HEART_CHARM.getDefaultStack(),Shitmod.UNBREAKABLE_HEART_CHARM.getDefaultStack(),Shitmod.FRAGILE_STRENGTH_CHARM.getDefaultStack(),Shitmod.UNBREAKABLE_STRENGTH_CHARM.getDefaultStack()}; - Registry.register(Registry.ITEM, new Identifier("shitmod", "lean"), LEAN); + ItemStack[] toolItems = {Shitmod.BLAZE_METAL_SWORD.getDefaultStack(),Shitmod.BLAZE_METAL_PICKAXE.getDefaultStack(),Shitmod.BLAZE_METAL_AXE.getDefaultStack(),Shitmod.BLAZE_METAL_SHOVEL.getDefaultStack(),Shitmod.BLAZE_METAL_HOE.getDefaultStack(),Shitmod.COPPER_SWORD.getDefaultStack(),Shitmod.COPPER_PICKAXE.getDefaultStack(),Shitmod.COPPER_AXE.getDefaultStack(),Shitmod.COPPER_SHOVEL.getDefaultStack(),Shitmod.COPPER_HOE.getDefaultStack(),Shitmod.GLOCK.getDefaultStack(),Shitmod.HAMMER.getDefaultStack()}; + + ItemGroupEvents.modifyEntriesEvent(Shitmod.GENERAL_GROUP).register(content -> { + for (a = 0;a { + for (b = 0;b { + for (c = 0;c { + for (d = 0;d e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); playerEntity.getItemCooldownManager().set(this, 20); diff --git a/src/main/java/net/serenas/shitmod/rockWithAStringAround.java b/src/main/java/net/serenas/shitmod/rockWithAStringAround.java index a56a54a..fb74a7b 100644 --- a/src/main/java/net/serenas/shitmod/rockWithAStringAround.java +++ b/src/main/java/net/serenas/shitmod/rockWithAStringAround.java @@ -26,8 +26,6 @@ public class rockWithAStringAround extends Item { } else if (messageToSay > 0.6) { System.out.println("placeholder 3"); } - - return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(Hand)); } diff --git a/src/main/java/net/serenas/shitmod/testHammer.java b/src/main/java/net/serenas/shitmod/testHammer.java index 57b7754..548da52 100644 --- a/src/main/java/net/serenas/shitmod/testHammer.java +++ b/src/main/java/net/serenas/shitmod/testHammer.java @@ -40,7 +40,8 @@ public class testHammer extends PickaxeItem { boolean canBreak = newState.getHardness(world, newPos) >= 0 || (!newState.isToolRequired() && mainHandStack.getMiningSpeedMultiplier(newState) > 1); if (!canBreak) continue; - world.breakBlock(newPos, true, player); + if (player.isCreative()) world.breakBlock(newPos, false, player); + if (!player.isCreative()) world.breakBlock(newPos, true, player); } } return true; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e30bcc4..e20dc07 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,12 +27,12 @@ ], "depends": { - "fabricloader": ">=0.14.6", + "fabricloader": ">=0.14.14", "fabric": "*", - "minecraft": "1.19", + "minecraft": "1.19.3", "java": ">=17" }, "suggests": { - "another-mod": "*" + } } diff --git a/src/main/resources/serenas-shitmod.mixins.json b/src/main/resources/serenas-shitmod.mixins.json deleted file mode 100644 index 8e5a6c3..0000000 --- a/src/main/resources/serenas-shitmod.mixins.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.serenas.shitmod", - "compatibilityLevel": "JAVA_8", - "mixins": [ - "LivingEntityMixin" - ], - "client": [], - "server": [], - "injectors": { - "defaultRequire": 1 - } - } \ No newline at end of file