Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts: # src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java # src/main/java/techreborn/client/container/ContainerPda.java # src/main/java/techreborn/client/gui/TRBuilder.java # src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java # src/main/java/techreborn/compat/crafttweaker/CTGeneric.java # src/main/java/techreborn/compat/jei/RecipeUtil.java # src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java # src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java # src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java # src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java # src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java # src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java # src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java # src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeCategory.java # src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java # src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeCategory.java # src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java # src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java # src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java # src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java # src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java # src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java # src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java # src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java # src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java # src/main/java/techreborn/init/ModBlocks.java # src/main/java/techreborn/init/ModTileEntities.java # src/main/java/techreborn/init/recipes/CraftingTableRecipes.java # src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java # src/main/java/techreborn/items/tools/ItemAdvancedDrill.java # src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java # src/main/resources/assets/techreborn/lang/en_us.lang # src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json # src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json # src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json # src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json # src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json # src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json
This commit is contained in:
commit
6060a97855
77 changed files with 1863 additions and 4017 deletions
|
@ -30,6 +30,7 @@ import net.minecraft.world.storage.loot.conditions.LootCondition;
|
|||
import net.minecraftforge.event.LootTableLoadEvent;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import techreborn.Core;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
@ -40,18 +41,24 @@ public class ModLoot {
|
|||
public static List<ResourceLocation> lootTables = new ArrayList<ResourceLocation>();
|
||||
|
||||
public static void init() {
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/abandoned_mineshaft"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/desert_pyramid"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/end_city_treasure"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/igloo_chest"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/jungle_temple"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/nether_bridge"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/simple_dungeon"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_corridor"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_crossing"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_library"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/village_blacksmith"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/woodland_mansion"));
|
||||
if (ConfigTechReborn.enableOverworldLoot) {
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/abandoned_mineshaft"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/desert_pyramid"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/igloo_chest"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/jungle_temple"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/simple_dungeon"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_corridor"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_crossing"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_library"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/village_blacksmith"));
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/woodland_mansion"));
|
||||
}
|
||||
if (ConfigTechReborn.enableNetherLoot) {
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/nether_bridge"));
|
||||
}
|
||||
if (ConfigTechReborn.enableEndLoot) {
|
||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/end_city_treasure"));
|
||||
}
|
||||
|
||||
for (ResourceLocation lootTable : lootTables) {
|
||||
LootTableList.register(lootTable);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue