mirror of
https://github.com/dje4321/TerrafirmaPunk-Tweaks.git
synced 2024-09-28 23:00:54 +00:00
Damage system tweaks, various fixes, house keeping
Fixed damage with non-weapons doing 200 hp, fixed hedge maze doing little damage, fixed wooden bucket to iron bucket bug, provided US localization for bleeding effect
This commit is contained in:
parent
8fbb397717
commit
0a00fdaa8f
@ -1,6 +1,6 @@
|
|||||||
minecraft_version=1.7.10
|
minecraft_version=1.7.10
|
||||||
forge_version=10.13.4.1558-1.7.10
|
forge_version=10.13.4.1558-1.7.10
|
||||||
tfc_version=0.79.27
|
tfc_version=0.79.27
|
||||||
mod_version=1.07
|
mod_version=1.08
|
||||||
mod_id=TerraFirmaPunkTweaks
|
mod_id=TerraFirmaPunkTweaks
|
||||||
group_name=com.JAWolfe.tfptweaks
|
group_name=com.JAWolfe.TerraFirmaPunkTweaks
|
Binary file not shown.
BIN
builds/TerraFirmaPunkTweaks-1.7.10-1.08.jar
Normal file
BIN
builds/TerraFirmaPunkTweaks-1.7.10-1.08.jar
Normal file
Binary file not shown.
Binary file not shown.
BIN
builds/TerraFirmaPunkTweaks-1.7.10-deobf-1.08.jar
Normal file
BIN
builds/TerraFirmaPunkTweaks-1.7.10-deobf-1.08.jar
Normal file
Binary file not shown.
Binary file not shown.
BIN
builds/TerraFirmaPunkTweaks-1.7.10-src-1.08.jar
Normal file
BIN
builds/TerraFirmaPunkTweaks-1.7.10-src-1.08.jar
Normal file
Binary file not shown.
@ -1,6 +1,18 @@
|
|||||||
Changelog
|
Changelog
|
||||||
=================================================
|
=================================================
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
|
TFP Tweaks 1.08
|
||||||
|
-------------------------------------------------
|
||||||
|
New Features
|
||||||
|
+Added Wooden oil bucket support
|
||||||
|
+Added TF Hedge maze hits back
|
||||||
|
|
||||||
|
Tweaks
|
||||||
|
+Added "Potion of Bleeding" US localization to effect.bleeding.postfix
|
||||||
|
|
||||||
|
Bug Fixes
|
||||||
|
+Fixed Player damage to mobs with non-weapon items and open handed attacks
|
||||||
|
-------------------------------------------------
|
||||||
TFP Tweaks 1.07
|
TFP Tweaks 1.07
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
New Features
|
New Features
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
package com.JAWolfe.tfptweaks;
|
package com.JAWolfe.terrafirmapunktweaks;
|
||||||
|
|
||||||
import cpw.mods.fml.common.FMLLog;
|
import cpw.mods.fml.common.FMLLog;
|
||||||
import org.apache.logging.log4j.Level;
|
import org.apache.logging.log4j.Level;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.reference.References;
|
import com.JAWolfe.terrafirmapunktweaks.reference.References;
|
||||||
|
|
||||||
public class LogHelper
|
public class LogHelper
|
||||||
{
|
{
|
@ -1,8 +1,8 @@
|
|||||||
package com.JAWolfe.tfptweaks;
|
package com.JAWolfe.terrafirmapunktweaks;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.blocks.TFPBlocks;
|
import com.JAWolfe.terrafirmapunktweaks.blocks.TFPBlocks;
|
||||||
import com.JAWolfe.tfptweaks.reference.ConfigSettings;
|
import com.JAWolfe.terrafirmapunktweaks.reference.ConfigSettings;
|
||||||
import com.JAWolfe.tfptweaks.reference.References;
|
import com.JAWolfe.terrafirmapunktweaks.reference.References;
|
||||||
|
|
||||||
import codechicken.nei.api.API;
|
import codechicken.nei.api.API;
|
||||||
import codechicken.nei.api.IConfigureNEI;
|
import codechicken.nei.api.IConfigureNEI;
|
@ -1,8 +1,8 @@
|
|||||||
package com.JAWolfe.tfptweaks;
|
package com.JAWolfe.terrafirmapunktweaks;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.reference.ConfigSettings;
|
import com.JAWolfe.terrafirmapunktweaks.reference.ConfigSettings;
|
||||||
|
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
@ -1,10 +1,11 @@
|
|||||||
package com.JAWolfe.tfptweaks;
|
package com.JAWolfe.terrafirmapunktweaks;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.blocks.TFPBlocks;
|
import com.JAWolfe.terrafirmapunktweaks.blocks.TFPBlocks;
|
||||||
import com.JAWolfe.tfptweaks.handlers.*;
|
import com.JAWolfe.terrafirmapunktweaks.handlers.*;
|
||||||
import com.JAWolfe.tfptweaks.minetweaker.TFCTweaker;
|
import com.JAWolfe.terrafirmapunktweaks.items.TFPItems;
|
||||||
import com.JAWolfe.tfptweaks.proxy.CommonProxy;
|
import com.JAWolfe.terrafirmapunktweaks.minetweaker.TFCTweaker;
|
||||||
import com.JAWolfe.tfptweaks.reference.References;
|
import com.JAWolfe.terrafirmapunktweaks.proxy.CommonProxy;
|
||||||
|
import com.JAWolfe.terrafirmapunktweaks.reference.References;
|
||||||
|
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.common.Mod;
|
import cpw.mods.fml.common.Mod;
|
||||||
@ -30,7 +31,9 @@ public class TerraFirmaPunkTweaks
|
|||||||
ConfigHandler.init(event.getSuggestedConfigurationFile());
|
ConfigHandler.init(event.getSuggestedConfigurationFile());
|
||||||
FMLCommonHandler.instance().bus().register(new ConfigHandler());
|
FMLCommonHandler.instance().bus().register(new ConfigHandler());
|
||||||
|
|
||||||
TFPBlocks.setup();
|
TFPItems.initialise();
|
||||||
|
|
||||||
|
TFPBlocks.initialise();
|
||||||
|
|
||||||
proxy.registerTileEntities();
|
proxy.registerTileEntities();
|
||||||
}
|
}
|
||||||
@ -40,6 +43,8 @@ public class TerraFirmaPunkTweaks
|
|||||||
{
|
{
|
||||||
RecipeTweaks.RecipeFixes();
|
RecipeTweaks.RecipeFixes();
|
||||||
|
|
||||||
|
proxy.setupFluids();
|
||||||
|
|
||||||
MinecraftForge.EVENT_BUS.register(new PlayerInteractionHandler());
|
MinecraftForge.EVENT_BUS.register(new PlayerInteractionHandler());
|
||||||
MinecraftForge.EVENT_BUS.register(new PlayerDamageHandler());
|
MinecraftForge.EVENT_BUS.register(new PlayerDamageHandler());
|
||||||
|
|
@ -1,10 +1,10 @@
|
|||||||
package com.JAWolfe.tfptweaks;
|
package com.JAWolfe.terrafirmapunktweaks;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.reference.ConfigSettings;
|
import com.JAWolfe.terrafirmapunktweaks.reference.ConfigSettings;
|
||||||
import com.JAWolfe.tfptweaks.tiles.TEBoiler;
|
import com.JAWolfe.terrafirmapunktweaks.tiles.TEBoiler;
|
||||||
import com.JAWolfe.tfptweaks.tiles.TEFlashBoiler;
|
import com.JAWolfe.terrafirmapunktweaks.tiles.TEFlashBoiler;
|
||||||
|
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import mcp.mobius.waila.api.IWailaConfigHandler;
|
import mcp.mobius.waila.api.IWailaConfigHandler;
|
||||||
@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
|
||||||
|
|
||||||
public class WAILAInfo implements IWailaDataProvider
|
public class WAILAInfo implements IWailaDataProvider
|
||||||
{
|
{
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.blocks;
|
package com.JAWolfe.terrafirmapunktweaks.blocks;
|
||||||
|
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
@ -11,7 +11,7 @@ public class TFPBlocks
|
|||||||
public static Block tweakedboilerOn;
|
public static Block tweakedboilerOn;
|
||||||
public static Block tweakedFlashBoiler;
|
public static Block tweakedFlashBoiler;
|
||||||
|
|
||||||
public static void setup()
|
public static void initialise()
|
||||||
{
|
{
|
||||||
if(Loader.isModLoaded("Steamcraft"))
|
if(Loader.isModLoaded("Steamcraft"))
|
||||||
{
|
{
|
@ -1,8 +1,8 @@
|
|||||||
package com.JAWolfe.tfptweaks.blocks;
|
package com.JAWolfe.terrafirmapunktweaks.blocks;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.tiles.TEBoiler;
|
import com.JAWolfe.terrafirmapunktweaks.tiles.TEBoiler;
|
||||||
import com.bioxx.tfc.api.TFCFluids;
|
import com.bioxx.tfc.api.TFCFluids;
|
||||||
|
|
||||||
import flaxbeard.steamcraft.Steamcraft;
|
import flaxbeard.steamcraft.Steamcraft;
|
@ -1,8 +1,8 @@
|
|||||||
package com.JAWolfe.tfptweaks.blocks;
|
package com.JAWolfe.terrafirmapunktweaks.blocks;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.tiles.TEFlashBoiler;
|
import com.JAWolfe.terrafirmapunktweaks.tiles.TEFlashBoiler;
|
||||||
import com.bioxx.tfc.api.TFCFluids;
|
import com.bioxx.tfc.api.TFCFluids;
|
||||||
|
|
||||||
import flaxbeard.steamcraft.Steamcraft;
|
import flaxbeard.steamcraft.Steamcraft;
|
@ -1,9 +1,9 @@
|
|||||||
package com.JAWolfe.tfptweaks.handlers;
|
package com.JAWolfe.terrafirmapunktweaks.handlers;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.reference.ConfigSettings;
|
import com.JAWolfe.terrafirmapunktweaks.reference.ConfigSettings;
|
||||||
import com.JAWolfe.tfptweaks.reference.References;
|
import com.JAWolfe.terrafirmapunktweaks.reference.References;
|
||||||
|
|
||||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
@ -1,9 +1,8 @@
|
|||||||
package com.JAWolfe.tfptweaks.handlers;
|
package com.JAWolfe.terrafirmapunktweaks.handlers;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.LogHelper;
|
import com.JAWolfe.terrafirmapunktweaks.reference.ConfigSettings;
|
||||||
import com.JAWolfe.tfptweaks.reference.ConfigSettings;
|
|
||||||
import com.bioxx.tfc.Items.ItemTFCArmor;
|
import com.bioxx.tfc.Items.ItemTFCArmor;
|
||||||
import com.bioxx.tfc.api.Enums.EnumDamageType;
|
import com.bioxx.tfc.api.Enums.EnumDamageType;
|
||||||
import com.bioxx.tfc.api.Events.EntityArmorCalcEvent;
|
import com.bioxx.tfc.api.Events.EntityArmorCalcEvent;
|
||||||
@ -184,16 +183,57 @@ public class PlayerDamageHandler
|
|||||||
|
|
||||||
//Handle attacks done to mobs in the vanilla range from a non-TFC source and there is no attacking tag or is false
|
//Handle attacks done to mobs in the vanilla range from a non-TFC source and there is no attacking tag or is false
|
||||||
else if(event.ammount < 20 && !(event.entity instanceof EntityPlayer) && event.source != null && event.source.getEntity() != null &&
|
else if(event.ammount < 20 && !(event.entity instanceof EntityPlayer) && event.source != null && event.source.getEntity() != null &&
|
||||||
!event.source.getEntity().getClass().getName().contains("bioxx.tfc") &&
|
!event.source.getEntity().getClass().getName().contains("bioxx.tfc") && (!event.source.getEntity().getEntityData().hasKey("Attacking") ||
|
||||||
(!event.source.getEntity().getEntityData().hasKey("Attacking") ||
|
|
||||||
(event.source.getEntity().getEntityData().hasKey("Attacking") && !event.source.getEntity().getEntityData().getBoolean("Attacking"))))
|
(event.source.getEntity().getEntityData().hasKey("Attacking") && !event.source.getEntity().getEntityData().getBoolean("Attacking"))))
|
||||||
{
|
{
|
||||||
//Add "Attacking" tag to attacking entity
|
EntityLivingBase attacker = (EntityLivingBase)event.source.getEntity();
|
||||||
event.source.getEntity().getEntityData().setBoolean("Attacking", true);
|
Entity target = event.entity;
|
||||||
|
|
||||||
//Add damage for general damage
|
//Add damage for general damage
|
||||||
if(ConfigSettings.VanillaMobDamageScaling && !"indirectMagic".contentEquals(event.source.damageType))
|
if (ConfigSettings.VanillaMobDamageScaling && !"indirectMagic".contentEquals(event.source.damageType)
|
||||||
event.entity.attackEntityFrom(event.source, event.ammount * ConfigSettings.VanillaMobDamageMultipier);
|
&& target.canAttackWithItem())
|
||||||
|
{
|
||||||
|
if (!target.hitByEntity(target))
|
||||||
|
{
|
||||||
|
float damageAmount = ConfigSettings.VanillaPvPNonWeaponDamageMultipier;
|
||||||
|
if(attacker.getHeldItem() != null)
|
||||||
|
{
|
||||||
|
damageAmount = (float)attacker.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue();
|
||||||
|
|
||||||
|
if(damageAmount <= 1)
|
||||||
|
damageAmount *= ConfigSettings.VanillaPvPNonWeaponDamageMultipier;
|
||||||
|
else
|
||||||
|
damageAmount *= ConfigSettings.VanillaMobDamageMultipier;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (attacker.isPotionActive(Potion.damageBoost))
|
||||||
|
damageAmount += 3 << attacker.getActivePotionEffect(Potion.damageBoost).getAmplifier();
|
||||||
|
|
||||||
|
float enchantmentDamage = 0;
|
||||||
|
|
||||||
|
if (target instanceof EntityLiving)
|
||||||
|
{
|
||||||
|
enchantmentDamage = EnchantmentHelper.getEnchantmentModifierLiving(attacker, (EntityLiving) target);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (damageAmount > 0 || enchantmentDamage > 0)
|
||||||
|
{
|
||||||
|
boolean criticalHit = attacker.fallDistance > 0.0F && !attacker.onGround &&
|
||||||
|
!attacker.isOnLadder() && !attacker.isInWater() &&
|
||||||
|
!attacker.isPotionActive(Potion.blindness) && attacker.ridingEntity == null &&
|
||||||
|
target instanceof EntityLiving;
|
||||||
|
|
||||||
|
if (criticalHit && damageAmount > 0)
|
||||||
|
damageAmount += event.entity.worldObj.rand.nextInt((int) (damageAmount / 2 + 2));
|
||||||
|
|
||||||
|
damageAmount += enchantmentDamage;
|
||||||
|
|
||||||
|
//Add "Attacking" tag to attacking entity
|
||||||
|
event.source.getEntity().getEntityData().setBoolean("Attacking", true);
|
||||||
|
target.attackEntityFrom(event.source, damageAmount);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//Add damage for indirect magic damage
|
//Add damage for indirect magic damage
|
||||||
if(ConfigSettings.VanillaMagicScaling && "indirectMagic".contentEquals(event.source.damageType))
|
if(ConfigSettings.VanillaMagicScaling && "indirectMagic".contentEquals(event.source.damageType))
|
||||||
@ -207,6 +247,10 @@ public class PlayerDamageHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if(event.source == DamageSource.cactus && event.ammount <=3 && ConfigSettings.VanillaMobDamageScaling)
|
||||||
|
{
|
||||||
|
event.entity.attackEntityFrom(event.source, event.ammount * ConfigSettings.VanillaMobDamageMultipier);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
@ -1,18 +1,21 @@
|
|||||||
package com.JAWolfe.tfptweaks.handlers;
|
package com.JAWolfe.terrafirmapunktweaks.handlers;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.blocks.TFPBlocks;
|
import com.JAWolfe.terrafirmapunktweaks.blocks.TFPBlocks;
|
||||||
import com.JAWolfe.tfptweaks.reference.ConfigSettings;
|
import com.JAWolfe.terrafirmapunktweaks.items.TFPItems;
|
||||||
import com.JAWolfe.tfptweaks.reference.ReferenceLists;
|
import com.JAWolfe.terrafirmapunktweaks.reference.ConfigSettings;
|
||||||
|
import com.JAWolfe.terrafirmapunktweaks.reference.ReferenceLists;
|
||||||
import com.bioxx.tfc.Core.TFC_Core;
|
import com.bioxx.tfc.Core.TFC_Core;
|
||||||
import com.bioxx.tfc.Items.ItemTerra;
|
import com.bioxx.tfc.Items.ItemTerra;
|
||||||
import com.bioxx.tfc.TileEntities.TEAnvil;
|
import com.bioxx.tfc.TileEntities.TEAnvil;
|
||||||
import com.bioxx.tfc.api.HeatIndex;
|
import com.bioxx.tfc.api.HeatIndex;
|
||||||
import com.bioxx.tfc.api.HeatRegistry;
|
import com.bioxx.tfc.api.HeatRegistry;
|
||||||
import com.bioxx.tfc.api.TFCBlocks;
|
import com.bioxx.tfc.api.TFCBlocks;
|
||||||
|
import com.bioxx.tfc.api.TFCItems;
|
||||||
import com.bioxx.tfc.api.TFC_ItemHeat;
|
import com.bioxx.tfc.api.TFC_ItemHeat;
|
||||||
|
|
||||||
|
import buildcraft.BuildCraftEnergy;
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
import cpw.mods.fml.common.eventhandler.Event.Result;
|
import cpw.mods.fml.common.eventhandler.Event.Result;
|
||||||
@ -28,6 +31,7 @@ import net.minecraft.util.EnumChatFormatting;
|
|||||||
import net.minecraft.util.MathHelper;
|
import net.minecraft.util.MathHelper;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
|
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
|
||||||
|
import net.minecraftforge.event.entity.player.FillBucketEvent;
|
||||||
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
|
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
|
||||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
|
import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
|
||||||
@ -109,6 +113,20 @@ public class PlayerInteractionHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public void onFillBucket(FillBucketEvent event)
|
||||||
|
{
|
||||||
|
ItemStack itemInHand = event.entityPlayer.getCurrentEquippedItem();
|
||||||
|
|
||||||
|
if(event.getResult() != Result.DENY && itemInHand.getItem() == TFCItems.woodenBucketEmpty)
|
||||||
|
{
|
||||||
|
if(event.result != null && event.result.getItem() == BuildCraftEnergy.bucketOil)
|
||||||
|
{
|
||||||
|
event.result = new ItemStack(TFPItems.CustomBucketOil);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onBlockPlaced(PlayerInteractEvent event)
|
public void onBlockPlaced(PlayerInteractEvent event)
|
||||||
{
|
{
|
@ -0,0 +1,31 @@
|
|||||||
|
package com.JAWolfe.terrafirmapunktweaks.items;
|
||||||
|
|
||||||
|
import com.JAWolfe.terrafirmapunktweaks.reference.References;
|
||||||
|
import com.bioxx.tfc.Items.Tools.ItemCustomBucket;
|
||||||
|
import com.bioxx.tfc.api.Enums.EnumSize;
|
||||||
|
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
|
||||||
|
public class CustomBucketOil extends ItemCustomBucket
|
||||||
|
{
|
||||||
|
public CustomBucketOil(Block contents)
|
||||||
|
{
|
||||||
|
super(contents);
|
||||||
|
this.setFolder("tools/");
|
||||||
|
this.setSize(EnumSize.MEDIUM);
|
||||||
|
}
|
||||||
|
|
||||||
|
public CustomBucketOil(Block contents, Item container)
|
||||||
|
{
|
||||||
|
this(contents);
|
||||||
|
this.setContainerItem(container);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void registerIcons(IIconRegister registerer)
|
||||||
|
{
|
||||||
|
this.itemIcon = registerer.registerIcon(References.ModID + ":" + this.getUnlocalizedName().replace("item.", ""));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,19 @@
|
|||||||
|
package com.JAWolfe.terrafirmapunktweaks.items;
|
||||||
|
|
||||||
|
import com.bioxx.tfc.api.TFCItems;
|
||||||
|
|
||||||
|
import buildcraft.BuildCraftEnergy;
|
||||||
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
|
||||||
|
public class TFPItems
|
||||||
|
{
|
||||||
|
public static Item CustomBucketOil;
|
||||||
|
|
||||||
|
public static void initialise()
|
||||||
|
{
|
||||||
|
CustomBucketOil = new CustomBucketOil(BuildCraftEnergy.blockOil, TFCItems.woodenBucketEmpty).setUnlocalizedName("Wooden Bucket Oil");
|
||||||
|
|
||||||
|
GameRegistry.registerItem(CustomBucketOil, CustomBucketOil.getUnlocalizedName());
|
||||||
|
}
|
||||||
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.minetweaker.Buildcraft;
|
package com.JAWolfe.terrafirmapunktweaks.minetweaker.Buildcraft;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.minetweaker.Buildcraft;
|
package com.JAWolfe.terrafirmapunktweaks.minetweaker.Buildcraft;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
@ -1,11 +1,9 @@
|
|||||||
package com.JAWolfe.tfptweaks.minetweaker.TFC;
|
package com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.LogHelper;
|
import com.JAWolfe.terrafirmapunktweaks.reference.ReferenceLists;
|
||||||
import com.JAWolfe.tfptweaks.reference.ReferenceLists;
|
|
||||||
import com.JAWolfe.tfptweaks.reference.References;
|
|
||||||
import com.bioxx.tfc.api.Crafting.AnvilManager;
|
import com.bioxx.tfc.api.Crafting.AnvilManager;
|
||||||
import com.bioxx.tfc.api.Crafting.AnvilRecipe;
|
import com.bioxx.tfc.api.Crafting.AnvilRecipe;
|
||||||
import com.bioxx.tfc.api.Crafting.AnvilReq;
|
import com.bioxx.tfc.api.Crafting.AnvilReq;
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.minetweaker.TFC;
|
package com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.minetweaker.TFC;
|
package com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -71,7 +71,6 @@ public class ItemHeat
|
|||||||
{
|
{
|
||||||
addRecipe(output, oredictentry, 600);
|
addRecipe(output, oredictentry, 600);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ZenMethod
|
@ZenMethod
|
||||||
public static void removeRecipe(IItemStack input)
|
public static void removeRecipe(IItemStack input)
|
||||||
{
|
{
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.minetweaker.TFC;
|
package com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.minetweaker.TFC;
|
package com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,12 +1,12 @@
|
|||||||
package com.JAWolfe.tfptweaks.minetweaker;
|
package com.JAWolfe.terrafirmapunktweaks.minetweaker;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.minetweaker.Buildcraft.AssemblyTable;
|
import com.JAWolfe.terrafirmapunktweaks.minetweaker.Buildcraft.AssemblyTable;
|
||||||
import com.JAWolfe.tfptweaks.minetweaker.TFC.Anvil;
|
import com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC.Anvil;
|
||||||
import com.JAWolfe.tfptweaks.minetweaker.TFC.Barrel;
|
import com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC.Barrel;
|
||||||
import com.JAWolfe.tfptweaks.minetweaker.TFC.ItemHeat;
|
import com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC.ItemHeat;
|
||||||
import com.JAWolfe.tfptweaks.minetweaker.TFC.Loom;
|
import com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC.Loom;
|
||||||
import com.JAWolfe.tfptweaks.minetweaker.TFC.Quern;
|
import com.JAWolfe.terrafirmapunktweaks.minetweaker.TFC.Quern;
|
||||||
import com.JAWolfe.tfptweaks.reference.ConfigSettings;
|
import com.JAWolfe.terrafirmapunktweaks.reference.ConfigSettings;
|
||||||
|
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import minetweaker.MineTweakerAPI;
|
import minetweaker.MineTweakerAPI;
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.proxy;
|
package com.JAWolfe.terrafirmapunktweaks.proxy;
|
||||||
|
|
||||||
public class ClientProxy extends CommonProxy
|
public class ClientProxy extends CommonProxy
|
||||||
{
|
{
|
@ -0,0 +1,36 @@
|
|||||||
|
package com.JAWolfe.terrafirmapunktweaks.proxy;
|
||||||
|
|
||||||
|
import com.JAWolfe.terrafirmapunktweaks.items.TFPItems;
|
||||||
|
import com.JAWolfe.terrafirmapunktweaks.tiles.TEBoiler;
|
||||||
|
import com.JAWolfe.terrafirmapunktweaks.tiles.TEFlashBoiler;
|
||||||
|
import com.bioxx.tfc.api.TFCItems;
|
||||||
|
|
||||||
|
import buildcraft.BuildCraftEnergy;
|
||||||
|
import cpw.mods.fml.common.Loader;
|
||||||
|
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||||
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||||
|
import net.minecraftforge.fluids.FluidRegistry;
|
||||||
|
|
||||||
|
public class CommonProxy
|
||||||
|
{
|
||||||
|
public void registerTileEntities()
|
||||||
|
{
|
||||||
|
if(Loader.isModLoaded("Steamcraft"))
|
||||||
|
{
|
||||||
|
GameRegistry.registerTileEntity(TEBoiler.class, "TEBoiler");
|
||||||
|
GameRegistry.registerTileEntity(TEFlashBoiler.class, "TEFlashBoiler");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setupFluids()
|
||||||
|
{
|
||||||
|
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid(BuildCraftEnergy.fluidOil.getName()), new ItemStack(TFPItems.CustomBucketOil), new ItemStack(TFCItems.woodenBucketEmpty));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void registerWAILA()
|
||||||
|
{
|
||||||
|
FMLInterModComms.sendMessage("Waila", "register", "com.JAWolfe.terrafirmapunktweaks.WAILAInfo.callbackRegister");
|
||||||
|
}
|
||||||
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.reference;
|
package com.JAWolfe.terrafirmapunktweaks.reference;
|
||||||
|
|
||||||
public class ConfigSettings
|
public class ConfigSettings
|
||||||
{
|
{
|
@ -1,10 +1,8 @@
|
|||||||
package com.JAWolfe.tfptweaks.reference;
|
package com.JAWolfe.terrafirmapunktweaks.reference;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.LogHelper;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ReferenceLists
|
public class ReferenceLists
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.reference;
|
package com.JAWolfe.terrafirmapunktweaks.reference;
|
||||||
|
|
||||||
public class References
|
public class References
|
||||||
{
|
{
|
||||||
@ -18,6 +18,6 @@ public class References
|
|||||||
";required-after:" + MODID_SC2 +
|
";required-after:" + MODID_SC2 +
|
||||||
";required-after:" + MODID_FSP;
|
";required-after:" + MODID_FSP;
|
||||||
|
|
||||||
public static final String SERVER_PROXY_CLASS = "com.JAWolfe.tfptweaks.proxy.CommonProxy";
|
public static final String SERVER_PROXY_CLASS = "com.JAWolfe.terrafirmapunktweaks.proxy.CommonProxy";
|
||||||
public static final String CLIENT_PROXY_CLASS = "com.JAWolfe.tfptweaks.proxy.ClientProxy";
|
public static final String CLIENT_PROXY_CLASS = "com.JAWolfe.terrafirmapunktweaks.proxy.ClientProxy";
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package com.JAWolfe.tfptweaks.tiles;
|
package com.JAWolfe.terrafirmapunktweaks.tiles;
|
||||||
|
|
||||||
import com.bioxx.tfc.api.TFCFluids;
|
import com.bioxx.tfc.api.TFCFluids;
|
||||||
|
|
@ -1,8 +1,8 @@
|
|||||||
package com.JAWolfe.tfptweaks.tiles;
|
package com.JAWolfe.terrafirmapunktweaks.tiles;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.blocks.TFPBlocks;
|
import com.JAWolfe.terrafirmapunktweaks.blocks.TFPBlocks;
|
||||||
import com.bioxx.tfc.api.TFCFluids;
|
import com.bioxx.tfc.api.TFCFluids;
|
||||||
|
|
||||||
import flaxbeard.steamcraft.api.ISteamTransporter;
|
import flaxbeard.steamcraft.api.ISteamTransporter;
|
@ -1,25 +0,0 @@
|
|||||||
package com.JAWolfe.tfptweaks.proxy;
|
|
||||||
|
|
||||||
import com.JAWolfe.tfptweaks.tiles.TEBoiler;
|
|
||||||
import com.JAWolfe.tfptweaks.tiles.TEFlashBoiler;
|
|
||||||
|
|
||||||
import cpw.mods.fml.common.Loader;
|
|
||||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
|
||||||
|
|
||||||
public class CommonProxy
|
|
||||||
{
|
|
||||||
public void registerTileEntities()
|
|
||||||
{
|
|
||||||
if(Loader.isModLoaded("Steamcraft"))
|
|
||||||
{
|
|
||||||
GameRegistry.registerTileEntity(TEBoiler.class, "TEBoiler");
|
|
||||||
GameRegistry.registerTileEntity(TEFlashBoiler.class, "TEFlashBoiler");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void registerWAILA()
|
|
||||||
{
|
|
||||||
FMLInterModComms.sendMessage("Waila", "register", "com.JAWolfe.tfptweaks.WAILAInfo.callbackRegister");
|
|
||||||
}
|
|
||||||
}
|
|
@ -10,3 +10,13 @@
|
|||||||
#=======
|
#=======
|
||||||
gui.tfptweaks.watertank=Water Tank
|
gui.tfptweaks.watertank=Water Tank
|
||||||
gui.tfptweaks.steamtank=Steam Tank
|
gui.tfptweaks.steamtank=Steam Tank
|
||||||
|
|
||||||
|
#=========
|
||||||
|
#= Items =
|
||||||
|
#=========
|
||||||
|
item.Wooden Bucket Oil.name=Wooden Bucket Oil
|
||||||
|
|
||||||
|
#===========
|
||||||
|
#= Effects =
|
||||||
|
#===========
|
||||||
|
effect.bleed.postfix=Potion of Bleeding
|
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
Loading…
Reference in New Issue
Block a user