From 21654a7285e8ded59bcefc0d43463ae0b8e97419 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 12 Sep 2014 01:31:23 +0800 Subject: [PATCH] First cut of attractor done --- resources/assets/enderio/lang/en_US.lang | 8 +++++ .../textures/items/attractorCrystal.png | Bin 0 -> 434 bytes .../java/crazypants/enderio/ModObject.java | 2 +- .../crazypants/enderio/config/Config.java | 7 ++++- .../enderio/machine/MachineRecipes.java | 6 ++++ .../machine/attractor/AttractorRenderer.java | 8 ++--- .../machine/attractor/BlockAttractor.java | 2 +- .../machine/attractor/GuiAttractor.java | 5 +++ .../machine/attractor/TileAttractor.java | 4 +-- .../enderio/machine/soul/BlockSoulBinder.java | 1 + .../soul/SoulBinderAttractorCystalRecipe.java | 29 ++++++++++++++++++ .../soul/SoulBinderEnderCystalRecipe.java | 2 -- .../machine/soul/SoulBinderSpawnerRecipe.java | 5 +-- .../crazypants/enderio/material/Material.java | 3 +- 14 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 resources/assets/enderio/textures/items/attractorCrystal.png create mode 100644 src/main/java/crazypants/enderio/machine/soul/SoulBinderAttractorCystalRecipe.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index d1da7baf..68f828d1 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -115,6 +115,7 @@ enderio.basicGear.name=Basic Gear enderio.pulsatingCrystal.name=Pulsating Crystal enderio.vibrantCrystal.name=Vibrant Crystal enderio.enderCrystal.name=Ender Crystal +enderio.attractorCrystal.name=Enticing Crystal enderio.darkGrindingBall.name=Dark Steel Ball enderio.darkGrindingBall.tooltip.detailed.line1=SAG Mill Grinding Ball enderio.darkGrindingBall.tooltip.detailed.line2=Main Output @@ -294,6 +295,7 @@ enderio.farm.note.outputFull=Output Full enderio.farm.note.noSeeds=No Seeds enderio.farm.note.noAxe=No Axe enderio.farm.note.noHoe=No Hoe +enderio.farm.note.noPower=No Power tile.blockTank.name=Fluid Tank tile.blockTank.advanced.name=Pressurized Fluid Tank @@ -329,6 +331,12 @@ tile.blockSoulBinder.name=Soul Binder tile.blockSoulBinder.tooltip.detailed.line1=Used to convert the type of tile.blockSoulBinder.tooltip.detailed.line2=a broken spawner +tile.blockAttractor.name=Attractor +tile.blockAttractor.tooltip.detailed.line1=Draws mobs towards it +tile.blockAttractor.tooltip.detailed.line2=Specify the mobs to effect +tile.blockAttractor.tooltip.detailed.line3=by placing their souls +tile.blockAttractor.tooltip.detailed.line4=within the device + enderio.machine.tooltip.configured=(Configured) diff --git a/resources/assets/enderio/textures/items/attractorCrystal.png b/resources/assets/enderio/textures/items/attractorCrystal.png new file mode 100644 index 0000000000000000000000000000000000000000..5c8dc4d0554fc56ebc7fe4368951abe71e830cdc GIT binary patch literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85o30K$!7fntTONP^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs% zRL{`B;7id$ps|XcE{-7<{>cZ}MU(_*q%d4s^6vZx`8H1@mSvUSn{EG#+sxoR<|55> zndef-H-*Rhe^j~|m_;xYcD5LYD4I2_tNiyjGvVwfX^DT?;s$@N&ph@a{uEEYqQco~ z`8TcE-*)G)n>o~K9tM9v6>we<6~K6=Y&H9<|H*Pc{>6Vu(7Ul<1^c}JrfEih z!e?`tteD-vXe{r;B+YP0f!Sdl=MgIjqDZzTfI40lysy@8@GARO=!Jg#V^FHaQ4ZHyC=Ca4LBT~rD*=4mi#+|Z#K!oX}`z`$^O X$r~$v6%kEfkTQ6>`njxgN@xNA&%l^o literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index b95e9bb5..51c84751 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -53,7 +53,7 @@ public enum ModObject { blockEnchanter, blockSoulBinder, blockSliceAndSplice, - blockAttrator, + blockAttractor, blockPoweredSpawner, itemBrokenSpawner, diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index e104c0f7..e6ecd2aa 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -275,6 +275,7 @@ public final class Config { public static int soulBinderBrokenSpawnerRF = 2500000; public static int soulBinderReanimationRF = 100000; public static int soulBinderEnderCystalRF = 100000; + public static int soulBinderAttractorCystalRF = 100000; public static boolean powerConduitCanDifferentTiersConnect = false; public static int powerConduitTierOneRF = 640; @@ -293,7 +294,9 @@ public final class Config { public static int attractorRangeLevelTwo = 32; public static int attractorPowerPerTickLevelTwo = 80; public static int attractorRangeLevelThree = 64; - public static int attractorPowerPerTickLevelThree = 320; + public static int attractorPowerPerTickLevelThree = 160; + + public static void load(FMLPreInitializationEvent event) { @@ -770,6 +773,8 @@ public final class Config { "The number of RF required to to re-animated a mob head.").getInt(soulBinderReanimationRF); soulBinderEnderCystalRF = config.get(sectionSoulBinder.name, "soulBinderEnderCystalRF", soulBinderEnderCystalRF, "The number of RF required to create an ender crystal.").getInt(soulBinderEnderCystalRF); + soulBinderAttractorCystalRF = config.get(sectionSoulBinder.name, "soulBinderAttractorCystalRF", soulBinderAttractorCystalRF, + "The number of RF required to create an attractor crystal.").getInt(soulBinderAttractorCystalRF); sliceAndSpliceLevelOnePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelOnePowerPerTickRF", sliceAndSpliceLevelOnePowerPerTickRF, "The number of RF/t consumed by an unupgraded Slice'N'Splice").getInt(sliceAndSpliceLevelOnePowerPerTickRF); diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 4d141c71..b7b4e188 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -206,6 +206,12 @@ public class MachineRecipes { ItemStack soulBinder = new ItemStack(EnderIO.blockSoulFuser); GameRegistry.addShapedRecipe(soulBinder, "ses", "zmc","sks", 's', soularium, 'm', machineChassi, 'e', enderBit, 'z', zombieSkull, 'c', creeperSkull, 'k', skeletonSkull); + ItemStack attractor = new ItemStack(EnderIO.blockAttractor); + ItemStack attractorCrystal = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()); + GameRegistry + .addShapedRecipe(attractor, " c ", "sss", "sms", 's', soularium, 'm', machineChassi, 'c', attractorCrystal); + + ClearConfigRecipe inst = new ClearConfigRecipe(); MinecraftForge.EVENT_BUS.register(inst); GameRegistry.addRecipe(inst); diff --git a/src/main/java/crazypants/enderio/machine/attractor/AttractorRenderer.java b/src/main/java/crazypants/enderio/machine/attractor/AttractorRenderer.java index ea251d73..d721b0a7 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/AttractorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/attractor/AttractorRenderer.java @@ -52,7 +52,7 @@ public class AttractorRenderer extends TileEntitySpecialRenderer implements ISim GL11.glPopMatrix(); - EntityItem ei = new EntityItem(world, x, y, z, new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal())); + EntityItem ei = new EntityItem(world, x, y, z, new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal())); ei.age = (int) world.getTotalWorldTime(); //Remove the bob @@ -96,11 +96,7 @@ public class AttractorRenderer extends TileEntitySpecialRenderer implements ISim xform2.isX = true; CubeRenderer.render(bb, icon, xform2); - Tessellator.instance.addTranslation(-x, -y, -z); - - // - // CubeRenderer.render(block, 0, xform); - // + Tessellator.instance.addTranslation(-x, -y, -z); return true; } diff --git a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java index ce4be876..8fbafdd3 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java @@ -24,7 +24,7 @@ public class BlockAttractor extends AbstractMachineBlock { } protected BlockAttractor() { - super(ModObject.blockAttrator, TileAttractor.class); + super(ModObject.blockAttractor, TileAttractor.class); } @Override diff --git a/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java index c1cf40ff..da2b8f1d 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java @@ -27,4 +27,9 @@ public class GuiAttractor extends GuiMachineBase { super.drawGuiContainerBackgroundLayer(par1, par2, par3); } + @Override + protected boolean showRecipeButton() { + return false; + } + } diff --git a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java index 0e559a1b..b30f75ae 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java @@ -83,7 +83,7 @@ public class TileAttractor extends AbstractMachineEntity { @Override public String getMachineName() { - return ModObject.blockAttrator.unlocalisedName; + return ModObject.blockAttractor.unlocalisedName; } @Override @@ -204,7 +204,7 @@ public class TileAttractor extends AbstractMachineEntity { public Target() { super(MinecraftServer.getServer().worldServerForDimension(getWorldObj().provider.dimensionId), new GameProfile(null, - ModObject.blockAttrator.unlocalisedName + ":" + getLocation())); + ModObject.blockAttractor.unlocalisedName + ":" + getLocation())); posX = xCoord + 0.5; posY = yCoord + 0.5; posZ = zCoord + 0.5; diff --git a/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java index 2256a485..4b24526f 100644 --- a/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java @@ -51,6 +51,7 @@ public class BlockSoulBinder extends AbstractMachineBlock { MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSpawnerRecipe.instance); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderReanimationRecipe.instance); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderEnderCystalRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderAttractorCystalRecipe.instance); } @Override diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderAttractorCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderAttractorCystalRecipe.java new file mode 100644 index 00000000..ca637d62 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderAttractorCystalRecipe.java @@ -0,0 +1,29 @@ +package crazypants.enderio.machine.soul; + +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.enderio.material.Material; + +public class SoulBinderAttractorCystalRecipe extends AbstractSoulBinderRecipe { + + public static SoulBinderAttractorCystalRecipe instance = new SoulBinderAttractorCystalRecipe(); + + private SoulBinderAttractorCystalRecipe() { + super(Config.soulBinderAttractorCystalRF, "SoulBinderAttractorCystalRecipe", EntityVillager.class); + } + + @Override + public ItemStack getInputStack() { + return new ItemStack(Items.emerald); + } + + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java index 02e3d5e1..8dfea469 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java @@ -25,7 +25,5 @@ public class SoulBinderEnderCystalRecipe extends AbstractSoulBinderRecipe { public ItemStack getOutputStack() { return new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()); } - - } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java index 0e402349..43329a54 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java @@ -115,10 +115,7 @@ public class SoulBinderSpawnerRecipe implements IMachineRecipe, ISoulBinderRecip @Override public List getSupportedSouls() { - List res = EntityUtil.getAllRegisteredMobNames(!Config.soulVesselCapturesBosses); - for(String str : res) { - System.out.println(" \"" + str + "\" : \"100\""); - } + List res = EntityUtil.getAllRegisteredMobNames(!Config.soulVesselCapturesBosses); return res; } diff --git a/src/main/java/crazypants/enderio/material/Material.java b/src/main/java/crazypants/enderio/material/Material.java index 0ae1c2af..116908e4 100644 --- a/src/main/java/crazypants/enderio/material/Material.java +++ b/src/main/java/crazypants/enderio/material/Material.java @@ -10,7 +10,8 @@ public enum Material { PULSATING_CYSTAL("pulsatingCrystal", true), VIBRANT_CYSTAL("vibrantCrystal", true), DRAK_GRINDING_BALL("darkGrindingBall"), - ENDER_CRYSTAL("enderCrystal", true); + ENDER_CRYSTAL("enderCrystal", true), + ATTRACTOR_CRYSTAL("attractorCrystal", true); public final String unlocalisedName; public final String iconKey;