Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-01-19 17:57:19 +00:00
commit 39dc016908
23 files changed
+499 -97

No files matched your search

+4 -4
View File
@@ -71,14 +71,14 @@ import mekanism.common.recipe.inputs.ItemStackInput;
import mekanism.common.recipe.machines.SmeltingRecipe;
import mekanism.common.recipe.outputs.ItemStackOutput;
import mekanism.common.tile.TileEntityAdvancedBoundingBlock;
import mekanism.common.tile.TileEntityThermoelectricBoiler;
import mekanism.common.tile.TileEntityThermoelectricValve;
import mekanism.common.tile.TileEntityBoundingBlock;
import mekanism.common.tile.TileEntityCardboardBox;
import mekanism.common.tile.TileEntityElectricBlock;
import mekanism.common.tile.TileEntityEntangledBlock;
import mekanism.common.tile.TileEntitySolarEvaporationBlock;
import mekanism.common.tile.TileEntitySolarEvaporationValve;
import mekanism.common.tile.TileEntityThermoelectricBoiler;
import mekanism.common.tile.TileEntityThermoelectricValve;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.common.voice.VoiceServerManager;
@@ -140,7 +140,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
* @author AidanBrady
*
*/
@Mod(modid = "Mekanism", name = "Mekanism", version = "8.1.8", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
"after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore")
public class Mekanism
@@ -166,7 +166,7 @@ public class Mekanism
public static Configuration configuration;
/** Mekanism version number */
public static Version versionNumber = new Version(8, 1, 8);
public static Version versionNumber = new Version(9, 0, 0);
/** MultiblockManagers for various structrures */
public static MultiblockManager<SynchronizedTankData> tankManager = new MultiblockManager<SynchronizedTankData>("dynamicTank");
@@ -24,6 +24,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import com.mojang.realmsclient.util.Pair;
public final class TransporterPathfinder
{
public static class IdlePath
@@ -541,7 +543,7 @@ public final class TransporterPathfinder
}
}
public static List<Coord4D> getIdlePath(ILogisticalTransporter start, TransporterStack stack)
public static Pair<List<Coord4D>, Path> getIdlePath(ILogisticalTransporter start, TransporterStack stack)
{
if(stack.homeLocation != null)
{
@@ -559,8 +561,7 @@ public final class TransporterPathfinder
if(path.size() >= 2)
{
stack.pathType = Path.HOME;
return path;
return Pair.of(path, Path.HOME);
}
else {
stack.homeLocation = null;
@@ -574,9 +575,7 @@ public final class TransporterPathfinder
{
return null;
}
stack.pathType = dest.pathType;
return dest.path;
return Pair.of(dest.path, dest.pathType);
}
}
@@ -18,6 +18,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import com.mojang.realmsclient.util.Pair;
public class TransporterStack
{
public ItemStack itemStack;
@@ -150,11 +152,16 @@ public class TransporterStack
return stack;
}
public void setPath(List<Coord4D> path)
public void setPath(List<Coord4D> path, Path type)
{
TransporterManager.remove(this);
//Make sure old path isn't null
if(pathType != Path.NONE)
{
TransporterManager.remove(this);
}
pathToTarget = path;
pathType = type;
if(pathType != Path.NONE)
{
@@ -181,9 +188,8 @@ public class TransporterStack
return itemStack;
}
pathType = Path.DEST;
idleDir = ForgeDirection.UNKNOWN;
setPath(newPath.path);
setPath(newPath.path, Path.DEST);
initiatedPath = true;
return newPath.rejected;
@@ -198,9 +204,8 @@ public class TransporterStack
return itemStack;
}
pathType = Path.DEST;
idleDir = ForgeDirection.UNKNOWN;
setPath(newPath.path);
setPath(newPath.path, Path.DEST);
initiatedPath = true;
return newPath.rejected;
@@ -208,19 +213,19 @@ public class TransporterStack
public boolean calculateIdle(ILogisticalTransporter transporter)
{
List<Coord4D> newPath = TransporterPathfinder.getIdlePath(transporter, this);
Pair<List<Coord4D>, Path> newPath = TransporterPathfinder.getIdlePath(transporter, this);
if(newPath == null)
{
return false;
}
if(pathType == Path.HOME)
if(newPath.second() == Path.HOME)
{
idleDir = ForgeDirection.UNKNOWN;
}
setPath(newPath);
setPath(newPath.first(), newPath.second());
originalLocation = transporter.coord();
initiatedPath = true;
@@ -75,7 +75,7 @@ public class ContainerMetallurgicInfuser extends Container
{
if(InfuseRegistry.getObject(slotStack) != null && (tileEntity.infuseStored.type == null || tileEntity.infuseStored.type == InfuseRegistry.getObject(slotStack).type))
{
if(!mergeItemStack(slotStack, 1, 2, false))
if(!mergeItemStack(slotStack, 0, 1, false))
{
return null;
}
@@ -89,7 +89,7 @@ public class ContainerMetallurgicInfuser extends Container
}
else if(isInputItem(slotStack))
{
if(!mergeItemStack(slotStack, 2, 3, false))
if(!mergeItemStack(slotStack, 1, 2, false))
{
return null;
}
@@ -199,13 +199,17 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
if(structure.locations.contains(Coord4D.get(pointer)) && isCorrectCorner(Coord4D.get(tile), origX+xmin, origY+ymin, origZ+zmin))
{
structureFound = structure;
return;
if(isInteriorValid(structure))
{
structureFound = structure;
return;
}
}
}
}
}
innerNodes.clear();
iteratedNodes.add(tile);
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
@@ -221,6 +225,11 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
}
}
}
public boolean isInteriorValid(T structure)
{
return true;
}
public ForgeDirection getSide(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax)
{
@@ -80,7 +80,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png"));
hydrogenGenerator.render(0.0625F);
}
else if(metadata == GeneratorType.WIND_TURBINE.meta)
else if(metadata == GeneratorType.WIND_GENERATOR.meta)
{
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F);
@@ -10,13 +10,14 @@ import mekanism.generators.client.gui.GuiReactorHeat;
import mekanism.generators.client.gui.GuiReactorLogicAdapter;
import mekanism.generators.client.gui.GuiReactorStats;
import mekanism.generators.client.gui.GuiSolarGenerator;
import mekanism.generators.client.gui.GuiWindTurbine;
import mekanism.generators.client.gui.GuiWindGenerator;
import mekanism.generators.client.render.RenderAdvancedSolarGenerator;
import mekanism.generators.client.render.RenderBioGenerator;
import mekanism.generators.client.render.RenderGasGenerator;
import mekanism.generators.client.render.RenderHeatGenerator;
import mekanism.generators.client.render.RenderReactor;
import mekanism.generators.client.render.RenderSolarGenerator;
import mekanism.generators.client.render.RenderTurbineRod;
import mekanism.generators.client.render.RenderWindTurbine;
import mekanism.generators.common.GeneratorsCommonProxy;
import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator;
@@ -24,10 +25,11 @@ import mekanism.generators.common.tile.TileEntityBioGenerator;
import mekanism.generators.common.tile.TileEntityGasGenerator;
import mekanism.generators.common.tile.TileEntityHeatGenerator;
import mekanism.generators.common.tile.TileEntitySolarGenerator;
import mekanism.generators.common.tile.TileEntityWindTurbine;
import mekanism.generators.common.tile.TileEntityWindGenerator;
import mekanism.generators.common.tile.reactor.TileEntityReactorController;
import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter;
import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture;
import mekanism.generators.common.tile.turbine.TileEntityTurbineRod;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
@@ -48,8 +50,9 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy
ClientRegistry.registerTileEntity(TileEntityBioGenerator.class, "BioGenerator", new RenderBioGenerator());
ClientRegistry.registerTileEntity(TileEntityHeatGenerator.class, "HeatGenerator", new RenderHeatGenerator());
ClientRegistry.registerTileEntity(TileEntityGasGenerator.class, "GasGenerator", new RenderGasGenerator());
ClientRegistry.registerTileEntity(TileEntityWindTurbine.class, "WindTurbine", new RenderWindTurbine());
ClientRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine", new RenderWindTurbine());
ClientRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController", new RenderReactor());
ClientRegistry.registerTileEntity(TileEntityTurbineRod.class, "TurbineRod", new RenderTurbineRod());
}
@Override
@@ -77,7 +80,7 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy
case 4:
return new GuiBioGenerator(player.inventory, (TileEntityBioGenerator)tileEntity);
case 5:
return new GuiWindTurbine(player.inventory, (TileEntityWindTurbine)tileEntity);
return new GuiWindGenerator(player.inventory, (TileEntityWindGenerator)tileEntity);
case 10:
return new GuiReactorController(player.inventory, (TileEntityReactorController)tileEntity);
case 11:
@@ -17,8 +17,8 @@ import mekanism.client.gui.element.GuiSlot.SlotType;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.inventory.container.ContainerWindTurbine;
import mekanism.generators.common.tile.TileEntityWindTurbine;
import mekanism.generators.common.inventory.container.ContainerWindGenerator;
import mekanism.generators.common.tile.TileEntityWindGenerator;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -26,15 +26,15 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GuiWindTurbine extends GuiMekanism
public class GuiWindGenerator extends GuiMekanism
{
public TileEntityWindTurbine tileEntity;
public TileEntityWindGenerator tileEntity;
private DecimalFormat powerFormat = new DecimalFormat("0.##");
public GuiWindTurbine(InventoryPlayer inventory, TileEntityWindTurbine tentity)
public GuiWindGenerator(InventoryPlayer inventory, TileEntityWindGenerator tentity)
{
super(new ContainerWindTurbine(inventory, tentity));
super(new ContainerWindGenerator(inventory, tentity));
tileEntity = tentity;
guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png")));
guiElements.add(new GuiEnergyInfo(new IInfoHandler()
@@ -0,0 +1,17 @@
package mekanism.generators.client.render;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderTurbineRod extends TileEntitySpecialRenderer
{
@Override
public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_)
{
// TODO Auto-generated method stub
}
}
@@ -4,19 +4,19 @@ import mekanism.common.Mekanism;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.client.model.ModelWindTurbine;
import mekanism.generators.common.tile.TileEntityWindTurbine;
import mekanism.generators.common.tile.TileEntityWindGenerator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
public class RenderWindTurbine extends TileEntitySpecialRenderer<TileEntityWindTurbine>
public class RenderWindTurbine extends TileEntitySpecialRenderer<TileEntityWindGenerator>
{
private ModelWindTurbine model = new ModelWindTurbine();
@Override
public void renderTileEntityAt(TileEntityWindTurbine tileEntity, double x, double y, double z, float partialTick, int destroyStage)
public void renderTileEntityAt(TileEntityWindGenerator tileEntity, double x, double y, double z, float partialTick, int destroyStage)
{
GL11.glPushMatrix();
GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F);
@@ -10,13 +10,13 @@ import mekanism.generators.common.inventory.container.ContainerHeatGenerator;
import mekanism.generators.common.inventory.container.ContainerNeutronCapture;
import mekanism.generators.common.inventory.container.ContainerReactorController;
import mekanism.generators.common.inventory.container.ContainerSolarGenerator;
import mekanism.generators.common.inventory.container.ContainerWindTurbine;
import mekanism.generators.common.inventory.container.ContainerWindGenerator;
import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator;
import mekanism.generators.common.tile.TileEntityBioGenerator;
import mekanism.generators.common.tile.TileEntityGasGenerator;
import mekanism.generators.common.tile.TileEntityHeatGenerator;
import mekanism.generators.common.tile.TileEntitySolarGenerator;
import mekanism.generators.common.tile.TileEntityWindTurbine;
import mekanism.generators.common.tile.TileEntityWindGenerator;
import mekanism.generators.common.tile.reactor.TileEntityReactorController;
import mekanism.generators.common.tile.reactor.TileEntityReactorFrame;
import mekanism.generators.common.tile.reactor.TileEntityReactorGlass;
@@ -24,6 +24,7 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorLaserFocusMatrix
import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter;
import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture;
import mekanism.generators.common.tile.reactor.TileEntityReactorPort;
import mekanism.generators.common.tile.turbine.TileEntityTurbineRod;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity;
@@ -63,8 +64,9 @@ public class GeneratorsCommonProxy
GameRegistry.registerTileEntity(TileEntityBioGenerator.class, "BioGenerator");
GameRegistry.registerTileEntity(TileEntityHeatGenerator.class, "HeatGenerator");
GameRegistry.registerTileEntity(TileEntityGasGenerator.class, "GasGenerator");
GameRegistry.registerTileEntity(TileEntityWindTurbine.class, "WindTurbine");
GameRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine");
GameRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController");
GameRegistry.registerTileEntity(TileEntityTurbineRod.class, "TurbineRod");
}
/**
@@ -157,7 +159,7 @@ public class GeneratorsCommonProxy
case 4:
return new ContainerBioGenerator(player.inventory, (TileEntityBioGenerator)tileEntity);
case 5:
return new ContainerWindTurbine(player.inventory, (TileEntityWindTurbine)tileEntity);
return new ContainerWindGenerator(player.inventory, (TileEntityWindGenerator)tileEntity);
case 10:
return new ContainerReactorController(player.inventory, (TileEntityReactorController)tileEntity);
case 11:
@@ -11,10 +11,12 @@ public class GeneratorsItems
{
public static final Item SolarPanel = new ItemMekanism().setUnlocalizedName("SolarPanel");
public static final ItemHohlraum Hohlraum = (ItemHohlraum)new ItemHohlraum().setUnlocalizedName("Hohlraum");
public static final Item TurbineBlade = new ItemMekanism().setUnlocalizedName("TurbineBlade");
public static void register()
{
GameRegistry.registerItem(SolarPanel, "SolarPanel");
GameRegistry.registerItem(Hohlraum, "Hohlraum");
GameRegistry.registerItem(TurbineBlade, "TurbineBlade");
}
}
@@ -34,7 +34,7 @@ import net.minecraftforge.oredict.OreDictionary;
import java.io.IOException;
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.1.8", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
public class MekanismGenerators implements IModule
{
/** Mekanism Generators Packet Pipeline */
@@ -47,7 +47,7 @@ public class MekanismGenerators implements IModule
public static MekanismGenerators instance;
/** MekanismGenerators version number */
public static Version versionNumber = new Version(8, 1, 8);
public static Version versionNumber = new Version(9, 0, 0);
@EventHandler
public void preInit(FMLPreInitializationEvent event)
@@ -7,14 +7,27 @@ import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.IEnergizedItem;
import mekanism.common.ItemAttacher;
import mekanism.common.Mekanism;
import mekanism.common.base.*;
import mekanism.common.base.IActiveState;
import mekanism.common.base.IBoundingBlock;
import mekanism.common.base.ISpecialBounds;
import mekanism.common.base.ISustainedData;
import mekanism.common.base.ISustainedInventory;
import mekanism.common.base.ISustainedTank;
import mekanism.common.tile.TileEntityBasicBlock;
import mekanism.common.tile.TileEntityContainerBlock;
import mekanism.common.tile.TileEntityElectricBlock;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.generators.common.GeneratorsBlocks;
import mekanism.generators.common.GeneratorsItems;
import mekanism.generators.common.MekanismGenerators;
import mekanism.generators.common.tile.*;
import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator;
import mekanism.generators.common.tile.TileEntityBioGenerator;
import mekanism.generators.common.tile.TileEntityGasGenerator;
import mekanism.generators.common.tile.TileEntityHeatGenerator;
import mekanism.generators.common.tile.TileEntitySolarGenerator;
import mekanism.generators.common.tile.TileEntityWindGenerator;
import mekanism.generators.common.tile.turbine.TileEntityTurbineRod;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -26,6 +39,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
@@ -43,12 +57,16 @@ import java.util.Random;
* 3: Hydrogen Generator
* 4: Bio-Generator
* 5: Advanced Solar Generator
* 6: Wind Turbine
* 6: Wind Generator
* 7: Turbine Rod
* @author AidanBrady
*
*/
public class BlockGenerator extends BlockContainer implements ISpecialBounds
{
public IIcon[][] icons = new IIcon[16][16];
public IIcon BASE_ICON;
public Random machineRand = new Random();
public BlockGenerator()
@@ -60,7 +78,33 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
}
@Override
public void registerBlockIcons(IIconRegister register) {}
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register)
{
BASE_ICON = register.registerIcon("mekanism:SteelCasing");
icons[7][0] = register.registerIcon("mekanism:TurbineRod");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta)
{
if(meta == GeneratorType.TURBINE_ROD.meta)
{
return icons[meta][0];
}
return BASE_ICON;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side)
{
int meta = world.getBlockMetadata(x, y, z);
return getIcon(side, meta);
}
@Override
public void onNeighborBlockChange(World world, int x, int y, int z, Block block)
@@ -147,12 +191,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item i, CreativeTabs creativetabs, List list)
{
list.add(new ItemStack(i, 1, 0));
list.add(new ItemStack(i, 1, 1));
list.add(new ItemStack(i, 1, 3));
list.add(new ItemStack(i, 1, 4));
list.add(new ItemStack(i, 1, 5));
list.add(new ItemStack(i, 1, 6));
for(GeneratorType type : GeneratorType.values())
{
list.add(new ItemStack(i, 1, type.meta));
}
}
@Override
@@ -160,7 +202,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
public void randomDisplayTick(World world, int x, int y, int z, Random random)
{
int metadata = world.getBlockMetadata(x, y, z);
TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z);
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
if(MekanismUtils.isActive(world, x, y, z))
{
float xRandom = (float)x + 0.5F;
@@ -254,7 +297,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
return (!nonAir) && canPlace;
}
else if(world.getBlockMetadata(x, y, z) == GeneratorType.WIND_TURBINE.meta)
else if(world.getBlockMetadata(x, y, z) == GeneratorType.WIND_GENERATOR.meta)
{
boolean canPlace = super.canPlaceBlockAt(world, x, y, z);
@@ -274,7 +317,24 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
@Override
public void breakBlock(World world, int x, int y, int z, Block block, int meta)
{
TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z);
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
if(!world.isRemote && tileEntity instanceof TileEntityTurbineRod)
{
int amount = ((TileEntityTurbineRod)tileEntity).getHousedBlades();
if(amount > 0)
{
float motion = 0.7F;
double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, new ItemStack(GeneratorsItems.TurbineBlade, amount));
world.spawnEntityInWorld(entityItem);
}
}
if(tileEntity instanceof IBoundingBlock)
{
@@ -297,7 +357,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
return true;
}
TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z);
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
int metadata = world.getBlockMetadata(x, y, z);
if(entityplayer.getCurrentEquippedItem() != null)
@@ -313,7 +373,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
}
if(MekanismUtils.isBCWrench(tool))
{
((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z);
}
int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing];
@@ -330,6 +392,66 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
return false;
}
}
if(metadata == GeneratorType.TURBINE_ROD.meta)
{
TileEntityTurbineRod rod = (TileEntityTurbineRod)tileEntity;
if(!entityplayer.isSneaking())
{
if(entityplayer.getCurrentEquippedItem() != null && entityplayer.getCurrentEquippedItem().getItem() == GeneratorsItems.TurbineBlade)
{
if(!world.isRemote && rod.editBlade(true))
{
if(!entityplayer.capabilities.isCreativeMode)
{
entityplayer.getCurrentEquippedItem().stackSize--;
if(entityplayer.getCurrentEquippedItem().stackSize == 0)
{
entityplayer.setCurrentItemOrArmor(0, null);
}
}
}
return true;
}
}
else {
if(!world.isRemote)
{
if(entityplayer.getCurrentEquippedItem() == null)
{
if(rod.editBlade(false))
{
if(!entityplayer.capabilities.isCreativeMode)
{
entityplayer.setCurrentItemOrArmor(0, new ItemStack(GeneratorsItems.TurbineBlade));
entityplayer.inventory.markDirty();
}
}
}
else if(entityplayer.getCurrentEquippedItem().getItem() == GeneratorsItems.TurbineBlade)
{
if(entityplayer.getCurrentEquippedItem().stackSize < entityplayer.getCurrentEquippedItem().getMaxStackSize())
{
if(rod.editBlade(false))
{
if(!entityplayer.capabilities.isCreativeMode)
{
entityplayer.getCurrentEquippedItem().stackSize++;
entityplayer.inventory.markDirty();
}
}
}
}
}
return true;
}
return false;
}
if(tileEntity != null)
{
@@ -402,6 +524,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
{
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.65F, 1.0F);
}
else if(metadata == GeneratorType.TURBINE_ROD.meta)
{
setBlockBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F);
}
else {
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}
@@ -442,7 +568,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player)
{
TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z);
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, world.getBlockMetadata(x, y, z));
if(tileEntity == null)
@@ -450,11 +576,17 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
return null;
}
IEnergizedItem electricItem = (IEnergizedItem)itemStack.getItem();
electricItem.setEnergy(itemStack, tileEntity.electricityStored);
if(tileEntity instanceof TileEntityElectricBlock)
{
IEnergizedItem electricItem = (IEnergizedItem)itemStack.getItem();
electricItem.setEnergy(itemStack, ((TileEntityElectricBlock)tileEntity).electricityStored);
}
ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem();
inventory.setInventory(tileEntity.getInventory(), itemStack);
if(tileEntity instanceof TileEntityContainerBlock)
{
ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem();
inventory.setInventory(((TileEntityContainerBlock)tileEntity).getInventory(), itemStack);
}
if(tileEntity instanceof ISustainedData)
{
@@ -501,7 +633,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
{
int metadata = world.getBlockMetadata(x, y, z);
if(metadata != GeneratorType.SOLAR_GENERATOR.meta && metadata != GeneratorType.ADVANCED_SOLAR_GENERATOR.meta && metadata != GeneratorType.WIND_TURBINE.meta)
if(metadata != GeneratorType.SOLAR_GENERATOR.meta &&
metadata != GeneratorType.ADVANCED_SOLAR_GENERATOR.meta &&
metadata != GeneratorType.WIND_GENERATOR.meta &&
metadata != GeneratorType.TURBINE_ROD.meta)
{
return true;
}
@@ -516,7 +651,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
GAS_GENERATOR(3, "GasGenerator", 3, general.FROM_H2*100, TileEntityGasGenerator.class, true),
BIO_GENERATOR(4, "BioGenerator", 4, 160000, TileEntityBioGenerator.class, true),
ADVANCED_SOLAR_GENERATOR(5, "AdvancedSolarGenerator", 1, 200000, TileEntityAdvancedSolarGenerator.class, true),
WIND_TURBINE(6, "WindTurbine", 5, 200000, TileEntityWindTurbine.class, true);
WIND_GENERATOR(6, "WindGenerator", 5, 200000, TileEntityWindGenerator.class, true),
TURBINE_ROD(7, "TurbineRod", -1, -1, TileEntityTurbineRod.class, false);
public int meta;
public String name;
@@ -540,8 +676,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
for(GeneratorType type : values())
{
if(type.meta == meta)
{
return type;
}
}
return null;
}
@@ -580,6 +719,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
{
block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.65F, 1.0F);
}
else if(metadata == GeneratorType.TURBINE_ROD.meta)
{
block.setBlockBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F);
}
else {
block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}
@@ -2,7 +2,7 @@ package mekanism.generators.common.inventory.container;
import mekanism.common.inventory.slot.SlotEnergy.SlotCharge;
import mekanism.common.util.ChargeUtils;
import mekanism.generators.common.tile.TileEntityWindTurbine;
import mekanism.generators.common.tile.TileEntityWindGenerator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
@@ -10,11 +10,11 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
public class ContainerWindTurbine extends Container
public class ContainerWindGenerator extends Container
{
private TileEntityWindTurbine tileEntity;
private TileEntityWindGenerator tileEntity;
public ContainerWindTurbine(InventoryPlayer inventory, TileEntityWindTurbine tentity)
public ContainerWindGenerator(InventoryPlayer inventory, TileEntityWindGenerator tentity)
{
tileEntity = tentity;
addSlotToContainer(new SlotCharge(tentity, 0, 143, 35));
@@ -45,7 +45,8 @@ import ic2.api.item.ISpecialElectricItem;
* 3: Hydrogen Generator
* 4: Bio-Generator
* 5: Advanced Solar Generator
* 6: Wind Turbine
* 6: Wind Generator
* 7: Turbine Rod
* @author AidanBrady
*
*/
@@ -95,24 +96,30 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
{
GeneratorType type = GeneratorType.getFromMetadata(itemstack.getItemDamage());
if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey))
if(type != GeneratorType.TURBINE_ROD)
{
list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + ".");
list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.and") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDesc") + ".");
}
else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey))
{
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
if(hasTank(itemstack))
if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey))
{
if(getFluidStack(itemstack) != null)
{
list.add(EnumColor.PINK + FluidRegistry.getFluidName(getFluidStack(itemstack)) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB");
}
list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + ".");
list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.and") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDesc") + ".");
}
else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey))
{
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
if(hasTank(itemstack))
{
if(getFluidStack(itemstack) != null)
{
list.add(EnumColor.PINK + FluidRegistry.getFluidName(getFluidStack(itemstack)) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB");
}
}
list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0));
}
else {
list.addAll(MekanismUtils.splitLines(type.getDescription()));
}
list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0));
}
else {
list.addAll(MekanismUtils.splitLines(type.getDescription()));
@@ -145,7 +152,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
}
}
}
else if(stack.getItemDamage() == GeneratorType.WIND_TURBINE.meta)
else if(stack.getItemDamage() == GeneratorType.WIND_GENERATOR.meta)
{
if(!block.isReplaceable(world, x, y, z))
{
@@ -165,10 +172,17 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
if(place && super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata))
{
TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z);
tileEntity.electricityStored = getEnergy(stack);
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
if(tileEntity instanceof TileEntityElectricBlock)
{
((TileEntityElectricBlock)tileEntity).electricityStored = getEnergy(stack);
}
((ISustainedInventory)tileEntity).setInventory(getInventory(stack));
if(tileEntity instanceof ISustainedInventory)
{
((ISustainedInventory)tileEntity).setInventory(getInventory(stack));
}
if(tileEntity instanceof ISustainedData)
{
@@ -360,7 +374,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
@Override
public boolean canSend(ItemStack itemStack)
{
return true;
return GeneratorType.getFromMetadata(itemStack.getItemDamage()).maxEnergy != -1;
}
@Override
@@ -10,14 +10,14 @@ import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
public class TileEntityWindTurbine extends TileEntityGenerator implements IBoundingBlock
public class TileEntityWindGenerator extends TileEntityGenerator implements IBoundingBlock
{
/** The angle the blades of this Wind Turbine are currently at. */
public double angle;
public TileEntityWindTurbine()
public TileEntityWindGenerator()
{
super("wind", "WindTurbine", 200000, (generators.windGenerationMax)*2);
super("wind", "WindGenerator", 200000, (generators.windGenerationMax)*2);
inventory = new ItemStack[1];
}
@@ -0,0 +1,205 @@
package mekanism.generators.common.tile.turbine;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.Range4D;
import mekanism.common.Mekanism;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.TileEntityBasicBlock;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
public class TileEntityTurbineRod extends TileEntityBasicBlock
{
public List<Coord4D> rods = new ArrayList<Coord4D>();
//Total blades on server, housed blades on client
public int blades = 0;
@Override
public boolean canUpdate()
{
return false;
}
@Override
public void onNeighborChange(Block block)
{
if(!worldObj.isRemote)
{
updateRods();
}
}
private void updateRods()
{
Coord4D current = Coord4D.get(this);
Coord4D up = current.getFromSide(ForgeDirection.UP);
Coord4D down = current.getFromSide(ForgeDirection.DOWN);
if(!rods.contains(current))
{
rods.add(current);
}
if((isRod(up) != !rods.contains(up)) || (isRod(down) != !rods.contains(down)))
{
buildRods();
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this)));
}
}
private void buildRods()
{
List<Coord4D> newRods = new ArrayList<Coord4D>();
int newBlades = 0;
Coord4D pointer = Coord4D.get(this);
//Go to bottom rod
while(true)
{
if(isRod(pointer.getFromSide(ForgeDirection.DOWN)))
{
pointer.step(ForgeDirection.DOWN);
continue;
}
break;
}
//Put all rods in new list, top to bottom
while(true)
{
newRods.add(pointer.clone());
newBlades += ((TileEntityTurbineRod)pointer.getTileEntity(worldObj)).getHousedBlades();
if(isRod(pointer.getFromSide(ForgeDirection.UP)))
{
pointer.step(ForgeDirection.UP);
continue;
}
break;
}
//Update all rods, send packet if necessary
for(Coord4D coord : newRods)
{
TileEntityTurbineRod rod = (TileEntityTurbineRod)coord.getTileEntity(worldObj);
int prev = rod.getHousedBlades();
rod.rods = newRods;
rod.blades = newBlades;
if(rod.getHousedBlades() != prev)
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rod.getNetworkedData(new ArrayList())), new Range4D(coord));
}
}
}
public boolean editBlade(boolean add)
{
if((add && (rods.size()*2) - blades > 0) || (!add && (blades > 0)))
{
for(Coord4D coord : rods)
{
TileEntityTurbineRod rod = (TileEntityTurbineRod)coord.getTileEntity(worldObj);
rod.internalEditBlade(add);
}
return true;
}
else {
return false;
}
}
public void internalEditBlade(boolean add)
{
int prev = getHousedBlades();
blades += add ? 1 : -1;
if(getHousedBlades() != prev)
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this)));
}
}
public int getHousedBlades()
{
if(!worldObj.isRemote)
{
if(rods.size() > 0)
{
return Math.max(0, Math.min(2, blades - (rods.indexOf(Coord4D.get(this)))*2));
}
else {
return blades;
}
}
else {
return blades;
}
}
private boolean isRod(Coord4D coord)
{
return coord.getTileEntity(worldObj) instanceof TileEntityTurbineRod;
}
@Override
public void onChunkLoad()
{
super.onChunkLoad();
if(!worldObj.isRemote)
{
updateRods();
}
}
@Override
public void handlePacketData(ByteBuf dataStream)
{
super.handlePacketData(dataStream);
blades = dataStream.readInt();
}
@Override
public ArrayList getNetworkedData(ArrayList data)
{
super.getNetworkedData(data);
data.add(blades);
return data;
}
@Override
public void readFromNBT(NBTTagCompound nbtTags)
{
super.readFromNBT(nbtTags);
blades = nbtTags.getInteger("blades");
}
@Override
public void writeToNBT(NBTTagCompound nbtTags)
{
super.writeToNBT(nbtTags);
nbtTags.setInteger("blades", getHousedBlades());
}
@Override
public void onUpdate() {}
}
@@ -28,7 +28,7 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import java.io.IOException;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.1.8", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
public class MekanismTools implements IModule
{
@SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")
@@ -38,7 +38,7 @@ public class MekanismTools implements IModule
public static MekanismTools instance;
/** MekanismTools version number */
public static Version versionNumber = new Version(8, 1, 8);
public static Version versionNumber = new Version(9, 0, 0);
//Enums: Tools
public static ToolMaterial toolOBSIDIAN;