diff --git a/src/main/generated/assets/acesbs/models/item/tobacco.json b/src/main/generated/assets/acesbs/models/item/tobacco.json new file mode 100644 index 0000000..6a367e1 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/tobacco.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/tobacco" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/tobacco_crop.json b/src/main/generated/data/acesbs/loot_table/blocks/tobacco_crop.json index ff09d43..78acd70 100644 --- a/src/main/generated/data/acesbs/loot_table/blocks/tobacco_crop.json +++ b/src/main/generated/data/acesbs/loot_table/blocks/tobacco_crop.json @@ -23,7 +23,7 @@ } } ], - "name": "acesbs:lemon" + "name": "acesbs:tobacco" }, { "type": "minecraft:item", diff --git a/src/main/java/com/acethewildfire/acesbs/TODO.txt b/src/main/java/com/acethewildfire/acesbs/TODO.txt index ff04d66..09dd5ce 100644 --- a/src/main/java/com/acethewildfire/acesbs/TODO.txt +++ b/src/main/java/com/acethewildfire/acesbs/TODO.txt @@ -19,7 +19,7 @@ Food - Infernal Beef (Mob/Ashes + Cooked Beef) - Hyper Stimulants (Hyper Sugar) - Narcan (Stimulants + Entropic Eviscerator) -- Tobacco +X Tobacco Crop X Tobacco @@ -29,7 +29,7 @@ Items - Pale wood + Others Armor -O Beserker Pauldron (Special: Skeleton hurt sound) +X Beserker Pauldron (Special: Skeleton hurt sound) - Wildfire Boots (Special: Rainbow ember) - Sov's Plate Carrier - (Headlamp Armors using Everburn Gold) diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java index 899a4cd..69fde4c 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java @@ -76,7 +76,7 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider { BlockStatePropertyLootCondition.Builder builder2 = BlockStatePropertyLootCondition.builder(ModBlocks.TOBACCO_CROP) .properties(StatePredicate.Builder.create().exactMatch(TobaccoCrop.AGE, TobaccoCrop.MAX_AGE)); - this.addDrop(ModBlocks.TOBACCO_CROP, this.cropDrops(ModBlocks.TOBACCO_CROP, ModItems.LEMON, ModItems.TOBACCO_SEEDS, builder2)); + this.addDrop(ModBlocks.TOBACCO_CROP, this.cropDrops(ModBlocks.TOBACCO_CROP, ModItems.TOBACCO, ModItems.TOBACCO_SEEDS, builder2)); } public LootTable.Builder multipleOreDrops(Block drop, Item item, float minDrops, float maxDrops) { diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index 5024558..d37b580 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -58,6 +58,7 @@ public class ModModelProvider extends FabricModelProvider { public void generateItemModels(ItemModelGenerator itemModelGenerator) { itemModelGenerator.register(ModItems.COOKED_LEMON, Models.GENERATED); itemModelGenerator.register(ModItems.LEMON, Models.GENERATED); + itemModelGenerator.register(ModItems.TOBACCO, Models.GENERATED); itemModelGenerator.register(ModItems.RAW_ENTROPY, Models.GENERATED); itemModelGenerator.register(ModItems.ORACLE_LEMON, Models.GENERATED); itemModelGenerator.register(ModItems.GREEN_BRICKS, Models.GENERATED); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java index f13438a..a8f5c57 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java @@ -28,6 +28,7 @@ public class ModItemGroups { entries.add(ModItems.PRISMA_SMITHING_TEMPLATE); entries.add(ModItems.CRAB_RAVE_MUSIC_DISC); entries.add(ModItems.TOBACCO_SEEDS); + entries.add(ModItems.TOBACCO); }) .build()); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java index d4c942f..d60b5ec 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java @@ -12,6 +12,7 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.AttributeModifierSlot; import net.minecraft.component.type.AttributeModifiersComponent; +import net.minecraft.component.type.FoodComponent; import net.minecraft.component.type.PotionContentsComponent; import net.minecraft.entity.attribute.EntityAttribute; import net.minecraft.entity.attribute.EntityAttributeModifier; @@ -148,6 +149,8 @@ public class ModItems { public static final Item TOBACCO_SEEDS = registerItem("tobacco_seeds", new AliasedBlockItem(ModBlocks.TOBACCO_CROP, new Item.Settings())); + public static final Item TOBACCO = registerItem("tobacco", new Item(new Item.Settings())); + private static Item registerItem(String name, Item item){ return Registry.register(Registries.ITEM, Identifier.of(AcesBS.MOD_ID, name), item); } diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index a2180d2..0b02f26 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -41,6 +41,7 @@ "item.acesbs.crab_rave_music_disc.desc": "Noisestorm - Crab Rave [Monstercat Release]", "item.acesbs.tobacco_seeds": "Tobacco Seeds", + "item.acesbs.tobacco": "Tobacco", "painting.acesbs.herald.title": "Herald's Banner", diff --git a/src/main/resources/assets/acesbs/textures/item/tobacco.png b/src/main/resources/assets/acesbs/textures/item/tobacco.png new file mode 100644 index 0000000..679fed3 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/tobacco.png differ