Merge upstream

This commit is contained in:
Vincent Lee committed 2016-02-18 10:04:02 -06:00
commit ad5b7fd73b
15 files changed
+460 -337

No files matched your search

@@ -370,6 +370,7 @@ public final class ModelHandler {
BotaniaAPIClient.registerSubtileModel(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS));
BotaniaAPIClient.registerSubtileModel(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC));
BotaniaAPIClient.registerSubtileModel(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA));
BotaniaAPIClient.registerSubtileModel(SubTileClayconia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA + "Chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM));
BotaniaAPIClient.registerSubtileModel(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL));
BotaniaAPIClient.registerSubtileModel(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS));
@@ -510,7 +510,7 @@ public final class ModBlocks {
registerSubTileWithMini(LibBlockNames.SUBTILE_RANNUNCARPUS, SubTileRannuncarpus.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HYACIDUS, SubTileHyacidus.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_POLLIDISIAC, SubTilePollidisiac.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_CLAYCONIA, SubTileClayconia.class);
registerSubTileWithMini(LibBlockNames.SUBTILE_CLAYCONIA, SubTileClayconia.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_LOONIUM, SubTileLoonuim.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DAFFOMILL, SubTileDaffomill.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_VINCULOTUS, SubTileVinculotus.class);
@@ -27,16 +27,19 @@ import vazkii.botania.common.lexicon.LexiconData;
public class SubTileClayconia extends SubTileFunctional {
private static final int COST = 80;
private static final int RANGE = 5;
private static final int RANGE_Y = 3;
private static final int RANGE_MINI = 2;
private static final int RANGE_Y_MINI = 1;
@Override
public void onUpdate() {
super.onUpdate();
if(!supertile.getWorld().isRemote && ticksExisted % 5 == 0) {
int manaCost = 80;
if(mana >= manaCost) {
if(mana >= COST) {
BlockPos coords = getCoordsToPut();
if(coords != null) {
supertile.getWorld().setBlockToAir(coords);
@@ -44,7 +47,7 @@ public class SubTileClayconia extends SubTileFunctional {
supertile.getWorld().playAuxSFX(2001, coords, Block.getStateId(Blocks.sand.getDefaultState()));
EntityItem item = new EntityItem(supertile.getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.clay_ball));
supertile.getWorld().spawnEntityInWorld(item);
mana -= manaCost;
mana -= COST;
}
}
}
@@ -53,12 +56,15 @@ public class SubTileClayconia extends SubTileFunctional {
public BlockPos getCoordsToPut() {
List<BlockPos> possibleCoords = new ArrayList<>();
for(int i = -RANGE; i < RANGE + 1; i++)
for(int j = -RANGE_Y; j < RANGE_Y + 1; j++)
for(int k = -RANGE; k < RANGE + 1; k++) {
int range = getRange();
int rangeY = getRangeY();
for(int i = -range; i < range + 1; i++)
for(int j = -rangeY; j < rangeY + 1; j++)
for(int k = -range; k < range + 1; k++) {
BlockPos pos = supertile.getPos().add(i, j, k);
Block block = supertile.getWorld().getBlockState(pos).getBlock();
if(block == Block.getBlockFromName("sand"))
if(block == Blocks.sand)
possibleCoords.add(pos);
}
@@ -69,9 +75,17 @@ public class SubTileClayconia extends SubTileFunctional {
@Override
public RadiusDescriptor getRadius() {
return new RadiusDescriptor.Square(toBlockPos(), RANGE);
return new RadiusDescriptor.Square(toBlockPos(), getRange());
}
public int getRange() {
return RANGE;
}
public int getRangeY() {
return RANGE_Y;
}
@Override
public int getColor() {
return 0x7B8792;
@@ -87,4 +101,8 @@ public class SubTileClayconia extends SubTileFunctional {
return LexiconData.clayconia;
}
public static class Mini extends SubTileClayconia {
@Override public int getRange() { return RANGE_MINI; }
@Override public int getRangeY() { return RANGE_Y_MINI; }
}
}
@@ -95,7 +95,7 @@ public class SubTileMarimorphosis extends SubTileFunctional {
int rangeY = getRangeY();
for(int i = -range; i < range + 1; i++)
for(int j = -range; j < rangeY; j++)
for(int j = -rangeY; j < rangeY; j++)
for(int k = -range; k < range + 1; k++) {
BlockPos pos = supertile.getPos().add(i, j, k);
Block block = supertile.getWorld().getBlockState(pos).getBlock();
@@ -2,16 +2,22 @@
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
*
* File Created @ [Jan 13, 2014, 7:45:37 PM (GMT)]
*/
package vazkii.botania.common.core.proxy;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.boss.EntityDragon;
import net.minecraft.entity.boss.EntityDragonPart;
import net.minecraft.entity.boss.EntityWither;
import net.minecraft.entity.item.EntityEnderCrystal;
import net.minecraft.entity.item.EntityItemFrame;
import net.minecraft.entity.item.EntityPainting;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemRecord;
import net.minecraft.item.ItemStack;
@@ -34,6 +40,7 @@ import vazkii.botania.common.block.ModBanners;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModMultiblocks;
import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus;
import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover;
import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
import vazkii.botania.common.brew.ModBrews;
import vazkii.botania.common.brew.ModPotions;
@@ -60,7 +67,15 @@ import vazkii.botania.common.crafting.ModManaInfusionRecipes;
import vazkii.botania.common.crafting.ModPetalRecipes;
import vazkii.botania.common.crafting.ModPureDaisyRecipes;
import vazkii.botania.common.crafting.ModRuneRecipes;
import vazkii.botania.common.entity.EntityCorporeaSpark;
import vazkii.botania.common.entity.EntityDoppleganger;
import vazkii.botania.common.entity.EntityFlameRing;
import vazkii.botania.common.entity.EntityMagicLandmine;
import vazkii.botania.common.entity.EntityMagicMissile;
import vazkii.botania.common.entity.EntityManaBurst;
import vazkii.botania.common.entity.EntityPinkWither;
import vazkii.botania.common.entity.EntitySignalFlare;
import vazkii.botania.common.entity.EntitySpark;
import vazkii.botania.common.entity.ModEntities;
//import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; todo 1.8
//import vazkii.botania.common.block.ModBanners;
@@ -125,7 +140,7 @@ public class CommonProxy {
MinecraftForge.EVENT_BUS.register(new SpawnerChangingHandler());
MinecraftForge.EVENT_BUS.register(new SubTileNarslimmus.SpawnIntercepter());
MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler());
if(Botania.gardenOfGlassLoaded)
MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents());
@@ -158,6 +173,8 @@ public class CommonProxy {
words += countWords(((ITwoNamedPage) page).getSecondUnlocalizedName());
}
FMLLog.log(Level.INFO, "[Botania] The Lexica Botania has %d words.", words);
registerDefaultEntityBlacklist();
}
private int countWords(String s) {
@@ -165,6 +182,28 @@ public class CommonProxy {
return s1.split(" ").length;
}
private void registerDefaultEntityBlacklist() {
// Vanilla
BotaniaAPI.blacklistEntityFromGravityRod(EntityDragon.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityDragonPart.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityWither.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityItemFrame.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityEnderCrystal.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityPainting.class);
// Botania
BotaniaAPI.blacklistEntityFromGravityRod(EntityCorporeaSpark.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityDoppleganger.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityFlameRing.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicLandmine.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicMissile.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityManaBurst.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityPinkWither.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntitySignalFlare.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntitySpark.class);
BotaniaAPI.blacklistEntityFromGravityRod(EntityPlayerMover.class);
}
// Overriding the internal method handler will break everything as it changes regularly.
// So just don't be a moron and don't override it. Thanks.
public void serverAboutToStart(FMLServerAboutToStartEvent event) {
@@ -1392,7 +1392,7 @@ public final class ModCraftingRecipes {
// Wing Recipes
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.flightTiara, 1, 1), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), "gemQuartz"));
for(int i = 0; i < 7; i++)
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.flightTiara, 1, 2 + i), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), new ItemStack(ModItems.quartz, 1, i));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.flightTiara, 1, 2 + i), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), LibOreDict.QUARTZ[i]));
recipesWings = BotaniaAPI.getLatestAddedRecipes(8);
// Mana Fluxfield Recipe
@@ -2313,9 +2313,9 @@ public final class ModCraftingRecipes {
}
private static IRecipe addQuartzRecipes(int meta, Item req, Block block, Block stairs, Block slab) {
GameRegistry.addRecipe(new ItemStack(block),
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(block),
"QQ", "QQ",
'Q', new ItemStack(ModItems.quartz, 1, meta));
'Q', LibOreDict.QUARTZ[meta]));
GameRegistry.addRecipe(new ItemStack(block, 2, 2),
"Q", "Q",
'Q', block);
@@ -76,7 +76,7 @@ public final class ModManaInfusionRecipes {
if(Botania.thaumcraftLoaded) {
Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "scribing_tools"));
manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell), new ItemStack(inkwell), 35000);
manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell, 1, ModItems.manaInkwell.getMaxDamage()), new ItemStack(inkwell), 35000);
}
managlassRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.manaGlass), new ItemStack(Blocks.glass), 150);
@@ -25,50 +25,48 @@ import codechicken.microblock.MicroMaterialRegistry;
public class MultipartHandler {
public MultipartHandler() {
registerAllMultiparts(ModBlocks.livingrock);
registerAllMultiparts(ModBlocks.livingwood);
registerAllMultiparts(ModBlocks.storage);
registerAllMultiparts(ModBlocks.dreamwood);
registerAllMultiparts(ModBlocks.livingrock);
registerAllMultiparts(ModBlocks.prismarine);
registerAllMultiparts(ModBlocks.seaLamp);
registerAllMultiparts(ModBlocks.reedBlock);
registerAllMultiparts(ModBlocks.thatch);
registerAllMultiparts(ModBlocks.customBrick);
registerAllMultiparts(ModBlocks.elfGlass);
registerAllMultiparts(ModBlocks.manaGlass);
registerAllMultiparts(ModBlocks.endStoneBrick);
registerAllMultiparts(ModBlocks.blazeBlock);
registerAllMultiparts(ModBlocks.livingrock);
registerAllMultiparts(ModBlocks.bifrostPerm);
registerAllMultiparts(ModBlocks.shimmerrock);
registerAllMultiparts(ModBlocks.shimmerwoodPlanks);
registerMultiparts(ModBlocks.livingrock, 0, 4);
registerMultiparts(ModBlocks.livingwood, 0, 5);
registerMultiparts(ModBlocks.storage, 0, 4);
registerMultiparts(ModBlocks.dreamwood, 0, 4);
registerMultiparts(ModBlocks.prismarine, 0, 2);
registerMultiparts(ModBlocks.seaLamp);
registerMultiparts(ModBlocks.reedBlock);
registerMultiparts(ModBlocks.thatch);
registerMultiparts(ModBlocks.customBrick, 0, 15);
registerMultiparts(ModBlocks.elfGlass);
registerMultiparts(ModBlocks.manaGlass);
registerMultiparts(ModBlocks.endStoneBrick, 0, 3);
registerMultiparts(ModBlocks.blazeBlock);
registerMultiparts(ModBlocks.bifrostPerm);
registerMultiparts(ModBlocks.shimmerrock);
registerMultiparts(ModBlocks.shimmerwoodPlanks);
registerAllMultiparts(ModFluffBlocks.darkQuartz);
registerAllMultiparts(ModFluffBlocks.manaQuartz);
registerAllMultiparts(ModFluffBlocks.blazeQuartz);
registerAllMultiparts(ModFluffBlocks.lavenderQuartz);
registerAllMultiparts(ModFluffBlocks.redQuartz);
registerAllMultiparts(ModFluffBlocks.elfQuartz);
registerAllMultiparts(ModFluffBlocks.sunnyQuartz);
registerAllMultiparts(ModFluffBlocks.biomeStoneA);
registerAllMultiparts(ModFluffBlocks.biomeStoneB);
registerAllMultiparts(ModFluffBlocks.stone);
registerAllMultiparts(ModFluffBlocks.pavement);
registerMultiparts(ModFluffBlocks.darkQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.manaQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.blazeQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.lavenderQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.redQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.elfQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.sunnyQuartz, 0, 2);
registerMultiparts(ModFluffBlocks.biomeStoneA, 0, 15);
registerMultiparts(ModFluffBlocks.biomeStoneB, 0, 15);
registerMultiparts(ModFluffBlocks.stone, 0, 15);
registerMultiparts(ModFluffBlocks.pavement, 0, 5);
}
private static void registerAllMultiparts(Block block) {
List<ItemStack> stacks = new ArrayList();
Item item = Item.getItemFromBlock(block);
block.getSubBlocks(item, block.getCreativeTabToDisplayOn(), stacks);
for(ItemStack stack : stacks)
if(stack.getItem() == item)
registerMultipart(block, stack.getItemDamage());
private static void registerMultiparts(Block block) {
registerMultiparts(block, 0);
}
private static void registerMultipart(Block block, int meta) {
private static void registerMultiparts(Block block, int meta) {
MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta));
}
private static void registerMultiparts(Block block, int metamin, int metamax) {
for (int i = metamin; i <= metamax; i++) {
registerMultiparts(block, i);
}
}
}*/
@@ -423,6 +423,9 @@ public final class ModItems {
OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i));
OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i));
}
for(int i = 0; i < 7; i++)
OreDictionary.registerOre(LibOreDict.QUARTZ[i], new ItemStack(quartz, 1, i));
OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar);
OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaResource, 1, 0));
OreDictionary.registerOre(LibOreDict.MANA_PEARL, new ItemStack(manaResource, 1, 1));
@@ -90,4 +90,9 @@ public final class LibOreDict {
"stoneAndesiteBricks", "stoneBasaltBricks", "stoneDioriteBricks", "stoneGraniteBricks",
"stoneAndesiteChiseled", "stoneBasaltChiseled", "stoneDioriteChiseled", "stoneGraniteChiseled"
};
public static final String[] QUARTZ = new String[] {
"quartzDark", "quartzMana", "quartzBlaze",
"quartzLavender", "quartzRed", "quartzElven", "quartzSunny"
};
}