Flatten horns

This commit is contained in:
Vincent Lee committed 2017-12-15 21:41:58 -06:00
1 parent e5aa9339df
commit 52281e047b
26 files changed
+85 -90

No files matched your search

@@ -1,4 +1,4 @@
@API(owner = "Botania", apiVersion = "88", provides = "BotaniaAPI")
@API(owner = "botania", apiVersion = "89", provides = "BotaniaAPI")
package vazkii.botania.api;
import net.minecraftforge.fml.common.API;
@@ -42,7 +42,8 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.DrumVariant;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.item.ItemGrassHorn;
import vazkii.botania.common.item.ItemHorn;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -119,9 +120,9 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
}
DrumVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT);
if(variant == DrumVariant.WILD)
ItemGrassHorn.breakGrass(world, null, 0, pos);
ItemHorn.breakGrass(world, new ItemStack(ModItems.grassHorn), pos);
else if(variant == DrumVariant.CANOPY)
ItemGrassHorn.breakGrass(world, null, 1, pos);
ItemHorn.breakGrass(world, new ItemStack(ModItems.leavesHorn), pos);
else {
int range = 10;
List<EntityLiving> entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1)));
@@ -97,6 +97,8 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.terraformRod);
addItem(ModItems.laputaShard);
addItem(ModItems.grassHorn);
addItem(ModItems.leavesHorn);
addItem(ModItems.snowHorn);
addItem(ModItems.waterRod);
addItem(ModItems.openBucket);
addItem(ModItems.rainbowRod);
@@ -591,9 +591,9 @@ public final class ModCraftingRecipes {
recipeTerrasteelChest = ModItems.terrasteelChest.getRegistryName();
recipeTerrasteelLegs = ModItems.terrasteelLegs.getRegistryName();
recipeTerrasteelBoots = ModItems.terrasteelBoots.getRegistryName();
recipeGrassHorn = path("grasshorn_0");
recipeLeafHorn = path("grasshorn_1");
recipeSnowHorn = path("grasshorn_2");
recipeGrassHorn = ModItems.grassHorn.getRegistryName();
recipeLeafHorn = ModItems.leavesHorn.getRegistryName();
recipeSnowHorn = ModItems.snowHorn.getRegistryName();
recipeTerraSword = ModItems.terraSword.getRegistryName();
recipeTerraPick = ModItems.terraPick.getRegistryName();
recipeWaterRod = ModItems.waterRod.getRegistryName();
@@ -16,7 +16,7 @@ public class FlattenItems implements IFixableData {
static {
LOOKUP.put("botania:manaresource", i -> {
if (i == 10) {
if(i == 10) {
// support ancient prismarine from 1.7
return "minecraft:prismarine_shard";
} else {
@@ -24,7 +24,7 @@ public class FlattenItems implements IFixableData {
}
});
LOOKUP.put("botania:vial", i -> {
if (i == 1) {
if(i == 1) {
return LibMisc.MOD_ID + ":" + LibItemNames.FLASK;
} else {
return LibMisc.MOD_ID + ":" + LibItemNames.VIAL;
@@ -38,6 +38,15 @@ public class FlattenItems implements IFixableData {
return LibMisc.MOD_ID + ":" + LibItemNames.THORN_CHAKRAM;
}
});
LOOKUP.put("botania:grasshorn", i -> {
switch (i) {
case 0:
default:
return LibMisc.MOD_ID + ":" + LibItemNames.GRASS_HORN;
case 1: return LibMisc.MOD_ID + ":" + LibItemNames.LEAVES_HORN;
case 2: return LibMisc.MOD_ID + ":" + LibItemNames.SNOW_HORN;
}
});
}
@Override
@@ -46,38 +46,14 @@ import java.util.List;
import java.util.Locale;
import java.util.Random;
public class ItemGrassHorn extends ItemMod {
private static final int SUBTYPES = 3;
public ItemGrassHorn() {
super(LibItemNames.GRASS_HORN);
public class ItemHorn extends ItemMod {
public ItemHorn(String name) {
super(name);
setMaxStackSize(1);
setHasSubtypes(true);
addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "vuvuzela"),
(stack, worldIn, entityIn) -> stack.getDisplayName().toLowerCase(Locale.ROOT).contains("vuvuzela") ? 1 : 0);
}
@Override
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> list) {
if(isInCreativeTab(tab)) {
for(int i = 0; i < SUBTYPES; i++)
list.add(new ItemStack(this, 1, i));
}
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerItemAppendMeta(this, 3, LibItemNames.GRASS_HORN);
}
@Nonnull
@Override
public EnumAction getItemUseAction(ItemStack par1ItemStack) {
@@ -100,31 +76,39 @@ public class ItemGrassHorn extends ItemMod {
public void onUsingTick(ItemStack stack, EntityLivingBase player, int time) {
if(!player.world.isRemote) {
if(time != getMaxItemUseDuration(stack) && time % 5 == 0)
breakGrass(player.world, stack, stack.getItemDamage(), new BlockPos(player));
breakGrass(player.world, stack, new BlockPos(player));
player.world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_NOTE_BASS, SoundCategory.BLOCKS, 1F, 0.001F);
}
}
public static void breakGrass(World world, ItemStack stack, int stackDmg, BlockPos srcPos) {
EnumHornType type = EnumHornType.getTypeForMeta(stackDmg);
public static void breakGrass(World world, ItemStack stack, BlockPos srcPos) {
EnumHornType type = null;
if (stack.getItem() == ModItems.grassHorn) {
type = EnumHornType.WILD;
} else if (stack.getItem() == ModItems.leavesHorn) {
type = EnumHornType.CANOPY;
} else if (stack.getItem() == ModItems.snowHorn) {
type = EnumHornType.COVERING;
}
Random rand = new Random(srcPos.hashCode());
int range = 12 - stackDmg * 3;
int rangeY = 3 + stackDmg * 4;
int range = 12 - type.ordinal() * 3;
int rangeY = 3 + type.ordinal() * 4;
List<BlockPos> coords = new ArrayList<>();
for(BlockPos pos : BlockPos.getAllInBox(srcPos.add(-range, -rangeY, -range), srcPos.add(range, rangeY, range))) {
Block block = world.getBlockState(pos).getBlock();
if(block instanceof IHornHarvestable
? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type)
: stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower)
|| stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos)
|| stackDmg == 2 && block == Blocks.SNOW_LAYER)
: type == EnumHornType.WILD && block instanceof BlockBush && !(block instanceof ISpecialFlower)
|| type == EnumHornType.CANOPY && block.isLeaves(world.getBlockState(pos), world, pos)
|| type == EnumHornType.COVERING && block == Blocks.SNOW_LAYER)
coords.add(pos);
}
Collections.shuffle(coords, rand);
int count = Math.min(coords.size(), 32 + stackDmg * 16);
int count = Math.min(coords.size(), 32 + type.ordinal() * 16);
for(int i = 0; i < count; i++) {
BlockPos currCoords = coords.get(i);
IBlockState state = world.getBlockState(currCoords);
@@ -135,7 +135,9 @@ public final class ModItems {
public static final Item grassSeeds = new ItemGrassSeeds();
public static final Item dirtRod = new ItemDirtRod();
public static final Item terraformRod = new ItemTerraformRod();
public static final Item grassHorn = new ItemGrassHorn();
public static final Item grassHorn = new ItemHorn(LibItemNames.GRASS_HORN);
public static final Item leavesHorn = new ItemHorn(LibItemNames.LEAVES_HORN);
public static final Item snowHorn = new ItemHorn(LibItemNames.SNOW_HORN);
public static final Item manaMirror = new ItemManaMirror();
public static final Item manasteelHelm = new ItemManasteelHelm();
public static final Item manasteelHelmRevealing = new ItemManasteelHelmRevealing();
@@ -322,6 +324,8 @@ public final class ModItems {
r.register(dirtRod);
r.register(terraformRod);
r.register(grassHorn);
r.register(leavesHorn);
r.register(snowHorn);
r.register(manaMirror);
r.register(manasteelHelm);
r.register(manasteelHelmRevealing);
@@ -38,7 +38,9 @@ public final class LibItemNames {
public static final String MANASTEEL_AXE = "manasteelAxe";
public static final String MANASTEEL_SWORD = "manasteelSword";
public static final String MANASTEEL_SHEARS = "manasteelShears";
public static final String GRASS_HORN = "grassHorn";
public static final String GRASS_HORN = "horn_grass";
public static final String LEAVES_HORN = "horn_leaves";
public static final String SNOW_HORN = "horn_snow";
public static final String TERRASTEEL_HELM = "terrasteelHelm";
public static final String TERRASTEEL_CHEST = "terrasteelChest";
public static final String TERRASTEEL_LEGS = "terrasteelLegs";