Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-26 05:08:34 +01:00
Code Issues Projects Releases Wiki Activity

re-add foreign ores to the ores list

Browse source
This commit is contained in:
Ellpeck 2020-04-29 00:24:07 +02:00
parent 32c62cbc50
commit 288d09feda
1 changed files with 44 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java
View file

@ -27,6 +27,7 @@ import net.minecraft.potion.PotionUtils;
import net.minecraft.potion.Potions; import net.minecraft.potion.Potions;
import net.minecraft.profiler.IProfiler; import net.minecraft.profiler.IProfiler;
import net.minecraft.resources.IResourceManager; import net.minecraft.resources.IResourceManager;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags; import net.minecraft.tags.ItemTags;
import net.minecraft.tags.Tag; import net.minecraft.tags.Tag;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -35,6 +36,7 @@ import net.minecraftforge.common.Tags;
import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistries;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
public class ModRecipes extends ReloadListener<Object> { public class ModRecipes extends ReloadListener<Object> {
@ -313,51 +315,40 @@ public class ModRecipes extends ReloadListener<Object> {
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre(Tags.Blocks.ORES_EMERALD, 30)); NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre(Tags.Blocks.ORES_EMERALD, 30));
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre(Tags.Blocks.ORES_QUARTZ, 3000)); NaturesAuraAPI.NETHER_ORES.add(new WeightedOre(Tags.Blocks.ORES_QUARTZ, 3000));
// TODO figure out how to deal with foreign ore tags foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/copper", 2000);
/*NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreCopper", 2000)); foreignOre(NaturesAuraAPI.NETHER_ORES, "ores/nether/copper", 2000);
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreNetherCopper", 2000)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/tin", 1800);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreTin", 1800)); foreignOre(NaturesAuraAPI.NETHER_ORES, "ores/nether/tin", 1800);
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreNetherTin", 1800)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/lead", 1500);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreLead", 1500)); foreignOre(NaturesAuraAPI.NETHER_ORES, "ores/nether/lead", 1500);
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreNetherLead", 1500)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/silver", 1000);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreSilver", 1000)); foreignOre(NaturesAuraAPI.NETHER_ORES, "ores/nether/silver", 1000);
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreNetherSilver", 1000)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/nickel", 100);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreNickel", 100)); foreignOre(NaturesAuraAPI.NETHER_ORES, "ores/nether/nickel", 100);
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreNetherNickel", 100)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/platinum", 20);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("orePlatinum", 20)); foreignOre(NaturesAuraAPI.NETHER_ORES, "ores/nether/platinum", 20);
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreNetherPlatinum", 20)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/aluminum", 1200);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreAluminum", 1200)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/aluminium", 1200);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreAluminium", 1200)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/osmium", 1500);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreOsmium", 1500)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/zinc", 1000);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreZinc", 1000)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/yellorite", 1200);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreYellorite", 1200)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/uranium", 400);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreUranium", 400)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/apatite", 700);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreCertusQuartz", 800)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/ruby", 40);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreApatite", 700)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/peridot", 40);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreQuartzBlack", 3000)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/topaz", 40);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreRuby", 40)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/tanzanite", 40);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("orePeridot", 40)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/malachite", 40);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreTopaz", 40)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/sapphire", 40);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreTanzanite", 40)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/amber", 150);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreMalachite", 40)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/resonating", 50);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreSapphire", 40)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/sulfur", 3000);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreAmber", 150)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/saltpeter", 250);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreResonating", 50)); foreignOre(NaturesAuraAPI.NETHER_ORES, "ores/firestone", 30);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreSulfur", 3000)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/salt", 2900);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreSaltpeter", 250)); foreignOre(NaturesAuraAPI.OVERWORLD_ORES, "ores/draconium", 5);
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreFirestone", 30)); foreignOre(NaturesAuraAPI.NETHER_ORES, "ores/cobalt", 50);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreSalt", 2900)); foreignOre(NaturesAuraAPI.NETHER_ORES, "ores/ardite", 50);
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreDraconium", 5));
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("orePoorIron", 3000));
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("orePoorGold", 500));
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("orePoorCopper", 2000));
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("orePoorTin", 1800));
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("orePoorLead", 1500));
NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("orePoorSilver", 1000));
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreCobalt", 50));
NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreArdite", 50));*/
NaturesAuraAPI.PROJECTILE_GENERATIONS.put(EntityType.EGG, 2500); NaturesAuraAPI.PROJECTILE_GENERATIONS.put(EntityType.EGG, 2500);
NaturesAuraAPI.PROJECTILE_GENERATIONS.put(EntityType.SNOWBALL, 3500); NaturesAuraAPI.PROJECTILE_GENERATIONS.put(EntityType.SNOWBALL, 3500);
@ -378,6 +369,14 @@ public class ModRecipes extends ReloadListener<Object> {
new AnimalSpawnerRecipe(res(name), entity, aura, time, actualIngs).register(); new AnimalSpawnerRecipe(res(name), entity, aura, time, actualIngs).register();
} }
private static void foreignOre(List<WeightedOre> list, String name, int weight) {
ResourceLocation res = new ResourceLocation("forge", name);
Tag<Block> tag = BlockTags.getCollection().get(res);
if (tag == null)
return;
list.add(new WeightedOre(tag, weight));
}
private static Ingredient ing(Block... blocks) { private static Ingredient ing(Block... blocks) {
return ing(Arrays.stream(blocks).map(ItemStack::new).toArray(ItemStack[]::new)); return ing(Arrays.stream(blocks).map(ItemStack::new).toArray(ItemStack[]::new));
} }