Laptop Change!

This commit is contained in:
Arcaratus committed 2014-12-03 17:18:03 -05:00
1 parent f24715f89c
commit 97e688ccdd
17 files changed
+198 -100

No files matched your search

@@ -6,8 +6,6 @@ import com.arc.bloodarsenal.items.ModItems;
import com.arc.bloodarsenal.items.bauble.VampireRing;
import com.arc.bloodarsenal.items.tinkers.BloodArsenalTinkers;
import com.arc.bloodarsenal.items.tinkers.RecipeHelper;
import com.arc.bloodarsenal.potion.PotionBleeding;
import com.arc.bloodarsenal.potion.PotionSwimming;
import com.arc.bloodarsenal.potion.PotionVampiricAura;
import com.arc.bloodarsenal.rituals.RitualRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
@@ -34,11 +32,11 @@ import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@Mod(modid="BloodArsenal", version="1.0.0", name="Blood Arsenal", dependencies="required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct", guiFactory = "com.arc.bloodarsenal.gui.ConfigGuiFactory")
@Mod(modid="BloodArsenal", version="1.1.0", name="Blood Arsenal", dependencies="required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct", guiFactory = "com.arc.bloodarsenal.gui.ConfigGuiFactory")
public class BloodArsenal
{
public static String MODID = "BloodArsenal";
public static String VERSION = "1.0.0";
public static String VERSION = "1.1.0";
public static String NAME = "Blood Arsenal";
@SidedProxy(clientSide = "com.arc.bloodarsenal.ClientProxy", serverSide = "com.arc.bloodarsenal.CommonProxy")
@@ -104,7 +102,7 @@ public class BloodArsenal
}
catch (Exception e)
{
logger.error("Severe error, please report this to the mod author:");
logger.error("ポケモン!");
logger.error(e);
}
}
@@ -130,9 +128,9 @@ public class BloodArsenal
proxy.registerRenders();
proxy.registerEvents();
vampiricAura = (new PotionVampiricAura(BloodArsenalConfig.vampiricAuraID, false, 0).setIconIndex(0, 0).setPotionName("Vampiric Aura"));
bleeding = (new PotionBleeding(BloodArsenalConfig.bleedingID, true, 0).setIconIndex(0, 0).setPotionName("Bleeding"));
swimming = (new PotionSwimming(BloodArsenalConfig.swimmingID, false, 0).setIconIndex(0, 0).setPotionName("Swimming"));
vampiricAura = new PotionVampiricAura(BloodArsenalConfig.vampiricAuraID, false, 0).setIconIndex(0, 0).setPotionName("Vampiric Aura");
bleeding = new PotionVampiricAura(BloodArsenalConfig.bleedingID, false, 0).setIconIndex(0, 0).setPotionName("Bleeding");
swimming = new PotionVampiricAura(BloodArsenalConfig.swimmingID, false, 0).setIconIndex(0, 0).setPotionName("Swimming");
}
@Mod.EventHandler
@@ -154,7 +152,7 @@ public class BloodArsenal
if (Loader.isModLoaded("TConstruct"))
{
isTinkersConstructLoaded = true;
logger.info("Loaded Tinker's Construct integration");
logger.info("Loaded Tinker's Construct integration ほし!");
BloodArsenalTinkers.addMaterials();
BloodArsenalTinkers.addParts();
@@ -9,9 +9,10 @@ public class BloodArsenalConfig
public static Configuration config;
// Config Categories
public static String potionid = "Potion ID";
public static String ritualblacklist = "Ritual Blacklist";
public static String toolsetting = "Tool Settings";
public static String potionId = "Potion ID";
public static String ritualBlacklist = "Ritual Blacklist";
public static String toolSetting = "Tool Settings";
public static String modSettings = "Mod Settings";
public static String misc = "Miscellaneous";
// Config Options
@@ -22,7 +23,10 @@ public class BloodArsenalConfig
// Tool Settings
public static boolean diamondToolsAllowed;
public static boolean tinkerToolsAllowed;
//ModSettings
public static boolean baublesIntegration;
public static boolean tinkersIntegration;
// Ritual Blacklist
public static boolean ritualDisabledMidas;
@@ -51,20 +55,23 @@ public class BloodArsenalConfig
public static void syncConfig()
{
config.addCustomCategoryComment(potionid, "Change potion ID's here if you have conflicts");
config.addCustomCategoryComment(toolsetting, "Settings for various tools");
config.addCustomCategoryComment(ritualblacklist, "Blacklist rituals that you don't want/like");
config.addCustomCategoryComment(potionId, "Change potion ID's here if you have conflicts");
config.addCustomCategoryComment(toolSetting, "Settings for various tools");
config.addCustomCategoryComment(modSettings, "Disable mod integration here");
config.addCustomCategoryComment(ritualBlacklist, "Blacklist rituals that you don't want/like");
config.addCustomCategoryComment(misc, "Random stuffs");
vampiricAuraID = config.get(potionid, "Vampiric Aura", 150).getInt(vampiricAuraID);
bleedingID = config.get(potionid, "Bleeding", 151).getInt(bleedingID);
swimmingID = config.get(potionid, "Swimming", 152).getInt(swimmingID);
vampiricAuraID = config.get(potionId, "Vampiric Aura", 50).getInt(vampiricAuraID);
bleedingID = config.get(potionId, "Bleeding", 51).getInt(bleedingID);
swimmingID = config.get(potionId, "Swimming", 52).getInt(swimmingID);
diamondToolsAllowed = config.get(toolsetting, "Are Infused Diamond tools allowed", true).getBoolean(diamondToolsAllowed);
tinkerToolsAllowed = config.get(toolsetting, "Are Tinker's Construct tools allowed (only when TConstruct is found)", true).getBoolean(tinkerToolsAllowed);
diamondToolsAllowed = config.get(toolSetting, "Are Infused Diamond tools allowed", true).getBoolean(diamondToolsAllowed);
ritualDisabledWither = config.get(ritualblacklist, "Ritual of Withering", false).getBoolean(ritualDisabledWither);
ritualDisabledMidas = config.get(ritualblacklist, "Midas Touch", false).getBoolean(ritualDisabledMidas);
baublesIntegration = config.get(modSettings, "Disable Baubles integration?", false).getBoolean(baublesIntegration);
tinkersIntegration = config.get(modSettings, "Disable TConstruct integration?", false).getBoolean(tinkersIntegration);
ritualDisabledWither = config.get(ritualBlacklist, "Ritual of Withering", false).getBoolean(ritualDisabledWither);
ritualDisabledMidas = config.get(ritualBlacklist, "Midas Touch", false).getBoolean(ritualDisabledMidas);
isRedGood = config.get(misc, "Is RED > PURPLE?", false, "Purple is always better than Red. But I won't tell you how to live your life. Even if it is incorrectly.").getBoolean(isRedGood);
cakeIsLie = config.get(misc, "The cake is a lie", false, "The cake is a lie").getBoolean(cakeIsLie);
@@ -1,17 +1,20 @@
package com.arc.bloodarsenal;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraftforge.event.entity.living.LivingAttackEvent;
import net.minecraftforge.event.entity.living.LivingEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
public class BloodArsenalEventHooks
{
public final float speed = 0.025F;
public static double rand = Math.random();
@SubscribeEvent
public void onEntityDamaged(LivingAttackEvent event)
@@ -30,13 +33,16 @@ public class BloodArsenalEventHooks
}
}
if (entityAttacked.isPotionActive(BloodArsenal.swimming))
if (entityAttacked instanceof EntityPlayer)
{
if (entityAttacked.isInsideOfMaterial(Material.lava))
if (entityAttacked.isPotionActive(BloodArsenal.swimming))
{
if (event.source.isFireDamage())
if (entityAttacked.isInsideOfMaterial(Material.lava))
{
event.setCanceled(true);
if (event.source.isFireDamage())
{
event.setCanceled(true);
}
}
}
}
@@ -49,68 +55,56 @@ public class BloodArsenalEventHooks
if (entityLiving.isPotionActive(BloodArsenal.bleeding))
{
int i = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getAmplifier();
int j = i + 1;
int amplifier = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getAmplifier();
int duration = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getDuration();
int damage = ((int)(rand * rand) * (amplifier + 1) + 3);
// if (entityLiving.worldObj.getWorldTime() % (20 / (i + 1)) == 0)
// {
// entityLiving.attackEntityFrom(BloodArsenal.deathFromBlood, 2);
// entityLiving.hurtResistantTime = Math.min(entityLiving.hurtResistantTime, 20 / (i + 1));
// }
if (entityLiving.worldObj.getWorldTime() % (20 / (amplifier + 1)) == 0)
{
entityLiving.attackEntityFrom(BloodArsenal.deathFromBlood, damage);
entityLiving.addPotionEffect(new PotionEffect(Potion.blindness.id, duration, 1));
entityLiving.hurtResistantTime = Math.min(entityLiving.hurtResistantTime, 20 / (amplifier + 1));
}
}
if (entityLiving.isPotionActive(BloodArsenal.swimming))
if (entityLiving instanceof EntityPlayer)
{
if (entityLiving instanceof EntityPlayer)
if (entityLiving.isPotionActive(BloodArsenal.swimming))
{
EntityLivingBase player = (EntityPlayer) entityLiving;
if (player.isInWater())
if (entityLiving.isInWater() || entityLiving.isInsideOfMaterial(Material.lava))
{
player.motionX *= 1.2D;
if (player.motionY > 0.0D)
entityLiving.setAir(300);
entityLiving.motionX *= 1.2D;
if (entityLiving.motionY > 0.0D)
{
player.motionY *= 1.2D;
entityLiving.motionY *= 1.2D;
}
player.motionZ *= 1.2D;
entityLiving.motionZ *= 1.2D;
double maxSpeed = 0.2D;
if (player.motionX > maxSpeed)
if (entityLiving.motionX > maxSpeed)
{
player.motionX = maxSpeed;
entityLiving.motionX = maxSpeed;
}
else if (player.motionX < -maxSpeed)
else if (entityLiving.motionX < -maxSpeed)
{
player.motionX = -maxSpeed;
entityLiving.motionX = -maxSpeed;
}
if (player.motionY > maxSpeed)
if (entityLiving.motionY > maxSpeed)
{
player.motionY = maxSpeed;
entityLiving.motionY = maxSpeed;
}
if (player.motionZ > maxSpeed)
if (entityLiving.motionZ > maxSpeed)
{
player.motionZ = maxSpeed;
entityLiving.motionZ = maxSpeed;
}
else if (player.motionZ < -maxSpeed)
else if (entityLiving.motionZ < -maxSpeed)
{
player.motionZ = -maxSpeed;
entityLiving.motionZ = -maxSpeed;
}
}
}
/* if (entityLiving.isInsideOfMaterial(Material.lava))
{
if (entityLiving instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer) entityLiving;
entityLiving.extinguish();
if ((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F)
{
player.moveFlying(0F, 1F, player.capabilities.isFlying ? speed : speed);
}
}
}
*/ }
}
}
@SubscribeEvent
@@ -118,12 +112,25 @@ public class BloodArsenalEventHooks
{
EntityLivingBase entityLiving = event.entityLiving;
if (entityLiving.isPotionActive(BloodArsenal.swimming))
if (entityLiving instanceof EntityPlayer)
{
if (entityLiving.isInsideOfMaterial(Material.water) || entityLiving.isInsideOfMaterial(Material.lava))
if (entityLiving.isPotionActive(BloodArsenal.swimming))
{
event.newSpeed = 1.75F;
if (entityLiving.isInWater() || entityLiving.isInsideOfMaterial(Material.lava))
{
event.newSpeed = 1.75F;
}
}
}
}
@SubscribeEvent
public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event)
{
if (event.modID.equals("BloodArsenal"))
{
BloodArsenalConfig.syncConfig();
BloodArsenal.logger.info("Refreshing configuration file");
}
}
}
@@ -128,7 +128,14 @@ public class BlockBloodCake extends Block
}
else if (player.canEat(true))
{
player.addChatMessage(new ChatComponentText("You are too full to eat any cake"));
if (BloodArsenalConfig.cakeIsLie)
{
player.addChatMessage(new ChatComponentText("The cake is a lie!"));
}
else
{
player.addChatMessage(new ChatComponentText("You are too full to eat any cake"));
}
}
}
@@ -20,6 +20,7 @@ public class BlockBloodInfusedRedstoneLamp extends Block
setHardness(0.5F);
setResistance(0.75F);
setStepSound(soundTypeGlass);
setCreativeTab(BloodArsenal.BA_TAB);
if (isOn)
@@ -64,6 +65,16 @@ public class BlockBloodInfusedRedstoneLamp extends Block
if (!world.isRemote && isOn && !world.isBlockIndirectlyGettingPowered(x, y, z))
{
isOn = true;
setLightLevel(1.0F);
setBlockTextureName("BloodArsenal:blood_infused_redstone_lamp_on");
world.scheduleBlockUpdate(x, y, z, this, 4);
}
else
{
isOn = false;
setLightLevel(0.0F);
setBlockTextureName("BloodArsenal:blood_infused_redstone_lamp_off");
world.scheduleBlockUpdate(x, y, z, this, 4);
}
}
}
@@ -28,7 +28,7 @@ public class EntityGatlingProjectile extends Entity implements IProjectile, IThr
protected int maxTicksInAir = 600;
private int ricochetCounter = 0;
private boolean scheduledForDeath = false;
protected int projectileDamage = 4;
protected int projectileDamage = 8;
public EntityGatlingProjectile(World par1World)
{
@@ -0,0 +1,56 @@
package com.arc.bloodarsenal.gui;
import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRecipe;
import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
import net.minecraft.item.ItemStack;
public class BindingRecipeNEI extends TemplateRecipeHandler
{
public class CachedBindingRecipe extends CachedRecipe
{
PositionedStack input;
PositionedStack output;
public CachedBindingRecipe(BindingRecipe recipe)
{
input = new PositionedStack(recipe.requiredItem, 38, 2, false);
output = new PositionedStack(recipe.outputItem, 132, 32, false);
}
@Override
public PositionedStack getIngredient()
{
return input;
}
@Override
public PositionedStack getResult()
{
return output;
}
}
@Override
public void loadCraftingRecipes(String outputId, Object... results)
{
if (outputId.equals("alchemicalwizardry.binding"))
{
}
}
@Override
public void loadCraftingRecipes(ItemStack result)
{
for(BindingRecipe recipe: BindingRegistry.bindingRecipes)
{
if(NEIServerUtils.areStacksSameTypeCrafting(recipe.outputItem, result))
{
if (recipe != null && recipe.outputItem != null) arecipes.add(new CachedBindingRecipe(recipe));
}
}
}
}
@@ -24,9 +24,9 @@ public class ConfigGui extends GuiConfig {
// Adds sections declared in BloodArsenalConfig. toLowerCase() is used because the configuration class automatically does this, so must we.
list.add(new ConfigElement<ConfigCategory>(config.getCategory(misc.toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory(potionid.toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory(ritualblacklist.toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory(toolsetting.toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory(potionId.toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory(ritualBlacklist.toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory(toolSetting.toLowerCase())));
return list;
}
@@ -16,6 +16,7 @@ public class SigilEnder extends EnergyItems implements IBindable
public SigilEnder()
{
super();
setMaxStackSize(1);
setUnlocalizedName("sigil_of_ender");
setTextureName("BloodArsenal:sigil_of_ender");
setCreativeTab(BloodArsenal.BA_TAB);
@@ -1,6 +1,7 @@
package com.arc.bloodarsenal.items.tinkers;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.BloodArsenalConfig;
import cpw.mods.fml.common.registry.GameRegistry;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.client.TConstructClientRegistry;
@@ -36,23 +37,29 @@ public class BloodArsenalTinkers
{
if (BloodArsenal.isTinkersConstructLoaded)
{
TConstructRegistry.addToolMaterial(250, "Blood Infused Iron", 3, 250, 2000, 2, 0.75F, 0, 0.0F , "", "");
if (BloodArsenalConfig.tinkersIntegration)
{
TConstructRegistry.addToolMaterial(250, "Blood Infused Iron", 3, 550, 1800, 3, 1.5F, 0, 0.0F, "", "");
TConstructClientRegistry.addMaterialRenderMapping(250, "BloodArsenal", "blood_infused_iron", true);
TConstructClientRegistry.addMaterialRenderMapping(250, "BloodArsenal", "blood_infused_iron", true);
TConstructRegistry.addBowMaterial(250, 500, 40, 1.2F);
TConstructRegistry.addBowMaterial(250, 500, 40, 1.2F);
TConstructRegistry.addArrowMaterial(250, 4.7F, 0.2F, 100.0F);
TConstructRegistry.addArrowMaterial(250, 4.7F, 0.2F, 100.0F);
}
}
}
public static void addParts()
{
initParts();
if (BloodArsenalConfig.tinkersIntegration)
{
initParts();
addMaterialToParts(250, "blood.infused.iron", "blood_infused_iron");
addMaterialToParts(250, "blood.infused.iron", "blood_infused_iron");
registerParts();
registerParts();
}
}
private static void initParts()
@@ -85,7 +85,7 @@ public class PartHelper extends Item implements IToolPart
{
for (Map.Entry<Integer, String> subItem : this.unlocalizedMaterialNames.entrySet())
{
int materialId = ((Integer)subItem.getKey()).intValue();
int materialId = (Integer)subItem.getKey().intValue();
itemStackList.add(new ItemStack(item, 1, materialId));
}
}
@@ -1,6 +1,7 @@
package com.arc.bloodarsenal.items.tinkers;
import com.arc.bloodarsenal.BloodArsenal;
import com.arc.bloodarsenal.items.ModItems;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -88,7 +89,8 @@ public class RecipeHelper
addPartBuilding(250);
unregisterMaterial(_bloodIron);
registerWithStation(new ItemStack(bloodIron, 1, 0), "Blood Infused Iron", 250, new ItemStack(_CHUNK, 1, 250));
// registerWithStation(new ItemStack(ModItems.blood_infused_iron, 1), "Blood Infused Iron", 250, new ItemStack(_CHUNK, 1, 250));
registerWithStation("Blood Infused Iron", "Blood Infused Iron", 250);
}
}
}