fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Most of the 1.8 Port.

Browse Source
This commit is contained in:
AlgorithmX2
2015-06-15 19:44:59 -05:00
parent 17465e68e8
commit 38afde724b
824 changed files with 12120 additions and 9158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/misc/ItemCrystalSeed.java
+79 -76
View File
@@ -21,28 +21,30 @@ package appeng.items.misc;
import java.util.EnumSet;
import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import cpw.mods.fml.common.registry.EntityRegistry;
import net.minecraftforge.fml.common.registry.EntityRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.definitions.IMaterials;
import appeng.api.implementations.items.IGrowableCrystal;
import appeng.api.recipes.ResolverResult;
import appeng.client.ClientHelper;
import appeng.core.AppEng;
import appeng.core.features.AEFeature;
import appeng.core.localization.ButtonToolTips;
@@ -63,9 +65,9 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
public static final int FLUIX = SINGLE_OFFSET * 2;
public static final int FINAL_STAGE = SINGLE_OFFSET * 3;
final IIcon[] certus = new IIcon[3];
final IIcon[] fluix = new IIcon[3];
final IIcon[] nether = new IIcon[3];
final ModelResourceLocation[] certus = new ModelResourceLocation[3];
final ModelResourceLocation[] fluix = new ModelResourceLocation[3];
final ModelResourceLocation[] nether = new ModelResourceLocation[3];
public ItemCrystalSeed()
{
@@ -75,6 +77,71 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
EntityRegistry.registerModEntity( EntityGrowingCrystal.class, EntityGrowingCrystal.class.getSimpleName(), EntityIds.get( EntityGrowingCrystal.class ), AppEng.instance(), 16, 4, true );
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons( ClientHelper ir, String name )
{
String preFix = name+".";
this.certus[0] = ir.setIcon( this, preFix + "Certus" );
this.certus[1] = ir.setIcon( this, preFix + "Certus2" );
this.certus[2] = ir.setIcon( this, preFix + "Certus3" );
this.nether[0] = ir.setIcon( this, preFix + "Nether" );
this.nether[1] = ir.setIcon( this, preFix + "Nether2" );
this.nether[2] = ir.setIcon( this, preFix + "Nether3" );
this.fluix[0] = ir.setIcon( this, preFix + "Fluix" );
this.fluix[1] = ir.setIcon( this, preFix + "Fluix2" );
this.fluix[2] = ir.setIcon( this, preFix + "Fluix3" );
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){
@Override
public ModelResourceLocation getModelLocation(
ItemStack stack )
{
ModelResourceLocation[] list = null;
int damage = getProgress( stack );
if( damage < CERTUS + SINGLE_OFFSET )
{
list = certus;
}
else if( damage < NETHER + SINGLE_OFFSET )
{
damage -= NETHER;
list = nether;
}
else if( damage < FLUIX + SINGLE_OFFSET )
{
damage -= FLUIX;
list = fluix;
}
if( list == null )
{
return new ModelResourceLocation( "diamond" );
}
if( damage < LEVEL_OFFSET )
{
return list[0];
}
else if( damage < LEVEL_OFFSET * 2 )
{
return list[1];
}
else
{
return list[2];
}
}
});
}
@Nullable
public static ResolverResult getResolver( int certus2 )
{
@@ -220,72 +287,6 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
return FINAL_STAGE;
}
@Override
public IIcon getIcon( ItemStack stack, int pass )
{
return this.getIconIndex( stack );
}
@Override
public IIcon getIconIndex( ItemStack stack )
{
IIcon[] list = null;
int damage = this.getProgress( stack );
if( damage < CERTUS + SINGLE_OFFSET )
{
list = this.certus;
}
else if( damage < NETHER + SINGLE_OFFSET )
{
damage -= NETHER;
list = this.nether;
}
else if( damage < FLUIX + SINGLE_OFFSET )
{
damage -= FLUIX;
list = this.fluix;
}
if( list == null )
{
return Items.diamond.getIconFromDamage( 0 );
}
if( damage < LEVEL_OFFSET )
{
return list[0];
}
else if( damage < LEVEL_OFFSET * 2 )
{
return list[1];
}
else
{
return list[2];
}
}
@Override
public void registerIcons( IIconRegister ir )
{
String preFix = "appliedenergistics2:ItemCrystalSeed.";
this.certus[0] = ir.registerIcon( preFix + "Certus" );
this.certus[1] = ir.registerIcon( preFix + "Certus2" );
this.certus[2] = ir.registerIcon( preFix + "Certus3" );
this.nether[0] = ir.registerIcon( preFix + "Nether" );
this.nether[1] = ir.registerIcon( preFix + "Nether2" );
this.nether[2] = ir.registerIcon( preFix + "Nether3" );
this.fluix[0] = ir.registerIcon( preFix + "Fluix" );
this.fluix[1] = ir.registerIcon( preFix + "Fluix2" );
this.fluix[2] = ir.registerIcon( preFix + "Fluix3" );
}
@Override
public boolean hasCustomEntity( ItemStack stack )
{
@@ -303,7 +304,9 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
if( location instanceof EntityItem )
{
egc.delayBeforeCanPickup = ( (EntityItem) location ).delayBeforeCanPickup;
// TODO: DELAY BEFORE PICKUP
// NEEDS FIXING?!?!
// egc.delayBeforeCanPickup = ( (EntityItem) location ).delayBeforeCanPickup;
}
return egc;
src/main/java/appeng/items/misc/ItemEncodedPattern.java
+59 -8
View File
@@ -24,18 +24,23 @@ import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.implementations.ICraftingPatternItem;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.render.items.ItemEncodedPatternRenderer;
import appeng.client.ClientHelper;
import appeng.core.CommonHelper;
import appeng.core.features.AEFeature;
import appeng.core.localization.GuiText;
@@ -53,12 +58,50 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
{
this.setFeature( EnumSet.of( AEFeature.Patterns ) );
this.setMaxStackSize( 1 );
if( Platform.isClient() )
{
MinecraftForgeClient.registerItemRenderer( this, new ItemEncodedPatternRenderer() );
}
}
@SideOnly(Side.CLIENT)
ModelResourceLocation res;
@SideOnly(Side.CLIENT)
ModelResourceLocation encodedPatternModel; // TODO: make encoded pattern model!
@Override
public void registerIcons(
ClientHelper proxy,
String name )
{
encodedPatternModel = res = proxy.setIcon( this, name );
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){
boolean recursive = false;
@Override
public ModelResourceLocation getModelLocation(
ItemStack stack )
{
if ( recursive == false )
{
this.recursive = true;
ItemEncodedPattern iep = (ItemEncodedPattern) stack.getItem();
ItemStack is = iep.getOutput( stack );
if ( Minecraft.getMinecraft().thePlayer.isSneaking() )
{
return encodedPatternModel;
}
this.recursive = false;
}
return res;
}
});
}
@Override
public ItemStack onItemRightClick( ItemStack stack, World w, EntityPlayer player )
{
@@ -68,7 +111,15 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
}
@Override
public boolean onItemUseFirst( ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ )
public boolean onItemUseFirst(
ItemStack stack,
EntityPlayer player,
World world,
BlockPos pos,
EnumFacing side,
float hitX,
float hitY,
float hitZ )
{
return this.clearPattern( stack, player );
}
src/main/java/appeng/items/misc/ItemPaintBall.java
+53 -9
View File
@@ -22,17 +22,19 @@ package appeng.items.misc;
import java.util.EnumSet;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.AEColor;
import appeng.client.render.items.PaintBallRender;
import appeng.client.ClientHelper;
import appeng.core.features.AEFeature;
import appeng.core.localization.GuiText;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
public class ItemPaintBall extends AEBaseItem
@@ -44,13 +46,30 @@ public class ItemPaintBall extends AEBaseItem
{
this.setFeature( EnumSet.of( AEFeature.PaintBalls ) );
this.setHasSubtypes( true );
if( Platform.isClient() )
{
MinecraftForgeClient.registerItemRenderer( this, new PaintBallRender() );
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons( ClientHelper ir, String name )
{
final ModelResourceLocation sloc = ir.setIcon( this, name + "Shimmer" );
final ModelResourceLocation loc = ir.setIcon( this, name );
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){
@Override
public ModelResourceLocation getModelLocation(
ItemStack stack )
{
if ( isLumen(stack) )
return sloc;
return loc;
}
});
}
@Override
public String getItemStackDisplayName( ItemStack is )
{
@@ -61,6 +80,31 @@ public class ItemPaintBall extends AEBaseItem
{
return ( is.getItemDamage() >= DAMAGE_THRESHOLD ? GuiText.Lumen.getLocal() + ' ' : "" ) + this.getColor( is );
}
@Override
public int getColorFromItemStack(
ItemStack stack,
int renderPass )
{
AEColor col = getColor(stack);
int colorValue = stack.getItemDamage() >= 20 ? col.mediumVariant : col.mediumVariant;
int r = ( colorValue >> 16 ) & 0xff;
int g = ( colorValue >> 8 ) & 0xff;
int b = ( colorValue ) & 0xff;
int full = (int) ( 255 * 0.3 );
float fail = 0.7f;
if( stack.getItemDamage() >= 20 )
{
return (int)( full + r * fail ) << 16 | (int)( full + g * fail ) << 8 | (int)( full + b * fail ) | 0xff << 24;
}
else
{
return r << 16 | g << 8 | b | 0xff << 24 ;
}
}
public AEColor getColor( ItemStack is )
{