Fix #1375 Split up the loot tables for every plugin

This commit is contained in:
Nedelosk committed 2017-09-09 20:18:19 +02:00
1 parent 60debc45f3
commit 716167e3ec
38 files changed
+823 -774

No files matched your search

@@ -134,7 +134,7 @@ import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
@ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description")
@ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description", lootTable = "apiculture")
public class PluginApiculture extends BlankForestryPlugin {
private static final String CONFIG_CATEGORY = "apiculture";
private static float secondPrincessChance = 0;
@@ -113,7 +113,7 @@ import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
@ForestryPlugin(pluginID = ForestryPluginUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description")
@ForestryPlugin(pluginID = ForestryPluginUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description", lootTable = "arboriculture")
public class PluginArboriculture extends BlankForestryPlugin {
@SuppressWarnings("NullableProblems")
@@ -12,6 +12,7 @@ package forestry.core;
import java.net.URL;
import java.util.Collection;
import java.util.Set;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
@@ -120,15 +121,19 @@ public class EventHandlerCore {
return;
}
ResourceLocation resourceLocation = new ResourceLocation(Constants.MOD_ID, event.getName().getResourcePath());
URL url = EventHandlerCore.class.getResource("/assets/" + resourceLocation.getResourceDomain() + "/loot_tables/" + resourceLocation.getResourcePath() + ".json");
if (url != null) {
LootTable forestryChestAdditions = event.getLootTableManager().getLootTableFromLocation(resourceLocation);
if (forestryChestAdditions != LootTable.EMPTY_LOOT_TABLE) {
for (String poolName : PluginManager.getLootPoolNames()) {
LootPool pool = forestryChestAdditions.getPool(poolName);
if (pool != null) {
event.getTable().addPool(pool);
Set<String> lootPoolNames = PluginManager.getLootPoolNames();
for (String lootTableFile : PluginManager.getLootTableFiles()) {
ResourceLocation resourceLocation = new ResourceLocation(Constants.MOD_ID, event.getName().getResourcePath() + "/" + lootTableFile);
URL url = EventHandlerCore.class.getResource("/assets/" + resourceLocation.getResourceDomain() + "/loot_tables/" + resourceLocation.getResourcePath() + ".json");
if (url != null) {
LootTable forestryChestAdditions = event.getLootTableManager().getLootTableFromLocation(resourceLocation);
if (forestryChestAdditions != LootTable.EMPTY_LOOT_TABLE) {
for (String poolName : lootPoolNames) {
LootPool pool = forestryChestAdditions.getPool(poolName);
if (pool != null) {
event.getTable().addPool(pool);
}
}
}
}
@@ -75,7 +75,7 @@ import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
import forestry.storage.PluginStorage;
@ForestryPlugin(pluginID = ForestryPluginUids.FACTORY, name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.factory.description")
@ForestryPlugin(pluginID = ForestryPluginUids.FACTORY, name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.factory.description", lootTable = "factory")
public class PluginFactory extends BlankForestryPlugin {
@Nullable
private static BlockRegistryFactory blocks;
@@ -51,4 +51,9 @@ public @interface ForestryPlugin {
*/
String help() default "";
/**
* @return The name of the loot table file, if any.
*/
String lootTable() default "";
}
@@ -34,6 +34,7 @@ import net.minecraft.world.gen.IChunkGenerator;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fml.common.discovery.ASMDataTable;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -326,6 +327,18 @@ public class PluginManager {
return lootPoolNames;
}
public static Set<String> getLootTableFiles() {
Set<String> lootTableNames = new HashSet<>();
for (IForestryPlugin plugin : loadedPlugins) {
ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class);
String lootTableFolder = info.lootTable();
if (!lootTableFolder.isEmpty()) {
lootTableNames.add(lootTableFolder);
}
}
return lootTableNames;
}
private static boolean isEnabled(Configuration config, IForestryPlugin plugin) {
ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class);
@@ -10,23 +10,39 @@
******************************************************************************/
package forestry.storage;
import com.google.common.base.Preconditions;
import javax.annotation.Nullable;
import java.awt.Color;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import com.google.common.base.Preconditions;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.Forestry;
import forestry.api.core.ForestryAPI;
import forestry.api.recipes.RecipeManagers;
@@ -57,26 +73,8 @@ import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
import forestry.storage.items.ItemRegistryStorage;
import forestry.storage.proxy.ProxyStorage;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.OreDictionary;
@ForestryPlugin(pluginID = ForestryPluginUids.STORAGE, name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description")
@ForestryPlugin(pluginID = ForestryPluginUids.STORAGE, name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description", lootTable = "storage")
public class PluginStorage extends BlankForestryPlugin {
@SuppressWarnings("NullableProblems")