diff --git a/gradle.properties b/gradle.properties index ab007f7e..b0ae9be9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx3G mcversion=1.11.2 -forgeversion=13.20.0.2262 +forgeversion=13.20.0.2279 mcp_mappings=snapshot_20161220 -forestry_version=5.3.2.68 +forestry_version=5.3.3.90 version_major=2 version_minor=0 diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index 6e0c15c9..ec720a6b 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -661,4 +661,10 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return isBreeding(); } + + @Override + public World getWorldObj() { + return world; + } + } diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index 579a546b..c054027a 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -1073,7 +1073,7 @@ public enum FlowerDefinition implements IFlowerDefinition { } public static void preInitFlowers() { - MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(FlowerManager.flowerRoot)); + MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(FlowerManager.flowerRoot, IAlleleFlowerSpecies.class)); for (FlowerDefinition def : values()) { @SuppressWarnings("unchecked") IFlowerType type = def.species.getType(); diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 9b009e63..f7012306 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -55,8 +55,8 @@ import java.util.List; modid = Constants.CORE_MOD_ID, name = "Binnie Core", useMetadata = true, - dependencies = "required-after:forge@[13.20.0.2230,);" + - "required-after:forestry@[5.3.2.68,);" + + dependencies = "required-after:forge@[13.20.0.2279,);" + + "required-after:forestry@[5.3.3.89,);" + "after:jei@[4.3.1,);" ) public final class BinnieCore extends AbstractMod { diff --git a/src/main/java/binnie/core/genetics/VirtualMothHousing.java b/src/main/java/binnie/core/genetics/VirtualMothHousing.java index b09b52ab..7d05d077 100644 --- a/src/main/java/binnie/core/genetics/VirtualMothHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualMothHousing.java @@ -4,6 +4,7 @@ import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; import javax.annotation.Nullable; @@ -32,4 +33,10 @@ public class VirtualMothHousing extends VirtualHousing implements IButterflyNurs public boolean canNurse(final IButterfly butterfly) { return false; } + + @Override + public World getWorldObj() { + // TODO Auto-generated method stub + return null; + } } diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 252ebb23..b2617279 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -73,6 +73,10 @@ public class ExtraTrees extends AbstractMod { private static ModuleMachine machine; @Nullable private static ModuleKitchen kitchen; + + public ExtraTrees() { + MinecraftForge.EVENT_BUS.register(ModuleGenetics.class); + } @Mod.EventHandler public void onConstruction(FMLConstructionEvent e) { @@ -175,9 +179,6 @@ public class ExtraTrees extends AbstractMod { @SubscribeEvent public void speciesRegister(AlleleSpeciesRegisterEvent event) { if (event.getRoot() instanceof ITreeRoot) { - for (final AlleleETFruit fruit : AlleleETFruit.values()) { - AlleleManager.alleleRegistry.registerAllele(fruit); - } ETTreeDefinition.preInitTrees(); PlankType.ExtraTreePlanks.initWoodTypes(); diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index af07854f..36057d0a 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -1,6 +1,7 @@ package binnie.extratrees.block; import binnie.core.BinnieCore; +import forestry.arboriculture.genetics.alleles.AlleleFruit; import java.util.Locale; @@ -12,37 +13,11 @@ public enum FruitPod { RedBanana, Papayimar; - short[] textures; -// IIcon[] icons; - FruitPod() { - this.textures = new short[]{BinnieCore.getBinnieProxy().getUniqueTextureUID(), BinnieCore.getBinnieProxy().getUniqueTextureUID(), BinnieCore.getBinnieProxy().getUniqueTextureUID()}; -// this.icons = new IIcon[3]; } - - public short[] getTextures() { - return this.textures; - } - + public String getModelName() { return name().toLowerCase(Locale.ENGLISH); } -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final short texUID) { -// final int index = this.textures[0] - texUID; -// if (index >= 0 && index < 3) { -// return this.icons[index]; -// } -// return null; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.icons[0] = ExtraTrees.proxy.getIcon(register, "pods/" + this.toString().toLowerCase() + ".0"); -// this.icons[1] = ExtraTrees.proxy.getIcon(register, "pods/" + this.toString().toLowerCase() + ".1"); -// this.icons[2] = ExtraTrees.proxy.getIcon(register, "pods/" + this.toString().toLowerCase() + ".2"); -// } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenApple.java b/src/main/java/binnie/extratrees/gen/WorldGenApple.java index 2e702bfa..e72bec10 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenApple.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenApple.java @@ -74,10 +74,10 @@ public class WorldGenApple { WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); while (leafSpawn > 3) { - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.85F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.85F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java index 2e95005b..a140a659 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java @@ -1,28 +1,29 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + import forestry.api.world.ITreeGenData; +import forestry.arboriculture.worldgen.ITreeBlockType; +import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; +import forestry.core.worldgen.WorldGenHelper; +import forestry.core.worldgen.WorldGenHelper.EnumReplaceMode; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; +import net.minecraft.world.World; -public class WorldGenBanana extends WorldGenTree { +public class WorldGenBanana extends forestry.arboriculture.worldgen.WorldGenTree { public WorldGenBanana(ITreeGenData tree) { - super(tree); + super(tree, 6, 1); } - + @Override - public void generate() { - this.bushiness = 0.9f; - this.generateTreeTrunk(this.height, this.girth); + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = this.height + 1; - final float width = this.height / this.randBetween(1.8f, 2.0f); - final int bottom = this.randBetween(3, 4); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.9f * width, 1, this.leaf, false); - } - - @Override - public void preGenerate() { - this.height = this.determineHeight(6, 1); - this.girth = this.determineGirth(this.treeGen.getGirth()); + final float width = this.height / WorldGenUtils.randBetween(rand, 3f, 3.25f); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.25F * width + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, width + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.75F * width + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenCitrus.java b/src/main/java/binnie/extratrees/gen/WorldGenCitrus.java deleted file mode 100644 index 46ffbe40..00000000 --- a/src/main/java/binnie/extratrees/gen/WorldGenCitrus.java +++ /dev/null @@ -1,31 +0,0 @@ -package binnie.extratrees.gen; - -import forestry.api.arboriculture.ITree; - -public class WorldGenCitrus extends WorldGenTree { - public WorldGenCitrus(final ITree tree) { - super(tree); - } - - @Override - public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height; - final float width = this.height / this.randBetween(1.1f, 1.5f); - final int bottom = this.randBetween(1, 2); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, this.leaf, false); - while (leafSpawn > bottom) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width, 1, this.leaf, false); - } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, this.leaf, false); - } - - @Override - public void preGenerate() { - this.minHeight = this.randBetween(2, 3); - this.height = this.determineHeight(6, 1); - this.girth = this.determineGirth(this.treeGen.getGirth()); - } - -} diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index 4575c59b..156c7d14 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -8,6 +8,8 @@ import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.item.Food; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; + +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IFruitProvider; @@ -34,45 +36,12 @@ import java.lang.reflect.Field; import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Random; public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IFruitProvider { - - /*public static void createAlleles() { - List fruitAlleles = Arrays.asList( - fruitNone = new AlleleFruit("none", new FruitProviderNone("for.fruits.none", null)), - fruitApple = new AlleleFruit("apple", new FruitProviderRandom("for.fruits.apple", EnumFruitFamily.POMES, new ItemStack(Items.APPLE), 1.0f) - .setColour(new Color(0xff2e2e)) - .setOverlay("pomes")), - fruitCocoa = new AlleleFruit("cocoa", new FruitProviderPod("for.fruits.cocoa", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.COCOA, new ItemStack(Items.DYE, 1, EnumDyeColor.BROWN.getDyeDamage()))), - // .setColours(0xecdca5, 0xc4d24a), true); - fruitChestnut = new AlleleFruit("chestnut", new FruitProviderRipening("for.fruits.chestnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.CHESTNUT.getStack(), 1.0f) - .setRipeningPeriod(6) - .setColours(new Color(0x7f333d), new Color(0xc4d24a)) - .setOverlay("nuts"), true), - fruitWalnut = new AlleleFruit("walnut", new FruitProviderRipening("for.fruits.walnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.WALNUT.getStack(), 1.0f) - .setRipeningPeriod(8) - .setColours(new Color(0xfba248), new Color(0xc4d24a)) - .setOverlay("nuts"), true), - fruitCherry = new AlleleFruit("cherry", new FruitProviderRipening("for.fruits.cherry", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.CHERRY.getStack(), 1.0f) - .setColours(new Color(0xff2e2e), new Color(0xc4d24a)) - .setOverlay("berries"), true), - fruitDates = new AlleleFruit("dates", new FruitProviderPod("for.fruits.dates", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.DATES, ItemFruit.EnumFruit.DATES.getStack(4))), - fruitPapaya = new AlleleFruit("papaya", new FruitProviderPod("for.fruits.papaya", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.PAPAYA, ItemFruit.EnumFruit.PAPAYA.getStack())), - fruitLemon = new AlleleFruit("lemon", new FruitProviderRipening("for.fruits.lemon", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.LEMON.getStack(), 1.0f) - .setColours(new Color(0xeeee00), new Color(0x99ff00)) - .setOverlay("citrus"), true), - fruitPlum = new AlleleFruit("plum", new FruitProviderRipening("for.fruits.plum", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.PLUM.getStack(), 1.0f) - .setColours(new Color(0x663446), new Color(0xeeff1a)) - .setOverlay("plums"), true) - ); - - for (IAlleleFruit fruitAllele : fruitAlleles) { - AlleleManager.alleleRegistry.registerAllele(fruitAllele, EnumTreeChromosome.FRUITS); - } - }*/ public static final AlleleETFruit Blackthorn = new AlleleETFruit("Blackthorn", 10, 7180062, 14561129, FruitSprite.SMALL); public static final AlleleETFruit CherryPlum = new AlleleETFruit("CherryPlum", 10, 7180062, 15211595, FruitSprite.SMALL); public static final AlleleETFruit Peach = new AlleleETFruit("Peach", 10, 7180062, 16424995, FruitSprite.AVERAGE); @@ -166,6 +135,12 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF return list; } + + public static void preInit(){ + for (final AlleleETFruit fruit : AlleleETFruit.values()) { + AlleleManager.alleleRegistry.registerAllele(fruit, EnumTreeChromosome.FRUITS); + } + } public static void init() { final IFruitFamily familyPrune = AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"); @@ -397,7 +372,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Override public boolean trySpawnFruitBlock(ITreeGenome genome, World world, Random rand, BlockPos pos) { if (this.pod != null && world.rand.nextFloat() <= genome.getSappiness()) { - TreeManager.treeRoot.setFruitBlock(world, genome, this, genome.getSappiness(), pos); + return TreeManager.treeRoot.setFruitBlock(world, genome, this, genome.getSappiness(), pos); } return false; } @@ -435,7 +410,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Override public String getModelName() { if (pod != null) { - return pod.name(); + return pod.getModelName(); } else { return null; } @@ -501,22 +476,6 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF return this.pod != null; } -// @Override -// public short getIconIndex(final ITreeGenome genome, final IBlockAccess world, final int x, final int y, final int z, final int ripeningTime, final boolean fancy) { -// return this.index.getIndex(); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// if (this.ordinal() == 0) { -// for (final FruitSprite sprite : FruitSprite.values()) { -// sprite.registerIcons(register); -// } -// } -// } - - @Nullable @Override public ResourceLocation getDecorativeSprite() { diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 0c43bdda..5137bff7 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -52,6 +52,7 @@ import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.ITreeDefinition; import forestry.arboriculture.genetics.Tree; import forestry.arboriculture.tiles.TileLeaves; +import forestry.arboriculture.worldgen.WorldGenDate; import forestry.arboriculture.worldgen.WorldGenLemon; import forestry.arboriculture.worldgen.WorldGenPlum; import forestry.core.genetics.alleles.AlleleBoolean; diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 2ca4a520..50ab5a86 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -3,6 +3,10 @@ package binnie.extratrees.genetics; import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.IInitializable; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.genetics.AlleleRegisterEvent; +import forestry.arboriculture.genetics.alleles.AlleleFruits; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.ArrayList; import java.util.List; @@ -31,7 +35,6 @@ public class ModuleGenetics implements IInitializable { @Override public void postInit() { - if (BinnieCore.isLepidopteryActive()) { for (final ButterflySpecies species2 : ButterflySpecies.values()) { //AlleleManager.alleleRegistry.registerAllele(species2); @@ -40,4 +43,11 @@ public class ModuleGenetics implements IInitializable { } } } + + @SubscribeEvent + public static void onRegisterAllele(AlleleRegisterEvent event){ + if(event.getAlleleClass() == IAlleleFruit.class){ + AlleleETFruit.preInit(); + } + } } \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java index 5a833bf9..7ad18d58 100644 --- a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java +++ b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java @@ -112,4 +112,10 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu public BlockPos getCoordinates() { return getPos(); } + + @Override + public World getWorldObj() { + // TODO Auto-generated method stub + return null; + } } diff --git a/src/main/resources/assets/extratrees/blockstates/pods/banana.json b/src/main/resources/assets/extratrees/blockstates/pods/banana.json new file mode 100644 index 00000000..b4b4dca0 --- /dev/null +++ b/src/main/resources/assets/extratrees/blockstates/pods/banana.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0,facing=south": { "model": "extratrees:pods/banana_0" }, + "age=0,facing=west": { "model": "extratrees:pods/banana_0", "y": 90 }, + "age=0,facing=north": { "model": "extratrees:pods/banana_0", "y": 180 }, + "age=0,facing=east": { "model": "extratrees:pods/banana_0", "y": 270 }, + "age=1,facing=south": { "model": "extratrees:pods/banana_1" }, + "age=1,facing=west": { "model": "extratrees:pods/banana_1", "y": 90 }, + "age=1,facing=north": { "model": "extratrees:pods/banana_1", "y": 180 }, + "age=1,facing=east": { "model": "extratrees:pods/banana_1", "y": 270 }, + "age=2,facing=south": { "model": "extratrees:pods/banana_2" }, + "age=2,facing=west": { "model": "extratrees:pods/banana_2", "y": 90 }, + "age=2,facing=north": { "model": "extratrees:pods/banana_2", "y": 180 }, + "age=2,facing=east": { "model": "extratrees:pods/banana_2", "y": 270 } + } +} diff --git a/src/main/resources/assets/extratrees/blockstates/pods/brazil.json b/src/main/resources/assets/extratrees/blockstates/pods/brazil.json new file mode 100644 index 00000000..5817a794 --- /dev/null +++ b/src/main/resources/assets/extratrees/blockstates/pods/brazil.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0,facing=south": { "model": "extratrees:pods/brazil_0" }, + "age=0,facing=west": { "model": "extratrees:pods/brazil_0", "y": 90 }, + "age=0,facing=north": { "model": "extratrees:pods/brazil_0", "y": 180 }, + "age=0,facing=east": { "model": "extratrees:pods/brazil_0", "y": 270 }, + "age=1,facing=south": { "model": "extratrees:pods/brazil_1" }, + "age=1,facing=west": { "model": "extratrees:pods/brazil_1", "y": 90 }, + "age=1,facing=north": { "model": "extratrees:pods/brazil_1", "y": 180 }, + "age=1,facing=east": { "model": "extratrees:pods/brazil_1", "y": 270 }, + "age=2,facing=south": { "model": "extratrees:pods/brazil_2" }, + "age=2,facing=west": { "model": "extratrees:pods/brazil_2", "y": 90 }, + "age=2,facing=north": { "model": "extratrees:pods/brazil_2", "y": 180 }, + "age=2,facing=east": { "model": "extratrees:pods/brazil_2", "y": 270 } + } +} diff --git a/src/main/resources/assets/extratrees/blockstates/pods/coconut.json b/src/main/resources/assets/extratrees/blockstates/pods/coconut.json new file mode 100644 index 00000000..5460e22e --- /dev/null +++ b/src/main/resources/assets/extratrees/blockstates/pods/coconut.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0,facing=south": { "model": "extratrees:pods/coconut_0" }, + "age=0,facing=west": { "model": "extratrees:pods/coconut_0", "y": 90 }, + "age=0,facing=north": { "model": "extratrees:pods/coconut_0", "y": 180 }, + "age=0,facing=east": { "model": "extratrees:pods/coconut_0", "y": 270 }, + "age=1,facing=south": { "model": "extratrees:pods/coconut_1" }, + "age=1,facing=west": { "model": "extratrees:pods/coconut_1", "y": 90 }, + "age=1,facing=north": { "model": "extratrees:pods/coconut_1", "y": 180 }, + "age=1,facing=east": { "model": "extratrees:pods/coconut_1", "y": 270 }, + "age=2,facing=south": { "model": "extratrees:pods/coconut_2" }, + "age=2,facing=west": { "model": "extratrees:pods/coconut_2", "y": 90 }, + "age=2,facing=north": { "model": "extratrees:pods/coconut_2", "y": 180 }, + "age=2,facing=east": { "model": "extratrees:pods/coconut_2", "y": 270 } + } +} diff --git a/src/main/resources/assets/extratrees/blockstates/pods/plantain.json b/src/main/resources/assets/extratrees/blockstates/pods/plantain.json new file mode 100644 index 00000000..d86e2461 --- /dev/null +++ b/src/main/resources/assets/extratrees/blockstates/pods/plantain.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0,facing=south": { "model": "extratrees:pods/plantain_0" }, + "age=0,facing=west": { "model": "extratrees:pods/plantain_0", "y": 90 }, + "age=0,facing=north": { "model": "extratrees:pods/plantain_0", "y": 180 }, + "age=0,facing=east": { "model": "extratrees:pods/plantain_0", "y": 270 }, + "age=1,facing=south": { "model": "extratrees:pods/plantain_1" }, + "age=1,facing=west": { "model": "extratrees:pods/plantain_1", "y": 90 }, + "age=1,facing=north": { "model": "extratrees:pods/plantain_1", "y": 180 }, + "age=1,facing=east": { "model": "extratrees:pods/plantain_1", "y": 270 }, + "age=2,facing=south": { "model": "extratrees:pods/plantain_2" }, + "age=2,facing=west": { "model": "extratrees:pods/plantain_2", "y": 90 }, + "age=2,facing=north": { "model": "extratrees:pods/plantain_2", "y": 180 }, + "age=2,facing=east": { "model": "extratrees:pods/plantain_2", "y": 270 } + } +} diff --git a/src/main/resources/assets/extratrees/blockstates/pods/redbanana.json b/src/main/resources/assets/extratrees/blockstates/pods/redbanana.json new file mode 100644 index 00000000..44647aac --- /dev/null +++ b/src/main/resources/assets/extratrees/blockstates/pods/redbanana.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0,facing=south": { "model": "extratrees:pods/redbanana_0" }, + "age=0,facing=west": { "model": "extratrees:pods/redbanana_0", "y": 90 }, + "age=0,facing=north": { "model": "extratrees:pods/redbanana_0", "y": 180 }, + "age=0,facing=east": { "model": "extratrees:pods/redbanana_0", "y": 270 }, + "age=1,facing=south": { "model": "extratrees:pods/redbanana_1" }, + "age=1,facing=west": { "model": "extratrees:pods/redbanana_1", "y": 90 }, + "age=1,facing=north": { "model": "extratrees:pods/redbanana_1", "y": 180 }, + "age=1,facing=east": { "model": "extratrees:pods/redbanana_1", "y": 270 }, + "age=2,facing=south": { "model": "extratrees:pods/redbanana_2" }, + "age=2,facing=west": { "model": "extratrees:pods/redbanana_2", "y": 90 }, + "age=2,facing=north": { "model": "extratrees:pods/redbanana_2", "y": 180 }, + "age=2,facing=east": { "model": "extratrees:pods/redbanana_2", "y": 270 } + } +} diff --git a/src/main/resources/assets/extratrees/models/block/pods/banana_0.json b/src/main/resources/assets/extratrees/models/block/pods/banana_0.json new file mode 100644 index 00000000..0b08c6a4 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/banana_0.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age0_s", + "textures": { + "particle": "extratrees:blocks/pods/banana.0", + "cocoa": "extratrees:blocks/pods/banana.0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/banana_1.json b/src/main/resources/assets/extratrees/models/block/pods/banana_1.json new file mode 100644 index 00000000..87cd1f50 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/banana_1.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age1_s", + "textures": { + "particle": "extratrees:blocks/pods/banana.1", + "cocoa": "extratrees:blocks/pods/banana.1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/banana_2.json b/src/main/resources/assets/extratrees/models/block/pods/banana_2.json new file mode 100644 index 00000000..3d204b00 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/banana_2.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age2_s", + "textures": { + "particle": "extratrees:blocks/pods/banana.2", + "cocoa": "extratrees:blocks/pods/banana.2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/brazil_0.json b/src/main/resources/assets/extratrees/models/block/pods/brazil_0.json new file mode 100644 index 00000000..bcd826eb --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/brazil_0.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age0_s", + "textures": { + "particle": "extratrees:blocks/pods/brazil.0", + "cocoa": "extratrees:blocks/pods/brazil.0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/brazil_1.json b/src/main/resources/assets/extratrees/models/block/pods/brazil_1.json new file mode 100644 index 00000000..fea0c1ce --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/brazil_1.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age1_s", + "textures": { + "particle": "extratrees:blocks/pods/brazil.1", + "cocoa": "extratrees:blocks/pods/brazil.1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/brazil_2.json b/src/main/resources/assets/extratrees/models/block/pods/brazil_2.json new file mode 100644 index 00000000..a075030c --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/brazil_2.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age2_s", + "textures": { + "particle": "extratrees:blocks/pods/brazil.2", + "cocoa": "extratrees:blocks/pods/brazil.2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/coconut_0.json b/src/main/resources/assets/extratrees/models/block/pods/coconut_0.json new file mode 100644 index 00000000..d1b05e7a --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/coconut_0.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age0_s", + "textures": { + "particle": "extratrees:blocks/pods/coconut.0", + "cocoa": "extratrees:blocks/pods/coconut.0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/coconut_1.json b/src/main/resources/assets/extratrees/models/block/pods/coconut_1.json new file mode 100644 index 00000000..d92f6d57 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/coconut_1.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age1_s", + "textures": { + "particle": "extratrees:blocks/pods/coconut.1", + "cocoa": "extratrees:blocks/pods/coconut.1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/coconut_2.json b/src/main/resources/assets/extratrees/models/block/pods/coconut_2.json new file mode 100644 index 00000000..4bd68e1a --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/coconut_2.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age2_s", + "textures": { + "particle": "extratrees:blocks/pods/coconut.2", + "cocoa": "extratrees:blocks/pods/coconut.2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/plantain_0.json b/src/main/resources/assets/extratrees/models/block/pods/plantain_0.json new file mode 100644 index 00000000..be9185b4 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/plantain_0.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age0_s", + "textures": { + "particle": "extratrees:blocks/pods/plantain.0", + "cocoa": "extratrees:blocks/pods/plantain.0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/plantain_1.json b/src/main/resources/assets/extratrees/models/block/pods/plantain_1.json new file mode 100644 index 00000000..621b29a0 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/plantain_1.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age1_s", + "textures": { + "particle": "extratrees:blocks/pods/plantain.1", + "cocoa": "extratrees:blocks/pods/plantain.1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/plantain_2.json b/src/main/resources/assets/extratrees/models/block/pods/plantain_2.json new file mode 100644 index 00000000..2763707b --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/plantain_2.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age2_s", + "textures": { + "particle": "extratrees:blocks/pods/plantain.2", + "cocoa": "extratrees:blocks/pods/plantain.2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/redbanana_0.json b/src/main/resources/assets/extratrees/models/block/pods/redbanana_0.json new file mode 100644 index 00000000..9d3b2db3 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/redbanana_0.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age0_s", + "textures": { + "particle": "extratrees:blocks/pods/redbanana.0", + "cocoa": "extratrees:blocks/pods/redbanana.0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/redbanana_1.json b/src/main/resources/assets/extratrees/models/block/pods/redbanana_1.json new file mode 100644 index 00000000..b9cf8bf4 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/redbanana_1.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age1_s", + "textures": { + "particle": "extratrees:blocks/pods/redbanana.1", + "cocoa": "extratrees:blocks/pods/redbanana.1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/pods/redbanana_2.json b/src/main/resources/assets/extratrees/models/block/pods/redbanana_2.json new file mode 100644 index 00000000..9ca00a88 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/pods/redbanana_2.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age2_s", + "textures": { + "particle": "extratrees:blocks/pods/redbanana.2", + "cocoa": "extratrees:blocks/pods/redbanana.2" + } +} \ No newline at end of file