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

Added skystone, skystone block, skystone brick, skystone small brick, certus quartz, certus quartz pillar, chiseled certus quartz and fluix stars

Browse Source 
To integrate these into the current system, some changes to the background had to be done, especially to the feature handler. It now uses an interface to work against which you can implement to get your own feature handler instead modifying the base one and add several special cases code
This commit is contained in:
thatsIch
2014-11-18 16:47:30 +01:00
parent 1572351a54
commit 56aad10ffe
46 changed files with 2624 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java
+23 -17
View File
@@ -18,36 +18,36 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.AEFeatureHandler;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzAxe extends ItemAxe implements IAEFeature
{
private final AEFeature type;
private final IFeatureHandler feature;
final AEFeature type;
final AEFeatureHandler feature;
@Override
public AEFeatureHandler feature()
public ToolQuartzAxe( AEFeature Type )
{
return feature;
}
@Override
public boolean getIsRepairable(ItemStack a, ItemStack b)
{
return Platform.canRepair( type, a, b );
}
public ToolQuartzAxe(AEFeature Type) {
super( ToolMaterial.IRON );
feature = new AEFeatureHandler( EnumSet.of( type = Type, AEFeature.QuartzAxe ), this, Type.name() );
this.feature = new ItemFeatureHandler( EnumSet.of( type = Type, AEFeature.QuartzAxe ), this, this, Optional.of( Type.name() ) );
}
@Override
public IFeatureHandler handler()
{
return this.feature;
}
@Override
@@ -55,4 +55,10 @@ public class ToolQuartzAxe extends ItemAxe implements IAEFeature
{
// override!
}
@Override
public boolean getIsRepairable( ItemStack a, ItemStack b )
{
return Platform.canRepair( type, a, b );
}
}
src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java
+41 -34
View File
@@ -18,12 +18,16 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.implementations.guiobjects.IGuiItem;
import appeng.api.implementations.guiobjects.IGuiItemObject;
import appeng.core.features.AEFeature;
@@ -32,20 +36,46 @@ import appeng.items.AEBaseItem;
import appeng.items.contents.QuartzKnifeObj;
import appeng.util.Platform;
public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem
{
final AEFeature type;
public ToolQuartzCuttingKnife(AEFeature Type) {
super( ToolQuartzCuttingKnife.class, Type.name() );
public ToolQuartzCuttingKnife( AEFeature Type )
{
super( ToolQuartzCuttingKnife.class, Optional.of( Type.name() ) );
setFeature( EnumSet.of( type = Type, AEFeature.QuartzKnife ) );
setMaxDamage( 50 );
setMaxStackSize( 1 );
}
@Override
public boolean getIsRepairable(ItemStack a, ItemStack b)
public boolean onItemUse( ItemStack is, EntityPlayer p, World w, int x, int y, int z, int s, float hitX, float hitY, float hitZ )
{
if ( Platform.isServer() )
Platform.openGUI( p, null, ForgeDirection.UNKNOWN, GuiBridge.GUI_QUARTZ_KNIFE );
return true;
}
@Override
public ItemStack onItemRightClick( ItemStack it, World w, EntityPlayer p )
{
if ( Platform.isServer() )
Platform.openGUI( p, null, ForgeDirection.UNKNOWN, GuiBridge.GUI_QUARTZ_KNIFE );
p.swingItem();
return it;
}
@Override
public boolean doesContainerItemLeaveCraftingGrid( ItemStack par1ItemStack )
{
return false;
}
@Override
public boolean getIsRepairable( ItemStack a, ItemStack b )
{
return Platform.canRepair( type, a, b );
}
@@ -57,43 +87,20 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem
}
@Override
public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack)
{
return false;
}
@Override
public boolean hasContainerItem(ItemStack stack)
{
return true;
}
@Override
public ItemStack onItemRightClick(ItemStack it, World w, EntityPlayer p)
{
if ( Platform.isServer() )
Platform.openGUI( p, null, ForgeDirection.UNKNOWN, GuiBridge.GUI_QUARTZ_KNIFE );
p.swingItem();
return it;
}
@Override
public boolean onItemUse(ItemStack is, EntityPlayer p, World w, int x, int y, int z, int s, float hitX, float hitY, float hitZ)
{
if ( Platform.isServer() )
Platform.openGUI( p, null, ForgeDirection.UNKNOWN, GuiBridge.GUI_QUARTZ_KNIFE );
return true;
}
@Override
public ItemStack getContainerItem(ItemStack itemStack)
public ItemStack getContainerItem( ItemStack itemStack )
{
itemStack.setItemDamage( itemStack.getItemDamage() + 1 );
return itemStack;
}
@Override
public IGuiItemObject getGuiObject(ItemStack is, World world, int x, int y, int z)
public boolean hasContainerItem( ItemStack stack )
{
return true;
}
@Override
public IGuiItemObject getGuiObject( ItemStack is, World world, int x, int y, int z )
{
return new QuartzKnifeObj( is );
}
src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java
+25 -17
View File
@@ -18,36 +18,38 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.AEFeatureHandler;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzHoe extends ItemHoe implements IAEFeature
{
private final AEFeature feature;
private final IFeatureHandler handler;
final AEFeature type;
final AEFeatureHandler feature;
@Override
public AEFeatureHandler feature()
public ToolQuartzHoe( AEFeature feature )
{
return feature;
}
@Override
public boolean getIsRepairable(ItemStack a, ItemStack b)
{
return Platform.canRepair( type, a, b );
}
public ToolQuartzHoe(AEFeature Type) {
super( ToolMaterial.IRON );
feature = new AEFeatureHandler( EnumSet.of( type = Type, AEFeature.QuartzHoe ), this, Type.name() );
this.feature = feature;
this.handler = new ItemFeatureHandler( EnumSet.of( feature, AEFeature.QuartzHoe ), this, this, Optional.of( feature.name() ) );
}
@Override
public IFeatureHandler handler()
{
return handler;
}
@Override
@@ -55,4 +57,10 @@ public class ToolQuartzHoe extends ItemHoe implements IAEFeature
{
// override!
}
@Override
public boolean getIsRepairable( ItemStack a, ItemStack b )
{
return Platform.canRepair( feature, a, b );
}
}
src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java
+25 -17
View File
@@ -18,36 +18,38 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.AEFeatureHandler;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzPickaxe extends ItemPickaxe implements IAEFeature
{
private final AEFeature type;
private final IFeatureHandler feature;
final AEFeature type;
final AEFeatureHandler feature;
@Override
public AEFeatureHandler feature()
public ToolQuartzPickaxe( AEFeature Type )
{
return feature;
}
@Override
public boolean getIsRepairable(ItemStack a, ItemStack b)
{
return Platform.canRepair( type, a, b );
}
public ToolQuartzPickaxe(AEFeature Type) {
super( ToolMaterial.IRON );
feature = new AEFeatureHandler( EnumSet.of( type = Type, AEFeature.QuartzPickaxe ), this, Type.name() );
this.type = Type;
this.feature = new ItemFeatureHandler( EnumSet.of( Type, AEFeature.QuartzPickaxe ), this, this, Optional.of( Type.name() ) );
}
@Override
public IFeatureHandler handler()
{
return this.feature;
}
@Override
@@ -55,4 +57,10 @@ public class ToolQuartzPickaxe extends ItemPickaxe implements IAEFeature
{
// override!
}
@Override
public boolean getIsRepairable( ItemStack a, ItemStack b )
{
return Platform.canRepair( type, a, b );
}
}
src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java
+24 -17
View File
@@ -18,36 +18,37 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.AEFeatureHandler;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzSpade extends ItemSpade implements IAEFeature
{
private final AEFeature type;
private final IFeatureHandler handler;
final AEFeature type;
final AEFeatureHandler feature;
@Override
public AEFeatureHandler feature()
public ToolQuartzSpade( AEFeature Type )
{
return feature;
}
@Override
public boolean getIsRepairable(ItemStack a, ItemStack b)
{
return Platform.canRepair( type, a, b );
}
public ToolQuartzSpade(AEFeature Type) {
super( ToolMaterial.IRON );
feature = new AEFeatureHandler( EnumSet.of( type = Type, AEFeature.QuartzSpade ), this, Type.name() );
this.handler = new ItemFeatureHandler( EnumSet.of( type = Type, AEFeature.QuartzSpade ), this, this, Optional.of( Type.name() ) );
}
@Override
public IFeatureHandler handler()
{
return handler;
}
@Override
@@ -55,4 +56,10 @@ public class ToolQuartzSpade extends ItemSpade implements IAEFeature
{
// override!
}
@Override
public boolean getIsRepairable( ItemStack a, ItemStack b )
{
return Platform.canRepair( type, a, b );
}
}
src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java
+21 -15
View File
@@ -18,41 +18,47 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import appeng.core.features.AEFeature;
import appeng.core.features.AEFeatureHandler;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
public class ToolQuartzSword extends ItemSword implements IAEFeature
{
private final AEFeature type;
private final IFeatureHandler feature;
final AEFeature type;
final AEFeatureHandler feature;
public ToolQuartzSword( AEFeature Type )
{
super( ToolMaterial.IRON );
feature = new ItemFeatureHandler( EnumSet.of( type = Type, AEFeature.QuartzSword ), this, this, Optional.of( Type.name() ) );
}
@Override
public AEFeatureHandler feature()
public IFeatureHandler handler()
{
return feature;
}
@Override
public boolean getIsRepairable(ItemStack a, ItemStack b)
{
return Platform.canRepair( type, a, b );
}
public ToolQuartzSword(AEFeature Type) {
super( ToolMaterial.IRON );
feature = new AEFeatureHandler( EnumSet.of( type = Type, AEFeature.QuartzSword ), this, Type.name() );
}
@Override
public void postInit()
{
// override!
}
@Override
public boolean getIsRepairable( ItemStack a, ItemStack b )
{
return Platform.canRepair( type, a, b );
}
}
src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java
+16 -9
View File
@@ -18,27 +18,34 @@
package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.tools.IToolWrench;
import appeng.api.implementations.items.IAEWrench;
import appeng.api.util.DimensionalCoord;
import appeng.core.features.AEFeature;
import appeng.items.AEBaseItem;
import appeng.transformer.annotations.integration.Interface;
import appeng.util.Platform;
import buildcraft.api.tools.IToolWrench;
@Interface(iface = "buildcraft.api.tools.IToolWrench", iname = "BC")
@Interface( iface = "buildcraft.api.tools.IToolWrench", iname = "BC" )
public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWrench
{
public ToolQuartzWrench(AEFeature type) {
super( ToolQuartzWrench.class, type.name() );
public ToolQuartzWrench( AEFeature type )
{
super( ToolQuartzWrench.class, Optional.of( type.name() ) );
this.setFeature( EnumSet.of( type, AEFeature.QuartzWrench ) );
this.setMaxStackSize( 1 );
@@ -46,7 +53,7 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWren
}
@Override
public boolean onItemUseFirst(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
public boolean onItemUseFirst( ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ )
{
Block b = world.getBlock( x, y, z );
if ( b != null && !player.isSneaking() && Platform.hasPermissions( new DimensionalCoord( world, x, y, z ), player ) )
@@ -67,25 +74,25 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWren
@Override
// public boolean shouldPassSneakingClickToBlock(World w, int x, int y, int z)
public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player)
public boolean doesSneakBypassUse( World world, int x, int y, int z, EntityPlayer player )
{
return true;
}
@Override
public boolean canWrench(ItemStack is, EntityPlayer player, int x, int y, int z)
public boolean canWrench( ItemStack is, EntityPlayer player, int x, int y, int z )
{
return true;
}
@Override
public boolean canWrench(EntityPlayer player, int x, int y, int z)
public boolean canWrench( EntityPlayer player, int x, int y, int z )
{
return true;
}
@Override
public void wrenchUsed(EntityPlayer player, int x, int y, int z)
public void wrenchUsed( EntityPlayer player, int x, int y, int z )
{
player.swingItem();
}