Skip to content

Commit

Permalink
Update to 1.0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Otho committed Jan 4, 2015
1 parent 6929afd commit cfe756a
Show file tree
Hide file tree
Showing 28 changed files with 40 additions and 247 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

apply plugin: 'forge'

version = "1.0.7_beta_1.7.10"
version = "1.0.8_beta_1.7.10"
group= "me.otho.customItems" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "customitems"

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/otho/customItems/ModReference.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public class ModReference {
public static final String MOD_ID = "customitems";
public static final String MOD_NAME = "Custom Items";
public static final String DEPENDENCIES = "";
public static final String VERSION = "1.0.7b";
public static final String VERSION = "1.0.8b";

public static final String CLIENT_PROXY_CLASS = "me.otho.customItems.proxy.ClientProxy";
public static final String SERVER_PROXY_CLASS = "me.otho.customItems.proxy.ServerProxy";
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/otho/customItems/configuration/jsonReaders/blocks/Cfg_fluid.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

public class Cfg_fluid extends Cfg_basicData
{
//public int luminosity = 0;
public float lightLevel = 0.0f;
public int luminosity = 0;
//public float lightLevel = 0.0f;
public int density = 1000;
public int temperature = 300;
public int viscosity = 1000;
Expand Down
10 changes: 2 additions & 8 deletions src/main/java/me/otho/customItems/mod/blocks/CustomBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,8 @@ public String getUnlocalizedName() {
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
if(textureNames == null)
{
if(this.textureName == null)
{
blockIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}else
{
for (int i = 0; i < icons.length; i++) {
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/blocks/CustomChest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,7 @@ public IIcon getIcon(int side, int meta) {
public void registerBlockIcons(IIconRegister iconRegister) {
if(textureNames == null)
{
if(this.textureName == null)
{
blockIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}else
{
for (int i = 0; i < icons.length; i++) {
Expand Down
11 changes: 2 additions & 9 deletions src/main/java/me/otho/customItems/mod/blocks/CustomCrop.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,8 @@ public int getRenderType() {
public void registerBlockIcons(IIconRegister iconRegister) {
LogHelper.debug("registering icon for: " + this.getUnlocalizedName());
this.icons = new IIcon[4];
for(int i=1;i<this.icons.length+1;i++) {
if(this.textureName == null)
{
this.icons[i-1] = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf('.') + 1)+i);
}else
{
this.icons[i-1] = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName+i);
}

for(int i=1;i<this.icons.length+1;i++) {
this.icons[i-1] = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName+i);
}
}

Expand Down
10 changes: 2 additions & 8 deletions src/main/java/me/otho/customItems/mod/blocks/CustomFallingBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,8 @@ public String getUnlocalizedName() {
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
if(textureNames == null)
{
if(this.textureName == null)
{
blockIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}else
{
for (int i = 0; i < icons.length; i++) {
Expand Down
26 changes: 3 additions & 23 deletions src/main/java/me/otho/customItems/mod/blocks/CustomFenceBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@ public class CustomFenceBlock extends BlockFence{

public CustomFenceBlock(String p_i45406_1_, Material p_i45406_2_) {
super(p_i45406_1_, p_i45406_2_);
}

// @Override
// public int getRenderType()
// {
// return 0;
// }
}

private IIcon[] icons = new IIcon[6];
private boolean canSilkHarvest;
Expand All @@ -43,14 +37,6 @@ public CustomFenceBlock(String p_i45406_1_, Material p_i45406_2_) {
private String[] textureNames;
protected boolean breaks;

// @Override
// @SideOnly(Side.CLIENT)
// public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
// {
// Block i1 = par1IBlockAccess.getBlock(par2, par3, par4);
// return i1 == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5);
// }

@Override
@SideOnly(Side.CLIENT)
public int getRenderBlockPass()
Expand Down Expand Up @@ -156,14 +142,8 @@ public String getUnlocalizedName() {
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
if(textureNames == null)
{
if(this.textureName == null)
{
blockIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}else
{
for (int i = 0; i < icons.length; i++) {
Expand Down
13 changes: 3 additions & 10 deletions src/main/java/me/otho/customItems/mod/blocks/CustomPaneBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,9 @@ public String getUnlocalizedName() {
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
if(textureNames == null)
{
if(this.textureName == null)
{
blockIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
this.field_150102_N = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
this.field_150102_N = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
this.field_150102_N = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}else
{
icons[5] = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + textureNames[5]);
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/blocks/CustomRotatedPillar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,7 @@ public String getUnlocalizedName() {
public void registerBlockIcons(IIconRegister iconRegister) {
if(textureNames == null)
{
if(this.textureName == null)
{
blockIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}else
{
for (int i = 0; i < icons.length; i++) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/me/otho/customItems/mod/blocks/CustomSlabBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ public CustomSlabBlock(boolean p_i45410_1_, Material p_i45410_2_, String name)
this.opaque = true;
}
else
{

{
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F);
}

Expand Down
62 changes: 0 additions & 62 deletions src/main/java/me/otho/customItems/mod/blocks/CustomSlabBlock2.java
View file

This file was deleted.

8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/blocks/CustomStairsBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,7 @@ public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x
public void registerBlockIcons(IIconRegister iconRegister) {
if(textureNames == null)
{
if(this.textureName == null)
{
blockIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}else
{
for (int i = 0; i < icons.length; i++) {
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/blocks/CustomWallBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,7 @@ public String getUnlocalizedName() {
public void registerBlockIcons(IIconRegister iconRegister) {
if(textureNames == null)
{
if(this.textureName == null)
{
blockIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}
blockIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName);
}else
{
for (int i = 0; i < icons.length; i++) {
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/items/CustomBucket.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ public CustomBucket(CustomFluidBlock fluid, String textureName) {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
if(this.iconString == null)
{
itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName + "_bucket");
}
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName + "_bucket");
}
}
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/items/CustomItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@ public String getUnlocalizedName() {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
if(this.iconString == null)
{
itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}

}
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/items/CustomSeed.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ public String getUnlocalizedName() {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
if(this.iconString == null)
{
itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
}
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/items/armor/CustomArmor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ public String getArmorTexture(ItemStack stack, Entity entity, int slot, String t
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
if(this.textureName == null)
{
itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName + "_" + this.typeName);
}
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.textureName + "_" + this.typeName);
}
}
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/items/food/CustomFood.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,7 @@ public String getUnlocalizedName() {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
if(this.iconString == null)
{
itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}

@Override
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/items/tools/CustomAxe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ public CustomAxe(ToolMaterial mat) {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
if(this.iconString == null)
{
itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
}
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/items/tools/CustomHoe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ public CustomHoe(ToolMaterial mat) {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
if(this.iconString == null)
{
itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
}
8 changes: 1 addition & 7 deletions src/main/java/me/otho/customItems/mod/items/tools/CustomPickaxe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ public CustomPickaxe(ToolMaterial mat) {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
if(this.iconString == null)
{
itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".")+1));
}else
{
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
itemIcon = iconRegister.registerIcon(ModReference.MOD_ID.toLowerCase() + ":" + this.iconString);
}
}
Loading

0 comments on commit cfe756a

Please sign in to comment.