Fix camouflage and add agriculture tab

This commit is contained in:
Nedelosk committed 2016-03-17 19:36:21 +01:00
1 parent 86a93b29c0
commit 3eaf9d4d30
15 files changed
+158 -30

No files matched your search

@@ -12,6 +12,7 @@ import net.minecraft.creativetab.CreativeTabs;
*/
public class Tabs {
public static CreativeTabs tabAgriculture;
public static CreativeTabs tabApiculture;
public static CreativeTabs tabArboriculture;
public static CreativeTabs tabLepidopterology;
@@ -24,20 +24,24 @@ import forestry.plugins.ForestryPluginUids;
public class CreativeTabForestry extends CreativeTabs {
static {
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) {
Tabs.tabAgriculture= new CreativeTabForestry(1, "agriculture");
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) {
Tabs.tabApiculture = new CreativeTabForestry(1, "apiculture");
Tabs.tabApiculture = new CreativeTabForestry(2, "apiculture");
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) {
Tabs.tabArboriculture = new CreativeTabForestry(2, "arboriculture");
Tabs.tabArboriculture = new CreativeTabForestry(3, "arboriculture");
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) {
Tabs.tabLepidopterology = new CreativeTabForestry(3, "lepidopterology");
Tabs.tabLepidopterology = new CreativeTabForestry(4, "lepidopterology");
}
}
public static final CreativeTabs tabForestry = new CreativeTabForestry(0, Constants.MOD_ID);
public static final CreativeTabs tabForestry = new CreativeTabForestry(0, Constants.RESOURCE_ID);
private final int icon;
@@ -51,12 +55,15 @@ public class CreativeTabForestry extends CreativeTabs {
Item iconItem;
switch (icon) {
case 1:
iconItem = GameRegistry.findItem(Constants.MOD_ID, "beeDroneGE");
iconItem = GameRegistry.findItem(Constants.MOD_ID, "ffarm");
break;
case 2:
iconItem = GameRegistry.findItem(Constants.MOD_ID, "sapling");
iconItem = GameRegistry.findItem(Constants.MOD_ID, "beeDroneGE");
break;
case 3:
iconItem = GameRegistry.findItem(Constants.MOD_ID, "sapling");
break;
case 4:
iconItem = GameRegistry.findItem(Constants.MOD_ID, "butterflyGE");
break;
default:
@@ -52,6 +52,9 @@ public enum PacketIdClient implements IPacketId {
// Arboriculture
RIPENING_UPDATE,
// Greanhouse
TILE_FORESTRY_CAMOUFLAGE,
// Mail
TRADING_ADDRESS_RESPONSE,
LETTER_INFO_RESPONSE,
@@ -27,9 +27,6 @@ public enum PacketIdServer implements IPacketId {
// Apiculture
BEE_LOGIC_ACTIVE_ENTITY_REQUEST,
// Factory
WORKTABLE_NEI_SELECT,
//Greenhouse
TILE_FORESTRY_CAMOUFLAGE,
@@ -41,6 +41,8 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import forestry.core.CreativeTabForestry;
import forestry.core.blocks.BlockStructure;
import forestry.core.blocks.propertys.UnlistedBlockAccess;
import forestry.core.blocks.propertys.UnlistedBlockPos;
@@ -63,6 +65,7 @@ public class BlockFarm extends BlockStructure {
setHardness(1.0f);
setHarvestLevel("pickaxe", 0);
setDefaultState(blockState.getBaseState().withProperty(META, EnumFarmBlockType.PLAIN));
setCreativeTab(Tabs.tabAgriculture);
}
@@ -12,9 +12,12 @@ package forestry.greenhouse;
import forestry.api.greenhouse.GreenhouseManager;
import forestry.api.greenhouse.IGreenhouseItemAccess;
import forestry.apiculture.network.PacketRegistryApiculture;
import forestry.core.config.Constants;
import forestry.core.network.IPacketRegistry;
import forestry.greenhouse.blocks.BlockGreenhouseType;
import forestry.greenhouse.blocks.BlockRegistryGreenhouse;
import forestry.greenhouse.network.PacketRegistryGreenhouse;
import forestry.greenhouse.proxy.ProxyGreenhouse;
import forestry.greenhouse.tiles.TileGreenhouseControl;
import forestry.greenhouse.tiles.TileGreenhouseDoor;
@@ -100,6 +103,11 @@ public class PluginGreenhouse extends BlankForestryPlugin {
proxy.initializeModels();
}
@Override
public IPacketRegistry getPacketRegistry() {
return new PacketRegistryGreenhouse();
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleTextureRemap(TextureStitchEvent.Pre event) {
@@ -42,9 +42,11 @@ import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.common.property.Properties;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.ForestryAPI;
import forestry.api.core.ICamouflageHandler;
import forestry.api.core.ICamouflagedBlock;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import forestry.api.multiblock.IGreenhouseComponent;
import forestry.core.CreativeTabForestry;
import forestry.core.blocks.BlockStructure;
@@ -61,6 +63,7 @@ import forestry.greenhouse.tiles.TileGreenhouseHeater;
import forestry.greenhouse.tiles.TileGreenhousePlain;
import forestry.greenhouse.tiles.TileGreenhouseSprinkler;
import forestry.greenhouse.tiles.TileGreenhouseValve;
import forestry.plugins.ForestryPluginUids;
public abstract class BlockGreenhouse extends BlockStructure {
@@ -106,7 +109,11 @@ public abstract class BlockGreenhouse extends BlockStructure {
setHardness(1.0f);
setHarvestLevel("pickaxe", 0);
setCreativeTab(CreativeTabForestry.tabForestry);
if(ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)){
setCreativeTab(Tabs.tabAgriculture);
}else{
setCreativeTab(CreativeTabForestry.tabForestry);
}
}
@Override
@@ -82,7 +82,7 @@ public enum BlockGreenhouseType {
TextureManager.registerSprite("blocks/greenhouse/fan.off"),
TextureManager.registerSprite("blocks/greenhouse/fan.on"),
TextureManager.registerSprite("blocks/greenhouse/heater.off"),
TextureManager.registerSprite("blocks/greenhouse/heater.off"),
TextureManager.registerSprite("blocks/greenhouse/heater.on"),
TextureManager.registerSprite("blocks/greenhouse/dryer"),
TextureManager.registerSprite("blocks/greenhouse/control"),
TextureManager.registerSprite("blocks/greenhouse/hatch_input"),
@@ -89,7 +89,7 @@ public class WidgetCamouflageSlot extends Widget {
if(camouflageHandler instanceof IMultiblockController){
toolTip.add(StatCollector.translateToLocal("for.gui.empty.slot.camouflage.multiblock." + typeName) + ": ");
}else{
toolTip.add(StatCollector.translateToLocal("for.gui.empty.slot.camouflage." + typeName) + ": ");
toolTip.add(StatCollector.translateToLocal("for.gui.empty.slot.camouflage") + ": ");
}
ItemStack camouflageBlock = camouflageHandler.getCamouflageBlock(type);
@@ -45,7 +45,8 @@ import forestry.core.utils.CamouflageUtil;
import forestry.energy.EnergyManager;
import forestry.greenhouse.blocks.BlockGreenhouse;
import forestry.greenhouse.blocks.BlockGreenhouseType;
import forestry.greenhouse.network.packets.PacketCamouflageUpdate;
import forestry.greenhouse.network.packets.PacketCamouflageUpdateToClient;
import forestry.greenhouse.network.packets.PacketCamouflageUpdateToServer;
import forestry.greenhouse.tiles.TileGreenhouseSprinkler;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
@@ -259,16 +260,20 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
return;
}
if (worldObj != null && worldObj.isRemote) {
for(IMultiblockComponent comp : connectedParts){
if(comp instanceof ICamouflagedBlock){
ICamouflagedBlock camBlock = (ICamouflagedBlock) comp;
if(camBlock.getCamouflageType() == type){
worldObj.markBlockForUpdate(camBlock.getCoordinates());
if (worldObj != null) {
if(worldObj.isRemote){
for(IMultiblockComponent comp : connectedParts){
if(comp instanceof ICamouflagedBlock){
ICamouflagedBlock camBlock = (ICamouflagedBlock) comp;
if(camBlock.getCamouflageType() == type){
worldObj.markBlockForUpdate(camBlock.getCoordinates());
}
}
}
Proxies.net.sendToServer(new PacketCamouflageUpdateToServer(this, type, true));
}else{
Proxies.net.sendNetworkPacket(new PacketCamouflageUpdateToClient(this, type, true), worldObj);
}
Proxies.net.sendToServer(new PacketCamouflageUpdate(this, type, true));
}
}
@@ -11,11 +11,13 @@
package forestry.greenhouse.network;
import forestry.core.network.PacketRegistry;
import forestry.greenhouse.network.packets.PacketCamouflageUpdate;
import forestry.greenhouse.network.packets.PacketCamouflageUpdateToClient;
import forestry.greenhouse.network.packets.PacketCamouflageUpdateToServer;
public class PacketRegistryGreenhouse extends PacketRegistry {
@Override
public void registerPackets() {
registerServerPacket(new PacketCamouflageUpdate());
registerServerPacket(new PacketCamouflageUpdateToServer());
registerClientPacket(new PacketCamouflageUpdateToClient());
}
}
@@ -0,0 +1,92 @@
/*******************************************************************************
* 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.greenhouse.network.packets;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import forestry.api.core.EnumCamouflageType;
import forestry.api.core.ICamouflageHandler;
import forestry.api.multiblock.IMultiblockComponent;
import forestry.api.multiblock.IMultiblockController;
import forestry.core.network.DataInputStreamForestry;
import forestry.core.network.DataOutputStreamForestry;
import forestry.core.network.IForestryPacketClient;
import forestry.core.network.IForestryPacketServer;
import forestry.core.network.PacketIdClient;
import forestry.core.network.PacketIdServer;
import forestry.core.network.packets.PacketCoordinates;
public class PacketCamouflageUpdateToClient extends PacketCoordinates implements IForestryPacketClient {
private ItemStack camouflageBlock;
private EnumCamouflageType type;
private boolean isMultiblock;
public PacketCamouflageUpdateToClient() {
}
public PacketCamouflageUpdateToClient(ICamouflageHandler tile, EnumCamouflageType type, boolean isMultiblock) {
super(tile.getCoordinates());
this.camouflageBlock = tile.getCamouflageBlock(type);
this.isMultiblock = isMultiblock;
this.type = type;
}
public PacketCamouflageUpdateToClient(ICamouflageHandler tile, EnumCamouflageType type) {
super(tile.getCoordinates());
this.camouflageBlock = tile.getCamouflageBlock(type);
this.isMultiblock = false;
this.type = type;
}
@Override
public PacketIdClient getPacketId() {
return PacketIdClient.TILE_FORESTRY_CAMOUFLAGE;
}
@Override
protected void writeData(DataOutputStreamForestry data) throws IOException {
super.writeData(data);
data.writeBoolean(isMultiblock);
data.writeShort(type.ordinal());
data.writeItemStack(camouflageBlock);
}
@Override
public void readData(DataInputStreamForestry data) throws IOException {
super.readData(data);
isMultiblock = data.readBoolean();
type = EnumCamouflageType.VALUES[data.readShort()];
camouflageBlock = data.readItemStack();
}
@Override
public void onPacketData(DataInputStreamForestry data, EntityPlayer player) {
TileEntity tile = getTarget(player.worldObj);
ICamouflageHandler handler = null;
if(isMultiblock && tile instanceof IMultiblockComponent){
IMultiblockController controller = ((IMultiblockComponent) tile).getMultiblockLogic().getController();
if(controller instanceof ICamouflageHandler){
handler = (ICamouflageHandler) controller;
}
}
else if (tile instanceof ICamouflageHandler) {
handler = (ICamouflageHandler) tile;
}
if(handler != null){
handler.setCamouflageBlock(type, camouflageBlock);
}
}
}
@@ -21,27 +21,28 @@ import forestry.api.multiblock.IMultiblockComponent;
import forestry.api.multiblock.IMultiblockController;
import forestry.core.network.DataInputStreamForestry;
import forestry.core.network.DataOutputStreamForestry;
import forestry.core.network.IForestryPacketClient;
import forestry.core.network.IForestryPacketServer;
import forestry.core.network.PacketIdServer;
import forestry.core.network.packets.PacketCoordinates;
public class PacketCamouflageUpdate extends PacketCoordinates implements IForestryPacketServer {
public class PacketCamouflageUpdateToServer extends PacketCoordinates implements IForestryPacketServer {
private ItemStack camouflageBlock;
private EnumCamouflageType type;
private boolean isMultiblock;
public PacketCamouflageUpdate() {
public PacketCamouflageUpdateToServer() {
}
public PacketCamouflageUpdate(ICamouflageHandler tile, EnumCamouflageType type, boolean isMultiblock) {
public PacketCamouflageUpdateToServer(ICamouflageHandler tile, EnumCamouflageType type, boolean isMultiblock) {
super(tile.getCoordinates());
this.camouflageBlock = tile.getCamouflageBlock(type);
this.isMultiblock = isMultiblock;
this.type = type;
}
public PacketCamouflageUpdate(ICamouflageHandler tile, EnumCamouflageType type) {
public PacketCamouflageUpdateToServer(ICamouflageHandler tile, EnumCamouflageType type) {
super(tile.getCoordinates());
this.camouflageBlock = tile.getCamouflageBlock(type);
this.isMultiblock = false;
@@ -41,7 +41,8 @@ import forestry.greenhouse.blocks.BlockGreenhouseType;
import forestry.greenhouse.gui.ContainerGreenhouse;
import forestry.greenhouse.gui.GuiGreenhouse;
import forestry.greenhouse.multiblock.MultiblockLogicGreenhouse;
import forestry.greenhouse.network.packets.PacketCamouflageUpdate;
import forestry.greenhouse.network.packets.PacketCamouflageUpdateToClient;
import forestry.greenhouse.network.packets.PacketCamouflageUpdateToServer;
public abstract class TileGreenhouse extends MultiblockTileEntityForestry<MultiblockLogicGreenhouse> implements IGreenhouseComponent, IHintSource, IStreamableGui, IErrorLogicSource, IRestrictedAccess, ITitled, ICamouflageHandler, ICamouflagedBlock {
@@ -99,8 +100,9 @@ public abstract class TileGreenhouse extends MultiblockTileEntityForestry<Multib
if (worldObj != null) {
if (worldObj.isRemote) {
worldObj.markBlockForUpdate(getPos());
Proxies.net.sendToServer(new PacketCamouflageUpdateToServer(this, type));
} else {
Proxies.net.sendToServer(new PacketCamouflageUpdate(this, type));
Proxies.net.sendNetworkPacket(new PacketCamouflageUpdateToClient(this, type), worldObj);
}
}
}
@@ -39,7 +39,7 @@ import forestry.core.utils.PlayerUtil;
import forestry.greenhouse.blocks.BlockGreenhouse;
import forestry.greenhouse.blocks.BlockGreenhouseType;
import forestry.greenhouse.multiblock.MultiblockLogicGreenhouse;
import forestry.greenhouse.network.packets.PacketCamouflageUpdate;
import forestry.greenhouse.network.packets.PacketCamouflageUpdateToServer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -139,7 +139,7 @@ public class TileGreenhouseHatch extends MultiblockTileEntityBase<MultiblockLogi
if (worldObj.isRemote) {
worldObj.markBlockForUpdate(getPos());
} else {
Proxies.net.sendToServer(new PacketCamouflageUpdate(this, type));
Proxies.net.sendToServer(new PacketCamouflageUpdateToServer(this, type));
}
}
}