Fix #1294 JEI Integration for Thermionic Fab and Carpenter

This commit is contained in:
Nedelosk committed 2016-10-18 15:12:59 +02:00
1 parent 413e1b9a0d
commit dcaf6e144f
10 files changed
+272 -1

No files matched your search

@@ -56,7 +56,10 @@ public enum PacketIdClient implements IPacketId {
// Mail
TRADING_ADDRESS_RESPONSE,
LETTER_INFO_RESPONSE,
POBOX_INFO_RESPONSE;
POBOX_INFO_RESPONSE,
// JEI
RECIPE_TRANSFER_UPDATE;
public static final PacketIdClient[] VALUES = values();
@@ -28,6 +28,7 @@ public enum PacketIdServer implements IPacketId {
// JEI
WORKTABLE_RECIPE_REQUEST,
RECIPE_TRANSFER_REQUEST,
// Apiculture
BEE_LOGIC_ACTIVE_ENTITY_REQUEST,
@@ -78,4 +78,8 @@ public class ContainerCarpenter extends ContainerLiquidTanks<TileCarpenter> impl
}
}
public TileCarpenter getCarpenter() {
return tile;
}
}
@@ -73,4 +73,8 @@ public class ContainerFabricator extends ContainerLiquidTanks<TileFabricator> im
tile.sendGUINetworkData(this, crafter);
}
}
public TileFabricator getFabricator(){
return tile;
}
}
@@ -11,6 +11,8 @@
package forestry.factory.network;
import forestry.core.network.PacketRegistry;
import forestry.factory.network.packets.PacketRecipeTransferRequest;
import forestry.factory.network.packets.PacketRecipeTransferUpdate;
import forestry.factory.network.packets.PacketWorktableMemoryUpdate;
import forestry.factory.network.packets.PacketWorktableRecipeRequest;
import forestry.factory.network.packets.PacketWorktableRecipeUpdate;
@@ -21,7 +23,9 @@ public class PacketRegistryFactory extends PacketRegistry {
registerClientPacket(new PacketWorktableMemoryUpdate());
registerClientPacket(new PacketWorktableRecipeUpdate());
registerClientPacket(new PacketRecipeTransferUpdate());
registerServerPacket(new PacketWorktableRecipeRequest());
registerServerPacket(new PacketRecipeTransferRequest());
}
}
@@ -0,0 +1,79 @@
/*******************************************************************************
* Copyright (c) 2011-2014 SirSengir.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser Public License v3
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/lgpl-3.0.txt
*
* Various Contributors including, but not limited to:
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
******************************************************************************/
package forestry.factory.network.packets;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import forestry.core.network.DataInputStreamForestry;
import forestry.core.network.DataOutputStreamForestry;
import forestry.core.network.IForestryPacketServer;
import forestry.core.network.PacketIdServer;
import forestry.core.network.packets.PacketCoordinates;
import forestry.core.proxy.Proxies;
import forestry.core.tiles.TileBase;
import forestry.factory.tiles.TileCarpenter;
import forestry.factory.tiles.TileFabricator;
public class PacketRecipeTransferRequest extends PacketCoordinates implements IForestryPacketServer {
private ItemStack[] craftingInventory;
public PacketRecipeTransferRequest() {
}
public PacketRecipeTransferRequest(TileBase base, ItemStack[] craftingInventory) {
super(base);
this.craftingInventory = craftingInventory;
}
@Override
protected void writeData(DataOutputStreamForestry data) throws IOException {
super.writeData(data);
data.writeItemStacks(craftingInventory);
}
@Override
public void readData(DataInputStreamForestry data) throws IOException {
super.readData(data);
craftingInventory = data.readItemStacks();
}
@Override
public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException {
TileEntity tile = getTarget(player.worldObj);
if (tile instanceof TileCarpenter) {
TileCarpenter carpenter = (TileCarpenter) tile;
int index = 0;
for(ItemStack stack : craftingInventory){
carpenter.getCraftingInventory().setInventorySlotContents(index, stack);
index++;
}
Proxies.net.sendNetworkPacket(new PacketRecipeTransferUpdate(carpenter, craftingInventory), player.worldObj);
}else if(tile instanceof TileFabricator){
TileFabricator fabricator = (TileFabricator) tile;
int index = 0;
for(ItemStack stack : craftingInventory){
fabricator.getCraftingInventory().setInventorySlotContents(index, stack);
index++;
}
Proxies.net.sendNetworkPacket(new PacketRecipeTransferUpdate(fabricator, craftingInventory), player.worldObj);
}
}
@Override
public PacketIdServer getPacketId() {
return PacketIdServer.RECIPE_TRANSFER_REQUEST;
}
}
@@ -0,0 +1,74 @@
/*******************************************************************************
* Copyright (c) 2011-2014 SirSengir.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser Public License v3
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/lgpl-3.0.txt
*
* Various Contributors including, but not limited to:
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
******************************************************************************/
package forestry.factory.network.packets;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import forestry.core.network.DataInputStreamForestry;
import forestry.core.network.DataOutputStreamForestry;
import forestry.core.network.IForestryPacketClient;
import forestry.core.network.PacketIdClient;
import forestry.core.network.packets.PacketCoordinates;
import forestry.core.tiles.TileBase;
import forestry.factory.tiles.TileCarpenter;
import forestry.factory.tiles.TileFabricator;
public class PacketRecipeTransferUpdate extends PacketCoordinates implements IForestryPacketClient {
private ItemStack[] craftingInventory;
public PacketRecipeTransferUpdate() {
}
public PacketRecipeTransferUpdate(TileBase base, ItemStack[] craftingInventory) {
super(base);
this.craftingInventory = craftingInventory;
}
@Override
protected void writeData(DataOutputStreamForestry data) throws IOException {
super.writeData(data);
data.writeItemStacks(craftingInventory);
}
@Override
public void readData(DataInputStreamForestry data) throws IOException {
super.readData(data);
craftingInventory = data.readItemStacks();
}
@Override
public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException {
TileEntity tile = getTarget(player.worldObj);
if (tile instanceof TileCarpenter) {
TileCarpenter carpenter = (TileCarpenter) tile;
int index = 0;
for(ItemStack stack : craftingInventory){
carpenter.getCraftingInventory().setInventorySlotContents(index, stack);
index++;
}
}else if(tile instanceof TileFabricator){
TileFabricator fabricator = (TileFabricator) tile;
int index = 0;
for(ItemStack stack : craftingInventory){
fabricator.getCraftingInventory().setInventorySlotContents(index, stack);
index++;
}
}
}
@Override
public PacketIdClient getPacketId() {
return PacketIdClient.RECIPE_TRANSFER_UPDATE;
}
}
@@ -24,12 +24,14 @@ import forestry.factory.recipes.jei.bottler.BottlerRecipeMaker;
import forestry.factory.recipes.jei.carpenter.CarpenterRecipeCategory;
import forestry.factory.recipes.jei.carpenter.CarpenterRecipeHandler;
import forestry.factory.recipes.jei.carpenter.CarpenterRecipeMaker;
import forestry.factory.recipes.jei.carpenter.CarpenterRecipeTransferHandler;
import forestry.factory.recipes.jei.centrifuge.CentrifugeRecipeCategory;
import forestry.factory.recipes.jei.centrifuge.CentrifugeRecipeHandler;
import forestry.factory.recipes.jei.centrifuge.CentrifugeRecipeMaker;
import forestry.factory.recipes.jei.fabricator.FabricatorRecipeCategory;
import forestry.factory.recipes.jei.fabricator.FabricatorRecipeHandler;
import forestry.factory.recipes.jei.fabricator.FabricatorRecipeMaker;
import forestry.factory.recipes.jei.fabricator.FabricatorRecipeTransferHandler;
import forestry.factory.recipes.jei.fermenter.FermenterRecipeCategory;
import forestry.factory.recipes.jei.fermenter.FermenterRecipeHandler;
import forestry.factory.recipes.jei.fermenter.FermenterRecipeMaker;
@@ -127,6 +129,8 @@ public class FactoryJeiPlugin extends BlankModPlugin {
IRecipeTransferRegistry transferRegistry = registry.getRecipeTransferRegistry();
transferRegistry.addRecipeTransferHandler(new WorktableRecipeTransferHandler());
transferRegistry.addRecipeTransferHandler(new CarpenterRecipeTransferHandler());
transferRegistry.addRecipeTransferHandler(new FabricatorRecipeTransferHandler());
registry.addAdvancedGuiHandlers(new ForestryAdvancedGuiHandler());
@@ -0,0 +1,50 @@
package forestry.factory.recipes.jei.carpenter;
import java.util.Map.Entry;
import forestry.core.proxy.Proxies;
import forestry.core.recipes.jei.ForestryRecipeCategoryUid;
import forestry.factory.gui.ContainerCarpenter;
import forestry.factory.network.packets.PacketRecipeTransferRequest;
import mezz.jei.api.gui.IGuiIngredient;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.recipe.transfer.IRecipeTransferError;
import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
public class CarpenterRecipeTransferHandler implements IRecipeTransferHandler<ContainerCarpenter> {
@Override
public Class<ContainerCarpenter> getContainerClass() {
return ContainerCarpenter.class;
}
@Override
public String getRecipeCategoryUid() {
return ForestryRecipeCategoryUid.CARPENTER;
}
@Override
public IRecipeTransferError transferRecipe(ContainerCarpenter container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, boolean doTransfer) {
if(doTransfer){
IInventory craftingInventory = container.getCarpenter().getCraftingInventory();
ItemStack[] items = new ItemStack[9];
for(Entry<Integer, ? extends IGuiIngredient<ItemStack>> guiIngredientEntry : recipeLayout.getItemStacks().getGuiIngredients().entrySet()){
IGuiIngredient<ItemStack> guiIngredient = guiIngredientEntry.getValue();
if(guiIngredientEntry != null && guiIngredient.getDisplayedIngredient() != null){
int index = guiIngredientEntry.getKey();
if (index >= 2) {
ItemStack ingredient = guiIngredient.getDisplayedIngredient().copy();
craftingInventory.setInventorySlotContents(index - 2, ingredient);
items[index - 2] = ingredient;
}
}
}
Proxies.net.sendToServer(new PacketRecipeTransferRequest(container.getCarpenter(), items));
}
return null;
}
}
@@ -0,0 +1,48 @@
package forestry.factory.recipes.jei.fabricator;
import java.util.Map.Entry;
import forestry.core.proxy.Proxies;
import forestry.core.recipes.jei.ForestryRecipeCategoryUid;
import forestry.factory.gui.ContainerFabricator;
import forestry.factory.network.packets.PacketRecipeTransferRequest;
import mezz.jei.api.gui.IGuiIngredient;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.recipe.transfer.IRecipeTransferError;
import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
public class FabricatorRecipeTransferHandler implements IRecipeTransferHandler<ContainerFabricator> {
@Override
public Class<ContainerFabricator> getContainerClass() {
return ContainerFabricator.class;
}
@Override
public String getRecipeCategoryUid() {
return ForestryRecipeCategoryUid.FABRICATOR;
}
@Override
public IRecipeTransferError transferRecipe(ContainerFabricator container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, boolean doTransfer) {
if(doTransfer){
IInventory craftingInventory = container.getFabricator().getCraftingInventory();
ItemStack[] items = new ItemStack[9];
for(Entry<Integer, ? extends IGuiIngredient<ItemStack>> guiIngredientEntry : recipeLayout.getItemStacks().getGuiIngredients().entrySet()){
IGuiIngredient<ItemStack> guiIngredient = guiIngredientEntry.getValue();
int index = guiIngredientEntry.getKey();
if (index >= 3 && guiIngredientEntry != null && guiIngredient.getDisplayedIngredient() != null) {
ItemStack ingredient =guiIngredient.getDisplayedIngredient().copy();
craftingInventory.setInventorySlotContents(index - 3, ingredient);
items[index - 3] = ingredient;
}
}
Proxies.net.sendToServer(new PacketRecipeTransferRequest(container.getFabricator(), items));
}
return null;
}
}