tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

General enhancements

Browse source
This commit is contained in:
Aidan Brady 2014-02-05 20:22:43 -05:00
parent 6e210f0730
commit b821be5417
12 changed files with 119 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/client/ClientProxy.java
View file

@ -338,7 +338,7 @@ public class ClientProxy extends CommonProxy
MinecraftForgeClient.registerItemRenderer(Mekanism.GasMask.itemID, handler);
MinecraftForgeClient.registerItemRenderer(Mekanism.ScubaTank.itemID, handler);
MinecraftForgeClient.registerItemRenderer(Mekanism.Balloon.itemID, handler);
MinecraftForgeClient.registerItemRenderer(Mekanism.FrictionBoots.itemID, handler);
MinecraftForgeClient.registerItemRenderer(Mekanism.FreeRunners.itemID, handler);
MinecraftForgeClient.registerItemRenderer(Mekanism.AtomicDisassembler.itemID, handler);
//Register block handlers

4
common/mekanism/client/ClientTickHandler.java
View file

@ -19,7 +19,7 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.item.ItemConfigurator;
import mekanism.common.item.ItemElectricBow;
import mekanism.common.item.ItemFrictionBoots;
import mekanism.common.item.ItemFreeRunners;
import mekanism.common.item.ItemGasMask;
import mekanism.common.item.ItemJetpack;
import mekanism.common.item.ItemJetpack.JetpackMode;
@ -310,7 +310,7 @@ public class ClientTickHandler implements ITickHandler
}
}
if(mc.thePlayer.getCurrentItemOrArmor(1) != null && mc.thePlayer.getCurrentItemOrArmor(1).getItem() instanceof ItemFrictionBoots)
if(mc.thePlayer.getCurrentItemOrArmor(1) != null && mc.thePlayer.getCurrentItemOrArmor(1).getItem() instanceof ItemFreeRunners)
{
mc.thePlayer.stepHeight = 1.002F;
}

4
common/mekanism/client/model/ModelFrictionBoots.java → common/mekanism/client/model/ModelFreeRunners.java
View file

