Empowering tweaks, empowered crystal textures

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java

@@ -33,8 +33,11 @@ public class BlockCrystal extends BlockBase{
     public static final TheCrystals[] ALL_CRYSTALS = TheCrystals.values();
     private static final PropertyInteger META = PropertyInteger.create("meta", 0, ALL_CRYSTALS.length-1);
 
-    public BlockCrystal(String name){
+    private boolean isEmpowered;
+
+    public BlockCrystal(String name, boolean isEmpowered){
         super(Material.ROCK, name);
+        this.isEmpowered = isEmpowered;
         this.setHardness(1.5F);
         this.setResistance(10.0F);
         this.setHarvestLevel("pickaxe", 1);
@@ -87,5 +90,10 @@ public class BlockCrystal extends BlockBase{
         public String getUnlocalizedName(ItemStack stack){
             return stack.getItemDamage() >= ALL_CRYSTALS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_CRYSTALS[stack.getItemDamage()].name;
         }
+
+        @Override
+        public boolean hasEffect(ItemStack stack){
+            return this.block instanceof BlockCrystal && ((BlockCrystal)this.block).isEmpowered;
+        }
     }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java

@@ -141,8 +141,8 @@ public final class InitBlocks{
         blockFireworkBox = new BlockFireworkBox("blockFireworkBox");
         blockMiner = new BlockMiner("blockMiner");
         blockAtomicReconstructor = new BlockAtomicReconstructor("blockAtomicReconstructor");
-        blockCrystal = new BlockCrystal("blockCrystal");
-        blockCrystalEmpowered = new BlockCrystal("blockCrystalEmpowered");
+        blockCrystal = new BlockCrystal("blockCrystal", false);
+        blockCrystalEmpowered = new BlockCrystal("blockCrystalEmpowered", true);
         blockBlackLotus = new BlockBlackLotus("blockBlackLotus");
         blockLaserRelay = new BlockLaserRelay("blockLaserRelay", Type.ENERGY_BASIC);
         blockLaserRelayAdvanced = new BlockLaserRelay("blockLaserRelayAdvanced", Type.ENERGY_ADVANCED);

src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java

@@ -231,8 +231,8 @@ public final class InitItems{
         itemExplosionLens = new ItemLens("itemExplosionLens", ActuallyAdditionsAPI.lensDetonation);
         itemDamageLens = new ItemLens("itemDamageLens", ActuallyAdditionsAPI.lensDeath);
         itemDisenchantingLens = new ItemLens("itemDisenchantingLens", ActuallyAdditionsAPI.lensDisenchanting);
-        itemCrystal = new ItemCrystal("itemCrystal");
-        itemCrystalEmpowered = new ItemCrystal("itemCrystalEmpowered");
+        itemCrystal = new ItemCrystal("itemCrystal", false);
+        itemCrystalEmpowered = new ItemCrystal("itemCrystalEmpowered", true);
         itemLaserWrench = new ItemLaserWrench("itemLaserWrench");
         itemChestToCrateUpgrade = new ItemChestToCrateUpgrade("itemChestToCrateUpgrade");
         itemBooklet = new ItemBooklet("itemBooklet");

src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java

@@ -26,8 +26,11 @@ import java.util.List;
 
 public class ItemCrystal extends ItemBase{
 
-    public ItemCrystal(String name){
+    private boolean isEmpowered;
+
+    public ItemCrystal(String name, boolean isEmpowered){
         super(name);
+        this.isEmpowered = isEmpowered;
         this.setHasSubtypes(true);
         this.setMaxDamage(0);
     }
@@ -37,6 +40,10 @@ public class ItemCrystal extends ItemBase{
         return damage;
     }
 
+    @Override
+    public boolean hasEffect(ItemStack stack){
+        return this.isEmpowered;
+    }
 
     @Override
     public String getUnlocalizedName(ItemStack stack){

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java

@@ -40,7 +40,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{
         if(!this.worldObj.isRemote){
             EmpowererRecipe recipe = getRecipeForInput(this.slots[0]);
             if(recipe != null){
-                int processTimeGoal = 150;
+                int processTimeGoal = 200;
                 TileEntityDisplayStand[] modifierStands = this.getFittingModifiers(recipe, processTimeGoal);
                 if(modifierStands != null){ //Meaning the display stands around match all the criteria
 
@@ -62,7 +62,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{
                     }
 
                     if(done){
-                        ((WorldServer)this.worldObj).spawnParticle(EnumParticleTypes.END_ROD, false, this.pos.getX()+0.5, this.pos.getY()+1.1, this.pos.getZ()+0.5, 80, 0, 0, 0, 0.25D);
+                        ((WorldServer)this.worldObj).spawnParticle(EnumParticleTypes.END_ROD, false, this.pos.getX()+0.5, this.pos.getY()+1.1, this.pos.getZ()+0.5, 300, 0, 0, 0, 0.25D);
 
                         this.slots[0] = recipe.output.copy();
                         this.markDirty();
@@ -83,7 +83,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{
 
         for(int i = 0; i < EnumFacing.HORIZONTALS.length; i++){
             EnumFacing facing = EnumFacing.HORIZONTALS[i];
-            BlockPos offset = this.pos.offset(facing, 2);
+            BlockPos offset = this.pos.offset(facing, 3);
             TileEntity tile = this.worldObj.getTileEntity(offset);
 
             if(tile != null && tile instanceof TileEntityDisplayStand){

src/main/resources/assets/actuallyadditions/lang/en_US.lang

@@ -89,6 +89,7 @@ container.nei.actuallyadditions.coffee.special=Special Feature
 container.nei.actuallyadditions.coffee.maxAmount=Max Amount
 container.nei.actuallyadditions.coffee.extra.milk=+01:00, -1 Level
 container.nei.actuallyadditions.reconstructor.name=Atomic Reconstructor
+container.nei.actuallyadditions.empowerer.name=Empowerer
 
 container.nei.actuallyadditions.booklet.name=ActAdd Manual
 container.nei.actuallyadditions.booklet.header=The <item>Actually Additions Manual<r> reads:
@@ -197,6 +198,12 @@ tile.actuallyadditions.blockCrystalLightBlue.name=Diamatine Crystal Block
 tile.actuallyadditions.blockCrystalGreen.name=Emeradic Crystal Block
 tile.actuallyadditions.blockCrystalBlack.name=Void Crystal Block
 tile.actuallyadditions.blockCrystalWhite.name=Enori Crystal Block
+tile.actuallyadditions.blockCrystalEmpoweredRed.name=Empowered Restonia Crystal Block
+tile.actuallyadditions.blockCrystalEmpoweredBlue.name=Empowered Palis Crystal Block
+tile.actuallyadditions.blockCrystalEmpoweredLightBlue.name=Empowered Diamatine Crystal Block
+tile.actuallyadditions.blockCrystalEmpoweredGreen.name=Empowered Emeradic Crystal Block
+tile.actuallyadditions.blockCrystalEmpoweredBlack.name=Empowered Void Crystal Block
+tile.actuallyadditions.blockCrystalEmpoweredWhite.name=Empowered Enori Crystal Block
 tile.actuallyadditions.blockMiner.name=Vertical Digger
 tile.actuallyadditions.blockFireworkBox.name=Firework Box
 tile.actuallyadditions.blockQuartzWall.name=Black Quartz Wall
@@ -216,6 +223,7 @@ tile.actuallyadditions.blockBookletStand.name=Wall-Mount Manual
 tile.actuallyadditions.blockDisplayStand.name=Display Stand
 tile.actuallyadditions.blockShockSuppressor.name=Shock Absorber
 tile.actuallyadditions.blockTinyTorch.name=Tiny Torch
+tile.actuallyadditions.blockEmpowerer.name=Empowerer
 
 #ESD
 tile.actuallyadditions.blockInputter.name=ESD
@@ -425,6 +433,12 @@ item.actuallyadditions.itemCrystalLightBlue.name=Diamatine Crystal
 item.actuallyadditions.itemCrystalGreen.name=Emeradic Crystal
 item.actuallyadditions.itemCrystalBlack.name=Void Crystal
 item.actuallyadditions.itemCrystalWhite.name=Enori Crystal
+item.actuallyadditions.itemCrystalEmpoweredRed.name=Empowered Restonia Crystal
+item.actuallyadditions.itemCrystalEmpoweredBlue.name=Empowered Palis Crystal
+item.actuallyadditions.itemCrystalEmpoweredLightBlue.name=Empowered Diamatine Crystal
+item.actuallyadditions.itemCrystalEmpoweredGreen.name=Empowered Emeradic Crystal
+item.actuallyadditions.itemCrystalEmpoweredBlack.name=Empowered Void Crystal
+item.actuallyadditions.itemCrystalEmpoweredWhite.name=Empowered Enori Crystal
 item.actuallyadditions.itemMiscLens.name=Lens
 item.actuallyadditions.itemColorLens.name=Lens of Color
 item.actuallyadditions.itemExplosionLens.name=Lens of Detonation

src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlue.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredGreen.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}

src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png.mcmeta

@@ -0,0 +1,7 @@
+{
+  "animation": 
+  {
+    "frametime": 20,
+    "interpolate": true
+  }
+}