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 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..3a705ba 100644 --- a/src/main/resources/assets/shitmod/lang/en_us.json +++ b/src/main/resources/assets/shitmod/lang/en_us.json @@ -9,5 +9,29 @@ "item.shitmod.kingsoul_charm": "Kingsoul Charm", "itemGroup.shitmod.charms": "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" } \ No newline at end of file