Skip to content

Commit

Permalink
bugfix and drop for elephants
Browse files Browse the repository at this point in the history
  • Loading branch information
@GregoriusT
GregoriusT committed Dec 23, 2023
1 parent 26e9fe6 commit af3af39
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 29 deletions.
4 changes: 2 additions & 2 deletions src/main/java/gregapi/data/CS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregapi/data/IL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions src/main/java/gregapi/data/OD.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ public enum OD {
, itemSkin
, itemFur
, itemPelt
, itemIvory
, itemTusk
, itemHoof
, itemHorn
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/gregapi/load/LoaderItemList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/gregapi/worldgen/dungeon/DungeonChunkRoomFarmCrop.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2021 GregTech-6 Team
* Copyright (c) 2023 GregTech-6 Team
*
* This file is part of GregTech.
*
Expand All @@ -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
*/
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/gregtech/entities/Override_Drops.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,15 +496,20 @@ public static void handleDrops(EntityLivingBase aDead, String aClass, List<Entit
for (int i = 0; i < 2; i++) if (RNGSUS.nextInt(100) <= 25 + aLooting * 5) {
aDrops.add(ST.entity(aDead, IL.Tusk_Boar.get(1)));
}
} else if (aClass.equalsIgnoreCase("EntityTFDeer")) {
} else if (aClass.equalsIgnoreCase("EntityElephant") || aClass.equalsIgnoreCase("EntityElefant") || aClass.equalsIgnoreCase("MoCEntityElephant")) {
tReplaceIron = T;
for (int i = 0; i < 2; i++) if (RNGSUS.nextInt(100) <= 25 + aLooting * 5) {
aDrops.add(ST.entity(aDead, IL.Tusk_Elephant.get(1)));
}
} else if (aClass.equalsIgnoreCase("EntityDeer") || aClass.equalsIgnoreCase("EntityTFDeer")) {
tReplaceIron = T;
for (int i = 0; i < 4; i++) if (RNGSUS.nextInt(100) <= 25 + aLooting * 5) {
aDrops.add(ST.entity(aDead, IL.Hoof_Deer.get(1)));
}
for (int i = 0; i < 2; i++) if (RNGSUS.nextInt(100) <= 25 + aLooting * 5) {
aDrops.add(ST.entity(aDead, IL.Antler_Deer.get(1)));
}
} else if (aClass.equalsIgnoreCase("EntityDeer") || aClass.equalsIgnoreCase("MoCEntityDeer")) {
} else if (aClass.equalsIgnoreCase("MoCEntityDeer")) {
tReplaceIron = T;
ItemStack tRaw = IL.TF_Venison_Raw .get(1, ST.make(MD.HaC, "venisonrawItem" , 1, 0));
ItemStack tCooked = IL.TF_Venison_Cooked.get(1, ST.make(MD.HaC, "venisoncookedItem", 1, 0));
Expand Down
35 changes: 18 additions & 17 deletions src/main/java/gregtech/items/MultiItemFood.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,23 +198,24 @@ public void addItems() {
RM.Bath .addRecipe1(T, 0, 16, OM.dust(MT.Kaolinite ), tWater , NF, IL.Clay_Ball_White.get(1));
}

IL.Tusk .set(addItem(12400, "Tusk" , "" , OD.itemTusk , TC.stack(TC.BESTIA, 2), TC.stack(TC.FAMES, 2)));
IL.Tusk_Hoglin .set(addItem(12401, "Hoglin Tusk" , "not golden" , OD.itemTusk , TC.stack(TC.BESTIA, 2), TC.stack(TC.FAMES, 2)));
IL.Tusk_Boar .set(addItem(12402, "Boar Tusk" , "" , OD.itemTusk , TC.stack(TC.BESTIA, 2), TC.stack(TC.FAMES, 2)));

IL.Hoof .set(addItem(12500, "Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Cow .set(addItem(12501, "Cow Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Horse .set(addItem(12502, "Horse Hoof" , "not race-worthy" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Mule .set(addItem(12503, "Mule Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Donkey .set(addItem(12504, "Donkey Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Deer .set(addItem(12505, "Deer Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));

IL.Horn .set(addItem(12600, "Horn" , "" , OD.itemHorn , TC.stack(TC.BESTIA, 2), TC.stack(TC.TELUM, 2)));
IL.Horn_Cow .set(addItem(12601, "Cow Horn" , "" , OD.itemHorn , TC.stack(TC.BESTIA, 2), TC.stack(TC.TELUM, 2)));
IL.Horn_Sheep .set(addItem(12602, "Sheep Horn" , "from horned Sheep", OD.itemHorn , TC.stack(TC.BESTIA, 2), TC.stack(TC.TELUM, 2)));

IL.Antler .set(addItem(12700, "Antler" , "" , OD.itemAntler, TC.stack(TC.BESTIA, 2), TC.stack(TC.INSTRUMENTUM, 2)));
IL.Antler_Deer .set(addItem(12701, "Deer Antler" , "oh dear..." , OD.itemAntler, TC.stack(TC.BESTIA, 2), TC.stack(TC.INSTRUMENTUM, 2)));
IL.Tusk .set(addItem(12400, "Tusk" , "" , OD.itemTusk , TC.stack(TC.BESTIA, 2), TC.stack(TC.FAMES, 2)));
IL.Tusk_Hoglin .set(addItem(12401, "Hoglin Tusk" , "not golden" , OD.itemTusk , TC.stack(TC.BESTIA, 2), TC.stack(TC.FAMES, 2)));
IL.Tusk_Boar .set(addItem(12402, "Boar Tusk" , "" , OD.itemTusk , TC.stack(TC.BESTIA, 2), TC.stack(TC.FAMES, 2)));
IL.Tusk_Elephant.set(addItem(12403, "Elephant Tusk", "Ivory" , OD.itemTusk, OD.itemIvory, TC.stack(TC.BESTIA, 3), TC.stack(TC.FAMES, 3), TC.stack(TC.LUCRUM, 3)));

IL.Hoof .set(addItem(12500, "Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Cow .set(addItem(12501, "Cow Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Horse .set(addItem(12502, "Horse Hoof" , "not race-worthy" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Mule .set(addItem(12503, "Mule Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Donkey .set(addItem(12504, "Donkey Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));
IL.Hoof_Deer .set(addItem(12505, "Deer Hoof" , "" , OD.itemHoof , TC.stack(TC.BESTIA, 2), TC.stack(TC.ITER, 2)));

IL.Horn .set(addItem(12600, "Horn" , "" , OD.itemHorn , TC.stack(TC.BESTIA, 2), TC.stack(TC.TELUM, 2)));
IL.Horn_Cow .set(addItem(12601, "Cow Horn" , "" , OD.itemHorn , TC.stack(TC.BESTIA, 2), TC.stack(TC.TELUM, 2)));
IL.Horn_Sheep .set(addItem(12602, "Sheep Horn" , "from horned Sheep", OD.itemHorn , TC.stack(TC.BESTIA, 2), TC.stack(TC.TELUM, 2)));

IL.Antler .set(addItem(12700, "Antler" , "" , OD.itemAntler , TC.stack(TC.BESTIA, 2), TC.stack(TC.INSTRUMENTUM, 2)));
IL.Antler_Deer .set(addItem(12701, "Deer Antler" , "oh dear..." , OD.itemAntler , TC.stack(TC.BESTIA, 2), TC.stack(TC.INSTRUMENTUM, 2)));



Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/loaders/c/Loader_Recipes_Food.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ public class Loader_Recipes_Food implements Runnable {
RM.Bath .addRecipe1(T, 0, 128, aEvent.mStack, FL.Water_Geothermal.make(100), FL.Water.make(100), (ST.equal(aEvent.mStack, Items.egg)?IL.Food_Brown_Egg_Boiled:IL.Food_White_Egg_Boiled).get(1));
RM.Autoclave .addRecipe2(T, 0, 128, aEvent.mStack, ST.tag(0), FL.Steam.make(800), FL.DistW.make(5), (ST.equal(aEvent.mStack, Items.egg)?IL.Food_Brown_Egg_Boiled:IL.Food_White_Egg_Boiled).get(1));
RM.Mixer .addRecipe2(T, 16, 16, aEvent.mStack, OP.stick.mat(MT.WoodTreated, 0), IL.Food_Egg_Scrambled.get(1));
RM.Juicer .addRecipe1(T, 16, 16, aEvent.mStack, IL.Food_Egg_White.get(1), IL.Food_Egg_Yolk.get(1)); // There not gonna be a Squeezer Recipe!
RM.Juicer .addRecipe1(T, 16, 16, aEvent.mStack, IL.Food_Egg_White.get(1), IL.Food_Egg_Yolk.get(1)); // There is not gonna be a Squeezer Recipe!
RM.Centrifuge .addRecipe1(T, 16, 64, aEvent.mStack, IL.Food_Egg_White.get(1), IL.Food_Egg_Yolk.get(1));
RM.add_smelting(aEvent.mStack, IL.Food_Egg_Fried.get(1));
}});
Expand All @@ -319,7 +319,7 @@ public class Loader_Recipes_Food implements Runnable {
for (OreDictMaterial tMat : ANY.Flour.mToThis)
RM.Mixer .addRecipe2(T, 16, 16, aEvent.mStack, OM.dust(tMat), IL.Food_Dough_Egg.get(1));
}});
addListener(OD.itemTusk, new IOreDictListenerEvent() {@Override public void onOreRegistration(OreDictRegistrationContainer aEvent) {
addListener(OD.itemTusk, OD.itemIvory, new IOreDictListenerEvent() {@Override public void onOreRegistration(OreDictRegistrationContainer aEvent) {
if (OD.listAllmeatsubstitute.is_(aEvent.mStack)) return;
RM.add_smelting(aEvent.mStack, IL.Sticky_Goo.get(1), F, T, F);
RM.mortarize(aEvent.mStack, IL.Dye_Bonemeal.get(1));
Expand Down
Binary file added src/main/resources/assets/gregtech/textures/items/gt.multiitem.food/12403.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit af3af39

Please sign in to comment.