From efca60e5da2c8b34734f588c32148bf9877259f0 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sun, 14 Jan 2024 23:30:43 +0100 Subject: [PATCH] added canola oil for the drills --- gradle.properties | 2 +- .../quickiefabric/QuickieFabricClient.java | 3 +- .../blocks/BlockCanolaplant.java | 68 ++++++++++++++++++ .../quickiefabric/blocks/DrillBlock.java | 10 +-- .../quickiefabric/blocks/QuickieBlocks.java | 1 + .../quickiefabric/init/RegistryManager.java | 27 ++++--- .../quickiefabric/items/ItemCanola.java | 16 +++++ .../quickiefabric/items/ItemCanolabottle.java | 16 +++++ .../quickiefabric/items/ItemCanolaseed.java | 37 ++++++++++ .../quickiefabric/items/QuickieItems.java | 3 + .../blockstates/canolaplant.json | 12 ++++ .../assets/quickiefabric/lang/de_de.json | 5 +- .../assets/quickiefabric/lang/en_us.json | 5 +- .../models/block/canolaplant0.json | 6 ++ .../models/block/canolaplant1.json | 6 ++ .../models/block/canolaplant2.json | 6 ++ .../models/block/canolaplant3.json | 6 ++ .../models/block/canolaplant4.json | 6 ++ .../quickiefabric/models/item/canola.json | 6 ++ .../models/item/canolabottle.json | 6 ++ .../models/item/canolaplant.json | 6 ++ .../quickiefabric/models/item/canolaseed.json | 6 ++ .../textures/block/canolaplant0.png | Bin 0 -> 590 bytes .../textures/block/canolaplant1.png | Bin 0 -> 603 bytes .../textures/block/canolaplant2.png | Bin 0 -> 721 bytes .../textures/block/canolaplant3.png | Bin 0 -> 764 bytes .../textures/block/canolaplant4.png | Bin 0 -> 853 bytes .../quickiefabric/textures/item/canola.png | Bin 0 -> 1069 bytes .../textures/item/canolabottle.png | Bin 0 -> 4491 bytes .../textures/item/canolaseed.png | Bin 0 -> 1318 bytes .../quickiefabric/recipes/canolabottle.json | 15 ++++ 31 files changed, 250 insertions(+), 24 deletions(-) create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockCanolaplant.java create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanola.java create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolabottle.java create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolaseed.java create mode 100644 src/main/resources/assets/quickiefabric/blockstates/canolaplant.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/canolaplant0.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/canolaplant1.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/canolaplant2.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/canolaplant3.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/canolaplant4.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/canola.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/canolabottle.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/canolaplant.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/canolaseed.json create mode 100644 src/main/resources/assets/quickiefabric/textures/block/canolaplant0.png create mode 100644 src/main/resources/assets/quickiefabric/textures/block/canolaplant1.png create mode 100644 src/main/resources/assets/quickiefabric/textures/block/canolaplant2.png create mode 100644 src/main/resources/assets/quickiefabric/textures/block/canolaplant3.png create mode 100644 src/main/resources/assets/quickiefabric/textures/block/canolaplant4.png create mode 100644 src/main/resources/assets/quickiefabric/textures/item/canola.png create mode 100644 src/main/resources/assets/quickiefabric/textures/item/canolabottle.png create mode 100644 src/main/resources/assets/quickiefabric/textures/item/canolaseed.png create mode 100644 src/main/resources/data/quickiefabric/recipes/canolabottle.json diff --git a/gradle.properties b/gradle.properties index da14d13..5034f7c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.15.1 # Mod Properties - mod_version = 1.20.4.5 + mod_version = 1.20.4.6 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabricClient.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabricClient.java index e55b3a4..e49acd6 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabricClient.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabricClient.java @@ -22,8 +22,9 @@ public class QuickieFabricClient implements ClientModInitializer { public void onInitializeClient() { HandledScreens.register(RegistryManager.BACKPACK_SCREEN_HANDLER, BackpackScreen::new); HandledScreens.register(RegistryManager.BLOCKSTACKER_SCREEN_HANDLER, BlockStackerScreen::new); - // make cotton plant block and sulforpad transparent + // make plant blocks and sulforpad transparent BlockRenderLayerMap.INSTANCE.putBlock(QuickieBlocks.COTTONPLANT, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(QuickieBlocks.CANOLAPLANT, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(QuickieBlocks.SULFORPAD, RenderLayer.getCutout()); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockCanolaplant.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockCanolaplant.java new file mode 100644 index 0000000..d9d8c6e --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockCanolaplant.java @@ -0,0 +1,68 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.List; +import java.util.Random; + +import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.CropBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContextParameterSet.Builder; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.ItemScatterer; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BlockCanolaplant extends CropBlock { + + public BlockCanolaplant() { + super(FabricBlockSettings.copy(Blocks.WHEAT)); + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + DefaultedList list = DefaultedList.of(); + list.add(new ItemStack(getSeedsItem())); // the one from the seed + if (isMature(state)) { + list.add(new ItemStack(getSeedsItem(), new Random().nextInt(2))); + list.add(new ItemStack(QuickieItems.CANOLA, new Random().nextFloat() > 0.9f ? 2 : 1)); + } + return list; + } + + private void spawnHarvested(World world, BlockPos pos, BlockState state) { + DefaultedList list = DefaultedList.of(); + getDroppedStacks(state, null).forEach(itemStack -> { + list.add(itemStack); + }); + ItemScatterer.spawn(world, pos, list); + } + + @Override + public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) { + spawnHarvested(world, pos, state); + return super.onBreak(world, pos, state, player); + } + + @Override + protected ItemConvertible getSeedsItem() { + return QuickieItems.CANOLASEED; + } + + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, + BlockHitResult hitResult) { + if (!world.isClient && isMature(state)) { + spawnHarvested(world, pos, state); + world.setBlockState(pos, state.with(AGE, 0)); + } + return ActionResult.PASS; + } +} \ No newline at end of file diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/DrillBlock.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/DrillBlock.java index 49c9644..44874f8 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/DrillBlock.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/DrillBlock.java @@ -50,10 +50,7 @@ public abstract class DrillBlock extends FallingBlock { public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { Map loadings = new HashMap<>(); - loadings.put(QuickieItems.SPEEDPOWDER, 8); - loadings.put(QuickieItems.QUICKIEPOWDER, 32); - loadings.put(Items.REDSTONE, 1); - loadings.put(Items.REDSTONE_BLOCK, 10); + loadings.put(QuickieItems.CANOLABOTTLE, 8); ItemStack stack = player.getStackInHand(hand); Item item = stack.getItem(); if (stack.isEmpty() || !loadings.containsKey(item) ) { @@ -67,9 +64,12 @@ public abstract class DrillBlock extends FallingBlock { if (load < fuelWeight) { Integer numberOfTooMuchLoad = fuelWeight - load; fuelWeight = load; - world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.REDSTONE, numberOfTooMuchLoad))); +// world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(QuickieItems.CANOLABOTTLE, numberOfTooMuchLoad))); } world.setBlockState(pos, state.with(FUEL, state.get(FUEL) + fuelWeight)); + if (item.equals(QuickieItems.CANOLABOTTLE)) { + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.GLASS_BOTTLE, 1))); + } stack.decrement(1); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java index 5fea876..46432cc 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -19,6 +19,7 @@ public class QuickieBlocks { public static final BlockMonsterhoarder MONSTERHOARDER = new BlockMonsterhoarder(); public static final BlockKelpstack KELPSTACK = new BlockKelpstack(); public static final BlockCottonplant COTTONPLANT = new BlockCottonplant(); + public static final BlockCanolaplant CANOLAPLANT = new BlockCanolaplant(); public static final BlockSulphor BLOCKSULPHOR = new BlockSulphor(); public static final BlockSalpeter BLOCKSALPETER = new BlockSalpeter(); public static final BlockDrillDown DRILL_DOWN = new BlockDrillDown(); diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index 70db71f..c3e0d88 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -86,6 +86,9 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieItems.CARROTSTACK)); stacks.add(new ItemStack(QuickieItems.COTTON)); stacks.add(new ItemStack(QuickieItems.COTTONSEED)); + stacks.add(new ItemStack(QuickieItems.CANOLA)); + stacks.add(new ItemStack(QuickieItems.CANOLASEED)); + stacks.add(new ItemStack(QuickieItems.CANOLABOTTLE)); stacks.add(new ItemStack(QuickieItems.BACKPACK_BROWN)); stacks.add(new ItemStack(QuickieItems.BACKPACK_WHITE)); stacks.add(new ItemStack(QuickieItems.BACKPACK_BLACK)); @@ -145,7 +148,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKERSOUTH)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSPREADER)); stacks.add(new ItemStack(QuickieBlocks.SULFORPAD)); - }).build()); + }).build()); } private static final void registerBlock(Block block, String name) { @@ -209,6 +212,7 @@ public class RegistryManager { registerBlock(QuickieBlocks.MONSTERHOARDER, "monsterhoarder"); registerBlock(QuickieBlocks.KELPSTACK, "kelpstack"); registerBlock(QuickieBlocks.COTTONPLANT, "cottonplant"); + registerBlock(QuickieBlocks.CANOLAPLANT, "canolaplant"); registerBlock(QuickieBlocks.BLOCKSULPHOR, "blocksulphor"); registerBlock(QuickieBlocks.BLOCKSALPETER, "blocksalpeter"); registerBlock(QuickieBlocks.BLOCKSPEEDPOWDER, "blockspeedpowder"); @@ -241,6 +245,9 @@ public class RegistryManager { registerItem(QuickieItems.CARROTSTACK, "carrotstack"); registerItem(QuickieItems.COTTON, "cotton"); registerItem(QuickieItems.COTTONSEED, "cottonseed"); + registerItem(QuickieItems.CANOLA, "canola"); + registerItem(QuickieItems.CANOLASEED, "canolaseed"); + registerItem(QuickieItems.CANOLABOTTLE, "canolabottle"); registerItem(QuickieItems.BACKPACK_BROWN, "backpack_brown"); registerItem(QuickieItems.BACKPACK_WHITE, "backpack_white"); registerItem(QuickieItems.BACKPACK_BLACK, "backpack_black"); @@ -265,6 +272,8 @@ public class RegistryManager { ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTONSEED, 0.5f); ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTON, 0.75f); + ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.CANOLASEED, 0.5f); + ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.CANOLA, 0.75f); FuelRegistry.INSTANCE.add(QuickieItems.SULPHOR, 200); FuelRegistry.INSTANCE.add(QuickieBlocks.BLOCKSULPHOR, 2000); @@ -307,25 +316,13 @@ public class RegistryManager { // Nether features BiomeModifications.create(new Identifier(QUICKIEFABRIC, "nether_features")).add(ModificationPhase.ADDITIONS, BiomeSelectors.foundInTheNether(), FeaturesManager.netherOres()); - -// // Sulforpad feature -// Identifier SULFORPAD_FEATURE_ID = new Identifier(QUICKIEFABRIC, "sulforpad"); -// Feature SULFORPAD_FEATURE = new SulforpadFeature(SulforpadFeatureConfig.CODEC); -// ConfiguredFeature SULFORPAD_FEATURE_CONFIGURED = new ConfiguredFeature<>( -// (SulforpadFeature) SULFORPAD_FEATURE, -// new SulforpadFeatureConfig(new Identifier(QUICKIEFABRIC, "sulforpad"))); -// PlacedFeature SULFORPAD_FEATURE_PLACED = new PlacedFeature(RegistryEntry.of(SULFORPAD_FEATURE_CONFIGURED), List.of(SquarePlacementModifier.of())); -// Registry.register(Registries.FEATURE, new Identifier(QUICKIEFABRIC, "sulforpad"), new SulforpadFeature(SulforpadFeatureConfig.CODEC)); -// Registry.register(Registries.CONFIGURED_FEATURE, SULFORPAD_FEATURE_ID, SULFORPAD_FEATURE_CONFIGURED); -// Registry.register(RegistryKeys.PLACED_FEATURE, SULFORPAD_FEATURE_ID, SULFORPAD_FEATURE_PLACED); -// BiomeModifications.addFeature(BiomeSelectors.foundInTheNether(),GenerationStep.Feature.VEGETAL_DECORATION, -// RegistryKey.of(RegistryKeys.PLACED_FEATURE, SULFORPAD_FEATURE_ID)); } public static final void registerLootings() { LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> { if (isGrass(id)) { - tableBuilder.pool(LootHelper.build(1, QuickieItems.COTTONSEED, 0.125f)); + tableBuilder.pool(LootHelper.build(1, QuickieItems.COTTONSEED, 0.025f)); + tableBuilder.pool(LootHelper.build(1, QuickieItems.CANOLASEED, 0.05f)); tableBuilder.pool(LootHelper.build(2, QuickieItems.SALPETER, 0.012f)); } }); diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanola.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanola.java new file mode 100644 index 0000000..7416ae6 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanola.java @@ -0,0 +1,16 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemCanola extends Item { + + public ItemCanola() { + super(new FabricItemSettings().maxCount(64)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolabottle.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolabottle.java new file mode 100644 index 0000000..67276ad --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolabottle.java @@ -0,0 +1,16 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemCanolabottle extends Item { + + public ItemCanolabottle() { + super(new FabricItemSettings().maxCount(64)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolaseed.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolaseed.java new file mode 100644 index 0000000..5b99feb --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolaseed.java @@ -0,0 +1,37 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import de.jottyfan.minecraft.quickiefabric.blocks.QuickieBlocks; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +/** + * + * @author jotty + * + */ +public class ItemCanolaseed extends Item { + + public ItemCanolaseed() { + super(new FabricItemSettings().maxCount(64)); + } + + @Override + public ActionResult useOnBlock(ItemUsageContext context) { + BlockPos pos = context.getBlockPos(); + World world = context.getWorld(); + if (QuickieItems.CANOLASEED.equals(context.getStack().getItem())) { + BlockState state = world.getBlockState(pos); + if (Blocks.FARMLAND.equals(state.getBlock()) && world.getBlockState(pos.up()).isAir()) { + world.setBlockState(pos.up(), QuickieBlocks.CANOLAPLANT.getDefaultState()); + context.getStack().decrement(1); + } + } + return super.useOnBlock(context); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java index 4c8bf84..ca5e98a 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java @@ -33,8 +33,11 @@ public class QuickieItems { public static final ItemCarrotstack CARROTSTACK = new ItemCarrotstack(); public static final ItemCotton COTTON = new ItemCotton(); public static final ItemCottonseed COTTONSEED = new ItemCottonseed(); + public static final ItemCanola CANOLA = new ItemCanola(); + public static final ItemCanolaseed CANOLASEED = new ItemCanolaseed(); public static final ItemStub STUB = new ItemStub(); public static final ItemOxidizedcopperpowder OXIDIZEDCOPPERPOWDER = new ItemOxidizedcopperpowder(); public static final ItemSpeedingot SPEEDINGOT = new ItemSpeedingot(); public static final ItemQuickieingot QUICKIEINGOT = new ItemQuickieingot(); + public static final ItemCanolabottle CANOLABOTTLE = new ItemCanolabottle(); } diff --git a/src/main/resources/assets/quickiefabric/blockstates/canolaplant.json b/src/main/resources/assets/quickiefabric/blockstates/canolaplant.json new file mode 100644 index 0000000..4445594 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/canolaplant.json @@ -0,0 +1,12 @@ +{ + "variants": { + "age=0": { "model": "quickiefabric:block/canolaplant0" }, + "age=1": { "model": "quickiefabric:block/canolaplant1" }, + "age=2": { "model": "quickiefabric:block/canolaplant1" }, + "age=3": { "model": "quickiefabric:block/canolaplant2" }, + "age=4": { "model": "quickiefabric:block/canolaplant2" }, + "age=5": { "model": "quickiefabric:block/canolaplant2" }, + "age=6": { "model": "quickiefabric:block/canolaplant3" }, + "age=7": { "model": "quickiefabric:block/canolaplant4" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index 9e06277..f96e54d 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -40,6 +40,9 @@ "item.quickiefabric.carrotstack": "Karottenbündel", "item.quickiefabric.cotton": "Baumwolle", "item.quickiefabric.cottonseed": "Baumwollsaat", + "item.quickiefabric.canola": "Raps", + "item.quickiefabric.canolaseed": "Rapssaat", + "item.quickiefabric.canolabottle": "Rapsöl", "item.quickiefabric.stub": "Stummel", "item.quickiefabric.oxidizedcopperpowder": "oxidiertes Kupferpulver", "item.quickiefabric.speedingot": "Fluchtpulverbarren", @@ -101,6 +104,6 @@ "msg.backpack.transfer.filled": "Der Rucksack wurde befüllt.", "msg.backpack.transfer.cleared": "Der Rucksackinhalt wurde soweit möglich geleert.", "msg.backpack.transfer.cancel": "Entweder der Rucksack oder die Kiste sind nicht komplett leer.", - "msg.drill.fuelinfo": "Der Bohrer hat noch eine Ladung für den Abbau von %s Blöcken. Er kann mit Redstone, Flucht- oder Eilpulver aufgeladen werden.", + "msg.drill.fuelinfo": "Der Bohrer hat noch eine Ladung für den Abbau von %s Blöcken. Er kann mit Rapsöl aufgeladen werden.", "error.unleveling.inventory.full": "Es ist kein Platz mehr frei, um die Aufwertungen abzulegen." } diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index 367ef2a..1094424 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -40,6 +40,9 @@ "item.quickiefabric.carrotstack": "a bundle of carrots", "item.quickiefabric.cotton": "cotton", "item.quickiefabric.cottonseed": "cotton seed", + "item.quickiefabric.canola": "canola", + "item.quickiefabric.canolaseed": "canola seed", + "item.quickiefabric.canolabottle": "canola oil", "item.quickiefabric.stub": "stub", "item.quickiefabric.oxidizedcopperpowder": "oxidized copper powder", "item.quickiefabric.speedingot": "Speedpowderingot", @@ -101,6 +104,6 @@ "msg.backpack.transfer.filled": "Filled the backpack.", "msg.backpack.transfer.cleared": "Cleared the backpack as much as possible.", "msg.backpack.transfer.cancel": "Eigther backpack or chest are not completely empty.", - "msg.drill.fuelinfo": "The drill still has a charge for mining %s blocks. It can be charged with redstone, speed or hurry powder.", + "msg.drill.fuelinfo": "The drill still has a charge for mining %s blocks. It can be charged with canola oil.", "error.unleveling.inventory.full": "There is no free stack in your inventory for the level ups." } diff --git a/src/main/resources/assets/quickiefabric/models/block/canolaplant0.json b/src/main/resources/assets/quickiefabric/models/block/canolaplant0.json new file mode 100644 index 0000000..75fdb10 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/canolaplant0.json @@ -0,0 +1,6 @@ +{ + "parent":"block/cross", + "textures":{ + "cross":"quickiefabric:block/canolaplant0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/canolaplant1.json b/src/main/resources/assets/quickiefabric/models/block/canolaplant1.json new file mode 100644 index 0000000..a28b4e6 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/canolaplant1.json @@ -0,0 +1,6 @@ +{ + "parent":"block/cross", + "textures":{ + "cross":"quickiefabric:block/canolaplant1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/canolaplant2.json b/src/main/resources/assets/quickiefabric/models/block/canolaplant2.json new file mode 100644 index 0000000..369c05f --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/canolaplant2.json @@ -0,0 +1,6 @@ +{ + "parent":"block/cross", + "textures":{ + "cross":"quickiefabric:block/canolaplant2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/canolaplant3.json b/src/main/resources/assets/quickiefabric/models/block/canolaplant3.json new file mode 100644 index 0000000..e626c0a --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/canolaplant3.json @@ -0,0 +1,6 @@ +{ + "parent":"block/cross", + "textures":{ + "cross":"quickiefabric:block/canolaplant3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/canolaplant4.json b/src/main/resources/assets/quickiefabric/models/block/canolaplant4.json new file mode 100644 index 0000000..7bf18ae --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/canolaplant4.json @@ -0,0 +1,6 @@ +{ + "parent":"block/cross", + "textures":{ + "cross":"quickiefabric:block/canolaplant4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/canola.json b/src/main/resources/assets/quickiefabric/models/item/canola.json new file mode 100644 index 0000000..72cd852 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/canola.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiefabric:item/canola" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/canolabottle.json b/src/main/resources/assets/quickiefabric/models/item/canolabottle.json new file mode 100644 index 0000000..9862e19 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/canolabottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiefabric:item/canolabottle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/canolaplant.json b/src/main/resources/assets/quickiefabric/models/item/canolaplant.json new file mode 100644 index 0000000..86028cb --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/canolaplant.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiefabric:item/canolaseed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/canolaseed.json b/src/main/resources/assets/quickiefabric/models/item/canolaseed.json new file mode 100644 index 0000000..86028cb --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/canolaseed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiefabric:item/canolaseed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/block/canolaplant0.png b/src/main/resources/assets/quickiefabric/textures/block/canolaplant0.png new file mode 100644 index 0000000000000000000000000000000000000000..12eae03c15ba9baa4dd5d0997af6a80e25a36281 GIT binary patch literal 590 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/quickiefabric/textures/item/canolabottle.png b/src/main/resources/assets/quickiefabric/textures/item/canolabottle.png new file mode 100644 index 0000000000000000000000000000000000000000..fcd7a3adca33c461d5317c83c508af1b9f476b12 GIT binary patch literal 4491 zcmeHKeN+=y79WHHA|Tsh5p;Dn^z7o&NhaUPEP+A-Bx)oD7O+suWM&ekCYhKFB*9%j z7Z)sc70$B7Qo7=Ci?yqCD{93xQr!B{t#sGc#VRd@7NnrK?ON2T**D=sIPE!mIA{AG zIcG96_x9FrMbmw$Uqydi_d)1SuRi-o@Ds=Oy;dKQvMK(XI&)!f zrf(r@{dr|wn_>HBL)C|5J1>sH1bmYDQ+IMp>O1dh*Po2tyECVu@dzU+JpQ}opSJ`p zU9hI!7#_RM_|H()=<-}+;rtzzi%>@LGqDY~qXa>MrdRfTxHsFr-Yxj@`S`f7$ksXX z&*pj`jYbut?dClz{+?yE?by(j(&=Cp#g|%^ENZWVpnwWmtv2Y?>WRETwhh1DrP6j7 zqARir_wjxi@UikJjo>vpy>+Ee# zjd^0j=f{V?S~Sqqv7s?mCK~kgqHh|8i{IY5`kbNawW|2-uRnbq{;{h8+g@eQ?OeRcGH)$^q zEg88n*l@+G`tzOpP)nA>+as$0of+Y#K_eFES7HQX<>Mq{r1);D9dsxJC8fCSII)&u zVIyUxZ7SYKo0kXEq>7g>)uVd5nku2Su%^&uZ7}C+Tg@aTS0b0yl0K2>GbMY86cNaI)!TfMh(N@AYuzg7qxOrkqTv zgP_vOC>t9;m4YND{q3a=i$5Kb5KtD%3ZPCft8m(snL52;(u0%0Ok3@KFCg|bBukqf ziZv}ZZp5F?)IfmyB=0ozMDBhtKZfr~o;i20SL*BoYcuI6|UAB_fe4C5TcY z#t~FZ35`mlL@XBLQz)_=H0Vm)GBqlWiUd?rTq>4}L^4E9iWP`NDMt}pAu}OzLMoFh zl?oY!qJAopz%m$z6$j;{t+<&I*llM204F$>YS5{8BK{cEZ!uVK)&v|>yp^=A)cp{e zOIxWN7U$Fy%2BCEE|j1mpeDie6hqo!j%OB$pB$-u1^7h-wtxY z)D8+~8AmR|SX4YN0GRWf9M*&7MB*&2!C4BBq9O@~3NfK1S0u*7D29p>!RvUY9G#va zX_M!Fp}EBaCjmStxt4Z<`8|Hq*ow-b){VW5y;^AhQi5UsqQG!sECnZCMv?wF0oT|N zQG(md6xcn++jYWDe@`n&<#Hn>Rf5uqQ6VA`fg<8E8H%6^p;9E2;G~j}PG@&ACf0>J zs8lo15oiV4)2|hr;4jp&>1bC8#Z>_ah5-KW3MLp&SitQW6B#E7zN1N!A24N;0e)jP zuz7*KP%ya}j%&tkJ3ruWycR#;41juek{RhcE7z=CGg4qi;Mwk)m1{-{%m_T&UH><^ z!XAE3Q8sW2a)FPfg9TMx;6p3exFS;n`JjJ5iw{^gwgJmryLPn`g62KOT>;SUhK0Zw z!s_(tA=d&TA73)(+)Kmvfhm?vFJRS-l{=L~{=*_g!Y-OEfw{wC{^rOS0P5FiQgapW z5ycBjPF1exU4C$2V{mZrwgX3RpuZV8@xHbuAir^g&)4@MrtrPJ0IV_v>hzzciLK6~%WmFL!$H_-^gF;_G^#_WgT5(WE=O#&h?+?_a;Q*;k%j zP$2C%ag!TnMqjBE2ff_?oc#Rc}bS=+(<<4FLxti-?}v>>oCNF_8Eb0Uz;w;Pb^$J;&Bxukdw# qvavn3viewfYD{5K$r){}BoJCe)Jo1*7w!fbL%Q@;nuBS@TmB25iFcO( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png b/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png new file mode 100644 index 0000000000000000000000000000000000000000..860c20337ed2163470d6e370aea3a13f068c6165 GIT binary patch literal 1318 zcmV+>1=;$EP)EX>4Tx04R}tkv&MmP!xqvTSbwogBe5|GE{MB7Zq`=RVYG*P%E_RVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOiz@3D;k>@G%yn9$NMaF7kRU=q4P{hdBSyPUiiI?tCw%-Pu3sXTLas6x zITlcb2HEw4|H1FsT7{`eFDaY=x?ddUV+`oo1)6oo`95}><_Qpb2CnqBzuEw1KS{5* zwa5`LxD8xfw>4!CxZDATpA6ZQT`5E>SSSGRXY@@uVCWX;Tl41DI>+e)kfB+nZh(VB zV7y4#>pt)9?VQ`cJ+1lu0LH>{$N@8^@Bjb+24YJ`L;%PD006|iFCNSQ000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j~F~6#+51R6Q&J000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}00090NkllObLx8AOE;)jYbd3NWrkhx@#n8{+>g3gJ7mugy2xo|@w3Qz}y7hZQW} zV|8f*Q5xt)!D4-`egFQWd;ePS-s^96URhgfzqGK7@EvT^#q)f;#uYLF!CXkDAY5p3 zK8Y!FL8sH{e)P$^ixOZV4BDQlGl@ndNsbU2w&h|NCQ|AchJ_G%4?dmJBN4_B0w}nUeEljH7ad zVKOrvh6Th0%p8NXVh}9V5uQn@h4cm`FK%pZ%d&(l%ZQ?g=xj)q6%-{nj)UzuC{5Du zpHi>a84L!Tp7s#}`u$Tz(HJ=#MfgFdU8uL!Ts# z=?(e^^4FuMyW=uLI2I*>_~e*$+~@50h`?2>F4r(E_~Y4ACX<-yMS|m+{Mk9=mnZwX zIzXJH-HM&H=_~^myzY744&bmJ>))qd?D16hg zF>I5p6l6(;SFMp}1t`hyzdh-G`{2vl&wb-1?!5Eij%!+5^R4A=uM*PF*uR*i2M-^9 c{l7c^1^z)WhxG$My#N3J07*qoM6N<$g3v&0>Hq)$ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/quickiefabric/recipes/canolabottle.json b/src/main/resources/data/quickiefabric/recipes/canolabottle.json new file mode 100644 index 0000000..1ebe55d --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/canolabottle.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:glass_bottle" + }, + { + "item": "quickiefabric:canola" + } + ], + "result": { + "item": "quickiefabric:canolabottle", + "count": 1 + } +} \ No newline at end of file