Merge branch '1.9' into 1.9-BTM

This commit is contained in:
modmuss50 2016-05-15 09:39:05 +01:00
commit 3eb4eec55a
8 changed files with 20 additions and 21 deletions

View file

@ -86,7 +86,7 @@ dependencies {
compile 'RebornCore:RebornCore-1.9:+:dev'
deobfCompile "mezz.jei:jei_1.9:+"
deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.2.0_60:universal'
compile "net.darkhax.tesla:Tesla:1.9-1.0.1.21:deobf"
compile "net.darkhax.tesla:Tesla:1.9-1.0.2.23:deobf"
deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132"
deobfCompile "slimeknights:TConstruct:1.9-2.3.0.jenkins193"
}

View file

@ -1,8 +1,5 @@
package techreborn.blocks;
import java.util.List;
import java.util.Random;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
@ -18,11 +15,14 @@ import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks;
import java.util.List;
import java.util.Random;
public class BlockStorage extends BaseBlock implements ITexturedBlock
{
public static final String[] types = new String[] { "silver", "aluminum", "titanium", "chrome", "steel", "brass",
"lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "osmium", "iridium" };
"lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium" };
public PropertyInteger METADATA;
public BlockStorage(Material material)

View file

@ -1,9 +1,5 @@
package techreborn.blocks;
import java.security.InvalidParameterException;
import java.util.List;
import java.util.Random;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
@ -19,10 +15,14 @@ import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks;
import java.security.InvalidParameterException;
import java.util.List;
import java.util.Random;
public class BlockStorage2 extends BaseBlock implements ITexturedBlock
{
public static final String[] types = new String[] { "tungstensteel", "lodestone", "tellurium",
public static final String[] types = new String[] { "tungstensteel",
"iridium_reinforced_tungstensteel", "iridium_reinforced_stone", "ruby", "sapphire", "peridot",
"yellowGarnet", "redGarnet", "copper", "tin", "refinedIron" };
public PropertyInteger METADATA;

View file

@ -15,7 +15,7 @@ public class ItemPlates extends ItemTextureBase
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "iron", "gold", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium",
"tungsten", "hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "carbon", "wood", "magnalium",
"tungsten", "tungstensteel", "zinc", "refinedIron", "carbon", "wood", "magnalium",
"silicon", "ruby", "sapphire", "peridot", "redGarnet", "yellowGarnet", "redstone", "diamond", "emerald", "lapis", "coal", "obsidian" };
public ItemPlates()

View file

@ -11,8 +11,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo;
import net.minecraft.item.ItemArmor.ArmorMaterial;
/**
* Created by modmuss50 on 26/02/2016.
*/
@ -40,14 +38,14 @@ public class ItemTRArmour extends ItemArmor implements ITexturedItem {
@Override
public String getTextureName(int damage) {
if (slot == EntityEquipmentSlot.HEAD)
return "techreborn:items/tool/" + material.name() + "_helmet";
return "techreborn:items/tool/" + material.name().toLowerCase() + "_helmet";
if (slot == EntityEquipmentSlot.CHEST)
return "techreborn:items/tool/" + material.name() + "_chestplate";
return "techreborn:items/tool/" + material.name().toLowerCase() + "_chestplate";
if (slot == EntityEquipmentSlot.LEGS)
return "techreborn:items/tool/" + material.name() + "_leggings";
return "techreborn:items/tool/" + material.name().toLowerCase() + "_leggings";
if (slot == EntityEquipmentSlot.FEET)
return "techreborn:items/tool/" + material.name() + "_boots";
return "techreborn:items/tool/" + material.name() + "_error";
return "techreborn:items/tool/" + material.name().toLowerCase() + "_boots";
return "techreborn:items/tool/" + material.name().toLowerCase() + "_error";
}
@Override

View file

@ -89,7 +89,6 @@ public class ManualLoader {
File inputData = new File(outputDir, "master.json");
BufferedReader reader = new BufferedReader(new FileReader(inputData));
ManualLoader.format = gson.fromJson(reader, ManualFormat.class);
System.out.println(ManualLoader.format);
}
}

View file

@ -36,7 +36,7 @@ public class CategoriesPage extends TitledPage
buttonList.clear();
ArrayList<String> categories = new ArrayList<>();
for(Entry entry : ManualLoader.format.entries){
if(categories.contains(entry.category)){
if(!categories.contains(entry.category)){
categories.add(entry.category);
}
}
@ -45,7 +45,9 @@ public class CategoriesPage extends TitledPage
for(String string : categories){
buttonList.add(new GuiButtonItemTexture(i, getXMin() + 20, getYMin() + 20 + (i * 20), 0, 46, 100, 20,
ItemPlates.getPlateByName("iron"), string,
ttl(Reference.GETTINGSTARTED_KEY)));
string));
i++;
System.out.println(string);
}
//
//

Binary file not shown.

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 635 B