mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 19:59:36 +00:00
Ladies and Gentlemen! For my first trick... now you see the passive flowers. Now you don't!
This commit is contained in:
1 parent
309574adc7
commit
dd92eaf886
23 files changed
+36
-404
No files matched your search
@@ -52,9 +52,6 @@ public class BasicSignature extends SubTileSignature {
|
||||
if(clazz == null)
|
||||
return "uwotm8";
|
||||
|
||||
if(clazz.getAnnotation(PassiveFlower.class) != null)
|
||||
return "botania.flowerType.passiveGenerating";
|
||||
|
||||
if(SubTileGenerating.class.isAssignableFrom(clazz))
|
||||
return "botania.flowerType.generating";
|
||||
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
/**
|
||||
* 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 @ [04/12/2015, 16:47:01 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.api.subtile.signature;
|
||||
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
import static java.lang.annotation.ElementType.TYPE;
|
||||
import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
||||
|
||||
/**
|
||||
* This annotation used for detecting whether a SubTileEntity
|
||||
* is a passive flower without having to instantiate it. This
|
||||
* is used for the flowers' tooltips.
|
||||
*/
|
||||
@Retention(value = RUNTIME)
|
||||
@Target(value = TYPE)
|
||||
public @interface PassiveFlower {
|
||||
|
||||
}
|
||||
@@ -8,12 +8,15 @@
|
||||
*/
|
||||
package vazkii.botania.client.core.handler;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.function.IntFunction;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
|
||||
import net.minecraft.client.renderer.block.statemap.IStateMapper;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
@@ -22,12 +25,8 @@ import net.minecraftforge.fml.common.registry.RegistryDelegate;
|
||||
import net.minecraftforge.fml.relauncher.ReflectionHelper;
|
||||
import vazkii.botania.api.BotaniaAPIClient;
|
||||
import vazkii.botania.api.item.IFloatingFlower;
|
||||
import vazkii.botania.api.state.enums.BiomeStoneVariant;
|
||||
import vazkii.botania.client.model.SpecialFlowerModel;
|
||||
import vazkii.botania.client.render.IModelRegister;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.block.subtile.SubTileDecor;
|
||||
import vazkii.botania.common.block.subtile.SubTileManastar;
|
||||
import vazkii.botania.common.block.subtile.SubTilePureDaisy;
|
||||
import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation;
|
||||
@@ -58,7 +57,6 @@ import vazkii.botania.common.block.subtile.functional.SubTileTigerseye;
|
||||
import vazkii.botania.common.block.subtile.functional.SubTileVinculotus;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileDaybloom;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileEndoflame;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis;
|
||||
@@ -66,17 +64,12 @@ import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileKekimurus;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileMunchdew;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileNightshade;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.function.IntFunction;
|
||||
|
||||
public final class ModelHandler {
|
||||
|
||||
public static void registerModels() {
|
||||
@@ -111,16 +104,9 @@ public final class ModelHandler {
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY));
|
||||
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileDaybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileDecor.Daybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM + "Decor"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileDaybloom.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM_PRIME));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileDecor.Hydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS + "Decor"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileNightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileDecor.Nightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE + "Decor"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileNightshade.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE_PRIME));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM));
|
||||
|
||||
@@ -527,10 +527,10 @@ public class GuiLexicon extends GuiScreen {
|
||||
tutorial.add(LexiconData.manaIntro);
|
||||
tutorial.add(LexiconData.pool);
|
||||
tutorial.add(LexiconData.spreader);
|
||||
if(ConfigHandler.hardcorePassiveGeneration > 0)
|
||||
tutorial.add(LexiconData.generatingIntro);
|
||||
tutorial.add(LexiconData.passiveGen);
|
||||
tutorial.add(LexiconData.daybloom);
|
||||
tutorial.add(LexiconData.generatingIntro);
|
||||
tutorial.add(LexiconData.endoflame);
|
||||
// tutorial.add(LexiconData.passiveGen);
|
||||
// tutorial.add(LexiconData.daybloom);
|
||||
tutorial.add(LexiconData.functionalIntro);
|
||||
tutorial.add(LexiconData.runicAltar);
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ public final class ModAchievements {
|
||||
|
||||
public static Achievement flowerPickup;
|
||||
public static Achievement lexiconUse;
|
||||
public static Achievement daybloomPickup;
|
||||
public static Achievement daybloomPickup; // TODO change this to something else
|
||||
public static Achievement cacophoniumCraft;
|
||||
public static Achievement manaPoolPickup;
|
||||
|
||||
@@ -91,7 +91,7 @@ public final class ModAchievements {
|
||||
public static void init() {
|
||||
flowerPickup = new AchievementMod(LibAchievementNames.FLOWER_PICKUP, 0, 4, new ItemStack(ModBlocks.flower, 1, 6), null);
|
||||
lexiconUse = new AchievementMod(LibAchievementNames.LEXICON_USE, 1, 5, ModItems.lexicon, flowerPickup);
|
||||
daybloomPickup = new AchievementMod(LibAchievementNames.DAYBLOOM_PICKUP, 3, 5, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), lexiconUse);
|
||||
daybloomPickup = new AchievementMod(LibAchievementNames.DAYBLOOM_PICKUP, 3, 5, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), lexiconUse); // TODO this too
|
||||
cacophoniumCraft = new AchievementMod(LibAchievementNames.CACOPHONIUM_CRAFT, -1, 2, ModItems.cacophonium, flowerPickup);
|
||||
manaPoolPickup = new AchievementMod(LibAchievementNames.MANA_POOL_PICKUP, 3, 2, ModBlocks.pool, daybloomPickup);
|
||||
|
||||
|
||||
@@ -74,8 +74,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
|
||||
LibBlockNames.SUBTILE_MANASTAR,
|
||||
|
||||
// Generating
|
||||
LibBlockNames.SUBTILE_DAYBLOOM,
|
||||
LibBlockNames.SUBTILE_NIGHTSHADE,
|
||||
LibBlockNames.SUBTILE_ENDOFLAME,
|
||||
LibBlockNames.SUBTILE_HYDROANGEAS,
|
||||
LibBlockNames.SUBTILE_THERMALILY,
|
||||
|
||||
@@ -74,7 +74,6 @@ import vazkii.botania.common.block.string.BlockRedStringDispenser;
|
||||
import vazkii.botania.common.block.string.BlockRedStringFertilizer;
|
||||
import vazkii.botania.common.block.string.BlockRedStringInterceptor;
|
||||
import vazkii.botania.common.block.string.BlockRedStringRelay;
|
||||
import vazkii.botania.common.block.subtile.SubTileDecor;
|
||||
import vazkii.botania.common.block.subtile.SubTileManastar;
|
||||
import vazkii.botania.common.block.subtile.SubTilePureDaisy;
|
||||
import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation;
|
||||
@@ -105,7 +104,6 @@ import vazkii.botania.common.block.subtile.functional.SubTileTigerseye;
|
||||
import vazkii.botania.common.block.subtile.functional.SubTileVinculotus;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileDaybloom;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileEndoflame;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis;
|
||||
@@ -113,7 +111,6 @@ import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileKekimurus;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileMunchdew;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileNightshade;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
|
||||
@@ -175,9 +172,6 @@ import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibOreDict;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public final class ModBlocks {
|
||||
|
||||
public static Block flower;
|
||||
@@ -454,13 +448,9 @@ public final class ModBlocks {
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class);
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class);
|
||||
|
||||
registerSubTileWithDecor(LibBlockNames.SUBTILE_DAYBLOOM, SubTileDaybloom.class, SubTileDecor.Daybloom.class);
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DAYBLOOM_PRIME, SubTileDaybloom.Prime.class);
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HYDROANGEAS, SubTileHydroangeas.class);
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENDOFLAME, SubTileEndoflame.class);
|
||||
registerSubTileWithDecor(LibBlockNames.SUBTILE_HYDROANGEAS, SubTileHydroangeas.class, SubTileDecor.Hydroangeas.class);
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_THERMALILY, SubTileThermalily.class);
|
||||
registerSubTileWithDecor(LibBlockNames.SUBTILE_NIGHTSHADE, SubTileNightshade.class, SubTileDecor.Nightshade.class);
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_NIGHTSHADE_PRIME, SubTileNightshade.Prime.class);
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ARCANE_ROSE, SubTileArcaneRose.class);
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MUNCHDEW, SubTileMunchdew.class);
|
||||
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENTROPINNYUM, SubTileEntropinnyum.class);
|
||||
@@ -516,11 +506,6 @@ public final class ModBlocks {
|
||||
BotaniaAPI.registerMiniSubTile(key + "Chibi", innerClazz, key);
|
||||
}
|
||||
|
||||
private static void registerSubTileWithDecor(String key, Class<? extends SubTileEntity> clazz, Class<? extends SubTileEntity> decor) {
|
||||
BotaniaAPI.registerSubTile(key, clazz);
|
||||
BotaniaAPI.registerMiniSubTile(key + "Decor", decor, key);
|
||||
}
|
||||
|
||||
private static void registerTile(Class<? extends TileEntity> clazz, String key) {
|
||||
GameRegistry.registerTileEntity(clazz, LibResources.PREFIX_MOD + key);
|
||||
}
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
/**
|
||||
* 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 @ [Sep 28, 2015, 10:17:01 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.subtile;
|
||||
|
||||
import vazkii.botania.api.subtile.SubTileEntity;
|
||||
|
||||
public class SubTileDecor extends SubTileEntity {
|
||||
|
||||
public static class Daybloom extends SubTileDecor { }
|
||||
public static class Nightshade extends SubTileDecor { }
|
||||
public static class Hydroangeas extends SubTileDecor { }
|
||||
|
||||
}
|
||||
@@ -1,130 +0,0 @@
|
||||
/**
|
||||
* 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 25, 2014, 3:09:35 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.signature.PassiveFlower;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@PassiveFlower
|
||||
public class SubTileDaybloom extends SubTilePassiveGenerating {
|
||||
|
||||
private static final String TAG_PRIME_POSITION_X = "primePositionX";
|
||||
private static final String TAG_PRIME_POSITION_Y = "primePositionY";
|
||||
private static final String TAG_PRIME_POSITION_Z = "primePositionZ";
|
||||
private static final String TAG_SAVED_POSITION = "savedPosition";
|
||||
|
||||
BlockPos primePosition;
|
||||
boolean savedPosition;
|
||||
|
||||
@Override
|
||||
public int getColor() {
|
||||
return 0xFFFF00;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUpdate() {
|
||||
super.onUpdate();
|
||||
|
||||
if(isPrime() && (!savedPosition || !supertile.getPos().equals(primePosition)))
|
||||
supertile.getWorld().setBlockToAir(supertile.getPos());
|
||||
}
|
||||
|
||||
public void setPrimusPosition() {
|
||||
primePosition = supertile.getPos();
|
||||
|
||||
savedPosition = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getDrops(List<ItemStack> list) {
|
||||
if(isPrime())
|
||||
list.clear();
|
||||
|
||||
return super.getDrops(list);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canGeneratePassively() {
|
||||
boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering());
|
||||
return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeSky(supertile.getPos().up());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDelayBetweenPassiveGeneration() {
|
||||
return isPrime() ? 10 : 12;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToPacketNBT(NBTTagCompound cmp) {
|
||||
super.writeToPacketNBT(cmp);
|
||||
|
||||
if(isPrime()) {
|
||||
cmp.setInteger(TAG_PRIME_POSITION_X, primePosition.getX());
|
||||
cmp.setInteger(TAG_PRIME_POSITION_Y, primePosition.getY());
|
||||
cmp.setInteger(TAG_PRIME_POSITION_Z, primePosition.getZ());
|
||||
cmp.setBoolean(TAG_SAVED_POSITION, savedPosition);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromPacketNBT(NBTTagCompound cmp) {
|
||||
super.readFromPacketNBT(cmp);
|
||||
|
||||
if(isPrime()) {
|
||||
primePosition = new BlockPos(
|
||||
cmp.getInteger(TAG_PRIME_POSITION_X),
|
||||
cmp.getInteger(TAG_PRIME_POSITION_Y),
|
||||
cmp.getInteger(TAG_PRIME_POSITION_Z)
|
||||
);
|
||||
savedPosition = cmp.getBoolean(TAG_SAVED_POSITION);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldSyncPassiveGeneration() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPassiveFlower() {
|
||||
return !isPrime();
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry() {
|
||||
return LexiconData.daybloom;
|
||||
}
|
||||
|
||||
public boolean isPrime() {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static class Prime extends SubTileDaybloom {
|
||||
|
||||
@Override
|
||||
public boolean isPrime() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry() {
|
||||
return LexiconData.primusLoci;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+7
-8
@@ -10,6 +10,10 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLiquid;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -26,17 +30,12 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.BlockFluidBase;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.RadiusDescriptor;
|
||||
import vazkii.botania.api.subtile.signature.PassiveFlower;
|
||||
import vazkii.botania.api.subtile.SubTileGenerating;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@PassiveFlower
|
||||
public class SubTileHydroangeas extends SubTilePassiveGenerating {
|
||||
public class SubTileHydroangeas extends SubTileGenerating {
|
||||
|
||||
private static final String TAG_BURN_TIME = "burnTime";
|
||||
private static final String TAG_COOLDOWN = "cooldown";
|
||||
@@ -181,7 +180,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating {
|
||||
@Override
|
||||
public int getDelayBetweenPassiveGeneration() {
|
||||
boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering());
|
||||
return rain ? 1 : 2;
|
||||
return rain ? 2 : 3;
|
||||
}
|
||||
|
||||
public int getCooldown() {
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
/**
|
||||
* 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 @ [Mar 16, 2014, 11:15:42 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.signature.PassiveFlower;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
@PassiveFlower
|
||||
public class SubTileNightshade extends SubTileDaybloom {
|
||||
|
||||
@Override
|
||||
public boolean canGeneratePassively() {
|
||||
return !super.canGeneratePassively() && !supertile.getWorld().isDaytime();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColor() {
|
||||
return 0x3D2A90;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry() {
|
||||
return LexiconData.nightshade;
|
||||
}
|
||||
|
||||
public static class Prime extends SubTileNightshade {
|
||||
|
||||
@Override
|
||||
public boolean isPrime() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry() {
|
||||
return LexiconData.primusLoci;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
-22
@@ -1,22 +0,0 @@
|
||||
/**
|
||||
* 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 @ [Mar 16, 2015, 6:03:16 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import vazkii.botania.api.subtile.SubTileGenerating;
|
||||
|
||||
public class SubTilePassiveGenerating extends SubTileGenerating {
|
||||
|
||||
@Override
|
||||
public boolean isPassiveFlower() {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -55,7 +55,7 @@ public class SubTileRafflowsia extends SubTileGenerating {
|
||||
SubTileEntity stile = ((ISubTileContainer) tile).getSubTile();
|
||||
String name = stile.getUnlocalizedName();
|
||||
|
||||
if(stile instanceof SubTileGenerating && ((SubTileGenerating) stile).isPassiveFlower()) {
|
||||
if(stile instanceof SubTileGenerating) {
|
||||
boolean last = name.equals(lastFlower);
|
||||
if(last)
|
||||
lastFlowerTimes++;
|
||||
|
||||
@@ -34,11 +34,6 @@ public class SubTileThermalily extends SubTileHydroangeas {
|
||||
Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPassiveFlower() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Material getMaterialToSearchFor() {
|
||||
return Material.LAVA;
|
||||
|
||||
@@ -22,9 +22,6 @@ import vazkii.botania.api.item.IFlowerlessWorld;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockModFlower;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileDaybloom;
|
||||
import vazkii.botania.common.block.tile.TileSpecialFlower;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public final class BiomeDecorationHandler {
|
||||
|
||||
@@ -50,7 +47,6 @@ public final class BiomeDecorationHandler {
|
||||
int y = event.getWorld().getTopSolidOrLiquidBlock(event.getPos()).getY();
|
||||
|
||||
EnumDyeColor color = EnumDyeColor.byMetadata(event.getRand().nextInt(16));
|
||||
boolean primus = event.getRand().nextInt(380) == 0;
|
||||
|
||||
for(int j = 0; j < ConfigHandler.flowerDensity * ConfigHandler.flowerPatchChance; j++) {
|
||||
int x1 = x + event.getRand().nextInt(dist * 2) - dist;
|
||||
@@ -58,17 +54,9 @@ public final class BiomeDecorationHandler {
|
||||
int z1 = z + event.getRand().nextInt(dist * 2) - dist;
|
||||
BlockPos pos2 = new BlockPos(x1, y1, z1);
|
||||
if(event.getWorld().isAirBlock(pos2) && (!event.getWorld().provider.getHasNoSky() || y1 < 127) && ModBlocks.flower.canPlaceBlockAt(event.getWorld(), pos2)) {
|
||||
if(primus) {
|
||||
event.getWorld().setBlockState(pos2, ModBlocks.specialFlower.getDefaultState(), 2);
|
||||
TileSpecialFlower flower = (TileSpecialFlower) event.getWorld().getTileEntity(pos2);
|
||||
flower.setSubTile(event.getRand().nextBoolean() ? LibBlockNames.SUBTILE_NIGHTSHADE_PRIME : LibBlockNames.SUBTILE_DAYBLOOM_PRIME);
|
||||
SubTileDaybloom subtile = (SubTileDaybloom) flower.getSubTile();
|
||||
subtile.setPrimusPosition();
|
||||
} else {
|
||||
event.getWorld().setBlockState(pos2, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2);
|
||||
if(event.getRand().nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.getWorld(), pos2, event.getWorld().getBlockState(pos2), false))
|
||||
BlockModFlower.placeDoubleFlower(event.getWorld(), pos2, color, 0);
|
||||
}
|
||||
event.getWorld().setBlockState(pos2, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2);
|
||||
if(event.getRand().nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.getWorld(), pos2, event.getWorld().getBlockState(pos2), false))
|
||||
BlockModFlower.placeDoubleFlower(event.getWorld(), pos2, color, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,8 +35,6 @@ public final class ConfigHandler {
|
||||
public static ConfigAdaptor adaptor;
|
||||
|
||||
|
||||
public static int hardcorePassiveGeneration = 72000;
|
||||
|
||||
public static boolean useAdaptativeConfig = true;
|
||||
|
||||
public static boolean useShaders = true;
|
||||
@@ -240,9 +238,6 @@ public final class ConfigHandler {
|
||||
desc = "The quantity of Botania flower patches to generate in the world, defaults to 2, the lower the number the less patches generate.";
|
||||
flowerQuantity = loadPropInt("worldgen.flower.quantity", desc, flowerQuantity);
|
||||
|
||||
desc = "The amount of time it takes a Passive flower to decay and turn into a dead bush. Defaults to 72000, 60 minutes. Setting this to -1 disables the feature altogether.";
|
||||
hardcorePassiveGeneration = loadPropInt("passiveDecay.time", desc, hardcorePassiveGeneration);
|
||||
|
||||
desc = "The density of each Botania flower patch generated, defaults to 2, the lower the number, the less each patch will have.";
|
||||
adaptor.addMappingInt(0, "worldgen.flower.density", 16);
|
||||
adaptor.addMappingInt(238, "worldgen.flower.density", 2);
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
*/
|
||||
package vazkii.botania.common.core.handler;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import baubles.common.network.PacketHandler;
|
||||
import baubles.common.network.PacketSyncBauble;
|
||||
@@ -70,9 +73,7 @@ import vazkii.botania.common.lexicon.page.PageMultiblock;
|
||||
import vazkii.botania.common.lexicon.page.PagePetalRecipe;
|
||||
import vazkii.botania.common.lexicon.page.PageRuneRecipe;
|
||||
import vazkii.botania.common.lexicon.page.PageText;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
public class InternalMethodHandler extends DummyMethodHandler {
|
||||
|
||||
@@ -229,9 +230,9 @@ public class InternalMethodHandler extends DummyMethodHandler {
|
||||
|
||||
@Override
|
||||
public int getPassiveFlowerDecay() {
|
||||
return ConfigHandler.hardcorePassiveGeneration;
|
||||
return LibMisc.PASSIVE_FLOWER_DECAY;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "BuildCraft|Transport")
|
||||
public boolean isBuildcraftPipe(TileEntity tile) {
|
||||
|
||||
@@ -81,8 +81,6 @@ public final class ModPetalRecipes {
|
||||
pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white);
|
||||
manastarRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MANASTAR), lightBlue, green, red, cyan);
|
||||
|
||||
daybloomRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), yellow, yellow, orange, lightBlue);
|
||||
nightshadeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE), black, black, purple, gray);
|
||||
endoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), brown, brown, red, lightGray, manaPowder);
|
||||
hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), blue, blue, cyan, cyan, manaPowder);
|
||||
thermalilyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_THERMALILY), red, orange, orange, runeEarth, runeFire);
|
||||
|
||||
@@ -92,6 +92,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
|
||||
stacks.add(TextFormatting.ITALIC + refLocalized);
|
||||
}
|
||||
|
||||
System.out.println(type);
|
||||
String mod = BotaniaAPI.subTileMods.get(type);
|
||||
if(!mod.equals(LibMisc.MOD_ID))
|
||||
stacks.add(TextFormatting.ITALIC + "[" + mod + "]");
|
||||
@@ -119,8 +120,8 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
|
||||
public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) {
|
||||
String type = getType(stack);
|
||||
switch (type) {
|
||||
case LibBlockNames.SUBTILE_DAYBLOOM:
|
||||
return ModAchievements.daybloomPickup;
|
||||
// case LibBlockNames.SUBTILE_DAYBLOOM: TODO fix this here
|
||||
// return ModAchievements.daybloomPickup;
|
||||
case LibBlockNames.SUBTILE_ENDOFLAME:
|
||||
return ModAchievements.endoflamePickup;
|
||||
case LibBlockNames.SUBTILE_KEKIMURUS:
|
||||
|
||||
@@ -122,10 +122,6 @@ public final class LexiconData {
|
||||
public static LexiconEntry bergamute;
|
||||
|
||||
public static LexiconEntry generatingIntro;
|
||||
public static LexiconEntry passiveGen;
|
||||
public static LexiconEntry primusLoci;
|
||||
public static LexiconEntry daybloom;
|
||||
public static LexiconEntry nightshade;
|
||||
public static LexiconEntry endoflame;
|
||||
public static LexiconEntry hydroangeas;
|
||||
public static LexiconEntry thermalily;
|
||||
@@ -634,27 +630,8 @@ public final class LexiconData {
|
||||
bergamute.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bergamuteRecipe));
|
||||
|
||||
// GENERATING FLOWERS ENTRIES
|
||||
if (ConfigHandler.hardcorePassiveGeneration > 0) {
|
||||
generatingIntro = new BasicLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers);
|
||||
generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"));
|
||||
}
|
||||
|
||||
passiveGen = new BasicLexiconEntry(LibLexicon.GFLOWER_PASSIVE_GENERATION, categoryGenerationFlowers);
|
||||
passiveGen.setPriority().setLexiconPages(new PageText("0"), new PageText("1"))
|
||||
.setIcon(new ItemStack(Blocks.DEADBUSH));
|
||||
|
||||
primusLoci = new BasicLexiconEntry(LibLexicon.GFLOWER_PRIMUS_LOCI, categoryGenerationFlowers);
|
||||
primusLoci.setPriority().setLexiconPages(new PageText("0"), new PageText("1"));
|
||||
primusLoci.setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM_PRIME));
|
||||
primusLoci.addExtraDisplayedRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM_PRIME));
|
||||
primusLoci.addExtraDisplayedRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE_PRIME));
|
||||
|
||||
daybloom = new BasicLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers);
|
||||
daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText("1"),
|
||||
new PagePetalRecipe<>("2", ModPetalRecipes.daybloomRecipe));
|
||||
|
||||
nightshade = new BasicLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers);
|
||||
nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.nightshadeRecipe));
|
||||
generatingIntro = new BasicLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers);
|
||||
generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"));
|
||||
|
||||
endoflame = new BasicLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers);
|
||||
endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"),
|
||||
|
||||
@@ -110,12 +110,9 @@ public final class LibBlockNames {
|
||||
public static final String SUBTILE_PUREDAISY = "puredaisy";
|
||||
public static final String SUBTILE_MANASTAR = "manastar";
|
||||
|
||||
public static final String SUBTILE_DAYBLOOM = "daybloom";
|
||||
public static final String SUBTILE_DAYBLOOM_PRIME = "daybloomPrime";
|
||||
public static final String SUBTILE_ENDOFLAME = "endoflame";
|
||||
public static final String SUBTILE_HYDROANGEAS = "hydroangeas";
|
||||
public static final String SUBTILE_THERMALILY = "thermalily";
|
||||
public static final String SUBTILE_NIGHTSHADE = "nightshade";
|
||||
public static final String SUBTILE_NIGHTSHADE_PRIME = "nightshadePrime";
|
||||
public static final String SUBTILE_ARCANE_ROSE = "arcanerose";
|
||||
public static final String SUBTILE_MUNCHDEW = "munchdew";
|
||||
|
||||
@@ -36,5 +36,7 @@ public final class LibMisc {
|
||||
0x555555, 0x5555FF, 0x55FF55, 0x55FFFF,
|
||||
0xFF5555, 0xFF55FF, 0xFFFF55, 0xFFFFFF
|
||||
};
|
||||
|
||||
public static final int PASSIVE_FLOWER_DECAY = 72000;
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user