mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Merge branch 'master' of https://github.com/Vazkii/Botania
This commit is contained in:
commit
455adec13d
84 files changed
+955
-744
No files matched your search
@@ -45,6 +45,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
|
||||
|
||||
IIcon iconBases, iconFaces;
|
||||
IIcon iconBasesA, iconFacesA;
|
||||
IIcon iconBasesB, iconFacesB;
|
||||
|
||||
public BlockForestDrum() {
|
||||
super(Material.wood);
|
||||
@@ -88,18 +89,21 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
|
||||
iconFaces = IconHelper.forBlock(par1IconRegister, this, 1);
|
||||
iconBasesA = IconHelper.forBlock(par1IconRegister, this, 2);
|
||||
iconFacesA = IconHelper.forBlock(par1IconRegister, this, 3);
|
||||
iconBasesB = IconHelper.forBlock(par1IconRegister, this, 4);
|
||||
iconFacesB = IconHelper.forBlock(par1IconRegister, this, 5);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
|
||||
for(int i = 0; i < 2; i++)
|
||||
for(int i = 0; i < 3; i++)
|
||||
list.add(new ItemStack(item, 1, i));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(int side, int meta) {
|
||||
boolean animal = meta == 1;
|
||||
return side < 2 ? animal ? iconBasesA : iconBases : animal ? iconFacesA : iconFaces;
|
||||
boolean tree = meta == 2;
|
||||
return side < 2 ? animal ? iconBasesA : tree ? iconBasesB : iconBases : animal ? iconFacesA : tree ? iconFacesB : iconFaces;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -109,6 +113,8 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
|
||||
|
||||
if(world.getBlockMetadata(x, y, z) == 0)
|
||||
ItemGrassHorn.breakGrass(world, 0, x, y, z);
|
||||
else if(world.getBlockMetadata(x, y, z) == 2)
|
||||
ItemGrassHorn.breakGrass(world, 1, x, y, z);
|
||||
else if(!world.isRemote) {
|
||||
int range = 10;
|
||||
List<EntityLiving> entities = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1));
|
||||
|
||||
@@ -262,6 +262,7 @@ public final class ModCraftingRecipes {
|
||||
public static IRecipe recipeTerraAxe;
|
||||
public static IRecipe recipeHourglass;
|
||||
public static IRecipe recipeGhostRail;
|
||||
public static IRecipe recipeCanopyDrum;
|
||||
|
||||
public static void init() {
|
||||
// Lexicon Recipe
|
||||
@@ -1752,6 +1753,14 @@ public final class ModCraftingRecipes {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.ghostRail), new ItemStack(Blocks.rail), new ItemStack(ModBlocks.platform, 1, 1));
|
||||
recipeGhostRail = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Drum of the Canopy Recipe
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.forestDrum, 1, 2),
|
||||
"WLW", "WHW", "WLW",
|
||||
'W', LibOreDict.LIVING_WOOD,
|
||||
'L', new ItemStack(Items.leather),
|
||||
'H', new ItemStack(ModItems.grassHorn, 1, 1));
|
||||
recipeCanopyDrum = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Storage Block Recipes
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
|
||||
"III", "III", "III",
|
||||
|
||||
@@ -160,9 +160,8 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
|
||||
BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getCommandSenderName());
|
||||
BlockPistonRelay.mappedPositions.put(bindPos, currentPos);
|
||||
BlockPistonRelay.WorldData.get(par3World).markDirty();
|
||||
|
||||
if(par3World.isRemote)
|
||||
par2EntityPlayer.swingItem();
|
||||
|
||||
par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F);
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@@ -116,7 +116,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if(originCoords.posY == -1 && heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && player.isSneaking()) {
|
||||
} else if(originCoords.posY != -1 && heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && player.isSneaking()) {
|
||||
List<ChunkCoordinates> cursors = getCursorList(lokiRing);
|
||||
for(ChunkCoordinates cursor : cursors) {
|
||||
int x = lookPos.blockX + cursor.posX;
|
||||
|
||||
@@ -148,6 +148,7 @@ public final class LexiconData {
|
||||
public static LexiconEntry incense;
|
||||
public static LexiconEntry hourglass;
|
||||
public static LexiconEntry ghostRail;
|
||||
public static LexiconEntry canopyDrum;
|
||||
|
||||
public static LexiconEntry manaBlaster;
|
||||
public static LexiconEntry grassSeeds;
|
||||
@@ -595,6 +596,9 @@ public final class LexiconData {
|
||||
ghostRail = new ALexiconEntry(LibLexicon.DEVICE_GHOST_RAIL, categoryDevices);
|
||||
ghostRail.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGhostRail));
|
||||
|
||||
canopyDrum = new BLexiconEntry(LibLexicon.DEVICE_CANOPY_DRUM, categoryDevices);
|
||||
canopyDrum.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCanopyDrum));
|
||||
|
||||
// TOOLS ENTRIES
|
||||
manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools);
|
||||
manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster));
|
||||
|
||||
@@ -120,6 +120,7 @@ public final class LibLexicon {
|
||||
public static final String DEVICE_INCENSE = "incense";
|
||||
public static final String DEVICE_HOURGLASS = "hourglass";
|
||||
public static final String DEVICE_GHOST_RAIL = "ghostRail";
|
||||
public static final String DEVICE_CANOPY_DRUM = "canopyDrum";
|
||||
|
||||
public static final String TOOL_MANA_BLASTER = "manaBlaster";
|
||||
public static final String TOOL_GRASS_SEEDS = "grassSeeds";
|
||||
|
||||
@@ -19,7 +19,7 @@ public final class LibMisc {
|
||||
public static final String MOD_NAME = MOD_ID;
|
||||
public static final String BUILD = "GRADLE:BUILD";
|
||||
public static final String VERSION = "GRADLE:VERSION-" + BUILD;
|
||||
public static final String DEPENDENCIES = "required-after:Forge@[10.12.2.1147,);required-after:Baubles;after:Thaumcraft";
|
||||
public static final String DEPENDENCIES = "required-after:Forge@[10.13.2.1236,);required-after:Baubles;after:Thaumcraft";
|
||||
|
||||
// Network Contants
|
||||
public static final String NETWORK_CHANNEL = MOD_ID;
|
||||
|
||||
Reference in new issue
Block a user