From 18b71ec162ff9f5911706777c6ae19aadb4556a9 Mon Sep 17 00:00:00 2001
From: TheBlackfurGuy <64478051+TheBlackfurGuy@users.noreply.github.com>
Date: Thu, 6 Jan 2022 18:30:01 +0100
Subject: [PATCH] Added a Golden Toast similar to the Golden Apple
---
.idea/workspace.xml | 24 +++++----
.../blackfur/tastytoasters/Tastytoasters.java | 11 ++++-
.../tastytoasters/items/GoldenToastItem.java | 46 ++++++++++++++++++
.../tastytoasters/items/ToasterItem.java | 2 +-
.../assets/tastytoasters/lang/en_us.json | 2 +
.../textures/item/golden_toast.png | Bin 0 -> 791 bytes
6 files changed, 74 insertions(+), 11 deletions(-)
create mode 100644 src/main/java/blackfur/tastytoasters/items/GoldenToastItem.java
create mode 100644 src/main/resources/assets/tastytoasters/textures/item/golden_toast.png
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 26d8657..8a576bc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,12 @@
-
-
-
-
+
+
+
-
-
+
@@ -105,7 +103,7 @@
-
+
@@ -294,7 +292,14 @@
1641398298085
-
+
+ 1641409229142
+
+
+
+ 1641409229142
+
+
@@ -321,6 +326,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/java/blackfur/tastytoasters/Tastytoasters.java b/src/main/java/blackfur/tastytoasters/Tastytoasters.java
index f630be9..73cb38b 100644
--- a/src/main/java/blackfur/tastytoasters/Tastytoasters.java
+++ b/src/main/java/blackfur/tastytoasters/Tastytoasters.java
@@ -4,13 +4,18 @@ import blackfur.tastytoasters.block.ToasterBlock;
import blackfur.tastytoasters.block.ToasterBlockEntity;
import blackfur.tastytoasters.items.*;
import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder;
+import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
+import net.fabricmc.fabric.api.registry.FuelRegistry;
import net.minecraft.block.Material;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
+import net.minecraft.loot.LootTables;
+import net.minecraft.loot.entry.ItemEntry;
import net.minecraft.sound.SoundEvent;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
@@ -22,6 +27,7 @@ public class Tastytoasters implements ModInitializer {
public static final Item BURNT_TOAST_ITEM = new BurntToastItem();
public static final Item BUTTER_ITEM = new ButterItem();
public static final Item BUTTERED_TOAST_ITEM = new ButteredToastItem();
+ public static final Item GOLDEN_TOAST_ITEM = new GoldenToastItem();
public static final ToasterBlock TOASTER_BLOCK = new ToasterBlock(FabricBlockSettings.of(Material.METAL).hardness(4.0f).requiresTool());
@@ -31,7 +37,7 @@ public class Tastytoasters implements ModInitializer {
public static final Identifier TOASTER_RELEASE_SOUND_ID = new Identifier("tastytoasters:toaster_release");
public static SoundEvent TOASTER_LOCK_SOUND_EVENT = new SoundEvent(TOASTER_LOCK_SOUND_ID);
public static SoundEvent TOASTER_RELEASE_SOUND_EVENT = new SoundEvent(TOASTER_RELEASE_SOUND_ID);
-
+
@Override
public void onInitialize() {
Registry.register(Registry.ITEM, new Identifier("tastytoasters", "raw_toast"), RAW_TOAST_ITEM);
@@ -39,6 +45,7 @@ public class Tastytoasters implements ModInitializer {
Registry.register(Registry.ITEM, new Identifier("tastytoasters", "burnt_toast"), BURNT_TOAST_ITEM);
Registry.register(Registry.ITEM, new Identifier("tastytoasters", "butter"), BUTTER_ITEM);
Registry.register(Registry.ITEM, new Identifier("tastytoasters", "buttered_toast"), BUTTERED_TOAST_ITEM);
+ Registry.register(Registry.ITEM, new Identifier("tastytoasters", "golden_toast"), GOLDEN_TOAST_ITEM);
Registry.register(Registry.BLOCK, new Identifier("tastytoasters", "toaster"), TOASTER_BLOCK);
Registry.register(Registry.ITEM, new Identifier("tastytoasters", "toaster"), new BlockItem(TOASTER_BLOCK, new Item.Settings().group(ItemGroup.FOOD)));
@@ -47,5 +54,7 @@ public class Tastytoasters implements ModInitializer {
Registry.register(Registry.SOUND_EVENT, TOASTER_LOCK_SOUND_ID, TOASTER_LOCK_SOUND_EVENT);
Registry.register(Registry.SOUND_EVENT, TOASTER_RELEASE_SOUND_ID, TOASTER_RELEASE_SOUND_EVENT);
+
+ FuelRegistry.INSTANCE.add(BURNT_TOAST_ITEM, 1600);
}
}
diff --git a/src/main/java/blackfur/tastytoasters/items/GoldenToastItem.java b/src/main/java/blackfur/tastytoasters/items/GoldenToastItem.java
new file mode 100644
index 0000000..81d7b15
--- /dev/null
+++ b/src/main/java/blackfur/tastytoasters/items/GoldenToastItem.java
@@ -0,0 +1,46 @@
+package blackfur.tastytoasters.items;
+
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.entity.effect.StatusEffect;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.item.FoodComponent;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.Rarity;
+import net.minecraft.world.World;
+
+import java.util.List;
+
+public class GoldenToastItem extends Item {
+ public GoldenToastItem() {
+ super(new FabricItemSettings()
+ .group(ItemGroup.FOOD)
+ .food(new FoodComponent.Builder()
+ .hunger(4)
+ .saturationModifier(2.4f)
+ .statusEffect(new StatusEffectInstance(
+ StatusEffect.byRawId(22),
+ 120*20
+ ), 1.0f)
+ .statusEffect(new StatusEffectInstance(
+ StatusEffect.byRawId(10),
+ 5*20,
+ 2
+ ),
+ 1.0f)
+ .build()
+ )
+ .rarity(Rarity.RARE)
+ );
+ }
+
+ @Override
+ public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) {
+ tooltip.add(new TranslatableText("item.tastytoasters.golden_toast.tooltip").formatted(Formatting.GOLD));
+ }
+}
diff --git a/src/main/java/blackfur/tastytoasters/items/ToasterItem.java b/src/main/java/blackfur/tastytoasters/items/ToasterItem.java
index c7d66d0..31fa48c 100644
--- a/src/main/java/blackfur/tastytoasters/items/ToasterItem.java
+++ b/src/main/java/blackfur/tastytoasters/items/ToasterItem.java
@@ -15,7 +15,7 @@ import java.util.List;
public class ToasterItem extends BlockItem {
public ToasterItem(Block block) {
- super(block, new FabricItemSettings().group(ItemGroup.FOOD));
+ super(block, new FabricItemSettings().group(ItemGroup.DECORATIONS));
}
@Override
diff --git a/src/main/resources/assets/tastytoasters/lang/en_us.json b/src/main/resources/assets/tastytoasters/lang/en_us.json
index 836b0e6..25ae676 100644
--- a/src/main/resources/assets/tastytoasters/lang/en_us.json
+++ b/src/main/resources/assets/tastytoasters/lang/en_us.json
@@ -10,6 +10,8 @@
"item.tastytoasters.butter.tooltip.2": "inherits milk properties",
"item.tastytoasters.buttered_toast": "Buttered Toast",
"item.tastytoasters.buttered_toast.tooltip": "So great, but not shiny enough",
+ "item.tastytoasters.golden_toast": "Golden Toast",
+ "item.tastytoasters.golden_toast.tooltip": "The most shiny of them all",
"block.tastytoasters.toaster": "Toaster",
"block.tastytoasters.toaster.tooltip": "The gate to happiness",
"subtitles.tastytoasters.toaster_lock": "Toaster locks",
diff --git a/src/main/resources/assets/tastytoasters/textures/item/golden_toast.png b/src/main/resources/assets/tastytoasters/textures/item/golden_toast.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e74a174a3b07da046cc00b8c02190b142ce02f6
GIT binary patch
literal 791
zcmV+y1L*vTP)EX>4Tx04R}tkvmAkP!xv$rWGGl1g#+AkfAzR5EXHhDi*;)X)CnqU~mEM7-$i(q_q{(?uaYwv;1h}Gm~L3a8^kl4
zmd<&fIK+yQLVQjMkk13}XY@^3VBi+$S##&sJjdw+kfvEJ-v9@P
zz*vE@*FE0d)jqd>?=qYCUBu-|w|@u%
z!?^kL&3xa?z`wVk8+g8w4j|2H?p|!rjscwCR~}}s?Yur7I;mnRlcN#|x0M4>iTECX
zbnPZV7Yq=cJ@C0%@cwiIKscWvijvCY02pl>CZa202L?F4yhf@RQIyzeL^z*ev?a~z
zz67H!ikySfMUz~umoSY05Jfq-MA2T3(YB$zS}%LWmC3#34oVmT@1`4V#~J*_R3do$
zn2a|_vl^qVr*};I;2*TLN@C9+lhA9hJyD3F58CD?Kfm%twC{#kog8fdybJt^eF33n
Vcz3RiB9Z_A002ovPDHLkV1j1HROtW!
literal 0
HcmV?d00001