diff --git a/gradle.properties b/gradle.properties index 5034f7c..d4c7fcd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.15.1 # Mod Properties - mod_version = 1.20.4.6 + mod_version = 1.20.4.7 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric 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 44874f8..556d9cc 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/DrillBlock.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/DrillBlock.java @@ -37,7 +37,7 @@ public abstract class DrillBlock extends FallingBlock { @Override public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) { Integer fuelLeft = state.get(FUEL); - world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.REDSTONE, fuelLeft))); + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(QuickieItems.CANOLABOTTLE, fuelLeft))); return super.onBreak(world, pos, state, player); } @@ -51,6 +51,7 @@ public abstract class DrillBlock extends FallingBlock { BlockHitResult hit) { Map loadings = new HashMap<>(); loadings.put(QuickieItems.CANOLABOTTLE, 8); + loadings.put(QuickieItems.CANOLABOTTLESTACK, 72); ItemStack stack = player.getStackInHand(hand); Item item = stack.getItem(); if (stack.isEmpty() || !loadings.containsKey(item) ) { @@ -64,11 +65,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(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))); + } else if (item.equals(QuickieItems.CANOLABOTTLESTACK)) { + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.GLASS_BOTTLE, 9))); } stack.decrement(1); } 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 c3e0d88..f9ec661 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -89,6 +89,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieItems.CANOLA)); stacks.add(new ItemStack(QuickieItems.CANOLASEED)); stacks.add(new ItemStack(QuickieItems.CANOLABOTTLE)); + stacks.add(new ItemStack(QuickieItems.CANOLABOTTLESTACK)); stacks.add(new ItemStack(QuickieItems.BACKPACK_BROWN)); stacks.add(new ItemStack(QuickieItems.BACKPACK_WHITE)); stacks.add(new ItemStack(QuickieItems.BACKPACK_BLACK)); @@ -248,6 +249,7 @@ public class RegistryManager { registerItem(QuickieItems.CANOLA, "canola"); registerItem(QuickieItems.CANOLASEED, "canolaseed"); registerItem(QuickieItems.CANOLABOTTLE, "canolabottle"); + registerItem(QuickieItems.CANOLABOTTLESTACK, "canolabottlestack"); registerItem(QuickieItems.BACKPACK_BROWN, "backpack_brown"); registerItem(QuickieItems.BACKPACK_WHITE, "backpack_white"); registerItem(QuickieItems.BACKPACK_BLACK, "backpack_black"); diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolabottlestack.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolabottlestack.java new file mode 100644 index 0000000..afada93 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolabottlestack.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 ItemCanolabottlestack extends Item { + + public ItemCanolabottlestack() { + super(new FabricItemSettings().maxCount(64)); + } +} 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 ca5e98a..36e1b25 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java @@ -40,4 +40,5 @@ public class QuickieItems { public static final ItemSpeedingot SPEEDINGOT = new ItemSpeedingot(); public static final ItemQuickieingot QUICKIEINGOT = new ItemQuickieingot(); public static final ItemCanolabottle CANOLABOTTLE = new ItemCanolabottle(); + public static final ItemCanolabottlestack CANOLABOTTLESTACK = new ItemCanolabottlestack(); } diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index f96e54d..22befbe 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -43,6 +43,7 @@ "item.quickiefabric.canola": "Raps", "item.quickiefabric.canolaseed": "Rapssaat", "item.quickiefabric.canolabottle": "Rapsöl", + "item.quickiefabric.canolabottlestack": "Rapsölsammlung", "item.quickiefabric.stub": "Stummel", "item.quickiefabric.oxidizedcopperpowder": "oxidiertes Kupferpulver", "item.quickiefabric.speedingot": "Fluchtpulverbarren", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index 1094424..c406f54 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -43,6 +43,7 @@ "item.quickiefabric.canola": "canola", "item.quickiefabric.canolaseed": "canola seed", "item.quickiefabric.canolabottle": "canola oil", + "item.quickiefabric.canolabottlestack": "canola oil collection", "item.quickiefabric.stub": "stub", "item.quickiefabric.oxidizedcopperpowder": "oxidized copper powder", "item.quickiefabric.speedingot": "Speedpowderingot", diff --git a/src/main/resources/assets/quickiefabric/models/item/canolabottlestack.json b/src/main/resources/assets/quickiefabric/models/item/canolabottlestack.json new file mode 100644 index 0000000..631f762 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/canolabottlestack.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiefabric:item/canolabottlestack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/item/canolabottlestack.png b/src/main/resources/assets/quickiefabric/textures/item/canolabottlestack.png new file mode 100644 index 0000000..9805652 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/item/canolabottlestack.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png b/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png index 860c203..1b0851c 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png and b/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png differ diff --git a/src/main/resources/data/quickiefabric/recipes/canolabottle_from_stack.json b/src/main/resources/data/quickiefabric/recipes/canolabottle_from_stack.json new file mode 100644 index 0000000..cdea6e2 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/canolabottle_from_stack.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:canolabottlestack" + } + ], + "result": { + "item": "quickiefabric:canolabottle", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/canolabottlestack.json b/src/main/resources/data/quickiefabric/recipes/canolabottlestack.json new file mode 100644 index 0000000..443fe49 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/canolabottlestack.json @@ -0,0 +1,17 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "ccc", + "ccc", + "ccc" + ], + "key": { + "c": { + "item": "quickiefabric:canolabottle" + } + }, + "result": { + "item": "quickiefabric:canolabottlestack", + "count": 1 + } +} \ No newline at end of file