diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index 03f0e4da8..e6f62a4eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/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; + } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java index af0840d30..875eca8ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java +++ b/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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java index 304eeb677..b67f1d497 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java +++ b/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"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index d14a9e45c..6b7739136 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/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){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java index fa55859e6..8876c44fc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java +++ b/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){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index b6b9a48ea..fd28b7070 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/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 Actually Additions Manual 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 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png index 551064747..b75db1634 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlue.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlue.png index d26182a33..c8055cf1d 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlue.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlue.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlue.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlue.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlue.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredGreen.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredGreen.png index 6b5efd8b0..4716e4072 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredGreen.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredGreen.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredGreen.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredGreen.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredGreen.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png index 42ebe4300..bd1356e13 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png index 715785c87..a1a2d2f23 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png index f4b020a06..656c5d994 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png index b841b13db..2e7062e69 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png index 198850fac..5905ec754 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png index 536f5db6e..06e9031ae 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png index 34a0ffdde..65ecd8a5c 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png index b2deaaeb7..c9eb63a37 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png index f49a69f4a..e7b4fb518 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +}