Revert terrasteel nuggets

This commit is contained in:
Vasco Lavos committed 2017-09-02 16:27:28 +01:00
1 parent 2bfcbb3bc5
commit 27ea4e2db8
13 files changed
+16 -105

No files matched your search

@@ -132,11 +132,11 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable {
return false;
int meta = stack.getItemDamage();
if(meta == 17)
if(meta == 0)
ingot = stack;
else if(meta == 24)
else if(meta == 1)
pearl = stack;
else if(meta == 25)
else if(meta == 2)
diamond = stack;
else return false;
}
@@ -442,8 +442,6 @@ public final class ModItems {
OreDictionary.registerOre(LibOreDict.PEBBLE, new ItemStack(manaResource, 1, 21));
OreDictionary.registerOre(LibOreDict.MANAWEAVE_CLOTH, new ItemStack(manaResource, 1, 22));
OreDictionary.registerOre(LibOreDict.MANA_POWDER, new ItemStack(manaResource, 1, 23));
OreDictionary.registerOre(LibOreDict.MANA_PEARL_SHARD, new ItemStack(manaResource, 1, 24));
OreDictionary.registerOre(LibOreDict.MANA_DIAMOND_CHUNK, new ItemStack(manaResource, 1, 25));
OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0));
OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1));
@@ -10,7 +10,6 @@
*/
package vazkii.botania.common.item.material;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
@@ -24,7 +23,6 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -40,12 +38,13 @@ import vazkii.botania.common.entity.EntityDoppleganger;
import vazkii.botania.common.entity.EntityEnderAirBottle;
import vazkii.botania.common.item.ItemMod;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem {
final int types = 24;
public ItemManaResource() {
super(LibItemNames.MANA_RESOURCE);
setHasSubtypes(true);
@@ -118,7 +117,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
@Override
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> stacks) {
if(isInCreativeTab(tab)) {
for(int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) {
for(int i = 0; i < types; i++) {
if("UNUSED".equals(LibItemNames.MANA_RESOURCE_NAMES[i]))
continue;
if(Botania.gardenOfGlassLoaded || i != 20 && i != 21)
@@ -130,7 +129,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
@Nonnull
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(LibItemNames.MANA_RESOURCE_NAMES.length - 1, par1ItemStack.getItemDamage())];
return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())];
}
@Override
@@ -159,14 +158,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
for(int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) {
if("UNUSED".equals(LibItemNames.MANA_RESOURCE_NAMES[i]))
continue;
ModelLoader.setCustomModelResourceLocation(
this, i,
new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i], "inventory")
);
}
ModelHandler.registerItemMetas(this, LibItemNames.MANA_RESOURCE_NAMES.length, i -> LibItemNames.MANA_RESOURCE_NAMES[i]);
}
}
@@ -68,10 +68,10 @@ public class PageTerrasteel extends PageRecipe {
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 102, new ItemStack(block3), false);
GlStateManager.translate(0F, 0F, -10F);
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.manaResource, 1, 18), false);
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 80, new ItemStack(ModItems.manaResource, 1, 17), false);
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 20, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 24), false);
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 19, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 25), false);
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.manaResource, 1, 4), false);
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 80, new ItemStack(ModItems.manaResource, 1, 0), false);
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 20, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 1), false);
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 19, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 2), false);
Minecraft.getMinecraft().renderEngine.bindTexture(terrasteelOverlay);
@@ -84,13 +84,13 @@ public class PageTerrasteel extends PageRecipe {
@Override
public void onPageAdded(LexiconEntry entry, int index) {
LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 18), entry, index);
LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 4), entry, index);
}
@Override
public List<ItemStack> getDisplayedRecipes() {
ArrayList<ItemStack> list = new ArrayList<>();
list.add(new ItemStack(ModItems.manaResource, 1, 18));
list.add(new ItemStack(ModItems.manaResource, 1, 4));
return list;
}
@@ -217,8 +217,6 @@ public final class LibItemNames {
"livingRoot",
"pebble",
"manaweaveCloth",
"manaPowder",
"manaPearlShard",
"manaDiamondChunk"
"manaPowder"
};
}
@@ -41,12 +41,11 @@ public final class LibOreDict {
public static final String PEBBLE = "pebble";
public static final String MANAWEAVE_CLOTH = "clothManaweave";
public static final String MANA_POWDER = "powderMana";
public static final String MANA_PEARL_SHARD = "shardManaPearl";
public static final String MANA_DIAMOND_CHUNK = "nuggetManaDiamond";
public static final String VIAL = "bVial";
public static final String FLASK = "bFlask";
public static final String PRISMARINE_BLOCK = "blockPrismarine";
public static final String BLAZE_BLOCK = "blockBlaze";
public static final String DYE_WILDCARD = "dye";
@@ -1307,9 +1307,7 @@ item.botania:pestleAndMortar.name=Pestle and Mortar
item.botania:twigWand.name=Wand of the Forest
item.botania:manasteel.name=Manasteel Ingot
item.botania:manaPearl.name=Mana Pearl
item.botania:manaPearlShard.name=Mana Pearl Shard
item.botania:manaDiamond.name=Mana Diamond
item.botania:manaDiamondChunk.name=Mana Diamond Chunk
item.botania:lensNormal.name=Mana Lens
item.botania:lensSpeed.name=Mana Lens: Velocity
item.botania:lensSpeed.short=Velocity
@@ -517,13 +517,6 @@
},
"name": "NUGGETGOLD"
},
{
"ingredient": {
"type": "forge:ore_dict",
"ore": "nuggetManaDiamond"
},
"name": "NUGGETMANADIAMOND"
},
{
"ingredient": {
"type": "forge:ore_dict",
@@ -839,13 +832,6 @@
},
"name": "RUNEWRATHB"
},
{
"ingredient": {
"type": "forge:ore_dict",
"ore": "shardManaPearl"
},
"name": "SHARDMANAPEARL"
},
{
"ingredient": {
"type": "forge:ore_dict",
@@ -1,17 +0,0 @@
{
"result": {
"item": "botania:manaresource",
"data": 1
},
"pattern": [
"III",
"III",
"III"
],
"type": "forge:ore_shaped",
"key": {
"I": {
"item": "#SHARDMANAPEARL"
}
}
}
@@ -1,13 +0,0 @@
{
"result": {
"item": "botania:manaresource",
"data": 24,
"count": 9
},
"ingredients": [
{
"item": "#MANAPEARL"
}
],
"type": "forge:ore_shapeless"
}
@@ -1,13 +0,0 @@
{
"result": {
"item": "botania:manaresource",
"data": 25,
"count": 9
},
"ingredients": [
{
"item": "#MANADIAMOND"
}
],
"type": "forge:ore_shapeless"
}
@@ -1,17 +0,0 @@
{
"result": {
"item": "botania:manaresource",
"data": 2
},
"pattern": [
"III",
"III",
"III"
],
"type": "forge:ore_shaped",
"key": {
"I": {
"item": "#NUGGETMANADIAMOND"
}
}
}