From af3af391e30107486062cdf240a22c7247f1fb60 Mon Sep 17 00:00:00 2001 From: Gregorius Techneticies Date: Sat, 23 Dec 2023 04:16:04 +0100 Subject: [PATCH] bugfix and drop for elephants --- src/main/java/gregapi/data/CS.java | 4 +- src/main/java/gregapi/data/IL.java | 2 +- src/main/java/gregapi/data/OD.java | 1 + .../java/gregapi/load/LoaderItemList.java | 2 + .../dungeon/DungeonChunkRoomFarmCrop.java | 10 ++--- .../gregtech/entities/Override_Drops.java | 9 ++++- .../java/gregtech/items/MultiItemFood.java | 35 +++++++++--------- .../loaders/c/Loader_Recipes_Food.java | 4 +- .../items/gt.multiitem.food/12403.png | Bin 0 -> 5722 bytes 9 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.multiitem.food/12403.png diff --git a/src/main/java/gregapi/data/CS.java b/src/main/java/gregapi/data/CS.java index 2b8cf5c07..8e3f9ccbe 100644 --- a/src/main/java/gregapi/data/CS.java +++ b/src/main/java/gregapi/data/CS.java @@ -1651,8 +1651,8 @@ public static class BlocksGT { RailAluminiumDetector, RailMagnaliumDetector, RailBronzeDetector, RailStainlessSteelDetector, RailSteelDetector, RailTitaniumDetector, RailTungstenDetector, RailTungstenSteelDetector, RailTungstenCarbideDetector, RailAdamantiumDetector, RailRoad; - /** EFR Deepslate Redstone Ore Blocks. */ - public static Block EtFu_Deepslate_Redstone_Ore, EtFu_Deepslate_Lit_Redstone_Ore; + /** EFR unregistered Blocks. */ + public static Block EtFu_Deepslate_Redstone_Ore, EtFu_Deepslate_Lit_Redstone_Ore, EtFu_Beetroot_Crop; /** GT6 Stone Type. */ public static BlockBase GraniteBlack, GraniteRed, Basalt, Marble, Limestone, Granite, Diorite, Andesite, Komatiite, SchistGreen, SchistBlue, Kimberlite, Quartzite, PrismarineLight, PrismarineDark, Slate, Shale; /** Contains all GT6 Stone Types. */ diff --git a/src/main/java/gregapi/data/IL.java b/src/main/java/gregapi/data/IL.java index a399c7643..ee663797c 100644 --- a/src/main/java/gregapi/data/IL.java +++ b/src/main/java/gregapi/data/IL.java @@ -258,7 +258,7 @@ public enum IL implements IItemContainer { Bag_Sap_Resin, Rope, Rope_Silk, Rope_Grass, Rope_Vine, Rope_Plastic, Slimeball_Borax, - Tusk, Tusk_Boar, Tusk_Hoglin, + Tusk, Tusk_Boar, Tusk_Hoglin, Tusk_Elephant, Hoof, Hoof_Horse, Hoof_Mule, Hoof_Donkey, Hoof_Cow, Hoof_Deer, Horn, Horn_Sheep, Horn_Cow, Antler, Antler_Deer, diff --git a/src/main/java/gregapi/data/OD.java b/src/main/java/gregapi/data/OD.java index 3a1d39d1a..73f9917da 100644 --- a/src/main/java/gregapi/data/OD.java +++ b/src/main/java/gregapi/data/OD.java @@ -213,6 +213,7 @@ public enum OD { , itemSkin , itemFur , itemPelt + , itemIvory , itemTusk , itemHoof , itemHorn diff --git a/src/main/java/gregapi/load/LoaderItemList.java b/src/main/java/gregapi/load/LoaderItemList.java index 28a2272a9..4227ad447 100644 --- a/src/main/java/gregapi/load/LoaderItemList.java +++ b/src/main/java/gregapi/load/LoaderItemList.java @@ -705,6 +705,8 @@ public void run() { StoneLayer.REPLACEABLE_BLOCKS.add(ST.block(MD.DRPG, "arcaniumOre" , null)); + BlocksGT.EtFu_Beetroot_Crop = GameRegistry.findBlock(MD.EtFu.mID, "beetroots"); + DEB.println("TEST "+ BlocksGT.EtFu_Beetroot_Crop); BlocksGT.EtFu_Deepslate_Redstone_Ore = GameRegistry.findBlock(MD.EtFu.mID, "deepslate_redstone_ore"); BlocksGT.EtFu_Deepslate_Lit_Redstone_Ore = GameRegistry.findBlock(MD.EtFu.mID, "deepslate_lit_redstone_ore"); diff --git a/src/main/java/gregapi/worldgen/dungeon/DungeonChunkRoomFarmCrop.java b/src/main/java/gregapi/worldgen/dungeon/DungeonChunkRoomFarmCrop.java index bb329cc9b..b50fa6b3b 100644 --- a/src/main/java/gregapi/worldgen/dungeon/DungeonChunkRoomFarmCrop.java +++ b/src/main/java/gregapi/worldgen/dungeon/DungeonChunkRoomFarmCrop.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 GregTech-6 Team + * Copyright (c) 2023 GregTech-6 Team * * This file is part of GregTech. * @@ -19,16 +19,16 @@ package gregapi.worldgen.dungeon; -import static gregapi.data.CS.*; - import gregapi.code.ArrayListNoNulls; -import gregapi.data.CS.BlocksGT; +import gregapi.data.CS.*; import gregapi.data.MD; import gregapi.util.ST; import gregapi.util.WD; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import static gregapi.data.CS.*; + /** * @author Gregorius Techneticies */ @@ -60,7 +60,7 @@ public boolean generate(DungeonData aData) { , Blocks.carrots , Blocks.potatoes , Blocks.wheat - , ST.block(MD.EtFu, "beetroots", null) + , BlocksGT.EtFu_Beetroot_Crop , ST.block(MD.HaC, "pamartichokeCrop", null) , ST.block(MD.HaC, "pamasparagusCrop", null) , ST.block(MD.HaC, "pambambooshootCrop", null) diff --git a/src/main/java/gregtech/entities/Override_Drops.java b/src/main/java/gregtech/entities/Override_Drops.java index ab27bb985..026c131f7 100644 --- a/src/main/java/gregtech/entities/Override_Drops.java +++ b/src/main/java/gregtech/entities/Override_Drops.java @@ -496,7 +496,12 @@ public static void handleDrops(EntityLivingBase aDead, String aClass, List%{T4c{EDAF?{%(MMKxqf&sZO8gEt|J`= zLagg3QirhtjJL119HeYt=(^Qw?xuFL@sG3>qjz4KV*%u*dR%-jZa`*6JBdrq0CWDh zKP{$j%&14qYkhGzw zDPfEp4ZJodd7G`-^ii*mUga#z;&&}IeL3%4xpVl^*R{VqAPdAgi>=Il`m?LKVcnat zNF^8ls_(6d6!H$$F6WC&4(iSiGtX_4bv4CavN|u9TN2J&>yBu%oO zU7sDlvmU~k!YfCbjR$e}+;$TBe%qU*su;b|;J{g(k}J65GHtgp1mlPNeSS@(D~7Y}z`rwq^P$ID78P*8X#m$1@{vTEZIBrR|v>t|QL|4PRJ-02in&aB&2Y#KJ zoSM2PUEAHJ!Jj`bgH*|!QQ8+~v%IUh?ckx<6Omduj?>0hj&KgIzT*Q+EXR-{o4POT zsJu02m7aHg3vJp5%YAVZ8d`C6UO+bLBznC3*oWc=TGqj*60h3Vo*cWoHvg}d)jrvK z`nA?|Eb%d!YjdmcFKE2IHr=pbKO;LOaa(c5>)ZQX$_A3#-rcAnb%u28@hW&*s?=Mfz2S0$ z)=_-`i(*oXqT+l=l&Ur}ZE7RUFZtr08z)nOPU#=C7*TGVk%?Ave8-nG zy_lv|@~BLiF<9WVAfPI6w0_cWXDdO`6Qd`so(-yEZ*!O(IMZ>~G`rS~zojl;VjtVI zTpFm#G^S){&H8cNmPDF={T>s~ZORlz-bz-p;pEiC)ywvtm+i9ayb)}6v(@(2@?2(u z&ZN^iqX-kZi<~FZc<0)V1i0OfeR$pJ`TLnNo2RokY)7bOQKUH+`ggIw*PJ!K3Uh2?t~8GUyZ9AH z+ui47IXjLm-hZ2pZYWuHAhhbmF9oT8=;1wsW=i7XT|$oh@Zg1GXNS1+13p`$K@|LKY$s5n;ZBhZ2<{DYk#$aQ040DU5`p3Oo-D6^b1Qokf=k zcp=|`u*A+2^pv`wVM4bxGSqL47Z+I*jxhNICr1N&B?|)(p$ZtU6h(;TETscMgUiC6 z)y*UVUSpyNcOV3K`rut8G89iGQi&kIRti^>362JMdl_HA@^zj65dwR2AcQFtQWl96 z6%|E{q7WsrP!hysGD#qrL?#261t5MAzp_*a z1z*VeDmHbGCY|AdVD6uBzq0<6yT%x^^7Lf6N{~o(cpO&;f_i)wUxEnvEX^arpfPC( z1OZH@00pQZjS0XI3IiZaLunud;UfZY7!*e=SHNNfRYPImL?MR5L+B6++0ii{9uuHa zu?v$=W&kkEgauRq144O%VG!OjA*M<=Vt7<)C_V;7fe=K%CsP501|k5}j!6fYD2)d2 zQ7XuzqD(rOLDoR=5!QT(Oax=)6pG+blq400YC6<}v*!7590+9MP~e&tp9okXz#JS1 z3x(oHi7q9#}3c7a0mGBr>i<65&8l2Y^?5YUGW#A1aEQP>xwds}=uI^M2^6p|_za5Fylb z;qe;TvS4Ir5IMXWpgy$=|E^d(h=zg~r8L+M0;miM17N^> zG5`wbh#eD!ARdT*jV_l66j87YofnE_ie-ZdNRtiTT0^DH*Va*CsG28`OaVX!076`d z%%U)`!rFpl76=kZ|9pxFA4|}VX9pl;0R^Da1w4R3MNt4o5ISr}LFr`L|1w1i7oxMs zWEPe7|4Wg<6EMgip9%07bSySVLzp>4wSFMerQKY z-2&w}oZ)!&sdc9@wjXQMQ*b=lde26ijv(t+*jw$!nsj*{3tX`~cJ#Rvt;cQ+9M^eV z#;w})M#HNiW@WvhwsiOO@oeAKE{?>B8UE?kH?Pl_G}AH%T9#jvfA`#v(M^A4+g1-S zFIPuT+te2=e5LzS8O}LZ_jf^qy|z-7*YRuCn=2-NJaYc|MEiTsV|NS;4<=69&9-mP zHN3hkKj+V1O`z6p)vb0@E%CNS+15oxDejJmZZ!)gs{&@I;MODSFD!DlGCuTJ73)_K z_g?66va4