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