Migrate other meshers

This commit is contained in:
Vincent Lee committed 2016-07-24 14:01:14 -05:00
1 parent fbd9917fd4
commit e7e5b1b484
16 files changed
+78 -48

No files matched your search

@@ -8,7 +8,6 @@
*/
package vazkii.botania.client.core.handler;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDoublePlant;
@@ -131,7 +130,6 @@ public final class ModelHandler {
registerStandardItems();
registerTESRItems();
registerBrews();
}
private static void registerSubtiles() {
@@ -418,6 +416,10 @@ public final class ModelHandler {
registerItemModel(manaCookie);
registerItemModel(infiniteFruit);
registerItemModelMetas(lens, LibItemNames.LENS_NAMES.length, i -> LibItemNames.LENS_NAMES[i]);
ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory"));
ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory"));
registerItemModel(brewFlask);
registerItemModel(brewVial);
registerItemModel(waterRing);
registerItemModel(miningRing);
@@ -492,29 +494,6 @@ public final class ModelHandler {
ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class);
}
private static void registerBrews() {
ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory"));
ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory"));
for (int i = 0; i < 6; i++) {
ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory"));
}
ModelLoader.setCustomMeshDefinition(brewFlask, stack -> {
int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack);
return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory");
});
for (int i = 0; i < 4; i++) {
ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory"));
}
ModelLoader.setCustomMeshDefinition(brewVial, stack -> {
int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack);
return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory");
});
}
private static void registerStateMappers() {
// Override to let custom model loader work, see SpecialFlowerModel
ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build());
@@ -17,6 +17,7 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.EnumAction;
import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
@@ -25,6 +26,7 @@ import net.minecraft.stats.Achievement;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
@@ -39,8 +41,10 @@ import vazkii.botania.common.achievement.ModAchievements;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.item.IColorable;
import vazkii.botania.common.item.ItemMod;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.awt.*;
import java.util.List;
@@ -49,22 +53,17 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
private static final String TAG_BREW_KEY = "brewKey";
private static final String TAG_SWIGS_LEFT = "swigsLeft";
private final String name;
private final String texName;
private final int swigs;
private final int drinkSpeed;
private final ItemStack baseItem;
public ItemBrewBase(String name, String texName, int swigs, int drinkSpeed, ItemStack baseItem) {
public ItemBrewBase(String name, int swigs, int drinkSpeed, ItemStack baseItem) {
super(name);
this.name = name;
this.texName = texName;
this.swigs = swigs;
this.drinkSpeed = drinkSpeed;
this.baseItem = baseItem;
setMaxStackSize(1);
setMaxDamage(swigs);
setNoRepair();
addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "swigs_taken"), (stack, world, entity) -> swigs - getSwigsLeft(stack));
}
@Override
@@ -17,7 +17,7 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemBrewFlask extends ItemBrewBase {
public ItemBrewFlask() {
super(LibItemNames.BREW_FLASK, LibItemNames.FLASK, 6, 24, new ItemStack(ModItems.vial, 1, 1));
super(LibItemNames.BREW_FLASK, 6, 24, new ItemStack(ModItems.vial, 1, 1));
}
}
@@ -17,7 +17,7 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemBrewVial extends ItemBrewBase {
public ItemBrewVial() {
super(LibItemNames.BREW_VIAL, LibItemNames.VIAL, 4, 32, new ItemStack(ModItems.vial));
super(LibItemNames.BREW_VIAL, 4, 32, new ItemStack(ModItems.vial));
}
}
@@ -0,0 +1,39 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:items/flask0",
"layer1": "botania:items/flask1_0"
},
"overrides": [
{
"predicate": {
"botania:swigs_taken": 1
},
"model": "botania:item/brewFlask_1"
},
{
"predicate": {
"botania:swigs_taken": 2
},
"model": "botania:item/brewFlask_2"
},
{
"predicate": {
"botania:swigs_taken": 3
},
"model": "botania:item/brewFlask_3"
},
{
"predicate": {
"botania:swigs_taken": 4
},
"model": "botania:item/brewFlask_4"
},
{
"predicate": {
"botania:swigs_taken": 5
},
"model": "botania:item/brewFlask_5"
}
]
}
@@ -0,0 +1,27 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:items/vial0",
"layer1": "botania:items/vial1_0"
},
"overrides": [
{
"predicate": {
"botania:swigs_taken": 1
},
"model": "botania:item/brewVial_1"
},
{
"predicate": {
"botania:swigs_taken": 2
},
"model": "botania:item/brewVial_2"
},
{
"predicate": {
"botania:swigs_taken": 3
},
"model": "botania:item/brewVial_3"
}
]
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:items/flask0",
"layer1": "botania:items/flask1_0"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:items/vial0",
"layer1": "botania:items/vial1_0"
}
}