Merged all ingredients into single class

This commit is contained in:
drcrazy 2018-09-03 14:49:59 +03:00
parent 0b1733b733
commit 33b9f697dc
40 changed files with 258 additions and 1072 deletions

View file

@ -36,9 +36,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.OreDrop;
import techreborn.init.ModDusts;
import techreborn.init.ModGems;
import techreborn.init.ModItems;
import techreborn.init.TRIngredients;
import techreborn.lib.ModInfo;
import techreborn.utils.OreDictUtils;
@ -68,15 +67,15 @@ public class BlockBreakHandler {
List<ItemStack> drops = event.getDrops();
Random random = new Random();
if (OreDictUtils.isOre(state, "oreRuby")) {
OreDrop redGarnet = new OreDrop(ModGems.RED_GARNET.getStack(), redGarnetDropChance, 1);
OreDrop redGarnet = new OreDrop(TRIngredients.Gems.RED_GARNET.getStack(), redGarnetDropChance, 1);
drops.add(redGarnet.getDrops(event.getFortuneLevel(), random));
}
else if (OreDictUtils.isOre(state, "oreSapphire")) {
OreDrop peridot = new OreDrop(ModGems.PERIDOT.getStack(), peridotDropChance, 1);
OreDrop peridot = new OreDrop(TRIngredients.Gems.PERIDOT.getStack(), peridotDropChance, 1);
drops.add(peridot.getDrops(event.getFortuneLevel(), random));
}
else if (OreDictUtils.isOre(state, "oreSodalite")) {
OreDrop aluminium = new OreDrop(ModDusts.ALUMINUM.getStack(), aluminiumDropChance, 1);
OreDrop aluminium = new OreDrop(TRIngredients.Dusts.ALUMINUM.getStack(), aluminiumDropChance, 1);
drops.add(aluminium.getDrops(event.getFortuneLevel(), random));
}
else if (OreDictUtils.isOre(state, "oreCinnabar")) {
@ -84,7 +83,7 @@ public class BlockBreakHandler {
drops.add(redstone.getDrops(event.getFortuneLevel(), random));
}
else if (OreDictUtils.isOre(state, "oreSphalerite")) {
OreDrop yellowGarnet = new OreDrop(ModGems.YELLOW_GARNET.getStack(), yellowGarnetDropChance, 1);
OreDrop yellowGarnet = new OreDrop(TRIngredients.Gems.YELLOW_GARNET.getStack(), yellowGarnetDropChance, 1);
drops.add(yellowGarnet.getDrops(event.getFortuneLevel(), random));
}
}

View file

@ -25,7 +25,6 @@
package techreborn.events;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
@ -35,7 +34,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.registries.IForgeRegistryEntry;
import reborncore.common.util.ItemUtils;
import techreborn.init.ModItems;
import techreborn.init.ModParts;
import techreborn.init.TRIngredients;
import techreborn.lib.ModInfo;
import java.util.ArrayList;
@ -92,7 +91,7 @@ public class TRRecipeHandler {
}
//Hide uu recipes
for (Ingredient ingredient : recipe.getIngredients()) {
if (ingredient.apply(ModParts.UU_MATTER.getStack())) {
if (ingredient.apply(TRIngredients.Parts.UU_MATTER.getStack())) {
return false;
}
}