@ -4,7 +4,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelFrictionBoots extends ModelBase
public class ModelFreeRunners extends ModelBase
{
ModelRenderer SpringL;
ModelRenderer SpringR;
@ -13,7 +13,7 @@ public class ModelFrictionBoots extends ModelBase
ModelRenderer SupportL;
ModelRenderer SupportR;
public ModelFrictionBoots()
public ModelFreeRunners()
{
textureWidth = 64;
textureHeight = 32;

12
common/mekanism/client/render/ModelCustomArmor.java
View file

@ -1,6 +1,6 @@
package mekanism.client.render;
import mekanism.client.model.ModelFrictionBoots;
import mekanism.client.model.ModelFreeRunners;
import mekanism.client.model.ModelGasMask;
import mekanism.client.model.ModelJetpack;
import mekanism.client.model.ModelScubaTank;
@ -145,19 +145,19 @@ public class ModelCustomArmor extends ModelBiped
GL11.glTranslatef(0, 0, -0.05F);
ArmorModel.gasMaskModel.render(0.0625F);
}
else if(biped.modelType == ArmorModel.FRICTIONBOOTS)
else if(biped.modelType == ArmorModel.FREERUNNERS)
{
GL11.glScalef(0.99F, 0.99F, 0.99F);
if(partRender == biped.bipedLeftLeg)
{
GL11.glTranslatef(-0.1375F, -0.75F, 0);
ArmorModel.frictionBootsModel.renderLeft(0.0625F);
ArmorModel.freeRunnersModel.renderLeft(0.0625F);
}
else if(partRender == biped.bipedRightLeg)
{
GL11.glTranslatef(0.1375F, -0.75F, 0);
ArmorModel.frictionBootsModel.renderRight(0.0625F);
ArmorModel.freeRunnersModel.renderRight(0.0625F);
}
}
}
@ -197,7 +197,7 @@ public class ModelCustomArmor extends ModelBiped
JETPACK(1, MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")),
SCUBATANK(1, MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")),
GASMASK(0, MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")),
FRICTIONBOOTS(3, MekanismUtils.getResource(ResourceType.RENDER, "FrictionBoots.png"));
FREERUNNERS(3, MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png"));
public int armorSlot;
public ResourceLocation resource;
@ -205,7 +205,7 @@ public class ModelCustomArmor extends ModelBiped
public static ModelJetpack jetpackModel = new ModelJetpack();
public static ModelGasMask gasMaskModel = new ModelGasMask();
public static ModelScubaTank scubaTankModel = new ModelScubaTank();
public static ModelFrictionBoots frictionBootsModel = new ModelFrictionBoots();
public static ModelFreeRunners freeRunnersModel = new ModelFreeRunners();
private ArmorModel(int i, ResourceLocation r)
{

12
common/mekanism/client/render/item/ItemRenderingHandler.java
View file

@ -7,7 +7,7 @@ import mekanism.client.MekanismClient;
import mekanism.client.model.ModelAtomicDisassembler;
import mekanism.client.model.ModelEnergyCube;
import mekanism.client.model.ModelEnergyCube.ModelEnergyCore;
import mekanism.client.model.ModelFrictionBoots;
import mekanism.client.model.ModelFreeRunners;
import mekanism.client.model.ModelGasMask;
import mekanism.client.model.ModelGasTank;
import mekanism.client.model.ModelJetpack;
@ -28,7 +28,7 @@ import mekanism.common.item.ItemAtomicDisassembler;
import mekanism.common.item.ItemBalloon;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemFrictionBoots;
import mekanism.common.item.ItemFreeRunners;
import mekanism.common.item.ItemGasMask;
import mekanism.common.item.ItemJetpack;
import mekanism.common.item.ItemRobit;
@ -73,7 +73,7 @@ public class ItemRenderingHandler implements IItemRenderer
public ModelJetpack jetpack = new ModelJetpack();
public ModelGasMask gasMask = new ModelGasMask();
public ModelScubaTank scubaTank = new ModelScubaTank();
public ModelFrictionBoots frictionBoots = new ModelFrictionBoots();
public ModelFreeRunners freeRunners = new ModelFreeRunners();
public ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler();
private final RenderBalloon balloonRenderer = new RenderBalloon();
@ -349,14 +349,14 @@ public class ItemRenderingHandler implements IItemRenderer
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png"));
scubaTank.render(0.0625F);
}
else if(item.getItem() instanceof ItemFrictionBoots)
else if(item.getItem() instanceof ItemFreeRunners)
{
GL11.glRotatef(180, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(90, 0.0F, -1.0F, 0.0F);
GL11.glScalef(2.0F, 2.0F, 2.0F);
GL11.glTranslatef(0.2F, -1.43F, 0.12F);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FrictionBoots.png"));
frictionBoots.render(0.0625F);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png"));
freeRunners.render(0.0625F);
}
else if(item.getItem() instanceof ItemBalloon)
{

4
common/mekanism/common/CommonPlayerTickHandler.java
View file

@ -3,7 +3,7 @@ package mekanism.common;
import java.util.EnumSet;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.item.ItemFrictionBoots;
import mekanism.common.item.ItemFreeRunners;
import mekanism.common.item.ItemGasMask;
import mekanism.common.item.ItemJetpack;
import mekanism.common.item.ItemJetpack.JetpackMode;
@ -87,7 +87,7 @@ public class CommonPlayerTickHandler implements ITickHandler
}
}
if(player.getCurrentItemOrArmor(1) != null && player.getCurrentItemOrArmor(1).getItem() instanceof ItemFrictionBoots)
if(player.getCurrentItemOrArmor(1) != null && player.getCurrentItemOrArmor(1).getItem() instanceof ItemFreeRunners)
{
player.stepHeight = 1.002F;
}

10
common/mekanism/common/Mekanism.java
View file

@ -66,7 +66,7 @@ import mekanism.common.item.ItemDirtyDust;
import mekanism.common.item.ItemDust;
import mekanism.common.item.ItemElectricBow;
import mekanism.common.item.ItemEnergized;
import mekanism.common.item.ItemFrictionBoots;
import mekanism.common.item.ItemFreeRunners;
import mekanism.common.item.ItemGasMask;
import mekanism.common.item.ItemIngot;
import mekanism.common.item.ItemJetpack;
@ -257,7 +257,7 @@ public class Mekanism
public static Item Sawdust;
public static Item Salt;
public static Item BrineBucket;
public static Item FrictionBoots;
public static Item FreeRunners;
//Blocks
public static Block BasicBlock;
@ -561,7 +561,7 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 8), new Object[] {
"CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicCore, Character.valueOf('S'), new ItemStack(BasicBlock, 1, 8)
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(FrictionBoots), new Object[] {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(FreeRunners), new Object[] {
"C C", "A A", "T T", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('T'), EnergyTablet.getUnchargedItem()
}));
@ -790,7 +790,7 @@ public class Mekanism
Salt = new ItemMekanism(configuration.getItem("Salt", 11231).getInt()).setUnlocalizedName("Salt");
BrineBucket = new ItemMekanism(configuration.getItem("BrineBucket", 11232).getInt()).setMaxStackSize(1).setUnlocalizedName("BrineBucket");
Crystal = new ItemCrystal(configuration.getItem("Crystal", 11233).getInt());
FrictionBoots = new ItemFrictionBoots(configuration.getItem("FrictionBoots", 11234).getInt()).setUnlocalizedName("FrictionBoots");
FreeRunners = new ItemFreeRunners(configuration.getItem("FreeRunners", 11234).getInt()).setUnlocalizedName("FreeRunners");
configuration.save();
@ -831,7 +831,7 @@ public class Mekanism
GameRegistry.registerItem(Salt, "Salt");
GameRegistry.registerItem(BrineBucket, "BrineBucket");
GameRegistry.registerItem(Crystal, "Crystal");
GameRegistry.registerItem(FrictionBoots, "FrictionBoots");
GameRegistry.registerItem(FreeRunners, "FrictionBoots");
}
/**

88
common/mekanism/common/item/ItemAtomicDisassembler.java
View file

@ -18,6 +18,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event.Result;
import net.minecraftforge.event.entity.player.UseHoeEvent;
public class ItemAtomicDisassembler extends ItemEnergized
{
@ -148,6 +151,91 @@ public class ItemAtomicDisassembler extends ItemEnergized
return itemstack;
}
@Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
{
if(!player.isSneaking())
{
if(!useHoe(stack, player, world, x, y, z, side))
{
if(world.getBlockId(x, y, z) != Block.tilledField.blockID)
{
return false;
}
}
switch(getEfficiency(stack))
{
case 20:
for(int x1 = x-1; x1 <= x+1; x1++)
{
for(int z1 = z-1; z1 <= z+1; z1++)
{
useHoe(stack, player, world, x1, y, z1, side);
}
}
break;
case 128:
for(int x1 = x-2; x1 <= x+2; x1++)
{
for(int z1 = z-2; z1 <= z+2; z1++)
{System.out.println("lol");
useHoe(stack, player, world, x1, y, z1, side);
}
}
break;
}
return true;
}
return false;
}
private boolean useHoe(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side)
{
if(!player.canPlayerEdit(x, y, z, side, stack))
{
return false;
}
else {
UseHoeEvent event = new UseHoeEvent(player, stack, world, x, y, z);
if(MinecraftForge.EVENT_BUS.post(event))
{
return false;
}
if(event.getResult() == Result.ALLOW)
{
return true;
}
int id = world.getBlockId(x, y, z);
boolean air = world.isAirBlock(x, y + 1, z);
if(side != 0 && air && (id == Block.grass.blockID || id == Block.dirt.blockID))
{
Block block = Block.tilledField;
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block.stepSound.getStepSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F);
if(world.isRemote)
{
return true;
}
else {
world.setBlock(x, y, z, block.blockID);
return true;
}
}
else {
return false;
}
}
}
public int getEfficiency(ItemStack itemStack)
{
switch(getMode(itemStack))

10
common/mekanism/common/item/ItemFrictionBoots.java → common/mekanism/common/item/ItemFreeRunners.java
View file

@ -31,12 +31,12 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemFrictionBoots extends ItemArmor implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem
public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem
{
/** The maximum amount of energy this item can hold. */
public double MAX_ELECTRICITY = 64000;
public ItemFrictionBoots(int id)
public ItemFreeRunners(int id)
{
super(id, EnumHelper.addArmorMaterial("FRICTIONBOOTS", 0, new int[] {0, 0, 0, 0}, 0), 0, 3);
setMaxStackSize(1);
@ -67,7 +67,7 @@ public class ItemFrictionBoots extends ItemArmor implements IEnergizedItem, ISpe
public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
{
ModelCustomArmor model = ModelCustomArmor.INSTANCE;
model.modelType = ArmorModel.FRICTIONBOOTS;
model.modelType = ArmorModel.FREERUNNERS;
return model;
}
@ -249,10 +249,10 @@ public class ItemFrictionBoots extends ItemArmor implements IEnergizedItem, ISpe
{
EntityLivingBase base = event.entityLiving;
if(base.getCurrentItemOrArmor(1) != null && base.getCurrentItemOrArmor(1).getItem() instanceof ItemFrictionBoots)
if(base.getCurrentItemOrArmor(1) != null && base.getCurrentItemOrArmor(1).getItem() instanceof ItemFreeRunners)
{
ItemStack stack = base.getCurrentItemOrArmor(1);
ItemFrictionBoots boots = (ItemFrictionBoots)stack.getItem();
ItemFreeRunners boots = (ItemFreeRunners)stack.getItem();
if(boots.getEnergy(stack) > 0 && event.source == DamageSource.fall)
{

2
common/mekanism/generators/client/BlockRenderingHandler.java
View file

@ -45,7 +45,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
{
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.0F, 0.3F, 0.0F);
GL11.glTranslatef(0.0F, 0.2F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png"));
advancedSolarGenerator.render(0.022F);
}

2
resources/assets/mekanism/lang/en_US.lang
View file

@ -31,7 +31,7 @@ item.CompressedRedstone.name=Compressed Redstone
item.Sawdust.name=Sawdust
item.Salt.name=Salt
item.BrineBucket.name=Brine Bucket
item.FrictionBoots.name=Friction Boots
item.FreeRunners.name=Free Runners
//Gas Tank
tile.GasTank.GasTank.name=Gas Tank

0
resources/assets/mekanism/render/FrictionBoots.png → resources/assets/mekanism/render/FreeRunners.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB