diff --git a/README.md b/README.md index 7bc1c5f..5c9658c 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ linux: ./gradlew build windows: .\gradlew build -the resulting file will be located at [cloned folder]/build/libs/mod-VERSION.jar +the resulting file will be located at [repo root]/build/libs/mod-VERSION.jar diff --git a/build.gradle b/build.gradle index 94aac8c..4ceec3b 100644 --- a/build.gradle +++ b/build.gradle @@ -11,21 +11,9 @@ version = project.mod_version group = project.maven_group repositories { - maven { - url 'https://jitpack.io' - } - maven { - url "https://maven.terraformersmc.com/" - } - maven { - url "https://maven.shedaniel.me/" - } - + } -repositories { - maven {url = "https://maven.kyrptonaught.dev"} -} @@ -38,11 +26,6 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation 'net.kyrptonaught:customportalapi:0.0.1-beta47-1.18' - include 'net.kyrptonaught:customportalapi:0.0.1-beta47-1.18' - - modImplementation("com.gitlab.Lortseam:completeconfig:1.3.3") - include 'com.gitlab.Lortseam:completeconfig:1.3.3' } processResources { diff --git a/gradle.properties b/gradle.properties index 84f8c9a..3deb5e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx6G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.18.1 - yarn_mappings=1.18.1+build.22 - loader_version=0.12.12 + minecraft_version=1.19 + yarn_mappings=1.19+build.1 + loader_version=0.14.7 # Mod Properties - mod_version = 1.5.0 + mod_version = 1.6.0 maven_group = com.serenas.shitmod archives_base_name = serenas-shitmod -# Dependencies - fabric_version=0.46.2+1.18 +# Fabric API + fabric_version=0.55.3+1.19 diff --git a/src/main/java/net/serenas/shitmod/FabricBlock.java b/src/main/java/net/serenas/shitmod/FabricBlock.java index 041b5cf..61e03c0 100644 --- a/src/main/java/net/serenas/shitmod/FabricBlock.java +++ b/src/main/java/net/serenas/shitmod/FabricBlock.java @@ -9,7 +9,7 @@ import net.minecraft.sound.BlockSoundGroup; public class FabricBlock extends Block { public FabricBlock() { - super(FabricBlockSettings.of(Material.WOOL).breakByHand(false).sounds(BlockSoundGroup.ANCIENT_DEBRIS).strength(1000, 100f)); + super(FabricBlockSettings.of(Material.WOOL).sounds(BlockSoundGroup.ANCIENT_DEBRIS).strength(1000, 100f)); } } diff --git a/src/main/java/net/serenas/shitmod/Hausbommer.java b/src/main/java/net/serenas/shitmod/Hausbommer.java index cdf56fa..c941724 100644 --- a/src/main/java/net/serenas/shitmod/Hausbommer.java +++ b/src/main/java/net/serenas/shitmod/Hausbommer.java @@ -3,11 +3,9 @@ package net.serenas.shitmod; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; -import net.minecraft.util.Util; import net.minecraft.world.World; public class Hausbommer extends Item{ @@ -26,7 +24,7 @@ public class Hausbommer extends Item{ String Ymessage = String.valueOf(yRound); String Zmessage = String.valueOf(zRound); String fullMessage = "X: " + Xmessage + " Y: " + Ymessage + " Z: " + Zmessage; - playerentity.sendSystemMessage(new LiteralText(fullMessage), Util.NIL_UUID); + System.out.println(fullMessage); return new TypedActionResult(ActionResult.SUCCESS, playerentity.getStackInHand(hand)); } } diff --git a/src/main/java/net/serenas/shitmod/MyContainer.java b/src/main/java/net/serenas/shitmod/MyContainer.java deleted file mode 100644 index f496127..0000000 --- a/src/main/java/net/serenas/shitmod/MyContainer.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.serenas.shitmod; - -import me.lortseam.completeconfig.api.ConfigContainer; - -public class MyContainer implements ConfigContainer { - -} diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index a5daf4b..1b7e2cf 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -1,10 +1,8 @@ package net.serenas.shitmod; -import me.lortseam.completeconfig.data.Config; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.kyrptonaught.customportalapi.api.CustomPortalBuilder; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentTarget; @@ -31,15 +29,13 @@ public class Shitmod implements ModInitializer { public static final ItemGroup GENERAL_GROUP = FabricItemGroupBuilder.build( new Identifier("shitmod", "general"), - () -> new ItemStack(Shitmod.FABRIC_ITEM)); + () -> new ItemStack(Shitmod.PP)); public static final ItemGroup TOOLS_GROUP = FabricItemGroupBuilder.build( new Identifier("shitmod", "tools"), () -> new ItemStack(Shitmod.BLAZE_METAL_SHOVEL)); - public static final Config config = new Config("shitmod", new MyContainer(), new configGroup()); - - public static final Item FABRIC_ITEM = new FabricItem(new Item.Settings().group(Shitmod.GENERAL_GROUP)); + public static final Item PP = new FabricItem(new Item.Settings().group(Shitmod.GENERAL_GROUP)); public static final Block FABRIC_BLOCK = new FabricBlock(); @@ -55,8 +51,6 @@ public class Shitmod implements ModInitializer { public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); - public static final StatusEffect KINGSOUL_CHARM_EFFECT = new kingsoulEffect(); - public static final Item STALWART_SHELL_CHARM = new stalwartShell(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); public static final Item FRAGILE_HEART_CHARM = new fragileHeartCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(100).fireproof()); @@ -83,7 +77,7 @@ public class Shitmod implements ModInitializer { 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_HOE = new blazeMetalHoe(blazeMetalMaterial.INSTANCE, 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().group(Shitmod.TOOLS_GROUP).maxDamage(8000)); public static final Item BLAZE_METAL_INGOT = new blazeMetalIngot(new Item.Settings().group(Shitmod.GENERAL_GROUP)); @@ -111,14 +105,22 @@ public class Shitmod implements ModInitializer { public static final Item PULVERIZED_NETHERITE = new pulverizedNetherite(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + 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_PICKAXE = new copperPickaxe(copperMaterial.INSTANCE, 0, -2.8f, 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().group(Shitmod.TOOLS_GROUP).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_HOE = new copperHoe(copperMaterial.INSTANCE, -3, -1f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + @Override public void onInitialize() { - config.load(); + Registry.register(Registry.ITEM, new Identifier("shitmod", "pp"), PP); - Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_item"), FABRIC_ITEM); - - Registry.register(Registry.BLOCK, new Identifier("shitmod", "fabric_block"), FABRIC_BLOCK); + 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))); Registry.register(Registry.ITEM, new Identifier("shitmod", "hausbommer"), HAUSBOMMER_ITEM); @@ -133,8 +135,6 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("shitmod", "kingsoul_charm"), KINGSOUL_CHARM); - Registry.register(Registry.STATUS_EFFECT, new Identifier("shitmod", "kingsoul_charm"), KINGSOUL_CHARM_EFFECT); - Registry.register(Registry.ITEM, new Identifier("shitmod", "stalwart_shell_charm"), STALWART_SHELL_CHARM); Registry.register(Registry.ITEM, new Identifier("shitmod", "fragile_heart_charm"), FRAGILE_HEART_CHARM); @@ -189,14 +189,16 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("shitmod", "seared_gold_ingot"), SEARED_GOLD_INGOT); - CustomPortalBuilder.beginPortal() -.frameBlock(Shitmod.FABRIC_BLOCK) -.lightWithItem(Shitmod.BLAZE_METAL_INGOT) -.destDimID(new Identifier("the_end")) -.tintColor(45,65,101) -.registerPortal(); + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_sword"), COPPER_SWORD); + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_pickaxe"), COPPER_PICKAXE); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_axe"), COPPER_AXE); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_shovel"), COPPER_SHOVEL); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_hoe"), COPPER_HOE); } -} \ No newline at end of file +} diff --git a/src/main/java/net/serenas/shitmod/blazeMetalHoe.java b/src/main/java/net/serenas/shitmod/blazeMetalHoe.java index f8ab060..a2dc80b 100644 --- a/src/main/java/net/serenas/shitmod/blazeMetalHoe.java +++ b/src/main/java/net/serenas/shitmod/blazeMetalHoe.java @@ -1,12 +1,12 @@ package net.serenas.shitmod; -import net.minecraft.item.ToolItem; +import net.minecraft.item.HoeItem; import net.minecraft.item.ToolMaterial; -public class blazeMetalHoe extends ToolItem { +public class blazeMetalHoe extends HoeItem { - public blazeMetalHoe(ToolMaterial material, Settings settings) { - super(material, settings); + public blazeMetalHoe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); } } diff --git a/src/main/java/net/serenas/shitmod/blazeMetalSword.java b/src/main/java/net/serenas/shitmod/blazeMetalSword.java index 7f63f2c..59c15d0 100644 --- a/src/main/java/net/serenas/shitmod/blazeMetalSword.java +++ b/src/main/java/net/serenas/shitmod/blazeMetalSword.java @@ -21,7 +21,7 @@ public class blazeMetalSword extends SwordItem { @Override public TypedActionResult use(World World, PlayerEntity PlayerEntity, Hand Hand) { Vec3d looking = PlayerEntity.getRotationVector(); - FireballEntity fireball = new FireballEntity(World, PlayerEntity, looking.x, looking.y, looking.z, 5); + FireballEntity fireball = new FireballEntity(World, PlayerEntity, (2*looking.x), (2*looking.y), (2*looking.z), 5); World.spawnEntity(fireball); PlayerEntity.getStackInHand(Hand).damage(100,PlayerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(Hand)); diff --git a/src/main/java/net/serenas/shitmod/configGroup.java b/src/main/java/net/serenas/shitmod/configGroup.java deleted file mode 100644 index bf1553d..0000000 --- a/src/main/java/net/serenas/shitmod/configGroup.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.serenas.shitmod; - -import me.lortseam.completeconfig.api.ConfigEntry; -import me.lortseam.completeconfig.api.ConfigGroup; - -public class configGroup implements ConfigGroup { - @ConfigEntry - private int swordFireballStrengthMultiplier = 1; - @ConfigEntry - private int axeFireballStrengthMultiplier = 1; - @ConfigEntry - private int explosionAspectStrengthMultiplier = 1; - @ConfigEntry - private int explosiveThornsStrengthMultiplier = 1; - - public void setSetting(int explosionAspectStrengthMultiplier) { - this.explosionAspectStrengthMultiplier = explosionAspectStrengthMultiplier; - - } - -} diff --git a/src/main/java/net/serenas/shitmod/copperMaterial.java b/src/main/java/net/serenas/shitmod/copperMaterial.java new file mode 100644 index 0000000..62c0971 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/copperMaterial.java @@ -0,0 +1,41 @@ +package net.serenas.shitmod; + +import net.minecraft.item.Items; +import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; + +public class copperMaterial implements ToolMaterial { + + public static final copperMaterial INSTANCE = new copperMaterial(); + + @Override + public int getDurability() { + return 250; + } + + @Override + public float getMiningSpeedMultiplier() { + return 6.0f; + } + + @Override + public float getAttackDamage() { + return 3.0f; + } + + @Override + public int getMiningLevel() { + return 2; + } + + @Override + public int getEnchantability() { + return 44; + } + + @Override + public Ingredient getRepairIngredient() { + return Ingredient.ofItems(Items.COPPER_INGOT); + } + +} diff --git a/src/main/java/net/serenas/shitmod/fragileHeartCharm.java b/src/main/java/net/serenas/shitmod/fragileHeartCharm.java index d0df6d5..9cb25c9 100644 --- a/src/main/java/net/serenas/shitmod/fragileHeartCharm.java +++ b/src/main/java/net/serenas/shitmod/fragileHeartCharm.java @@ -3,7 +3,6 @@ package net.serenas.shitmod; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; @@ -18,23 +17,10 @@ public class fragileHeartCharm extends Item { super(settings); } - public int availableSlots = 1; - @Override public TypedActionResult use(World World, PlayerEntity Playerentity, Hand Hand) { - - if (availableSlots > 0) { - availableSlots--; - Playerentity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); Playerentity.addStatusEffect(new StatusEffectInstance(StatusEffects.HEALTH_BOOST, 20*1000000, 2)); Playerentity.getMainHandStack().damage(50,Playerentity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); - availableSlots++; - - } else if (availableSlots < 1) { - Playerentity.sendMessage(new LiteralText("You don't have enough charm notches to do that!"), true); - } - - return new TypedActionResult(ActionResult.SUCCESS, Playerentity.getStackInHand(Hand)); } } diff --git a/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java b/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java index b69611f..76f8321 100644 --- a/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java +++ b/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java @@ -6,7 +6,7 @@ import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; + import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; @@ -22,17 +22,9 @@ public class fragileStrengthCharm extends Item{ @Override public TypedActionResult use(World world, PlayerEntity PlayerEntity, Hand Hand) { - if (availableSlots > 0) { - availableSlots--; - PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); + PlayerEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 20*1000000, 2)); PlayerEntity.getMainHandStack().damage(50,PlayerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); - availableSlots++; - - } else if (availableSlots < 1) { - PlayerEntity.sendMessage(new LiteralText("You don't have enough charm notches to do that!"), true); - } - return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(Hand)); } diff --git a/src/main/java/net/serenas/shitmod/kingsoul.java b/src/main/java/net/serenas/shitmod/kingsoul.java index b9c75f8..38d4227 100644 --- a/src/main/java/net/serenas/shitmod/kingsoul.java +++ b/src/main/java/net/serenas/shitmod/kingsoul.java @@ -4,7 +4,6 @@ import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; @@ -21,17 +20,8 @@ public class kingsoul extends Item { @Override public TypedActionResult use(World world, PlayerEntity PlayerEntity, Hand hand) { - if (availableSlots > 0) { - availableSlots--; - PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); PlayerEntity.getHungerManager().add(1, 1); PlayerEntity.getMainHandStack().damage(1,PlayerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); - availableSlots++; - - } else if (availableSlots < 1) { - PlayerEntity.sendMessage(new LiteralText("You don't have enough charm notches to do that!"), true); - } - return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(hand)); } diff --git a/src/main/java/net/serenas/shitmod/kingsoulEffect.java b/src/main/java/net/serenas/shitmod/kingsoulEffect.java deleted file mode 100644 index f282fdc..0000000 --- a/src/main/java/net/serenas/shitmod/kingsoulEffect.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.serenas.shitmod; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.effect.StatusEffect; -import net.minecraft.entity.effect.StatusEffectCategory; -import net.minecraft.entity.player.PlayerEntity; - -public class kingsoulEffect extends StatusEffect{ - - public kingsoulEffect() { - super(StatusEffectCategory.BENEFICIAL, 0x98D982); - - } - @Override - public boolean canApplyUpdateEffect(int duration, int amplifier) { - return true; - } - PlayerEntity playerentity; - @Override - public void applyUpdateEffect(LivingEntity entity, int amplifier) { - if (entity instanceof PlayerEntity) { - playerentity.getHungerManager().add(1, 1); - } - } -} diff --git a/src/main/java/net/serenas/shitmod/potatoChips.java b/src/main/java/net/serenas/shitmod/potatoChips.java index dcdff39..f837149 100644 --- a/src/main/java/net/serenas/shitmod/potatoChips.java +++ b/src/main/java/net/serenas/shitmod/potatoChips.java @@ -1,11 +1,8 @@ package net.serenas.shitmod; -import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; diff --git a/src/main/java/net/serenas/shitmod/rockWithAStringAround.java b/src/main/java/net/serenas/shitmod/rockWithAStringAround.java index f26b713..a56a54a 100644 --- a/src/main/java/net/serenas/shitmod/rockWithAStringAround.java +++ b/src/main/java/net/serenas/shitmod/rockWithAStringAround.java @@ -3,7 +3,6 @@ package net.serenas.shitmod; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; @@ -19,13 +18,13 @@ public class rockWithAStringAround extends Item { public TypedActionResult use(World World, PlayerEntity PlayerEntity, Hand Hand) { var messageToSay = Math.random(); if (messageToSay < 0.3) { - PlayerEntity.sendMessage(new LiteralText("I'm a faggot"), false); + System.out.println("placeholder 1"); } else if (messageToSay > 0.3) { if (messageToSay < 0.6) { - PlayerEntity.sendMessage(new LiteralText("I'm a tranny"), false); + System.out.println("placeholder 2"); } } else if (messageToSay > 0.6) { - PlayerEntity.sendMessage(new LiteralText("I'm a mick"), false); + System.out.println("placeholder 3"); } diff --git a/src/main/java/net/serenas/shitmod/stalwartShell.java b/src/main/java/net/serenas/shitmod/stalwartShell.java index 6d5ee0c..b4ad1d8 100644 --- a/src/main/java/net/serenas/shitmod/stalwartShell.java +++ b/src/main/java/net/serenas/shitmod/stalwartShell.java @@ -6,7 +6,6 @@ import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; @@ -22,17 +21,8 @@ public class stalwartShell extends Item{ @Override public TypedActionResult use(World world, PlayerEntity PlayerEntity, Hand hand) { - if (availableSlots > 0) { - availableSlots--; - PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); PlayerEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 20, 5)); PlayerEntity.getMainHandStack().damage(1,PlayerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); - availableSlots++; - - } else if (availableSlots < 1) { - PlayerEntity.sendMessage(new LiteralText("You don't have enough charm notches to do that!"), true); - } - return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(hand)); } diff --git a/src/main/java/net/serenas/shitmod/unbreakableHeartCharm.java b/src/main/java/net/serenas/shitmod/unbreakableHeartCharm.java index d8aa3a7..0891980 100644 --- a/src/main/java/net/serenas/shitmod/unbreakableHeartCharm.java +++ b/src/main/java/net/serenas/shitmod/unbreakableHeartCharm.java @@ -5,7 +5,6 @@ import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; @@ -21,16 +20,7 @@ public class unbreakableHeartCharm extends Item { @Override public TypedActionResult use(World world, PlayerEntity PlayerEntity, Hand Hand) { - - if (availableSlots > 0) { - availableSlots--; - PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + " charm notches left."), false); PlayerEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.HEALTH_BOOST, 20*1000000, 4)); - availableSlots++; - - } else if (availableSlots < 1) { - PlayerEntity.sendMessage(new LiteralText("You don't have enough charm notches to do that!"), true); - } return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(Hand)); } } \ No newline at end of file diff --git a/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java b/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java index 37bd80a..4d65ed4 100644 --- a/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java +++ b/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java @@ -5,7 +5,6 @@ import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; @@ -21,17 +20,7 @@ public class unbreakableStrengthCharm extends Item { @Override public TypedActionResult use(World world, PlayerEntity PlayerEntity, Hand Hand) { - - if (availableSlots > 0) { - availableSlots--; - PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); PlayerEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 20*1000000, 3)); - availableSlots++; - - } else if (availableSlots < 1) { - PlayerEntity.sendMessage(new LiteralText("You don't have enough charm notches to do that!"), true); - } - return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(Hand)); } } diff --git a/src/main/resources/assets/customportalapi/blockstates/customportalblock.json b/src/main/resources/assets/customportalapi/blockstates/customportalblock.json deleted file mode 100644 index d9351f2..0000000 --- a/src/main/resources/assets/customportalapi/blockstates/customportalblock.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "customportalapi:block/customportalblock_ns" - }, - "axis=z": { - "model": "customportalapi:block/customportalblock_ew" - }, - "axis=y": { - "model": "customportalapi:block/customportalblock_flat" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/customportalapi/icon.png b/src/main/resources/assets/customportalapi/icon.png deleted file mode 100644 index 553162a..0000000 Binary files a/src/main/resources/assets/customportalapi/icon.png and /dev/null differ diff --git a/src/main/resources/assets/customportalapi/models/block/customportalblock_ew.json b/src/main/resources/assets/customportalapi/models/block/customportalblock_ew.json deleted file mode 100644 index 420f23a..0000000 --- a/src/main/resources/assets/customportalapi/models/block/customportalblock_ew.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "textures": { - "particle": "customportalapi:block/customportalblock", - "portal": "customportalapi:block/customportalblock" - }, - "elements": [ - { - "from": [ - 6, - 0, - 0 - ], - "to": [ - 10, - 16, - 16 - ], - "faces": { - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#portal", - "tintindex": 4 - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#portal", - "tintindex": 4 - } - } - } - ] -} diff --git a/src/main/resources/assets/customportalapi/models/block/customportalblock_flat.json b/src/main/resources/assets/customportalapi/models/block/customportalblock_flat.json deleted file mode 100644 index 6d5708b..0000000 --- a/src/main/resources/assets/customportalapi/models/block/customportalblock_flat.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "textures": { - "particle": "customportalapi:block/customportalblock", - "portal": "customportalapi:block/customportalblock" - }, - "elements": [ - { - "from": [ - 0, - 6, - 0 - ], - "to": [ - 16, - 10, - 16 - ], - "faces": { - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#portal", - "tintindex": 4 - }, - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#portal", - "tintindex": 4 - } - } - } - ] -} diff --git a/src/main/resources/assets/customportalapi/models/block/customportalblock_ns.json b/src/main/resources/assets/customportalapi/models/block/customportalblock_ns.json deleted file mode 100644 index 7d72834..0000000 --- a/src/main/resources/assets/customportalapi/models/block/customportalblock_ns.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "textures": { - "particle": "customportalapi:block/customportalblock", - "portal": "customportalapi:block/customportalblock" - }, - "elements": [ - { - "from": [ - 0, - 0, - 6 - ], - "to": [ - 16, - 16, - 10 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#portal", - "tintindex": 4 - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#portal", - "tintindex": 4 - } - } - } - ] -} diff --git a/src/main/resources/assets/customportalapi/particles/customportalparticle.json b/src/main/resources/assets/customportalapi/particles/customportalparticle.json deleted file mode 100644 index f970e44..0000000 --- a/src/main/resources/assets/customportalapi/particles/customportalparticle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "textures": [ - "minecraft:generic_0", - "minecraft:generic_1", - "minecraft:generic_2", - "minecraft:generic_3", - "minecraft:generic_4", - "minecraft:generic_5", - "minecraft:generic_6", - "minecraft:generic_7" - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/customportalapi/textures/block/customportalblock.png b/src/main/resources/assets/customportalapi/textures/block/customportalblock.png deleted file mode 100644 index 062ab90..0000000 Binary files a/src/main/resources/assets/customportalapi/textures/block/customportalblock.png and /dev/null differ diff --git a/src/main/resources/assets/customportalapi/textures/block/customportalblock.png.mcmeta b/src/main/resources/assets/customportalapi/textures/block/customportalblock.png.mcmeta deleted file mode 100644 index 4f0718a..0000000 --- a/src/main/resources/assets/customportalapi/textures/block/customportalblock.png.mcmeta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "animation": {} -} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/lang/en_us.json b/src/main/resources/assets/shitmod/lang/en_us.json index c1b4c89..9cca8fc 100644 --- a/src/main/resources/assets/shitmod/lang/en_us.json +++ b/src/main/resources/assets/shitmod/lang/en_us.json @@ -1,13 +1,44 @@ { - "item.shitmod.fabric_item": "Penis", - "block.shitmod.fabric_block": "Gay Block", + "item.shitmod.pp": "Penis", + "block.shitmod.gay_block": "Gay Block", "item.shitmod.hausbommer": "Hausbommer", "effect.shitmod.exp": "Experience", "effect.shitmod.lean": "Lean", "item.shitmod.lean": "Lean", "item.shitmod.orange_juice": "Orange Juice", "item.shitmod.kingsoul_charm": "Kingsoul Charm", - "itemGroup.shitmod.charms": "Charms", + "itemGroup.shitmod.charms": "Shitmod Charms", "item.shitmod.stalwart_shell_charm": "Stalwart Shell Charm", - "entity.minecraft.mooshroom": "Drug Cow" + "entity.minecraft.mooshroom": "Drug Cow", + "item.shitmod.potato_chip": "Potato Chips", + "item.shitmod.fragile_heart_charm": "Fragile Heart", + "item.shitmod.unbreakable_heart_charm": "Unbreakable Heart", + "item.shitmod.fragile_strength_charm": "Fragile Strength", + "item.shitmod.unbreakable_strength_charm": "Unbreakable Strength", + "item.shitmod.kingsoul_left_fragment": "Left Kingsoul Charm Fragment", + "item.shitmod.kingsoul_right_fragment": "Right Kingsoul Charm Fragment", + "item.shitmod.totem_of_equivalency": "Totem of Equivalency", + "item.shitmod.rock_with_string": "Rock with a string wound around", + "item.shitmod.blaze_metal_ingot": "Blaze Metal Ingot", + "item.shitmod.reinforced_blaze_metal_ingot": "Reinforced Blaze Metal Ingot", + "item.shitmod.blaze_metal_sword_casing": "Blaze Metal Sword Casing", + "item.shitmod.blaze_metal_pickaxe_casing": "Blaze Metal Pickaxe Casing", + "item.shitmod.blaze_metal_axe_casing": "Blaze Metal Axe Casing", + "item.shitmod.blaze_metal_shovel_casing": "Blaze Metal Shovel Casing", + "item.shitmod.blaze_metal_hoe_casing": "Blaze Metal Hoe Casing", + "item.shitmod.pulverized_blaze_metal": "Pulverized Blaze Metal", + "item.shitmod.pulverized_netherite": "Pulverized Netherite", + "item.shitmod.seared_gold_ingot": "Seared Gold Ingot", + "item.shitmod.blaze_metal_sword": "Blaze Metal Sword", + "item.shitmod.blaze_metal_pickaxe": "Blaze Metal Pickaxe", + "item.shitmod.blaze_metal_axe": "Blaze Metal Axe", + "item.shitmod.blaze_metal_shovel": "Blaze Metal Shovel", + "item.shitmod.blaze_metal_hoe": "Blaze Metal Hoe", + "item.shitmod.copper_sword": "Copper Sword", + "item.shitmod.copper_pickaxe": "Copper Pickaxe", + "item.shitmod.copper_axe": "Copper Axe", + "item.shitmod.copper_shovel": "Copper Shovel", + "item.shitmod.copper_hoe": "Copper Hoe", + "itemGroup.shitmod.general": "Shitmod Misc", + "itemGroup.shitmod.tools": "Shitmod Tools" } \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/fabric_block.json b/src/main/resources/assets/shitmod/models/item/fabric_block.json deleted file mode 100644 index cefb92b..0000000 --- a/src/main/resources/assets/shitmod/models/item/fabric_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "shitmod:block/fabric_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/gay_block.json b/src/main/resources/assets/shitmod/models/item/gay_block.json new file mode 100644 index 0000000..fb4feb9 --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/gay_block.json @@ -0,0 +1,3 @@ +{ + "parent": "shitmod:block/gay_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/fabric_item.json b/src/main/resources/assets/shitmod/models/item/pp.json similarity index 55% rename from src/main/resources/assets/shitmod/models/item/fabric_item.json rename to src/main/resources/assets/shitmod/models/item/pp.json index cff27d5..10fc00a 100644 --- a/src/main/resources/assets/shitmod/models/item/fabric_item.json +++ b/src/main/resources/assets/shitmod/models/item/pp.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "shitmod:item/fabric_item" + "layer0": "shitmod:item/pp" } } \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/textures/item/fabric_item.png b/src/main/resources/assets/shitmod/textures/item/pp.png similarity index 100% rename from src/main/resources/assets/shitmod/textures/item/fabric_item.png rename to src/main/resources/assets/shitmod/textures/item/pp.png diff --git a/src/main/resources/data/shitmod/loot_tables/blocks/fabric_block.json b/src/main/resources/data/shitmod/loot_tables/blocks/gay_block.json similarity index 88% rename from src/main/resources/data/shitmod/loot_tables/blocks/fabric_block.json rename to src/main/resources/data/shitmod/loot_tables/blocks/gay_block.json index 703df4f..1120476 100644 --- a/src/main/resources/data/shitmod/loot_tables/blocks/fabric_block.json +++ b/src/main/resources/data/shitmod/loot_tables/blocks/gay_block.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "shitmod:fabric_block", + "name": "shitmod:gay_block", "functions": [ { "function": "minecraft:set_count", diff --git a/src/main/resources/data/shitmod/portals/gayportal.json b/src/main/resources/data/shitmod/portals/gayportal.json deleted file mode 100644 index 9483c02..0000000 --- a/src/main/resources/data/shitmod/portals/gayportal.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "block": "shitmod:fabric_block", - "dim": "minecraft:the_end", - "ignitionType": "ITEM", - "ignitionSource": "shitmod:fabric_item", - "r": 255, - "g": 192, - "b": 203 - } - - \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/bedrock.json b/src/main/resources/data/shitmod/recipes/bedrock.json index 864e5c4..3e317cc 100644 --- a/src/main/resources/data/shitmod/recipes/bedrock.json +++ b/src/main/resources/data/shitmod/recipes/bedrock.json @@ -7,7 +7,7 @@ ], "key": { "X": { - "item": "shitmod:fabric_block" + "item": "shitmod:gay_block" }, "R": { "item": "shitmod:hausbommer" diff --git a/src/main/resources/data/shitmod/recipes/fabric_item.json b/src/main/resources/data/shitmod/recipes/fabric_item.json index f396445..736cfa6 100644 --- a/src/main/resources/data/shitmod/recipes/fabric_item.json +++ b/src/main/resources/data/shitmod/recipes/fabric_item.json @@ -10,14 +10,14 @@ "item": "minecraft:dragon_head" }, "R": { - "item": "shitmod:fabric_block" + "item": "shitmod:gay_block" }, "W": { "item": "minecraft:netherite_block" } }, "result": { - "item": "shitmod:fabric_item", + "item": "shitmod:pp", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/fabric_block.json b/src/main/resources/data/shitmod/recipes/gay_block.json similarity index 87% rename from src/main/resources/data/shitmod/recipes/fabric_block.json rename to src/main/resources/data/shitmod/recipes/gay_block.json index 35458e9..ed44ebb 100644 --- a/src/main/resources/data/shitmod/recipes/fabric_block.json +++ b/src/main/resources/data/shitmod/recipes/gay_block.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "shitmod:fabric_block", + "item": "shitmod:gay_block", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/hausbommer.json b/src/main/resources/data/shitmod/recipes/hausbommer.json index 840cdbc..11d06bb 100644 --- a/src/main/resources/data/shitmod/recipes/hausbommer.json +++ b/src/main/resources/data/shitmod/recipes/hausbommer.json @@ -7,10 +7,10 @@ ], "key": { "X": { - "item": "shitmod:fabric_item" + "item": "shitmod:pp" }, "R": { - "item": "shitmod:fabric_block" + "item": "shitmod:gay_block" }, "W": { "item": "minecraft:iron_block" diff --git a/src/main/resources/data/shitmod/tags/items/pickaxes.json b/src/main/resources/data/shitmod/tags/items/pickaxes.json index e565f14..7cdad0e 100644 --- a/src/main/resources/data/shitmod/tags/items/pickaxes.json +++ b/src/main/resources/data/shitmod/tags/items/pickaxes.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "shitmod:blaze_metal_pickaxe" + "shitmod:blaze_metal_pickaxe", + "shitmod:copper_pickaxe" ] } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b96dfea..33cb7da 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,9 +27,9 @@ ], "depends": { - "fabricloader": ">=0.12.12", + "fabricloader": ">=0.14.6", "fabric": "*", - "minecraft": "1.18.x", + "minecraft": "1.19", "java": ">=17" }, "suggests": {