From d3c28f07ee101c49ce10150a30f030ae5654c980 Mon Sep 17 00:00:00 2001 From: Sunskimmer822 <92886026+Sunskimmer822@users.noreply.github.com> Date: Sat, 26 Feb 2022 19:49:00 -0800 Subject: [PATCH] 1.3.2 --- .../java/net/serenas/shitmod/OrangeJuice.java | 12 +++++++++++ .../java/net/serenas/shitmod/Shitmod.java | 4 ++++ .../resources/assets/shitmod/lang/en_us.json | 3 ++- .../shitmod/models/item/orange_juice.json | 6 ++++++ .../shitmod/textures/item/orange_juice.png | Bin 0 -> 5293 bytes .../data/shitmod/recipes/bedrock.json | 20 ++++++++++++++++++ .../data/shitmod/recipes/orange_juice.json | 20 ++++++++++++++++++ 7 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/serenas/shitmod/OrangeJuice.java create mode 100644 src/main/resources/assets/shitmod/models/item/orange_juice.json create mode 100644 src/main/resources/assets/shitmod/textures/item/orange_juice.png create mode 100644 src/main/resources/data/shitmod/recipes/bedrock.json create mode 100644 src/main/resources/data/shitmod/recipes/orange_juice.json diff --git a/src/main/java/net/serenas/shitmod/OrangeJuice.java b/src/main/java/net/serenas/shitmod/OrangeJuice.java new file mode 100644 index 0000000..f2af644 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/OrangeJuice.java @@ -0,0 +1,12 @@ +package net.serenas.shitmod; + +import net.minecraft.item.Item; + +public class OrangeJuice extends Item { + + public OrangeJuice(Settings settings) { + super(settings); + + } + +} diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index 51f5dfd..fd18837 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -30,6 +30,8 @@ public class Shitmod implements ModInitializer { public static final Item LEAN = new Lean(new Item.Settings().group(ItemGroup.FOOD).rarity(Rarity.UNCOMMON).food(new FoodComponent.Builder().hunger(20).saturationModifier(10f).snack().meat().alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.WEAKNESS, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.BLINDNESS, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.NAUSEA, 20*60), 1f).statusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 20*60, 2), 1f).statusEffect(new StatusEffectInstance(StatusEffects.POISON, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.GLOWING, 20*60), 1f).statusEffect(new StatusEffectInstance(StatusEffects.MINING_FATIGUE, 20*60, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 20*60, 3), 1f).build())); public static final StatusEffect EXP = new ExpStatusEffect(); + + public static final Item ORANGE_JUICE = new OrangeJuice(new Item.Settings().group(ItemGroup.FOOD).rarity(Rarity.EPIC).food(new FoodComponent.Builder().hunger(200).saturationModifier(10f).snack().meat().alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 20*120, 20), 1f).statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 20*120), 1f).statusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 20*120, 3), 1f).statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20*120, 2), 1f).build())); @@ -49,6 +51,8 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.STATUS_EFFECT, new Identifier("shitmod", "lean"), LEAN_EFFECT); + Registry.register(Registry.ITEM, new Identifier("shitmod", "orange_juice"), ORANGE_JUICE); + CustomPortalBuilder.beginPortal() .frameBlock(Blocks.DIAMOND_BLOCK) .lightWithItem(Items.ENDER_EYE) diff --git a/src/main/resources/assets/shitmod/lang/en_us.json b/src/main/resources/assets/shitmod/lang/en_us.json index 8acf11d..d53c5f8 100644 --- a/src/main/resources/assets/shitmod/lang/en_us.json +++ b/src/main/resources/assets/shitmod/lang/en_us.json @@ -4,5 +4,6 @@ "item.shitmod.hausbommer": "Hausbommer", "effect.shitmod.exp": "Experience", "effect.shitmod.lean": "Lean", - "item.shitmod.lean": "Lean" + "item.shitmod.lean": "Lean", + "item.shitmod.orange_juice": "Orange Juice" } \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/orange_juice.json b/src/main/resources/assets/shitmod/models/item/orange_juice.json new file mode 100644 index 0000000..26776c4 --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/orange_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "shitmod:item/orange_juice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/textures/item/orange_juice.png b/src/main/resources/assets/shitmod/textures/item/orange_juice.png new file mode 100644 index 0000000000000000000000000000000000000000..1d4f41c9ff7b35923f79eb214c49d08c2abd3147 GIT binary patch literal 5293 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/shitmod/recipes/bedrock.json b/src/main/resources/data/shitmod/recipes/bedrock.json new file mode 100644 index 0000000..864e5c4 --- /dev/null +++ b/src/main/resources/data/shitmod/recipes/bedrock.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XRX", + "XXX" + ], + "key": { + "X": { + "item": "shitmod:fabric_block" + }, + "R": { + "item": "shitmod:hausbommer" + } + }, + "result": { + "item": "minecraft:bedrock", + "count": 1 + } + } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/orange_juice.json b/src/main/resources/data/shitmod/recipes/orange_juice.json new file mode 100644 index 0000000..1d467b3 --- /dev/null +++ b/src/main/resources/data/shitmod/recipes/orange_juice.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XRX", + "XXX" + ], + "key": { + "X": { + "item": "minecraft:bedrock" + }, + "R": { + "item": "minecraft:orange_dye" + } + }, + "result": { + "item": "shitmod:orange_juice", + "count": 64 + } + } \ No newline at end of file