mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 02:45:13 +00:00
Fix some deprecation warnings
This commit is contained in:
1 parent
e9ba8392d0
commit
a84397a9fe
5 files changed
+35
-38
No files matched your search
+3
-2
@@ -9,6 +9,7 @@
|
||||
package vazkii.botania.client.integration.jei.orechid;
|
||||
|
||||
import mezz.jei.api.ingredients.IIngredients;
|
||||
import mezz.jei.api.ingredients.VanillaTypes;
|
||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
@@ -62,8 +63,8 @@ public class OrechidRecipeWrapper implements IRecipeWrapper, Comparable<OrechidR
|
||||
|
||||
@Override
|
||||
public void getIngredients(IIngredients ingredients) {
|
||||
ingredients.setInput(ItemStack.class, getInputStack());
|
||||
ingredients.setOutputLists(ItemStack.class, outputStacks);
|
||||
ingredients.setInput(VanillaTypes.ITEM, getInputStack());
|
||||
ingredients.setOutputLists(VanillaTypes.ITEM, outputStacks);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -31,20 +31,7 @@ import vazkii.botania.common.block.corporea.BlockCorporeaFunnel;
|
||||
import vazkii.botania.common.block.corporea.BlockCorporeaIndex;
|
||||
import vazkii.botania.common.block.corporea.BlockCorporeaInterceptor;
|
||||
import vazkii.botania.common.block.corporea.BlockCorporeaRetainer;
|
||||
import vazkii.botania.common.block.decor.BlockBlaze;
|
||||
import vazkii.botania.common.block.decor.BlockBuriedPetals;
|
||||
import vazkii.botania.common.block.decor.BlockCustomBrick;
|
||||
import vazkii.botania.common.block.decor.BlockElfGlass;
|
||||
import vazkii.botania.common.block.decor.BlockFloatingFlower;
|
||||
import vazkii.botania.common.block.decor.BlockManaFlame;
|
||||
import vazkii.botania.common.block.decor.BlockManaGlass;
|
||||
import vazkii.botania.common.block.decor.BlockModMushroom;
|
||||
import vazkii.botania.common.block.decor.BlockPetalBlock;
|
||||
import vazkii.botania.common.block.decor.BlockShimmerrock;
|
||||
import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks;
|
||||
import vazkii.botania.common.block.decor.BlockShinyFlower;
|
||||
import vazkii.botania.common.block.decor.BlockStarfield;
|
||||
import vazkii.botania.common.block.decor.BlockTinyPotato;
|
||||
import vazkii.botania.common.block.decor.*;
|
||||
import vazkii.botania.common.block.dispenser.BehaviourFelPumpkin;
|
||||
import vazkii.botania.common.block.dispenser.BehaviourPoolMinecart;
|
||||
import vazkii.botania.common.block.dispenser.BehaviourWand;
|
||||
@@ -359,7 +346,7 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockMod(pump).setRegistryName(pump.getRegistryName()));
|
||||
r.register(new ItemBlockWithMetadataAndName(doubleFlower1).setRegistryName(doubleFlower1.getRegistryName()));
|
||||
r.register(new ItemBlockWithMetadataAndName(doubleFlower2).setRegistryName(doubleFlower2.getRegistryName()));
|
||||
r.register(new ItemBlockMod(blazeBlock).setRegistryName(blazeBlock.getRegistryName()));
|
||||
r.register(new ItemBlockBlaze(blazeBlock).setRegistryName(blazeBlock.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaInterceptor).setRegistryName(corporeaInterceptor.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaCrystalCube).setRegistryName(corporeaCrystalCube.getRegistryName()));
|
||||
r.register(new ItemBlockMod(incensePlate).setRegistryName(incensePlate.getRegistryName()));
|
||||
|
||||
@@ -13,22 +13,16 @@ package vazkii.botania.common.block.decor;
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntityFurnace;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.IFuelHandler;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler {
|
||||
public class BlockBlaze extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockBlaze() {
|
||||
super(Material.IRON, LibBlockNames.BLAZE_BLOCK);
|
||||
@@ -36,17 +30,10 @@ public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler {
|
||||
setResistance(10F);
|
||||
setSoundType(SoundType.METAL);
|
||||
setLightLevel(1F);
|
||||
GameRegistry.registerFuelHandler(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.blazeBlock;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBurnTime(ItemStack fuel) {
|
||||
return fuel.getItem() == Item.getItemFromBlock(this) ? TileEntityFurnace.getItemBurnTime(new ItemStack(Items.BLAZE_ROD)) * (Botania.gardenOfGlassLoaded ? 5 : 10) : 0;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package vazkii.botania.common.block.decor;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntityFurnace;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.item.block.ItemBlockMod;
|
||||
|
||||
public class ItemBlockBlaze extends ItemBlockMod {
|
||||
public ItemBlockBlaze(Block block) {
|
||||
super(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemBurnTime(ItemStack stack) {
|
||||
return TileEntityFurnace.getItemBurnTime(new ItemStack(Items.BLAZE_ROD))
|
||||
* (Botania.gardenOfGlassLoaded ? 5 : 10);
|
||||
}
|
||||
}
|
||||
@@ -29,12 +29,14 @@ public final class BiomeDecorationHandler {
|
||||
|
||||
@SubscribeEvent(priority = EventPriority.LOWEST)
|
||||
public static void onWorldDecoration(DecorateBiomeEvent.Decorate event) {
|
||||
BlockPos pos = event.getPlacementPos() != null ? event.getPlacementPos() : event.getChunkPos().getBlock(0, 0, 0);
|
||||
|
||||
if((event.getResult() == Result.ALLOW || event.getResult() == Result.DEFAULT) && event.getType() == EventType.FLOWERS) {
|
||||
boolean flowers = true;
|
||||
if(event.getWorld().provider instanceof IFlowerlessWorld)
|
||||
flowers = ((IFlowerlessWorld) event.getWorld().provider).generateFlowers(event.getWorld());
|
||||
else if(event.getWorld().getBiome(event.getPos()) instanceof IFlowerlessBiome)
|
||||
flowers = ((IFlowerlessBiome) event.getWorld().getBiome(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ());
|
||||
else if(event.getWorld().getBiome(pos) instanceof IFlowerlessBiome)
|
||||
flowers = ((IFlowerlessBiome) event.getWorld().getBiome(pos)).canGenerateFlowers(event.getWorld(), pos.getX(), pos.getZ());
|
||||
|
||||
if(!flowers)
|
||||
return;
|
||||
@@ -42,9 +44,9 @@ public final class BiomeDecorationHandler {
|
||||
int dist = Math.min(8, Math.max(1, ConfigHandler.flowerPatchSize));
|
||||
for(int i = 0; i < ConfigHandler.flowerQuantity; i++) {
|
||||
if(event.getRand().nextInt(ConfigHandler.flowerPatchChance) == 0) {
|
||||
int x = event.getPos().getX() + event.getRand().nextInt(16) + 8;
|
||||
int z = event.getPos().getZ() + event.getRand().nextInt(16) + 8;
|
||||
int y = event.getWorld().getTopSolidOrLiquidBlock(event.getPos()).getY();
|
||||
int x = pos.getX() + event.getRand().nextInt(16) + 8;
|
||||
int z = pos.getZ() + event.getRand().nextInt(16) + 8;
|
||||
int y = event.getWorld().getTopSolidOrLiquidBlock(pos).getY();
|
||||
|
||||
EnumDyeColor color = EnumDyeColor.byMetadata(event.getRand().nextInt(16));
|
||||
|
||||
@@ -63,8 +65,8 @@ public final class BiomeDecorationHandler {
|
||||
}
|
||||
|
||||
for(int i = 0; i < ConfigHandler.mushroomQuantity; i++) {
|
||||
int x = event.getPos().getX() + event.getRand().nextInt(16) + 8;
|
||||
int z = event.getPos().getZ() + event.getRand().nextInt(16) + 8;
|
||||
int x = pos.getX() + event.getRand().nextInt(16) + 8;
|
||||
int z = pos.getZ() + event.getRand().nextInt(16) + 8;
|
||||
int y = event.getRand().nextInt(26) + 4;
|
||||
BlockPos pos3 = new BlockPos(x, y, z);
|
||||
EnumDyeColor color = EnumDyeColor.byMetadata(event.getRand().nextInt(16));
|
||||
|
||||
Reference in new issue
Block a user