neocturne/minecraft
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GenericWood: make abstract

Browse source
This commit is contained in:
Matthias Schiffer 2014-05-26 22:12:57 +02:00
parent fcc093da13
commit 0c500046d4
3 changed files with 32 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/net/universe_factory/minecraft/test/Test.java
View file

@ -25,7 +25,7 @@ public class Test {
public static Test instance;
public static final Item cherries = new ItemFood(2, 0.2f, false).setTextureName(MODID + ":cherries").setUnlocalizedName("cherries");
public static final GenericWood cherryTree = new GenericWood(new GenericWood.Info() {
public static final GenericWood cherryTree = new GenericWood() {
@Override
public String getName() {
return "Cherry";
@ -54,7 +54,7 @@ public class Test {
return ret;
}
});
};
@EventHandler
public void preInit(FMLInitializationEvent event) {

56
java/net/universe_factory/minecraft/test/generic/GenericWood.java
View file

@ -29,9 +29,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class GenericWood {
public final Info info;
public abstract class GenericWood {
public final Block planks;
public final Block log;
public final BlockLeaves leaves;
@ -40,9 +38,7 @@ public class GenericWood {
public final BlockSlab double_slab;
public final BlockStairs stairs;
public GenericWood(Info info) {
this.info = info;
protected GenericWood() {
planks = new Planks();
log = new Log();
leaves = new Leaves();
@ -53,18 +49,18 @@ public class GenericWood {
}
public void register() {
GameRegistry.registerBlock(planks, "wood_" + info.getName().toLowerCase());
GameRegistry.registerBlock(log, "log_" + info.getName().toLowerCase());
GameRegistry.registerBlock(leaves, "leaves_" + info.getName().toLowerCase());
GameRegistry.registerBlock(sapling, "sapling_" + info.getName().toLowerCase());
GameRegistry.registerBlock(planks, "wood_" + getName().toLowerCase());
GameRegistry.registerBlock(log, "log_" + getName().toLowerCase());
GameRegistry.registerBlock(leaves, "leaves_" + getName().toLowerCase());
GameRegistry.registerBlock(sapling, "sapling_" + getName().toLowerCase());
GameRegistry.registerBlock(slab, null, "wooden_slab_" + info.getName().toLowerCase());
GameRegistry.registerItem(new ItemSlab(slab, slab, double_slab, false), "wooden_slab_" + info.getName().toLowerCase());
GameRegistry.registerBlock(slab, null, "wooden_slab_" + getName().toLowerCase());
GameRegistry.registerItem(new ItemSlab(slab, slab, double_slab, false), "wooden_slab_" + getName().toLowerCase());
GameRegistry.registerBlock(double_slab, null, "double_wooden_slab_" + info.getName().toLowerCase());
GameRegistry.registerItem(new ItemSlab(double_slab, slab, double_slab, true), "double_wooden_slab_" + info.getName().toLowerCase());
GameRegistry.registerBlock(double_slab, null, "double_wooden_slab_" + getName().toLowerCase());
GameRegistry.registerItem(new ItemSlab(double_slab, slab, double_slab, true), "double_wooden_slab_" + getName().toLowerCase());
GameRegistry.registerBlock(stairs, "stairs_wood_" + info.getName().toLowerCase());
GameRegistry.registerBlock(stairs, "stairs_wood_" + getName().toLowerCase());
GameRegistry.addRecipe(new ItemStack(planks, 4), "#", '#', log);
GameRegistry.addRecipe(new ItemStack(slab, 6), "###", '#', planks);
@ -89,11 +85,11 @@ public class GenericWood {
setHardness(2.0f);
setResistance(5.0f);
setStepSound(Block.soundTypeWood);
setBlockName("wood" + info.getName());
setBlockName("wood" + getName());
setCreativeTab(CreativeTabs.tabBlock);
setHarvestLevel("axe", 0);
setBlockTextureName(Test.MODID + ":planks_" + info.getName().toLowerCase());
setBlockTextureName(Test.MODID + ":planks_" + getName().toLowerCase());
}
}
@ -102,7 +98,7 @@ public class GenericWood {
private IIcon topIcon;
public Log() {
setBlockName("log" + info.getName());
setBlockName("log" + getName());
setHarvestLevel("axe", 0);
setBlockTextureName(Test.MODID + ":log");
@ -111,8 +107,8 @@ public class GenericWood {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
sideIcon = iconRegister.registerIcon(this.getTextureName() + "_" + info.getName().toLowerCase());
topIcon = iconRegister.registerIcon(this.getTextureName() + "_" + info.getName().toLowerCase() + "_top");
sideIcon = iconRegister.registerIcon(this.getTextureName() + "_" + getName().toLowerCase());
topIcon = iconRegister.registerIcon(this.getTextureName() + "_" + getName().toLowerCase() + "_top");
}
@Override
@ -129,12 +125,12 @@ public class GenericWood {
}
private class Leaves extends BlockLeaves {
private String[] nameArray = new String[] { info.getName() };
private String[] nameArray = new String[] { getName() };
private IIcon icon;
private IIcon iconOpaque;
public Leaves() {
setBlockName("leaves" + info.getName());
setBlockName("leaves" + getName());
setBlockTextureName(Test.MODID + ":leaves");
@ -144,8 +140,8 @@ public class GenericWood {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
icon = iconRegister.registerIcon(this.getTextureName() + "_" + info.getName().toLowerCase());
iconOpaque = iconRegister.registerIcon(this.getTextureName() + "_" + info.getName().toLowerCase() + "_opaque");
icon = iconRegister.registerIcon(this.getTextureName() + "_" + getName().toLowerCase());
iconOpaque = iconRegister.registerIcon(this.getTextureName() + "_" + getName().toLowerCase() + "_opaque");
}
@Override
@ -226,7 +222,7 @@ public class GenericWood {
this.dropBlockAsItem(world, x, y, z, new ItemStack(item, 1, this.damageDropped(meta)));
}
for (ItemStack drop : info.getDrops(world, x, y, z, meta, fortune))
for (ItemStack drop : GenericWood.this.getDrops(world, x, y, z, meta, fortune))
this.dropBlockAsItem(world, x, y, z, drop);
}
}
@ -234,12 +230,12 @@ public class GenericWood {
private class Sapling extends BlockSapling {
public Sapling() {
setBlockName("sapling" + info.getName());
setBlockName("sapling" + getName());
setHardness(0.0f);
setStepSound(soundTypeGrass);
setBlockTextureName(Test.MODID + ":sapling_" + info.getName().toLowerCase());
setBlockTextureName(Test.MODID + ":sapling_" + getName().toLowerCase());
}
@Override
@ -284,7 +280,7 @@ public class GenericWood {
setHardness(2.0f);
setResistance(5.0f);
setStepSound(soundTypeWood);
setBlockName("woodSlab" + info.getName());
setBlockName("woodSlab" + getName());
setLightOpacity(doubleSlab ? 255 : 0);
}
@ -332,12 +328,11 @@ public class GenericWood {
public Stairs() {
super(planks, 0);
setBlockName("stairsWood" + info.getName());
setBlockName("stairsWood" + getName());
setLightOpacity(0);
}
}
public static abstract class Info {
public abstract String getName();
public abstract int getMinTreeHeight();
@ -346,4 +341,3 @@ public class GenericWood {
return new ArrayList<ItemStack>();
}
}
}

7
java/net/universe_factory/minecraft/test/generic/WorldGenGenericTrees.java
View file

@ -3,13 +3,8 @@ package net.universe_factory.minecraft.test.generic;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
import net.minecraft.init.Blocks;
import net.minecraft.util.Direction;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.util.ForgeDirection;
public class WorldGenGenericTrees extends WorldGenAbstractTree {
@ -23,7 +18,7 @@ public class WorldGenGenericTrees extends WorldGenAbstractTree {
@Override
public boolean generate(World world, Random random, int x, int y, int z) {
int height = random.nextInt(3) + genericWood.info.getMinTreeHeight();
int height = random.nextInt(3) + genericWood.getMinTreeHeight();
boolean flag = true;
if (y >= 1 && y + height + 1 <= 256) {