All brews, mana tablet, mana gun, incense, and other items

This commit is contained in:
Vincent Lee committed 2015-12-27 20:16:31 -06:00
1 parent e83d1600cf
commit c513f17f88
41 files changed
+330 -31

No files matched your search

@@ -8,10 +8,12 @@ import net.minecraft.block.BlockFlower;
import net.minecraft.block.BlockRailPowered;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.BlockWall;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
@@ -79,6 +81,8 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade;
import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia;
import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus;
import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
import vazkii.botania.common.item.ItemManaGun;
import vazkii.botania.common.item.brew.ItemBrewBase;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
@@ -122,16 +126,26 @@ public final class ModelHandler {
registerRunes();
registerBows();
registerLens();
registerBrews();
registerItemModelAllMeta(laputaShard, 20);
registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length);
registerItemModelAllMeta(dye, EnumDyeColor.values().length);
registerItemModelAllMeta(petal, EnumDyeColor.values().length);
registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9);
registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8);
registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32);
registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9);
/** Special Item Meshers **/
ModelLoader.registerItemVariants(manaGun,
new ModelResourceLocation("botania:manaGun", "inventory"),
new ModelResourceLocation("botania:manaGunClip", "inventory"),
new ModelResourceLocation("botania:desuGun", "inventory"),
new ModelResourceLocation("botania:desuGunClip", "inventory"));
ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
String name;
if (((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack)) {
name = ItemManaGun.hasClip(stack) ? "botania:desuGunClip" : "botania:desuGun";
} else {
name = ItemManaGun.hasClip(stack) ? "botania:manaGunClip": "botania:manaGun";
}
return new ModelResourceLocation(name, "inventory");
}
});
}
private static void registerSubtiles() {
@@ -294,19 +308,46 @@ public final class ModelHandler {
registerItemModel(obedienceStick);
registerItemModel(dirtRod);
registerItemModel(waterRod);
registerItemModel(cobbleRod);
registerItemModel(fireRod);
registerItemModel(rainbowRod);
registerItemModel(skyDirtRod);
registerItemModel(tornadoRod);
registerItemModel(terraformRod);
registerItemModel(diviningRod);
registerItemModel(gravityRod);
registerItemModel(missileRod);
registerItemModel(smeltRod);
registerItemModel(exchangeRod);
registerItemModel(tornadoRod);
ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod_flying", "inventory"));
registerItemModel(openBucket);
registerItemModel(bloodPendant);
registerItemModel(manaTablet);
registerItemModel(enderDagger);
registerItemModel(slingshot);
registerItemModel(vineBall);
registerItemModel(regenIvy);
registerItemModel(keepIvy);
registerItemModel(recordGaia1);
registerItemModel(recordGaia2);
registerItemModel(overgrowthSeed);
registerItemModel(worldSeed);
registerItemModel(incenseStick);
registerItemModelAllMeta(laputaShard, 20);
registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length);
registerItemModelAllMeta(dye, EnumDyeColor.values().length);
registerItemModelAllMeta(petal, EnumDyeColor.values().length);
registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9);
registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8);
registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32);
registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9);
registerItemModelMetas(virus, LibItemNames.VIRUS, 2);
registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3);
}
private static void registerManaResources() {
@@ -350,6 +391,36 @@ public final class ModelHandler {
}
}
private static void registerBrews() {
ModelLoader.registerItemVariants(vial, new ModelResourceLocation("botania:vial", "inventory"), new ModelResourceLocation("botania:flask", "inventory"));
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, new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack 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, new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack);
return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory");
}
});
}
private static void registerStateMappers() {
// Ignore vanilla facing, variant in double flower
ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build());
@@ -16,6 +16,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack;
@@ -44,7 +45,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer {
public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) {
TileIncensePlate plate = (TileIncensePlate) tileentity;
EnumFacing facing = plate.getWorld() != null ? ((EnumFacing) plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS)) : EnumFacing.SOUTH;
EnumFacing facing = plate.getWorld() != null ? plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH;
GlStateManager.pushMatrix();
GlStateManager.enableRescaleNormal();
@@ -64,25 +65,10 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer {
GlStateManager.pushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
float s = 0.4F;
GlStateManager.translate(0.1F, -1.46F, 0F);
GlStateManager.translate(-0.075F, -1.25F, 0F);
GlStateManager.scale(s, s, s);
GlStateManager.rotate(180F, 0F, 1F, 0F);
// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8
// int renderPass = 0;
// do {
// IIcon icon = stack.getItem().getIcon(stack, renderPass);
// if(icon != null) {
// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
// float f = icon.getMinU();
// float f1 = icon.getMaxU();
// float f2 = icon.getMinV();
// float f3 = icon.getMaxV();
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);
// GlStateManager.color(1F, 1F, 1F);
// }
// renderPass++;
// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
//GlStateManager.rotate(180F, 0F, 1F, 0F);
Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND);
GlStateManager.popMatrix();
}
GlStateManager.color(1F, 1F, 1F);
@@ -49,11 +49,14 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable
@Override
public int getMetaFromState(IBlockState state) {
return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex();
return state.getValue(BotaniaStateProps.CARDINALS).getIndex();
}
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta < 2 || meta > 5) {
meta = 2;
}
return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta));
}
@@ -109,7 +112,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable
@Override
public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) {
setBlockBounds(((EnumFacing) w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS)).getAxis());
setBlockBounds(w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS).getAxis());
}
public void setBlockBounds(EnumFacing.Axis axis) {
@@ -135,7 +138,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable
@Override
public int getRenderType() {
return LibRenderIDs.idIncensePlate;
return 2;
}
@Override
@@ -120,7 +120,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
// ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN
// ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN
// ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN
private boolean isSugoiKawaiiDesuNe(ItemStack stack) {
public boolean isSugoiKawaiiDesuNe(ItemStack stack) {
return stack.getDisplayName().equalsIgnoreCase("desu gun");
}