mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 13:10:13 +00:00
Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git
This commit is contained in:
commit
9bf0bee92a
10 files changed
+243
-110
No files matched your search
@@ -71,6 +71,8 @@ public final class Config {
|
||||
public static boolean useAlternateTesseractModel = false;
|
||||
|
||||
public static boolean photovoltaicCellEnabled = true;
|
||||
|
||||
public static boolean reservoirEnabled = true;
|
||||
|
||||
public static double conduitScale = DEFAULT_CONDUIT_SCALE;
|
||||
|
||||
@@ -420,6 +422,10 @@ public final class Config {
|
||||
"If set to false: Photovoltaic Cells will not be craftable.")
|
||||
.getBoolean(photovoltaicCellEnabled);
|
||||
|
||||
reservoirEnabled= config.get(sectionItems.name, "reservoirEnabled", reservoirEnabled,
|
||||
"If set to false reservoirs will not be craftable.")
|
||||
.getBoolean(reservoirEnabled);
|
||||
|
||||
maxPhotovoltaicOutputRF = config.get(sectionPower.name, "maxPhotovoltaicOutputRF", maxPhotovoltaicOutputRF,
|
||||
"Maximum output in RF/t of the Photovoltaic Panels.").getInt(maxPhotovoltaicOutputRF);
|
||||
maxPhotovoltaicAdvancedOutputRF = config.get(sectionPower.name, "maxPhotovoltaicAdvancedOutputRF", maxPhotovoltaicAdvancedOutputRF,
|
||||
|
||||
@@ -18,9 +18,11 @@ import crazypants.enderio.conduit.ConduitDisplayMode;
|
||||
import crazypants.enderio.item.darksteel.DarkSteelController;
|
||||
import crazypants.enderio.item.darksteel.GogglesOfRevealingUpgrade;
|
||||
import crazypants.enderio.item.darksteel.ItemDarkSteelArmor;
|
||||
import crazypants.enderio.item.darksteel.PacketGlideState;
|
||||
import crazypants.enderio.item.darksteel.JumpUpgrade;
|
||||
import crazypants.enderio.item.darksteel.PacketUpgradeState;
|
||||
import crazypants.enderio.item.darksteel.SoundDetector;
|
||||
import crazypants.enderio.item.darksteel.SoundDetectorUpgrade;
|
||||
import crazypants.enderio.item.darksteel.SpeedUpgrade;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.util.Lang;
|
||||
|
||||
@@ -41,6 +43,13 @@ public class KeyTracker {
|
||||
private KeyBinding nightVisionKey;
|
||||
private boolean isNightVisionActive = false;
|
||||
|
||||
private KeyBinding stepAssistKey;
|
||||
private boolean isStepAssistActive = true;
|
||||
|
||||
private KeyBinding speedKey;
|
||||
private boolean isSpeedActive = true;
|
||||
|
||||
|
||||
private KeyBinding gogglesKey;
|
||||
|
||||
private KeyBinding yetaWrenchMode;
|
||||
@@ -56,6 +65,12 @@ public class KeyTracker {
|
||||
gogglesKey = new KeyBinding("Goggles of Revealing", Keyboard.KEY_R, "Dark Steel Armor");
|
||||
ClientRegistry.registerKeyBinding(gogglesKey);
|
||||
|
||||
stepAssistKey = new KeyBinding("Step Assist", Keyboard.KEY_NONE, "Dark Steel Armor");
|
||||
ClientRegistry.registerKeyBinding(stepAssistKey);
|
||||
|
||||
speedKey = new KeyBinding("Speed", Keyboard.KEY_NONE, "Dark Steel Armor");
|
||||
ClientRegistry.registerKeyBinding(speedKey);
|
||||
|
||||
yetaWrenchMode = new KeyBinding("Yeta Wrench Mode", Keyboard.KEY_Y, "Tools");
|
||||
ClientRegistry.registerKeyBinding(yetaWrenchMode);
|
||||
}
|
||||
@@ -67,6 +82,45 @@ public class KeyTracker {
|
||||
handleNightVision();
|
||||
handleYetaWrench();
|
||||
handleGoggles();
|
||||
handleStepAssist();
|
||||
handleSpeed();
|
||||
}
|
||||
|
||||
private void handleSpeed() {
|
||||
if(!SpeedUpgrade.isEquipped(Minecraft.getMinecraft().thePlayer)) {
|
||||
return;
|
||||
}
|
||||
if(speedKey.getIsKeyPressed()) {
|
||||
isSpeedActive = !isSpeedActive;
|
||||
String message;
|
||||
if(isSpeedActive) {
|
||||
message = Lang.localize("darksteel.upgrade.speed.enabled");
|
||||
} else {
|
||||
message = Lang.localize("darksteel.upgrade.speed.disabled");
|
||||
}
|
||||
Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation(message));
|
||||
DarkSteelController.instance.setSpeedActive(Minecraft.getMinecraft().thePlayer, isSpeedActive);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketUpgradeState(PacketUpgradeState.Type.SPEED, isSpeedActive));
|
||||
}
|
||||
}
|
||||
|
||||
private void handleStepAssist() {
|
||||
if(!JumpUpgrade.isEquipped(Minecraft.getMinecraft().thePlayer)) {
|
||||
return;
|
||||
}
|
||||
if(stepAssistKey.getIsKeyPressed()) {
|
||||
isStepAssistActive = !isStepAssistActive;
|
||||
String message;
|
||||
if(isStepAssistActive) {
|
||||
message = Lang.localize("darksteel.upgrade.stepAssist.enabled");
|
||||
} else {
|
||||
message = Lang.localize("darksteel.upgrade.stepAssist.disabled");
|
||||
}
|
||||
Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation(message));
|
||||
DarkSteelController.instance.setSpeedActive(Minecraft.getMinecraft().thePlayer, isStepAssistActive);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketUpgradeState(PacketUpgradeState.Type.STEP_ASSIST, isStepAssistActive));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void handleGoggles() {
|
||||
@@ -142,7 +196,7 @@ public class KeyTracker {
|
||||
}
|
||||
Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation(message));
|
||||
DarkSteelController.instance.setGlideActive(Minecraft.getMinecraft().thePlayer, isGlideActive);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketGlideState(isGlideActive));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketUpgradeState(PacketUpgradeState.Type.GLIDE, isGlideActive));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -51,14 +51,16 @@ public class DarkSteelController {
|
||||
private int jumpCount;
|
||||
private int ticksSinceLastJump;
|
||||
|
||||
private Map<String, Boolean> glideActiveMap = new HashMap<String, Boolean>();
|
||||
private Map<String, Boolean> glideActiveMap = new HashMap<String, Boolean>();
|
||||
private Map<String, Boolean> speedActiveMap = new HashMap<String, Boolean>();
|
||||
private Map<String, Boolean> stepAssistActiveMap = new HashMap<String, Boolean>();
|
||||
|
||||
private boolean nightVisionActive = false;
|
||||
private boolean removeNightvision = false;
|
||||
|
||||
private DarkSteelController() {
|
||||
PacketHandler.INSTANCE.registerMessage(PacketDarkSteelPowerPacket.class, PacketDarkSteelPowerPacket.class, PacketHandler.nextID(), Side.SERVER);
|
||||
PacketHandler.INSTANCE.registerMessage(PacketGlideState.class, PacketGlideState.class, PacketHandler.nextID(), Side.SERVER);
|
||||
PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.SERVER);
|
||||
}
|
||||
|
||||
public void setGlideActive(EntityPlayer player, boolean isGlideActive) {
|
||||
@@ -74,6 +76,34 @@ public class DarkSteelController {
|
||||
}
|
||||
return isActive.booleanValue();
|
||||
}
|
||||
|
||||
public void setSpeedActive(EntityPlayer player, boolean isSpeedActive) {
|
||||
if(player.getGameProfile().getName() != null) {
|
||||
speedActiveMap.put(player.getGameProfile().getName(), isSpeedActive);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isSpeedActive(EntityPlayer player) {
|
||||
Boolean isActive = speedActiveMap.get(player.getGameProfile().getName());
|
||||
if(isActive == null) {
|
||||
return true;
|
||||
}
|
||||
return isActive.booleanValue();
|
||||
}
|
||||
|
||||
public void setStepAssistActive(EntityPlayer player, boolean isActive) {
|
||||
if(player.getGameProfile().getName() != null) {
|
||||
stepAssistActiveMap.put(player.getGameProfile().getName(), isActive);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isStepAssistActive(EntityPlayer player) {
|
||||
Boolean isActive = stepAssistActiveMap.get(player.getGameProfile().getName());
|
||||
if(isActive == null) {
|
||||
return true;
|
||||
}
|
||||
return isActive.booleanValue();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPlayerTick(TickEvent.PlayerTickEvent event) {
|
||||
@@ -190,7 +220,7 @@ public class DarkSteelController {
|
||||
|
||||
ItemStack leggings = player.getEquipmentInSlot(2);
|
||||
SpeedUpgrade speedUpgrade = SpeedUpgrade.loadFromItem(leggings);
|
||||
if(leggings != null && leggings.getItem() == EnderIO.itemDarkSteelLeggings && speedUpgrade != null) {
|
||||
if(leggings != null && leggings.getItem() == EnderIO.itemDarkSteelLeggings && speedUpgrade != null && isSpeedActive(player)) {
|
||||
|
||||
double horzMovement = Math.abs(player.distanceWalkedModified - player.prevDistanceWalkedModified);
|
||||
double costModifier = player.isSprinting() ? Config.darkSteelSprintPowerCost : Config.darkSteelWalkPowerCost;
|
||||
@@ -225,7 +255,7 @@ public class DarkSteelController {
|
||||
}
|
||||
|
||||
JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots);
|
||||
if(jumpUpgrade != null && boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots) {
|
||||
if(jumpUpgrade != null && boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots && isStepAssistActive(player)) {
|
||||
player.stepHeight = 1.0023F;
|
||||
} else if(player.stepHeight == 1.0023F) {
|
||||
player.stepHeight = 0.5001F;
|
||||
@@ -353,6 +383,6 @@ public class DarkSteelController {
|
||||
removeNightvision = true;
|
||||
}
|
||||
this.nightVisionActive = isNightVisionActive;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package crazypants.enderio.item.darksteel;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -19,6 +20,11 @@ public class JumpUpgrade extends AbstractUpgrade {
|
||||
|
||||
protected short level;
|
||||
|
||||
public static boolean isEquipped(EntityPlayer player) {
|
||||
ItemStack boots = player.getEquipmentInSlot(1);
|
||||
return loadFromItem(boots) != null;
|
||||
}
|
||||
|
||||
public static JumpUpgrade loadFromItem(ItemStack stack) {
|
||||
if(stack == null) {
|
||||
return null;
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
package crazypants.enderio.item.darksteel;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
|
||||
public class PacketGlideState implements IMessage, IMessageHandler<PacketGlideState, IMessage> {
|
||||
|
||||
public PacketGlideState() {
|
||||
}
|
||||
|
||||
private boolean glideActive;
|
||||
|
||||
public PacketGlideState(boolean glideActive) {
|
||||
this.glideActive = glideActive;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
buf.writeBoolean(glideActive);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
glideActive = buf.readBoolean();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(PacketGlideState message, MessageContext ctx) {
|
||||
EntityPlayerMP player = ctx.getServerHandler().playerEntity;
|
||||
DarkSteelController.instance.setGlideActive(player, message.glideActive);
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
package crazypants.enderio.item.darksteel;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
|
||||
public class PacketUpgradeState implements IMessage, IMessageHandler<PacketUpgradeState, IMessage> {
|
||||
|
||||
public enum Type {
|
||||
GLIDE,
|
||||
SPEED,
|
||||
STEP_ASSIST
|
||||
}
|
||||
|
||||
public PacketUpgradeState() {
|
||||
}
|
||||
|
||||
private boolean isActive;
|
||||
private Type type;
|
||||
|
||||
public PacketUpgradeState(Type type, boolean isActive) {
|
||||
this.type = type;
|
||||
this.isActive = isActive;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
buf.writeShort(type.ordinal());
|
||||
buf.writeBoolean(isActive);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
type = Type.values()[buf.readShort()];
|
||||
isActive = buf.readBoolean();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(PacketUpgradeState message, MessageContext ctx) {
|
||||
EntityPlayerMP player = ctx.getServerHandler().playerEntity;
|
||||
switch(message.type) {
|
||||
case GLIDE:
|
||||
DarkSteelController.instance.setGlideActive(player, message.isActive);
|
||||
break;
|
||||
case SPEED:
|
||||
DarkSteelController.instance.setSpeedActive(player, message.isActive);
|
||||
break;
|
||||
case STEP_ASSIST:
|
||||
DarkSteelController.instance.setStepAssistActive(player, message.isActive);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package crazypants.enderio.item.darksteel;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -38,6 +39,11 @@ public class SpeedUpgrade extends AbstractUpgrade {
|
||||
protected float walkMultiplier;
|
||||
protected float sprintMultiplier;
|
||||
|
||||
public static boolean isEquipped(EntityPlayer player) {
|
||||
ItemStack legs = player.getEquipmentInSlot(2);
|
||||
return loadFromItem(legs) != null;
|
||||
}
|
||||
|
||||
public static SpeedUpgrade loadFromItem(ItemStack stack) {
|
||||
if(stack == null) {
|
||||
return null;
|
||||
|
||||
@@ -34,7 +34,7 @@ public class MachineRecipes {
|
||||
ItemStack silicon = new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal());
|
||||
ItemStack pulCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal());
|
||||
ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal());
|
||||
ItemStack electricSteel = new ItemStack(EnderIO.itemAlloy,1,Alloy.ELECTRICAL_STEEL.ordinal());
|
||||
ItemStack electricSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal());
|
||||
ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal());
|
||||
ItemStack phasedGold = new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal());
|
||||
ItemStack phasedIron = new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal());
|
||||
@@ -53,51 +53,54 @@ public class MachineRecipes {
|
||||
//Combustion Gen
|
||||
ItemStack res = new ItemStack(EnderIO.blockTank, 1, 0);
|
||||
ItemStack comGen = new ItemStack(EnderIO.blockCombustionGenerator, 1, 0);
|
||||
GameRegistry.addShapedRecipe(comGen, "eee", "rmr", "gpg", 'e', electricSteel, 'r', res, 'm', machineChassi, 'g', basicGear,'p', Blocks.piston);
|
||||
GameRegistry.addShapedRecipe(comGen, "eee", "rmr", "gpg", 'e', electricSteel, 'r', res, 'm', machineChassi, 'g', basicGear, 'p', Blocks.piston);
|
||||
|
||||
//ZombieGen
|
||||
ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0);
|
||||
GameRegistry.addShapedRecipe(zg, "eee", "qzq", "qqq", 'e', electricSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 0));
|
||||
|
||||
|
||||
//KillerJoe
|
||||
ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0);
|
||||
ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0);
|
||||
GameRegistry.addShapedRecipe(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie);
|
||||
|
||||
|
||||
//Wireless charger
|
||||
ItemStack wirelessCharger = new ItemStack(EnderIO.blockWirelessCharger);
|
||||
GameRegistry.addShapedRecipe(wirelessCharger, "svs", "imi", "scs", 's', electricSteel, 'i', silicon, 'm', machineChassi, 'c', capacitor3, 'v', vibCry);
|
||||
|
||||
|
||||
//Crafter
|
||||
ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0);
|
||||
GameRegistry.addShapedRecipe(crafter, "iti", "imi", "izi", 'i', Items.iron_ingot, 't', Blocks.crafting_table, 'm', machineChassi, 'z', zombieController);
|
||||
|
||||
|
||||
//Powered Spawner
|
||||
ItemStack poweredSpawner = new ItemStack(EnderIO.blockPoweredSpawner);
|
||||
ItemStack zombieBit;
|
||||
if(Config.useHardRecipes) {
|
||||
zombieBit = frankenZombie;
|
||||
} else {
|
||||
} else {
|
||||
zombieBit = zombieController;
|
||||
}
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(poweredSpawner, "ese","eme","vzv",'e', electricSteel, 's', "itemSkull", 'v', vibCry,'m',machineChassi, 'z', zombieBit));
|
||||
|
||||
//reservoir
|
||||
ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0);
|
||||
Object glassSides;
|
||||
if(Config.useHardRecipes) {
|
||||
glassSides = "blockGlassHardened";
|
||||
} else {
|
||||
glassSides = "glass";
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(poweredSpawner, "ese", "eme", "vzv", 'e', electricSteel, 's', "itemSkull", 'v', vibCry, 'm', machineChassi, 'z',
|
||||
zombieBit));
|
||||
|
||||
if(Config.reservoirEnabled) {
|
||||
//reservoir
|
||||
ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0);
|
||||
Object glassSides;
|
||||
if(Config.useHardRecipes) {
|
||||
glassSides = "blockGlassHardened";
|
||||
} else {
|
||||
glassSides = "glass";
|
||||
}
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz));
|
||||
}
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz));
|
||||
|
||||
//Tanks
|
||||
ItemStack basicTank = new ItemStack(EnderIO.blockTank,1,0);
|
||||
ItemStack basicTank = new ItemStack(EnderIO.blockTank, 1, 0);
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', Items.iron_ingot, 'b', Blocks.iron_bars));
|
||||
|
||||
ItemStack advTank = new ItemStack(EnderIO.blockTank,1,1);
|
||||
|
||||
ItemStack advTank = new ItemStack(EnderIO.blockTank, 1, 1);
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(advTank, "ibi", "bgb", "ibi", 'g', "blockGlassHardened", 'i', darkSteel, 'b', EnderIO.blockDarkIronBars));
|
||||
|
||||
|
||||
//mill
|
||||
ItemStack crusher = new ItemStack(EnderIO.blockCrusher, 1, 0);
|
||||
if(Config.useHardRecipes) {
|
||||
@@ -107,32 +110,31 @@ public class MachineRecipes {
|
||||
} else {
|
||||
GameRegistry.addShapedRecipe(crusher, "fff", "imi", "ipi", 'f', Items.flint, 'm', machineChassi, 'i', Items.iron_ingot, 'p', Blocks.piston);
|
||||
}
|
||||
|
||||
|
||||
//alloy smelter
|
||||
ItemStack alloySmelter = new ItemStack(EnderIO.blockAlloySmelter, 1, 0);
|
||||
if(Config.useHardRecipes) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(alloySmelter, "bfb", "fmf", "bcb", 'c', Items.cauldron, 'm', machineChassi, 'b', Blocks.iron_block, 'f',
|
||||
Blocks.furnace));
|
||||
} else {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(alloySmelter, "bfb", "fmf", "bcb", 'c', Items.cauldron, 'm', machineChassi, 'b', Items.iron_ingot, 'f',
|
||||
Blocks.furnace));
|
||||
|
||||
} else {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(alloySmelter, "bfb", "fmf", "bcb", 'c', Items.cauldron, 'm', machineChassi, 'b', Items.iron_ingot, 'f',
|
||||
Blocks.furnace));
|
||||
|
||||
}
|
||||
|
||||
//Vat
|
||||
ItemStack still = new ItemStack(EnderIO.blockVat, 1, 0);
|
||||
GameRegistry.addShapedRecipe(still, "eve", "tmt", "efe", 'v', Items.cauldron, 'm', machineChassi, 'e', electricSteel, 'f', Blocks.furnace, 't', basicTank);
|
||||
|
||||
|
||||
//capacitor bank
|
||||
ItemStack capacitorBank = new ItemStack(EnderIO.blockCapacitorBank, 1, 0);
|
||||
ItemStack capacitorBank = new ItemStack(EnderIO.blockCapacitorBank, 1, 0);
|
||||
if(Config.useHardRecipes) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "rcr", "ccc", "rMr", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block, 'M',
|
||||
machineChassi));
|
||||
} else {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "mcm", "crc", "mcm", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block));
|
||||
}
|
||||
|
||||
|
||||
//painter
|
||||
ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0);
|
||||
if(Config.useHardRecipes) {
|
||||
@@ -142,12 +144,12 @@ public class MachineRecipes {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(painter, "qdq", "mMm", "mmm", 'm', electricSteel, 'M', machineChassi, 'q', Items.quartz, 'd', Items.diamond,
|
||||
'd', Items.diamond));
|
||||
}
|
||||
|
||||
|
||||
//Farm
|
||||
ItemStack farm = new ItemStack(EnderIO.blockFarmStation, 1, 0);
|
||||
ItemStack farm = new ItemStack(EnderIO.blockFarmStation, 1, 0);
|
||||
if(Config.useHardRecipes) {
|
||||
zombieBit = frankenZombie;
|
||||
} else {
|
||||
} else {
|
||||
zombieBit = zombieController;
|
||||
}
|
||||
GameRegistry.addShapedRecipe(farm, "ehe", "eme", "pzp", 'h', Items.diamond_hoe, 'm', machineChassi, 'e', electricSteel, 'z', zombieController, 'p', pulCry);
|
||||
@@ -155,22 +157,25 @@ public class MachineRecipes {
|
||||
//transceiver
|
||||
ItemStack transceiver = new ItemStack(EnderIO.blockHyperCube, 1, 0);
|
||||
ItemStack obsidian = new ItemStack(Blocks.obsidian);
|
||||
|
||||
|
||||
GameRegistry
|
||||
.addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Items.ender_eye, 'c', enderCapacitor, 'p', phasedGold, 'd', Items.diamond);
|
||||
.addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Items.ender_eye, 'c', enderCapacitor, 'p', phasedGold, 'd', Items.diamond);
|
||||
|
||||
//solar panel
|
||||
if(Config.photovoltaicCellEnabled) {
|
||||
|
||||
|
||||
ItemStack solarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 0);
|
||||
ItemStack advSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 1);
|
||||
if(Config.useHardRecipes) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'c', capacitor, 'e',
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'c', capacitor,
|
||||
'e',
|
||||
energeticAlloy, 'p', phasedGold));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor2, 'e',
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor2,
|
||||
'e',
|
||||
phasedIron, 'p', phasedGold));
|
||||
} else {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'p', silicon, 'e',
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'p', silicon,
|
||||
'e',
|
||||
energeticAlloy, 'c', electricSteel));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vibCry, 'e',
|
||||
phasedGold, 'c', phasedIron));
|
||||
@@ -183,17 +188,17 @@ public class MachineRecipes {
|
||||
ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2);
|
||||
ItemStack mJMonitor = new ItemStack(EnderIO.blockPowerMonitor, 1, 0);
|
||||
GameRegistry
|
||||
.addShapedRecipe(mJMonitor, "sms", "sMs", "sps", 's', electricSteel, 'M', machineChassi, 'm', mJReader, 'p', powerConduit,
|
||||
'r', redstoneConduit);
|
||||
|
||||
.addShapedRecipe(mJMonitor, "sms", "sMs", "sps", 's', electricSteel, 'M', machineChassi, 'm', mJReader, 'p', powerConduit,
|
||||
'r', redstoneConduit);
|
||||
|
||||
//Enchanter
|
||||
ItemStack enchanter = new ItemStack(EnderIO.blockEnchanter);
|
||||
GameRegistry.addShapedRecipe(enchanter, "dbd", "sss", " s ", 'd', Items.diamond, 'b', Items.book, 's', darkSteel);
|
||||
|
||||
|
||||
//Vacuum Chest
|
||||
ItemStack vacuumChest = new ItemStack(EnderIO.blockVacuumChest);
|
||||
GameRegistry.addShapedRecipe(vacuumChest, "iii", "ici","ipi", 'i', Items.iron_ingot, 'c', Blocks.chest, 'p', pulCry);
|
||||
|
||||
GameRegistry.addShapedRecipe(vacuumChest, "iii", "ici", "ipi", 'i', Items.iron_ingot, 'c', Blocks.chest, 'p', pulCry);
|
||||
|
||||
//Soul Binder
|
||||
ItemStack enderBit;
|
||||
if(Config.soulBinderRequiresEndermanSkull) {
|
||||
@@ -205,37 +210,37 @@ public class MachineRecipes {
|
||||
ItemStack zombieSkull = new ItemStack(Items.skull, 1, 4);
|
||||
ItemStack skeletonSkull = new ItemStack(Items.skull, 1, 0);
|
||||
ItemStack soulBinder = new ItemStack(EnderIO.blockSoulFuser);
|
||||
GameRegistry.addShapedRecipe(soulBinder, "ses", "zmc","sks", 's', soularium, 'm', machineChassi, 'e', enderBit, 'z', zombieSkull, 'c', creeperSkull, 'k', skeletonSkull);
|
||||
|
||||
GameRegistry.addShapedRecipe(soulBinder, "ses", "zmc", "sks", 's', soularium, 'm', machineChassi, 'e', enderBit, 'z', zombieSkull, 'c', creeperSkull, 'k',
|
||||
skeletonSkull);
|
||||
|
||||
//Attractor
|
||||
ItemStack attractor = new ItemStack(EnderIO.blockAttractor);
|
||||
ItemStack attractorCrystal = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal());
|
||||
GameRegistry
|
||||
.addShapedRecipe(attractor, " c ", "ese", "sms", 's', soularium, 'm', machineChassi, 'c', attractorCrystal, 'e', energeticAlloy);
|
||||
|
||||
.addShapedRecipe(attractor, " c ", "ese", "sms", 's', soularium, 'm', machineChassi, 'c', attractorCrystal, 'e', energeticAlloy);
|
||||
|
||||
//Aversion
|
||||
ItemStack aversion = new ItemStack(EnderIO.blockSpawnGuard);
|
||||
ItemStack tormentedEnderman = new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal());
|
||||
GameRegistry
|
||||
.addShapedRecipe(aversion, " c ", "ese", "sms", 's', soularium, 'm', machineChassi, 'c', tormentedEnderman, 'e', energeticAlloy);
|
||||
|
||||
.addShapedRecipe(aversion, " c ", "ese", "sms", 's', soularium, 'm', machineChassi, 'c', tormentedEnderman, 'e', energeticAlloy);
|
||||
|
||||
//Experience
|
||||
ItemStack xp = new ItemStack(EnderIO.blockExperianceOblisk);
|
||||
ItemStack xpItem = new ItemStack(EnderIO.itemXpTransfer);
|
||||
GameRegistry
|
||||
.addShapedRecipe(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem);
|
||||
|
||||
.addShapedRecipe(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem);
|
||||
|
||||
ClearConfigRecipe inst = new ClearConfigRecipe();
|
||||
MinecraftForge.EVENT_BUS.register(inst);
|
||||
GameRegistry.addRecipe(inst);
|
||||
}
|
||||
|
||||
public static void addOreDictionaryRecipes() {
|
||||
ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0);
|
||||
ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0);
|
||||
ItemStack machineChassi = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal());
|
||||
ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0);
|
||||
|
||||
|
||||
//powered light
|
||||
ItemStack poweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, 0);
|
||||
ItemStack glowstone = new ItemStack(Items.glowstone_dust);
|
||||
@@ -243,18 +248,17 @@ public class MachineRecipes {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(poweredLamp, "ggg", "sds", "scs", 'g', fusedQuartz, 'd', glowstone, 's', "itemSilicon", 'c', capacitor));
|
||||
} else {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(poweredLamp, "ggg", "sds", "scs", 'g', "glass", 'd', glowstone, 's', "itemSilicon", 'c', capacitor));
|
||||
}
|
||||
}
|
||||
ItemStack invPoweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, 1);
|
||||
GameRegistry.addShapelessRecipe(invPoweredLamp, poweredLamp, Blocks.redstone_torch);
|
||||
GameRegistry.addShapelessRecipe(poweredLamp, invPoweredLamp, Blocks.redstone_torch);
|
||||
|
||||
|
||||
//light
|
||||
ItemStack lamp = new ItemStack(EnderIO.blockElectricLight, 1, 2);
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(lamp, " ", "ggg", "isi", 'g', "glass", 's', Blocks.glowstone, 'i', Items.iron_ingot));
|
||||
ItemStack invLamp = new ItemStack(EnderIO.blockElectricLight, 1, 3);
|
||||
GameRegistry.addShapelessRecipe(invLamp, lamp, Blocks.redstone_torch);
|
||||
GameRegistry.addShapelessRecipe(lamp, invLamp, Blocks.redstone_torch);
|
||||
|
||||
GameRegistry.addShapelessRecipe(lamp, invLamp, Blocks.redstone_torch);
|
||||
|
||||
//MJ Reader
|
||||
ItemStack mJReader = new ItemStack(EnderIO.itemConduitProbe, 1, 0);
|
||||
@@ -265,11 +269,12 @@ public class MachineRecipes {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(mJReader, "epe", "gcg", "srs", 'p', powerConduit, 'r', redstoneConduit, 'c', Items.comparator, 'g',
|
||||
Blocks.glass_pane, 's', "itemSilicon", 'e',
|
||||
electricalSteel));
|
||||
|
||||
|
||||
//Slice'N'Splice
|
||||
ItemStack soularium = new ItemStack(EnderIO.itemAlloy, 1, Alloy.SOULARIUM.ordinal());
|
||||
ItemStack sns = new ItemStack(EnderIO.blockSliceAndSplice);
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(sns, "iki", "ams","iii", 'i', soularium, 'm', machineChassi, 'k', "itemSkull", 'a', Items.iron_axe, 's', Items.shears));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(sns, "iki", "ams", "iii", 'i', soularium, 'm', machineChassi, 'k', "itemSkull", 'a', Items.iron_axe, 's',
|
||||
Items.shears));
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user