From 1e0cf3291eafc784a724fb970f8ea35f4395482e Mon Sep 17 00:00:00 2001 From: Sunskimmer82 <92886026+Sunskimmer822@users.noreply.github.com> Date: Thu, 9 Jun 2022 14:27:02 -0500 Subject: [PATCH 1/7] port to 1.19 + other changes --- build.gradle | 19 +---------------- gradle.properties | 10 ++++----- gradle_BAK.properties | 16 ++++++++++++++ .../java/net/serenas/shitmod/FabricBlock.java | 2 +- .../java/net/serenas/shitmod/Hausbommer.java | 4 +--- .../java/net/serenas/shitmod/MyContainer.java | 7 ------- .../java/net/serenas/shitmod/Shitmod.java | 14 ------------- .../java/net/serenas/shitmod/configGroup.java | 21 ------------------- .../serenas/shitmod/fragileHeartCharm.java | 14 ------------- .../serenas/shitmod/fragileStrengthCharm.java | 12 ++--------- .../java/net/serenas/shitmod/kingsoul.java | 10 --------- .../java/net/serenas/shitmod/potatoChips.java | 10 --------- .../shitmod/rockWithAStringAround.java | 7 +++---- .../net/serenas/shitmod/stalwartShell.java | 10 --------- .../shitmod/unbreakableHeartCharm.java | 10 --------- .../shitmod/unbreakableStrengthCharm.java | 11 ---------- 16 files changed, 29 insertions(+), 148 deletions(-) create mode 100644 gradle_BAK.properties delete mode 100644 src/main/java/net/serenas/shitmod/MyContainer.java delete mode 100644 src/main/java/net/serenas/shitmod/configGroup.java 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..5449f7e 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 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/gradle_BAK.properties b/gradle_BAK.properties new file mode 100644 index 0000000..84f8c9a --- /dev/null +++ b/gradle_BAK.properties @@ -0,0 +1,16 @@ +# Done to increase the memory available to gradle. +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 + +# Mod Properties + mod_version = 1.5.0 + maven_group = com.serenas.shitmod + archives_base_name = serenas-shitmod + +# Dependencies + fabric_version=0.46.2+1.18 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..a702062 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; @@ -37,8 +35,6 @@ public class Shitmod implements ModInitializer { 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 Block FABRIC_BLOCK = new FabricBlock(); @@ -114,8 +110,6 @@ public class Shitmod implements ModInitializer { @Override public void onInitialize() { - config.load(); - Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_item"), FABRIC_ITEM); Registry.register(Registry.BLOCK, new Identifier("shitmod", "fabric_block"), FABRIC_BLOCK); @@ -188,14 +182,6 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("shitmod", "pulverized_netherite"), PULVERIZED_NETHERITE); 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(); - } 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/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/potatoChips.java b/src/main/java/net/serenas/shitmod/potatoChips.java index 092933d..3bdd8e1 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; @@ -23,13 +20,6 @@ int potatoChipsConsumed = 0; public TypedActionResult use(World World, PlayerEntity PlayerEntity, Hand Hand) { PlayerEntity.getHungerManager().add(1, 10f); PlayerEntity.getStackInHand(Hand).decrement(1); - potatoChipsConsumed+=1; - if (potatoChipsConsumed == 69) { - PlayerEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 20 * 15, 4)); - int potatoChipsConsumed = 0; - PlayerEntity.sendMessage(new LiteralText("I'm really fat/test"), false); - System.out.println("I'm really fat\n/test"); - } return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(Hand)); } } 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)); } } From bc18fa3d6c62a1b06fc31b5b9176d968da5d1a5d Mon Sep 17 00:00:00 2001 From: Sunskimmer82 <92886026+Sunskimmer822@users.noreply.github.com> Date: Thu, 9 Jun 2022 15:06:50 -0500 Subject: [PATCH 2/7] 1.19 --- gradle.properties | 2 +- gradle_BAK.properties | 16 ---------------- src/main/resources/fabric.mod.json | 4 ++-- 3 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 gradle_BAK.properties diff --git a/gradle.properties b/gradle.properties index 5449f7e..3deb5e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx6G 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 diff --git a/gradle_BAK.properties b/gradle_BAK.properties deleted file mode 100644 index 84f8c9a..0000000 --- a/gradle_BAK.properties +++ /dev/null @@ -1,16 +0,0 @@ -# Done to increase the memory available to gradle. -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 - -# Mod Properties - mod_version = 1.5.0 - maven_group = com.serenas.shitmod - archives_base_name = serenas-shitmod - -# Dependencies - fabric_version=0.46.2+1.18 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": { From 6731e64cb1a103683de82839c50f517d551d7292 Mon Sep 17 00:00:00 2001 From: Sunskimmer82 <92886026+Sunskimmer822@users.noreply.github.com> Date: Thu, 9 Jun 2022 21:02:20 -0500 Subject: [PATCH 3/7] stuff --- .../net/serenas/shitmod/blazeMetalSword.java | 2 +- .../blockstates/customportalblock.json | 13 ------ .../resources/assets/customportalapi/icon.png | Bin 12231 -> 0 bytes .../models/block/customportalblock_ew.json | 42 ------------------ .../models/block/customportalblock_flat.json | 42 ------------------ .../models/block/customportalblock_ns.json | 42 ------------------ .../particles/customportalparticle.json | 12 ----- .../textures/block/customportalblock.png | Bin 19259 -> 0 bytes .../block/customportalblock.png.mcmeta | 3 -- .../resources/assets/shitmod/lang/en_us.json | 26 ++++++++++- 10 files changed, 26 insertions(+), 156 deletions(-) delete mode 100644 src/main/resources/assets/customportalapi/blockstates/customportalblock.json delete mode 100644 src/main/resources/assets/customportalapi/icon.png delete mode 100644 src/main/resources/assets/customportalapi/models/block/customportalblock_ew.json delete mode 100644 src/main/resources/assets/customportalapi/models/block/customportalblock_flat.json delete mode 100644 src/main/resources/assets/customportalapi/models/block/customportalblock_ns.json delete mode 100644 src/main/resources/assets/customportalapi/particles/customportalparticle.json delete mode 100644 src/main/resources/assets/customportalapi/textures/block/customportalblock.png delete mode 100644 src/main/resources/assets/customportalapi/textures/block/customportalblock.png.mcmeta 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/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 553162a81ba555d9b61ace21d91d7bbf272fb4fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12231 zcmeIY_g9n86F>SSh$ux6kfIQZND=8xsS!kx4i=E!dy`%aiAs?UiWoqO3Zl|Pn$(~) zr8lVpA{~U#1B4`Zd4KNx;rRXXlxn@|uY;)W5|*d!818AcosoH;f?& z4*rEhr%r;Oo#3HE2;zlq-?)A^`1RT(&g+6wHDS{)qz2lpg?`=683KR$_$k=Xsn4-_ zpQ+eSGr^Q1VTBKEPwBt0%X)%s|5B_b!}UBaZk0%-+Dfc<#(O3erE8w4*++Ye-+&;D z1f_sP1%9`L!Erv%j?a$%KmY!JKo0Z=K9{7^S1DXjUwT(_!)@YXlMgF&Q zrjxW7?R+k<(CNbc-K|(?dC1_xKL$QdbVs#dgs_&~jJWOkI|5 zEDrE`JRhkYPfm)ogFfr6zM)8W!G{vyx$611DDCP}(5PXj23p~NW76aADE7;-uwi;A zAQ*jbT7%*UHejblI=Y=F<#fy|76~lSok^9ljKKdMZ8*Htd+;isv(X$iu{q3f@^rvk=)<%8eoC1~m2Je<0lPa5=8aS5#$=7ftFaOjesFFK zJeN7`7Nx+Kz_Eweu7!e&Gly|si;0%x(T&McMr!0GGfooWr`Po+dRYDDRuh`j3AUmE zGkgpdp}r71Fmfkcx+m~!dduxm4=}Zc(A}oNC7gE&zIjj3>9oylg<3U=gmn(8)0Qn) zoE7S*Pa+eY${7@f%I}R5yR_ir@8dSAgR5xKnNzn2sOF$*1R&xdwHJue)~3U)cz9n` zPv<243mI*Xet-!zgoN#Oa)g4CW>D@5=1rm}cI3=e6ILWf8rha#(w9R4xsYMY63$~C zkz;kypYDv19|=d5DwnP%*0uT`FQzb7#sSzz!g3?}(Uvuh=nT1~SSqJ8|1!jK)aE2c zu5=WNb-|b3L5AO#ruAzpPg*|it5gmrW@Tcdmj5mv2Ibr$U=}Cqvn1(qli*0$JBqv? zic%q57ADz%3k@~hteyGnWk#NV+Fo+)8ar0bA!}^&mm9o)zw%;hrQb)ja{ULs0XPdA-34>VymOy%$hrf$h`Zz^ic!^tAZ{PbzQYvp5GUN|{ch~dDWrPl4Ny4EL)lI8|Y zA~|YD7&*-$cQzkp9!e}4HH?{^7U|hjGs>i&Doi~E3^U(UMiDWCDh8lB` zl`0~6a-)xs0B;hBg{eP^idI!*g_6gN=T>=!>6r%H?laCP^=RV(f z*|ug_X(2Az^yoFU9ZudnvOjT0ZL%+yhGYokDp;LkGB&}Ew{x&U&%P)rHL0tscQ}xe zj8q5SKuG3t$KdJUnuP!u-^VXwQTU-()A3s=2x{m{E-$Zu>dx<5r&*yN>qn(~YpG1; z2Zy&PVR3s#5U)}dE3@AhH&2&w4nw>Ow2;H@ zeD$7ZDpTgcmN|tOR|OUqc2@p3Qe&}-M)%7DnpQTX`d?qd2MS3O$R@el{|$;xC2JS= zd4A={+cZQkb2bog*Sq7(tvV}#YtBerpRA3X6ychC`udo>;KJI(;xgB`mt1;ubZZ^Y z%*^JlL2&X>eZlTSv4aqv*A#}F-h#|U#{D~2SfL!R9bCH$JK(yk4_cb=Ji-SRY3+yf zt|npq-|guKS=RLv>v)#QsyK2#+0$V0sFY0LSbGa0<=Ng3>I7J1if1EicuKMn9@Z3P z^q)%U=FeopA>lBvj`FyqaQD~_iint$v7HCdW*{H69+P|&4(Fwh&YaZpBAnMVq{}`Z=(6NCe+FHRqQDmDn6cL z65GhiXXJn<;&d}MymRU>%$1@d%t)jDAN#(~=zMn!x4Lz?58)~%Nqbn@5 z&4>Pg698piku1bqHhALHfvM|B0lVrM<`qpadS%jZ8D=x>A+ohs_k&otQLV6(Q$0Yh zC9qDQN(6dk%ytG^VZHqkH{JlTtajqUm%a~U^y{ksoS?j*Pxv)GQI6~~> zWRZ$fES9BWo_Tq00NmX8{{4G#sYKE`g1}CfwQf7&>i8*08chycQ|;=#KQq^|UTYz= zUl%j^%l6Vgv+Hi)ejUbk;c5wOQkkB?ruyuMId~BsZ-4g3W(T_V???x4fxFgf8z2si z3L?*6qnJ~QFndpNI$gb9uEVhbqFOO<=%=YGBw#m-+FW@I~}Utvr}Ana2Xn{ zd6EirtZUwkxHqaMm2gkH$H&xkBcSSXkjkN;Q-nu8J4S0i(G|V!LIXrtwj(aL05i9X zn?1B9p{AWXn?*M(Sq7y?jE`lXcLRnIxZ+vB9FwWtP0HO5v8L3K4HQC3zl{!=jppmF zl}6ee@A854Z9}?J@0|J4Zn*8A_~>n1Gg?9?&P4Mn$EjsQi1)M(1LnqGT8xD|m+w@c z(Dr62tDv9Ks?wD!>s*;wewxu}ICOjHP=DXhF1($qu+>lXNR4uSTG>gudUvd93Vf$< zI?)YgYUpOUKV;h9!8KY?ZQoT=u9;!FB?h>4@)RbO9y^o+ih=p)HwoC`I%3^Q*t z=^H_FqbmyOxT$OfrxkSVXM*aH#%C6y)z;zz z7t9@ohDOxn5gD+Up=l}R-D9#epp3?$vBBltgEQXN_SsT#%@vu~iYbvF*DM#&&6Vf_ z98cUZy}@!H(Hrj1F* zPvOX?bBqXh#38p_1Cqc^67 zr98QnChWwx=p)L6A*SxXA8re*2PKI3`*KZ&x@3ftB*@e0?mLui)uZ}K9-pBy4$%=d z5GWyK>Pg@in7ZxCvBr8B z<7uqW_G~$mJ>si~)oc+Za)dkWRvsH2bmrvuV_)F38O13hrsf|RoY?xHosBOsoy=3W zg)V21IhDq9#4SNB)(0N4Y~0TV%`5Fgl#j(}_QU7n$0j${wo%BN4FWmrzRe?qhkYkB1XZ7wL2#J)o`}q*_m^C3tW@6@K)=B2Rt=YvEF;e=&y{0O2xI6X~(kSO0Dd*_ZyGl zkWmqW<3-_V!<9%higBLPuMIgJZ071E1te<93UPF~QSqjHohA&)*KpBM4iOzJ#PK)1 z{sgC0Jn74?iV6;vc|*uXvM?^+R}L2Yz!bZ3*ha24Xs|L>*?;uG^!NDX@86KmG+>x- zR}hfE^8#>CKjmYTngokE#1+<8j2Iss$vLbY;xZ_8O+G^nom?%KZfKix0W4GR^-Z2D zyR#EL%=D3o5@cM59d0c~72=0;mF^9h$}SdGxN3gmNNltv7@XCz zbxOpMC3ncY)Gp|L-hP&^>XFd4wg2F^kBnBFVR~{V z;RXx*i8JmKtgImEk>`^_B_v;#~I5!MFUb=NIxUj$W}h6a=P#bplV~5O_O@H1?Y@@!r@MwLi5#5f(48q4XByrwI7CY9L_Q6Y6Nd ze`{!)JWP8`R%o6|kkCD~)ok5jef;(abfdsUzbG<@iESZG)iE}v(iIwe6?Bb}x(@-3 zGhhS+0BWqz)t`r-mde1#G$=2yx}GyD<2^GoeQAMEP40*TcX|qkgjx}I@94DYQx#a; z%d(FQN$j7h+@$&ARWC=ye0%yct>;^)>Gu7-M?4+CiHa0Z{8;aNycNb~Lge|6QJ@Lo z!jMnu?nxy7Y}J!|uG@MGA>p{xQsE-p`q(R0bEKHyeAT@Q;A(F@@Q&q|E;()3@rzPZ zGQYyt-8=H#t{1gA3fxlf!(JCUYAEr`BjA>#E;fx9Q0n4IV}gFf($F)l_TWP2;WM%z z*!}fgd*hfB!sucKnP*#R-OaUsx-(DlREL>yH~kwBdtDVKXcXSH18QVp@hVI^q|2o= zk}%o+w~{j%#8Wd@!6ptQC|6txM_l3a|ECim=I5Os&%Nea(Lf5}p-nSTu+1a+?%CA_ zA5H^9UoN$Z-lQ~)Ui39T#qijNo*FviX6wK)aYA@k{u48P#QtVjzSX8hNju>VR{VRB zZWn@trC8CG;2hhUO^y{|Z`%dzUj%61WEY1~svoOXj8t zDs~BoU zwPJ-vI}cMnSlU%%@;%-f`(CcWYbcB~uPrv{Q)T=-3MQzQ0&6o+;&>hK@!4eLRC_3J znW+sF9em!Bj9<#?%NqNT}npVRmsXWa;R@w0^l8iRrYJhyHDsrSlm`bG4CPnob0KrG^kk1Q)bKN4nX$USk z$8xc{f`OFItL=9sKz&p2CBFQd23?BGP_0GVzyOwL!z{pK@!pxZ6 z?K7}j-3_y>{SDa&I?V5jn;M!BHPXVk{{3SVE96q*nh?msn?#L_;e3UPqtZDCiS7Pi zdc(&Ar-fvzoh`#sUR1+vNTt6kQ8kjEhny$J`N!&Rk%(t@jG(I{e`5oHpen^)78v`= z9&F(&ht5_PcRxRN5W>)J_hMM`GqUO;+sIumon^w$x~v0j)UX&^K!&-a5e+T07$s|2 z#=Hh^nh?bdn2QHF!?d$#`s`pnWD^RR3fRG(%BruoZ=fA!i=jSKqp5Cq>UhuaU*}Jx zPxObv&}(<8@rEArN2XkHZSkGag^NbPCbTf)EEu1B>l=#&w^I_G#!WXV&c8)g&!T)=mE&(^I@La zZG0rqBo4)e>agWY>7l%K>r__4Dr=q)5`EC}YEPMC>9S2=zFP{G;E69SPLFXd1OpHMm< z)Fvkw#Mie~)HC^xOgildgg$UMT!H=gXB#(@)4kj0a_~~8_-6>OQ71J#q@6JKjJ(Z+BaDq^O%33ELy-8K*1BeV?Cq2Oia8(y9kyhy30O zZoLCE^Q2CYn-Zd9-*VBx&8;!6BK9L;6=ci5HoR)!CAgqYoS!(cWau0J1ANL>j2PSuomDlqGF^Hs04l`Z+ay=GzwpO6%+Gp~dY4(F z=D#y84GSaM2H`(qh^|uwMFOAQb_R2eDHA>qU|Rzc((L-s`4a=1{cie+ZDCDDSQW=CP2-Y5k)XN0 z-r0%vRs3zS(quP!hR5SKVSS&Eb(hESJHNQJpwyj7tHfY3fCyEi9)UfE56ki`?MfJ^ zp=IOH3m@}+Bn>CP@WLBdvexfP*M<~2PBwDX-r~B^|Gi+|G4^@?h1)4u9G^tF)?g%= zL>~eK)6prfFg5+0)t39`Odrz+U=9-$1BN_BV;+24n+bN1zVc7t+G{MH!y^}R8Ctnc ztTGZTo9tL>H3-y@h-sd&$py)+Y=@3ruNXmEL;Wz)3EBP*rKSPO01R6Lc{c>e!Bz$e z-oA>mREpWG?Kba#n`YROmJ^XKxsx94X_04bsvD{dBr8aZIT`XG>x%TcV#wvxADf@E zc7m^Rd;rM_!7y$+GvPOwwm7=35y5nL}HH!UVAxQ;X5 zL;w2~=nZGzG7!HxIQegJgXhY+L-w#i^2qTpkSKuG7&he-vJMaR7Q*)eUi`nt)3`?Z zCfr%KQb(N>rebfd5xEB5KrRv0K`Gaggm?EYM=D=hz_(6xU7(?=dg*P+3)zb%cqTd0BNFl_AG41Dc*QG;tun*uTn z|5?Mp4!{JC#kJ$8YUHTX+v;>h#;6k#@eYM=2HAF7$Rmnr^OAk-Mm1$Z$Bv9pCX4kk z{ZOTaX6rq#Gk+}PIjG~|Uqz3bMC8!}1|y$72C$Z7&uoHF5KAscj@P4-R*sCicAw%# zfHc`Bpm9Y=_hpNXVQl zi|+6*ec%h;2kFjiDA&#{n9V3i2}Z1i#z$0yyixP^Q`JF&+mdDmDxyf4Trx0=;62B0 zjYC>DDC3LLmiu91k~{aBj)UKGa9OJJX{V35~z z7sB6@trrw$0>6}^2Uv}yC~N1dWz&9OA8>(Um1M_kqkW1z0TC9yA9VYGDZQ(`^lUDt zA!Vpuj2%P~9P_(QgX3>6BFKC}Ny`P#+x=bhz-)zSY8a4K>PUs`I95D(A1~PMtd!oa zf^|J9du4q3Qp+1i^2chn{aGbFjQ)Yoy!SWjoEF`N#jjJx?6Oragd$-!$s-_5d8m+K zps@QpSI{qIn^I9~*ATPD(AS>K$({jY&=HNSQ2^Cr%aTgmdT2~Ya?r@CZ*jGwt2FyH zbEy^li`T8=4pZJFpbk-&oM(=WA^p}7Q%sFjox)MKyz(2+~)zpenn2=ufFw>R`Wz^{1X45JD!iMFB9z z2E;cTP+F$-yTZexbFQv^gK6b;@sn*zHU%$Wtu6Lj`R<99BKA!S=r!dRPR)*k7P41P zlC;l&Lafp~Rq~x+XHccb+!j|YdvQ`@__6`uV(Xp;aIX1AbBVf>ZLCms<}o;u3@U0- z!DwvjKe@edjjHVD#W~KMi%K3~v2x|k1QMVc$J0{$+pq4nQxhsD9O5_&W?VnstEM@g zv9b|hHi6<*&Lu7t?5u1}wi#(q9`u561cVcy@kB#e0b-7+bDAn}FxOgcb$k)BU(!$S z5)7&+L;(QHNPZ{&P!}MNw<1pKtlVA}l*#dOImw!7Os61)pvIg%=9*K1)`1&Ca;Y~@ z%z|x@KP7_4n|r*l?w=H%txm+!PT_pRg0oHrtTk`0hap}AW)neZc4*6%Z@YpanWmfV zSrz$7CUXO22v&o%9FABe%b`7cN4Ipl7g5Ojz^-h}XcJe9a#-=08mWmM>b2*TOc-e)(TMTCUao&GrX)zsA8K-WC=n45v zw_i5z!KTcwujc%Are`{H@(Tv^H(arxQ&=Aw*`5FC-Ey<7A_H}B*>g9!^i*zBMY(&k z3|JpP^CDQkgb?$Z#YU#A@PN>8$T?yCmuYxyuC5AbUaoJv@%EI~=od$cvOAs8PJ_M` zoO}P{`ARPIfr9~~?n`*Q=;SF{hGuM!Z5YBAh6J!1A2JEigYv%A`wtr0TqiWn+6a|} zbtQ>?&}$G*PR~y^P&gzQaoq$22yMRn`z(G9o&te-KR$BHiCD{(g$V)tF5n&5T{K2R z+e^r9jxEP{aH@>D$x8yGar@WzG&rwAm(aMfuN2%0$6djX1b;UJJh!Fex8c6K<%xUA^m2HMe~=?G>>>hs&Cq_+YPl za(4ftJK0IyZU2nD8ffuINzSN^LDkM&ok5K$eDBO+o-QoAXcG7`0ytqS&^wYLR*Czv zn^(2m{8RZzmlbX>reNHoa+p9migNh(1Zl;ia*41U2Y_uuzN)t>`BiWmb{V*BY8`%j zE_}Z=+)2Z4i7*?ce1(htt`IGTRw`hhl}_}TbLU2S$Zy49mx$MOagJS!tP^HRfjb@g z*#+?;dC82RePkU`i7VM{0Y%T%=6heqLa>}yhv&rz%@PacF{JbonE=F2D#&&5f>uEC z^fZu4(!3ylxg++l-lE!s>Gew1v@wjA+4|Y@0#mYhbu1{+U#c>E5WBaSGT?wf2v~v8#TWaNyP215Yl3Bh2`zIm84VOqncI~Epd$HjKM~;mxuN?yEhznuH>a< zqQrn<9opGQs&QR3J7TMYBsH%y`+=5+>}a5o>M+C8=b?tgkv2Yj_|W!-wMq->Oieg> zv|&!fX~fQ??8PFdUlTKc*gxD5qib-B-E;m+!t?IQ)>|k+ZSjaZ6(fnB&N|tPg9&5; zJq$G0jEe6lBY=CL6rg_Pd;y@zlNatY=Kmf`i_ksCQo`LmbK9f9!PmjTicu;CAK&xw zl-v;a(o~&VYVgI1tsWjJOg!{7_aljysom+IjscD`XEgG)7I?{U~;q+w6qvrHBi?^ly;hTuH}8hX_yf_HFJjr=(Eq$VD5w{zJg&} z&}W?H#riYiax0pqTM!vIsHIj>5$_g+2F=6(YVvO;b~2YF`(;f6#;dH7wG@O_21=+H0}|hphexB>lQ3GzFB=wXu)h1t3MrD{2)Q5%b(xFmKq9|fJl%G&@UP_IH4rMJ=RVfX^ zcf%GKlE`ug;xcmy$nvS&d^NqhHi>_+jSD$nI+twW?y(A7#C z3CFV=3;abkB>`px-z;=wK;l`?Sf?8!)T%GAt?od8FMNe)qd+s1!<*ajH|=gxqr5(Y z>|24|R@St6XWi+7*ZWKF?@CB_W8%3P(#DN6WODuA@Fjyz3rz>K-Fs7F&-*!H_>@Hi z4gO$y%l(A-i0$6Hp_$8|#%168thW+jYwdC}Reqdc+Y1EbqjB{$*63gI^8PBl`Ai_{ zD{U(>vDkVQJ8;C~h| zY)y&Cd8lRdIrJ2zYea2k`c0)>sB|xQsuZ2=4T*-dC?}+A^EYHDIB{rW>T6q`3tV;% zmp_*1Uq$~e=T!wo-kKbLZTM53n^xYhVyOk^e9k_yMaeFurvZrC?x9*p3@CHS3gn=d zDJnxtgL;R!!EX7EcQg)Ug2vJK>@%R@su&^tfGc*IG)W%e|R6hfvfp2J0k%SrXdjZgK&q|1@gaIlL58P zdE5&xw7gyJnEi{ShTpCTE}s7%9cLJs>M!UjYYYD~`*ZAsuwbUA@QDhFmvIPDMR&VE zT-}7x_U>!Gsli z%V;tmDx|yMsC2||x*IbP9fh1X0(@EhX%+!|wf2TqeW^6vFr0mZlD#0%P;;uBO-}Cs zuhWIsl*v7Y4?v4C?ZxPK{U?Mq#l3cUu*JYCa_{1FyYTJMpWq4#x&93#{Olw^6@Hx% zz6UUuAHN2QkYexS9tkllfSh$8TD|rPE#`@KmWh{~m}haV#e})+hi`wM;^@Gn(0d&G zFW~3KE?QYm7688>LHIM}Jj(7pMieDZ(|}jVNJI4!gerZ<$ynh!@NB{+wds#Dg3itj z$RR$V9$HUV$lBl2Sx4+r^i=>aORGFwEZgh#6I)Ja@k*=mmR!>!XSWH8mP?e$U;0Ep lLd5@Rm;V1>uQ-`U>dq$?^@<8-&?^t!*3`dIqHgo#{{pEACz${M 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 062ab90fa284de6f120ba474d83b58779c55c8bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19259 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 Date: Sat, 11 Jun 2022 11:43:54 -0500 Subject: [PATCH 4/7] stuff --- .../java/net/serenas/shitmod/Shitmod.java | 30 ++++++++++---- .../net/serenas/shitmod/blazeMetalHoe.java | 8 ++-- .../net/serenas/shitmod/copperMaterial.java | 41 +++++++++++++++++++ .../net/serenas/shitmod/kingsoulEffect.java | 25 ----------- .../resources/assets/shitmod/lang/en_us.json | 15 +++++-- .../shitmod/models/item/fabric_block.json | 3 -- .../assets/shitmod/models/item/gay_block.json | 3 ++ .../models/item/{fabric_item.json => pp.json} | 2 +- .../{fabric_block.json => gay_block.json} | 2 +- .../data/shitmod/portals/gayportal.json | 11 ----- .../data/shitmod/recipes/bedrock.json | 2 +- .../data/shitmod/recipes/fabric_item.json | 4 +- .../{fabric_block.json => gay_block.json} | 2 +- .../data/shitmod/recipes/hausbommer.json | 4 +- .../data/shitmod/tags/items/pickaxes.json | 3 +- 15 files changed, 92 insertions(+), 63 deletions(-) create mode 100644 src/main/java/net/serenas/shitmod/copperMaterial.java delete mode 100644 src/main/java/net/serenas/shitmod/kingsoulEffect.java delete mode 100644 src/main/resources/assets/shitmod/models/item/fabric_block.json create mode 100644 src/main/resources/assets/shitmod/models/item/gay_block.json rename src/main/resources/assets/shitmod/models/item/{fabric_item.json => pp.json} (55%) rename src/main/resources/data/shitmod/loot_tables/blocks/{fabric_block.json => gay_block.json} (88%) delete mode 100644 src/main/resources/data/shitmod/portals/gayportal.json rename src/main/resources/data/shitmod/recipes/{fabric_block.json => gay_block.json} (87%) diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index a702062..544677c 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -51,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()); @@ -79,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)); @@ -107,12 +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() { - Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_item"), FABRIC_ITEM); + Registry.register(Registry.ITEM, new Identifier("shitmod", "pp"), 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); @@ -127,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); @@ -182,6 +188,16 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("shitmod", "pulverized_netherite"), PULVERIZED_NETHERITE); Registry.register(Registry.ITEM, new Identifier("shitmod", "seared_gold_ingot"), SEARED_GOLD_INGOT); + + 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); } 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/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/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/resources/assets/shitmod/lang/en_us.json b/src/main/resources/assets/shitmod/lang/en_us.json index 3a705ba..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,13 @@ { - "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", "item.shitmod.potato_chip": "Potato Chips", @@ -33,5 +33,12 @@ "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.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/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 From a1254a91ff2803e3d0d21188ebd95072d7645a75 Mon Sep 17 00:00:00 2001 From: Sunskimmer82 <92886026+Sunskimmer822@users.noreply.github.com> Date: Sat, 11 Jun 2022 11:47:04 -0500 Subject: [PATCH 5/7] minor changes --- src/main/java/net/serenas/shitmod/Shitmod.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index 544677c..65bac4d 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -1,3 +1,8 @@ +//Welcome +//To any dev working on this project, I don't know how 90% of this works, but maybe you do. +public double hoursSpentOnThisProject = 90 + + package net.serenas.shitmod; import net.fabricmc.api.ModInitializer; @@ -201,4 +206,4 @@ public class Shitmod implements ModInitializer { } -} \ No newline at end of file +} From 54b58d790e9e01a699fefb327206caaa14bcaa9c Mon Sep 17 00:00:00 2001 From: Sunskimmer82 <92886026+Sunskimmer822@users.noreply.github.com> Date: Sat, 11 Jun 2022 11:52:41 -0500 Subject: [PATCH 6/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2fe6036756f78cdf921a3315da30190f26480405 Mon Sep 17 00:00:00 2001 From: Sunskimmer82 <92886026+Sunskimmer822@users.noreply.github.com> Date: Wed, 13 Jul 2022 15:43:52 -0500 Subject: [PATCH 7/7] make penis's name more clear --- src/main/java/net/serenas/shitmod/Shitmod.java | 11 +++-------- .../textures/item/{fabric_item.png => pp.png} | Bin 2 files changed, 3 insertions(+), 8 deletions(-) rename src/main/resources/assets/shitmod/textures/item/{fabric_item.png => pp.png} (100%) diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index 65bac4d..1b7e2cf 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -1,8 +1,3 @@ -//Welcome -//To any dev working on this project, I don't know how 90% of this works, but maybe you do. -public double hoursSpentOnThisProject = 90 - - package net.serenas.shitmod; import net.fabricmc.api.ModInitializer; @@ -34,13 +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 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(); @@ -123,7 +118,7 @@ public class Shitmod implements ModInitializer { @Override public void onInitialize() { - Registry.register(Registry.ITEM, new Identifier("shitmod", "pp"), FABRIC_ITEM); + Registry.register(Registry.ITEM, new Identifier("shitmod", "pp"), PP); 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))); 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