From 7f97cd70601917e4bd94eb2a60b05f049a984041 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Wed, 17 Jan 2024 22:56:13 +0100 Subject: [PATCH] added canola stack --- gradle.properties | 2 +- .../quickiefabric/blocks/DrillBlock.java | 6 ++++-- .../quickiefabric/init/RegistryManager.java | 2 ++ .../items/ItemCanolabottlestack.java | 16 ++++++++++++++++ .../quickiefabric/items/QuickieItems.java | 1 + .../assets/quickiefabric/lang/de_de.json | 1 + .../assets/quickiefabric/lang/en_us.json | 1 + .../models/item/canolabottlestack.json | 6 ++++++ .../textures/item/canolabottlestack.png | Bin 0 -> 4845 bytes .../textures/item/canolaseed.png | Bin 1318 -> 4800 bytes .../recipes/canolabottle_from_stack.json | 12 ++++++++++++ .../recipes/canolabottlestack.json | 17 +++++++++++++++++ 12 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCanolabottlestack.java create mode 100644 src/main/resources/assets/quickiefabric/models/item/canolabottlestack.json create mode 100644 src/main/resources/assets/quickiefabric/textures/item/canolabottlestack.png create mode 100644 src/main/resources/data/quickiefabric/recipes/canolabottle_from_stack.json create mode 100644 src/main/resources/data/quickiefabric/recipes/canolabottlestack.json 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 0000000000000000000000000000000000000000..98056527294857387e33a91d40544306b9ea0a61 GIT binary patch literal 4845 zcmeHLdsGuw8Xq4AFer*bMeAb>rJ{C{nY<<$6Okqnf(8&cXi(NpW+q_{S z+N$-{RSGH=wJNf^wf5A4EBL^5b+w$;)>?e))(1*gsp9%z?*v3R?KyiqyWPLYImyg? z_xJto_x--_-ZMAF$%%0T1j7Xo1Pw66>r%jV5dRGd0KcOjwvpg+uOMwEmqL1Br^{hs za~PP*cQP>JV=WNmyRdS)E#wFs^t^eTr*Gf!1tXqrXbPD4VsrQpc_-F36#Z1OdhGIh zKQ|uvbeJ`SFeOGsEnyoDhsW-)KfD@w`>LiqwDBkBC={*}X^^JYfDySZHNJJqJAn<~ z?-G_&6=saw(%jm#wDeH%?8QefZAx#eD_)wp=Fz-d{VuvX)0TP5{v>03J)6)F_Pb4| zQesOtokh>=?-xGt0yX6l3q_9J-rrbb2wO6=p(^D<%C7T~^TLAn4w|E%Uby4au=T!# zcqsSw(Yf2*8@KE`U}-t>;y}8u&*%qvp7IsNnGn=#Ijhws8?@S&iGy@Y=daPkA4v{d zmNaX-Fg$cZ5kY^J=$Rf`w>`Z)DE!^M-|Q|tF|}>0LA&5#6+%=+wT>d{dBx#-JVa!prjj+u}driYuK zEh{hm^7B)98Iketg-#tbX7ZHqsP*KSgz72p7l)M{*F4j%n)BB0r&SG(P`#17Sa9N> zg>7}s-&Bqz zTbuG$d%gS5+`GK_AI}y*=PF&NOV8X)gP@REENI1<#%ToQu!%_8VP-@=n-laX1gT?u zPLj%IIM~csS-VEqTzyCgv$RGyLvBQkPA!wg#uvDl)Plq`svw(E(ZZNX0=16-1U7~v zVV^C>?k0R1p`Vuk_qC1QyL0SLsMZ|6uKVs}UK6zv>3#!b0cC&xPM zFwaSv9eJEaCqYP6I1i zoWi&rc`l04dl)+x*_DE(I{lq_t{i_lG$m$o7#o1P!K_%fDdP;r0xN5C`n`bI z-H;q>c_mi2*!U5DI$Z++?w!2d&@XfMg8|BDByD5aN{--Wr5U3s8a1QRE>s4)n2Xp$p!B*y?!R3al#jKJ_TiG+}1gj_ZOJa%Nt z(-|E!YsvplXnyg)YJdkNk7wOr{(QfweMO}*x$RHwk2$P=DZ#LRQ4l26o`Re7Ftk5T zz|}rPWs!C(19p#&c717Qf29@VIBsU-Do{EpiXk!yC?cs)pa`nOR1!=^(ke>co!#xQ za9+~I#9D!lKr7Imey!kWf1$>8M|-mvz6wAv1n^_BG>Mduq68}G5KR1kND)=hQU#+z z6bhLFw5UvlC~465xS5jUDokOvpsMac|5qt?_Jq89ifS>xExs(OTKtQ$w*$KDqd=N= z8`z)0b}#PS?>jW(ch=wV)6s6f;S7MfXOh>_w@0oXxn4_w*8=x+SC3q;rNC=}d%Ej? zCYRvViIK5`7dX~Tz%-20&*ZcY8-MVC{O`jI4SQKG3+CU4XDkjG3jSB147%7f z<;lHku=w6&#PZ7%WtEB*J0jO_D}PkK{LRxPy>|{ey?@s53nND~3hW0D)W#+VJ{fqR zy!=>5({fbzm%*X?9wY|;oUIgTzFxQX(#?gfF_#{<9crdf{msIWy%$wK6)3(>M#TVZB( zS#4BJ1XM9kkf82kk=4G?7vw0idxs|=52zncrf(QK{oA4zMpzbEpKr2RLo+j$4t;pF zF9e@&hR-{oh%vh?xrfKr&)WF5r?ptMrixLJ1a`|*NqayRk&{)uW)nRf~iU3%)!h`ohkCW;bk9OzSZLVpl;#q;ON;C VJ}+^t&IL7r4EjV})w}O4`8Pb)-LU`w 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 index 860c20337ed2163470d6e370aea3a13f068c6165..1b0851cdac3a9c5f82c1d139f2cc811b1e606cd0 100644 GIT binary patch literal 4800 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