mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Merge upstream
This commit is contained in:
commit
a4a77fb20f
12 files changed
+69
-38
No files matched your search
@@ -99,12 +99,14 @@ public class RenderLexicon implements IItemRenderer {
|
||||
font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92);
|
||||
|
||||
GlStateManager.translate(0F, 10F, 0F);
|
||||
font.drawString(EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92);
|
||||
font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92);
|
||||
|
||||
GlStateManager.translate(0F, 50F, 0F);
|
||||
font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92);
|
||||
|
||||
GlStateManager.translate(0F, 10F, 0F);
|
||||
font.drawString(EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92);
|
||||
font.drawString(EnumChatFormatting.UNDERLINE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92);
|
||||
|
||||
if(bevo || saice) {
|
||||
GlStateManager.translate(0F, 10F, 0F);
|
||||
font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92);
|
||||
|
||||
@@ -54,6 +54,11 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
|
||||
return new BlockState(this, BotaniaStateProps.ALTGRASS_VARIANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isToolEffective(String type, IBlockState state) {
|
||||
return type.equals("shovel");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.ALTGRASS_VARIANT).ordinal();
|
||||
@@ -108,7 +113,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
|
||||
|
||||
@Override
|
||||
public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) {
|
||||
return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains;
|
||||
EnumPlantType type = plantable.getPlantType(world, pos.down());
|
||||
return type == EnumPlantType.Plains || type == EnumPlantType.Beach;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -121,8 +121,7 @@ public abstract class BlockCamo extends BlockModContainer<TileCamo> {
|
||||
TileCamo camo = (TileCamo) tile;
|
||||
Block block = camo.camo;
|
||||
if(block != null)
|
||||
return block instanceof BlockCamo ? 0xFFFFFF : block.colorMultiplier(par1World, pos, pass);
|
||||
|
||||
return block instanceof BlockCamo ? 0xFFFFFF : block.getRenderColor(block.getDefaultState()); // todo
|
||||
}
|
||||
return 0xFFFFFF;
|
||||
}
|
||||
|
||||
@@ -25,14 +25,17 @@ import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.tile.TileManaFlame;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.world.WorldTypeSkyblock;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
|
||||
public class BlockManaFlame extends BlockModContainer {
|
||||
public class BlockManaFlame extends BlockModContainer implements ILexiconable {
|
||||
|
||||
public BlockManaFlame() {
|
||||
super(Material.cloth);
|
||||
@@ -105,4 +108,9 @@ public class BlockManaFlame extends BlockModContainer {
|
||||
return new TileManaFlame();
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.lenses;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -35,6 +35,7 @@ public class BlockModPane extends BlockPane {
|
||||
setCreativeTab(BotaniaCreativeTab.INSTANCE);
|
||||
setHardness(0.3F);
|
||||
setStepSound(soundTypeGlass);
|
||||
setLightLevel(1.0F);
|
||||
useNeighborBrightness = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ public class SubTileHopperhock extends SubTileFunctional {
|
||||
if(inv != null) {
|
||||
List<ItemStack> filter = getFilterForInventory(inv, pos_, true);
|
||||
boolean canAccept = canAcceptItem(stack, filter, filterType);
|
||||
int availablePut = InventoryHelper.testInventoryInsertion(inv, stack, dir);
|
||||
int availablePut = supertile.getWorld().isRemote ? 1 : InventoryHelper.testInventoryInsertion(inv, stack, dir);
|
||||
canAccept &= availablePut > 0;
|
||||
|
||||
if(canAccept) {
|
||||
@@ -112,9 +112,9 @@ public class SubTileHopperhock extends SubTileFunctional {
|
||||
}
|
||||
}
|
||||
|
||||
if(invToPutItemIn != null) {
|
||||
if(invToPutItemIn != null && !item.isDead) {
|
||||
boolean remote = supertile.getWorld().isRemote;
|
||||
if(!item.isDead && remote) {
|
||||
if(remote) {
|
||||
if(!particled.contains(item)) {
|
||||
SubTileSpectranthemum.spawnExplosionParticles(item, 3);
|
||||
particled.add(item);
|
||||
|
||||
@@ -2187,13 +2187,10 @@ public final class ModCraftingRecipes {
|
||||
for(int i = 0; i < 8; i++)
|
||||
addWall(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneWall, i);
|
||||
|
||||
addWall(ModFluffBlocks.stone, 0, ModFluffBlocks.stoneWall, 0); // Andesite todo 1.8 convert to OreDict?
|
||||
addWall(Blocks.stone, 5, ModFluffBlocks.stoneWall, 0);
|
||||
addWall(ModFluffBlocks.stone, 1, ModFluffBlocks.stoneWall, 1); // Basalt
|
||||
addWall(ModFluffBlocks.stone, 2, ModFluffBlocks.stoneWall, 2); // Diorite
|
||||
addWall(Blocks.stone, 3, ModFluffBlocks.stoneWall, 2); // Diorite
|
||||
addWall(ModFluffBlocks.stone, 3, ModFluffBlocks.stoneWall, 3); // Granite
|
||||
addWall(Blocks.stone, 1, ModFluffBlocks.stoneWall, 3); // Granite
|
||||
addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[0], ModFluffBlocks.stoneWall, 0); // Andesite
|
||||
addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[1], ModFluffBlocks.stoneWall, 1); // Basalt
|
||||
addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[2], ModFluffBlocks.stoneWall, 2); // Diorite
|
||||
addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[3], ModFluffBlocks.stoneWall, 3); // Granite
|
||||
|
||||
// Pane Recipes
|
||||
addPane(ModBlocks.manaGlass, ModFluffBlocks.managlassPane);
|
||||
@@ -2210,23 +2207,20 @@ public final class ModCraftingRecipes {
|
||||
addStairsAndSlabs(ModFluffBlocks.biomeStoneB, i, ModFluffBlocks.biomeStoneStairs[i + 16], ModFluffBlocks.biomeStoneSlabs[i + 16]);
|
||||
}
|
||||
|
||||
// Andesite Basalt Diorite Granite Stair/Slab todo 1.8 convert to oredict?
|
||||
addStairsAndSlabs(ModFluffBlocks.stone, 0, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]);
|
||||
addStairsAndSlabs(Blocks.stone, 5, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]);
|
||||
// Andesite Basalt Diorite Granite Stair/Slab
|
||||
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[0], Blocks.stone, 5, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]);
|
||||
|
||||
addStairsAndSlabs(ModFluffBlocks.stone, 1, ModFluffBlocks.stoneStairs[1], ModFluffBlocks.stoneSlabs[1]);
|
||||
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[1], ModFluffBlocks.stone, 1, ModFluffBlocks.stoneStairs[1], ModFluffBlocks.stoneSlabs[1]);
|
||||
|
||||
addStairsAndSlabs(ModFluffBlocks.stone, 2, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]);
|
||||
addStairsAndSlabs(Blocks.stone, 3, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]);
|
||||
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[2], Blocks.stone, 3, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]);
|
||||
|
||||
addStairsAndSlabs(ModFluffBlocks.stone, 3, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]);
|
||||
addStairsAndSlabs(Blocks.stone, 1, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]);
|
||||
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[3], Blocks.stone, 1, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]);
|
||||
|
||||
// Andesite Basalt Diorite Granite Bricks Stair/Slab
|
||||
addStairsAndSlabs(ModFluffBlocks.stone, 8, ModFluffBlocks.stoneStairs[4], ModFluffBlocks.stoneSlabs[4]);
|
||||
addStairsAndSlabs(ModFluffBlocks.stone, 9, ModFluffBlocks.stoneStairs[5], ModFluffBlocks.stoneSlabs[5]);
|
||||
addStairsAndSlabs(ModFluffBlocks.stone, 10, ModFluffBlocks.stoneStairs[6], ModFluffBlocks.stoneSlabs[6]);
|
||||
addStairsAndSlabs(ModFluffBlocks.stone, 11, ModFluffBlocks.stoneStairs[7], ModFluffBlocks.stoneSlabs[7]);
|
||||
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[8], ModFluffBlocks.stone, 8, ModFluffBlocks.stoneStairs[4], ModFluffBlocks.stoneSlabs[4]);
|
||||
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[9], ModFluffBlocks.stone, 9, ModFluffBlocks.stoneStairs[5], ModFluffBlocks.stoneSlabs[5]);
|
||||
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[10], ModFluffBlocks.stone, 10, ModFluffBlocks.stoneStairs[6], ModFluffBlocks.stoneSlabs[6]);
|
||||
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[11], ModFluffBlocks.stone, 11, ModFluffBlocks.stoneStairs[7], ModFluffBlocks.stoneSlabs[7]);
|
||||
|
||||
// Pavement Stairsm & Stairs
|
||||
for(int i = 0; i < ModFluffBlocks.pavementStairs.length; i++)
|
||||
@@ -2283,12 +2277,34 @@ public final class ModCraftingRecipes {
|
||||
'Q', new ItemStack(slab));
|
||||
}
|
||||
|
||||
// Same as above, but use od for forward recipes, only use block and meta for slab -> full block recipe
|
||||
private static void addStairsAndSlabsWithOredict(String od, Block block, int meta, Block stairs, Block slab) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(slab, 6),
|
||||
"QQQ",
|
||||
'Q', od));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stairs, 4),
|
||||
" Q", " QQ", "QQQ",
|
||||
'Q', od));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stairs, 4),
|
||||
"Q ", "QQ ", "QQQ",
|
||||
'Q', od));
|
||||
GameRegistry.addRecipe(new ItemStack(block, 1, meta),
|
||||
"Q", "Q",
|
||||
'Q', new ItemStack(slab)); // TODO this causes conflicts between the brick slab -> brick restoration recipe and the brick slab -> chiseled brick recipe
|
||||
}
|
||||
|
||||
private static void addWall(Block block, int blockMeta, Block wall, int wallMeta) {
|
||||
GameRegistry.addRecipe(new ItemStack(wall, 6, wallMeta),
|
||||
"BBB", "BBB",
|
||||
'B', new ItemStack(block, 1, blockMeta));
|
||||
}
|
||||
|
||||
private static void addWallWithOreDict(String od, Block wall, int wallMeta) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(wall, 6, wallMeta),
|
||||
"BBB", "BBB",
|
||||
'B', od));
|
||||
}
|
||||
|
||||
private static void addPane(Block block, Block pane) {
|
||||
GameRegistry.addRecipe(new ItemStack(pane, 16),
|
||||
"BBB", "BBB",
|
||||
|
||||
@@ -45,6 +45,7 @@ public class LensDyeingRecipe implements IRecipe {
|
||||
foundDye = true;
|
||||
else return false;
|
||||
}
|
||||
else return false;//This means we have an additional item in the recipe after the lens and dye
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +62,7 @@ public class LensDyeingRecipe implements IRecipe {
|
||||
if(stack != null) {
|
||||
if(stack.getItem() instanceof ILens && lens == null)
|
||||
lens = stack;
|
||||
else color = getStackColor(stack);
|
||||
else color = getStackColor(stack);//We can assume if its not a lens its a dye because we checked it in matches()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -57,9 +57,7 @@ public class ItemOdinRing extends ItemRelicBauble {
|
||||
|
||||
@Override
|
||||
public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) {
|
||||
//if(player.ticksExisted % 30 == 0)
|
||||
//player.heal(1);
|
||||
if(player.isBurning())
|
||||
if(player.isBurning() && ConfigHandler.ringOfOdinFireResist)
|
||||
player.extinguish();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user