Compare commits

...
4 Commits
Author SHA1 Message Date
mezz ddffe5d4ce Bump version 2016-08-11 02:45:57 -07:00
mezz f59e57aa6a Fix loot table for storage plugin 2016-08-11 02:44:47 -07:00
mezz ae8cbf2ff2 Update Forge 2016-08-11 02:44:34 -07:00
mezz 305f3f78ec Update JEI 2016-08-11 02:44:25 -07:00
5 changed files with 16 additions and 12 deletions

No files matched your search

+3 -3
View File
@@ -1,11 +1,11 @@
mcversion=1.10.2
forgeversion=12.18.1.2044
forgeversion=12.18.1.2050
mcp_mappings=snapshot_20160525
tesla_version=1.10.2-1.2.1.41
jei_version=3.7.3.221
jei_version=3.8.0.240
ic2_version=2.6.15-ex110
version_major=5
version_minor=2
version_patch=7
version_patch=8
+1 -1
View File
@@ -52,7 +52,7 @@ import forestry.plugins.PluginManager;
guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
acceptedMinecraftVersions = "[1.10]",
dependencies = "required-after:Forge@[12.18.0.1989,);"
+ "after:JEI@[3.7.0,);"
+ "after:JEI@[3.8.0,);"
+ "after:" + PluginIC2.modId + ";")
public class Forestry {
@@ -15,12 +15,11 @@ import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
import mezz.jei.api.recipe.transfer.IRecipeTransferError;
import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
class WorktableRecipeTransferHandler implements IRecipeTransferHandler {
class WorktableRecipeTransferHandler implements IRecipeTransferHandler<ContainerWorktable> {
@Override
public Class<? extends Container> getContainerClass() {
public Class<ContainerWorktable> getContainerClass() {
return ContainerWorktable.class;
}
@@ -31,11 +30,10 @@ class WorktableRecipeTransferHandler implements IRecipeTransferHandler {
@Nullable
@Override
public IRecipeTransferError transferRecipe(@Nonnull Container container, @Nonnull IRecipeLayout recipeLayout, @Nonnull EntityPlayer player, boolean maxTransfer, boolean doTransfer) {
public IRecipeTransferError transferRecipe(@Nonnull ContainerWorktable container, @Nonnull IRecipeLayout recipeLayout, @Nonnull EntityPlayer player, boolean maxTransfer, boolean doTransfer) {
Map<Integer, ? extends IGuiIngredient<ItemStack>> guiIngredients = recipeLayout.getItemStacks().getGuiIngredients();
ContainerWorktable containerWorktable = (ContainerWorktable) container;
InventoryCraftingForestry inventory = new InventoryCraftingForestry(containerWorktable);
InventoryCraftingForestry inventory = new InventoryCraftingForestry(container);
List<ItemStack> recipeOutputs = Collections.emptyList();
for (Map.Entry<Integer, ? extends IGuiIngredient<ItemStack>> entry : guiIngredients.entrySet()) {
@@ -53,7 +51,7 @@ class WorktableRecipeTransferHandler implements IRecipeTransferHandler {
if (!recipeOutputs.isEmpty() && doTransfer) {
MemorizedRecipe recipe = new MemorizedRecipe(inventory, recipeOutputs);
containerWorktable.sendWorktableRecipeRequest(recipe);
container.sendWorktableRecipeRequest(recipe);
}
return null;
@@ -639,4 +639,10 @@ public class PluginStorage extends BlankForestryPlugin {
public void onBakeModel(ModelBakeEvent event) {
ModelCrate.initModel(event);
}
@Override
public void addLootPoolNames(Set<String> lootPoolNames) {
super.addLootPoolNames(lootPoolNames);
lootPoolNames.add("forestry_storage_items");
}
}
@@ -31,7 +31,7 @@
]
},
{
"name": "forestry_apiculture_items",
"name": "forestry_storage_items",
"rolls": 1,
"entries": [
{