mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Flatten spreaders
This commit is contained in:
1 parent
35ca7002ec
commit
2d567f04cb
37 files changed
+129
-179
No files matched your search
@@ -28,9 +28,7 @@ import vazkii.botania.api.state.enums.CratePattern;
|
||||
import vazkii.botania.api.state.enums.LivingRockVariant;
|
||||
import vazkii.botania.api.state.enums.LivingWoodVariant;
|
||||
import vazkii.botania.api.state.enums.LuminizerVariant;
|
||||
import vazkii.botania.api.state.enums.PlatformVariant;
|
||||
import vazkii.botania.api.state.enums.QuartzVariant;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
|
||||
/**
|
||||
* Holds all Botania block state properties. Use these to set botania blockstates
|
||||
@@ -127,7 +125,7 @@ public final class BotaniaStateProps {
|
||||
}
|
||||
});
|
||||
|
||||
// BlockOpenCrate
|
||||
// BlockCraftyCrate
|
||||
public static final PropertyEnum<CratePattern> CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class);
|
||||
|
||||
// BlockPavement
|
||||
@@ -140,15 +138,9 @@ public final class BotaniaStateProps {
|
||||
}
|
||||
});
|
||||
|
||||
// BlockPlatform
|
||||
public static final PropertyEnum<PlatformVariant> PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class);
|
||||
|
||||
// BlockPrism
|
||||
public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens");
|
||||
|
||||
// BlockSpreader
|
||||
public static final PropertyEnum<SpreaderVariant> SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class);
|
||||
|
||||
private BotaniaStateProps() {
|
||||
}
|
||||
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
/**
|
||||
* This class was created by <williewillus>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
* <p>
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*/
|
||||
package vazkii.botania.api.state.enums;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public enum SpreaderVariant implements IStringSerializable {
|
||||
MANA,
|
||||
REDSTONE,
|
||||
ELVEN,
|
||||
GAIA;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -19,7 +19,6 @@ import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.brew.Brew;
|
||||
import vazkii.botania.api.brew.IBrewItem;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.BlockCamo;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
@@ -66,12 +65,10 @@ public final class ColorHandler {
|
||||
// Spreader
|
||||
blocks.registerBlockColorHandler(
|
||||
(state, world, pos, tintIndex) -> {
|
||||
if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA)
|
||||
return 0xFFFFFF;
|
||||
float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
|
||||
return Color.HSBtoRGB(time * 5 % 360 / 360F, 0.4F, 0.9F);
|
||||
},
|
||||
ModBlocks.spreader
|
||||
ModBlocks.gaiaSpreader
|
||||
);
|
||||
|
||||
// Petal Block
|
||||
@@ -117,7 +114,7 @@ public final class ColorHandler {
|
||||
items.registerItemColorHandler(handler, petals);
|
||||
|
||||
items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).getBlock().getStateFromMeta(s.getMetadata()), null, null, t),
|
||||
ModBlocks.petalBlock, ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.spreader);
|
||||
ModBlocks.petalBlock, ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.gaiaSpreader);
|
||||
|
||||
items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, (float) ((ItemManaMirror) ModItems.manaMirror).getMana(s) / (float) TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror);
|
||||
|
||||
|
||||
@@ -49,10 +49,6 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader>
|
||||
|
||||
@Override
|
||||
public void render(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
|
||||
if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false)
|
||||
|| spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader)
|
||||
return;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
|
||||
@@ -140,7 +140,10 @@ public final class ModBlocks {
|
||||
public static final Block livingrock = new BlockLivingrock();
|
||||
public static final Block livingwood = new BlockLivingwood();
|
||||
public static final Block specialFlower = new BlockSpecialFlower();
|
||||
public static final Block spreader = new BlockSpreader();
|
||||
public static final Block manaSpreader = new BlockSpreader(BlockSpreader.Variant.MANA);
|
||||
public static final Block redstoneSpreader = new BlockSpreader(BlockSpreader.Variant.REDSTONE);
|
||||
public static final Block elvenSpreader = new BlockSpreader(BlockSpreader.Variant.ELVEN);
|
||||
public static final Block gaiaSpreader = new BlockSpreader(BlockSpreader.Variant.GAIA);
|
||||
public static final Block manaPool = new BlockPool(BlockPool.Variant.DEFAULT);
|
||||
public static final Block creativePool = new BlockPool(BlockPool.Variant.CREATIVE);
|
||||
public static final Block dilutedPool = new BlockPool(BlockPool.Variant.DILUTED);
|
||||
@@ -271,7 +274,10 @@ public final class ModBlocks {
|
||||
r.register(livingrock);
|
||||
r.register(livingwood);
|
||||
r.register(specialFlower);
|
||||
r.register(spreader);
|
||||
r.register(manaSpreader);
|
||||
r.register(redstoneSpreader);
|
||||
r.register(elvenSpreader);
|
||||
r.register(gaiaSpreader);
|
||||
r.register(manaPool);
|
||||
r.register(creativePool);
|
||||
r.register(dilutedPool);
|
||||
@@ -405,7 +411,10 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockWithMetadataAndName(livingrock).setRegistryName(livingrock.getRegistryName()));
|
||||
r.register(new ItemBlockWithMetadataAndName(livingwood).setRegistryName(livingwood.getRegistryName()));
|
||||
r.register(new ItemBlockSpecialFlower(specialFlower).setRegistryName(specialFlower.getRegistryName()));
|
||||
r.register(new ItemBlockWithMetadataAndName(spreader).setRegistryName(spreader.getRegistryName()));
|
||||
r.register(new ItemBlockMod(manaSpreader).setRegistryName(manaSpreader.getRegistryName()));
|
||||
r.register(new ItemBlockMod(redstoneSpreader).setRegistryName(redstoneSpreader.getRegistryName()));
|
||||
r.register(new ItemBlockMod(elvenSpreader).setRegistryName(elvenSpreader.getRegistryName()));
|
||||
r.register(new ItemBlockMod(gaiaSpreader).setRegistryName(gaiaSpreader.getRegistryName()));
|
||||
r.register(new ItemBlockPool(manaPool).setRegistryName(manaPool.getRegistryName()));
|
||||
r.register(new ItemBlockPool(creativePool).setRegistryName(creativePool.getRegistryName()));
|
||||
r.register(new ItemBlockPool(dilutedPool).setRegistryName(dilutedPool.getRegistryName()));
|
||||
|
||||
@@ -39,7 +39,6 @@ import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.mana.ILens;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
import vazkii.botania.api.wand.IWandHUD;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
import vazkii.botania.api.wand.IWireframeAABBProvider;
|
||||
@@ -52,40 +51,23 @@ import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Locale;
|
||||
|
||||
public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider {
|
||||
|
||||
public BlockSpreader() {
|
||||
super(Material.WOOD, LibBlockNames.SPREADER);
|
||||
public enum Variant {
|
||||
MANA,
|
||||
REDSTONE,
|
||||
ELVEN,
|
||||
GAIA
|
||||
}
|
||||
|
||||
public final Variant variant;
|
||||
public BlockSpreader(Variant v) {
|
||||
super(Material.WOOD, v.name().toLowerCase(Locale.ROOT) + LibBlockNames.SPREADER_SUFFIX);
|
||||
setHardness(2.0F);
|
||||
setSoundType(SoundType.WOOD);
|
||||
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA));
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockStateContainer createBlockState() {
|
||||
return new BlockStateContainer(this, BotaniaStateProps.SPREADER_VARIANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
if (meta > SpreaderVariant.values().length) {
|
||||
meta = 0;
|
||||
}
|
||||
return getDefaultState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.values()[meta]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(CreativeTabs par2, NonNullList<ItemStack> par3) {
|
||||
for(int i = 0; i < 4; i++)
|
||||
par3.add(new ItemStack(this, 1, i));
|
||||
this.variant = v;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -220,8 +202,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
SpreaderVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.SPREADER_VARIANT);
|
||||
return variant == SpreaderVariant.MANA ? LexiconData.spreader : variant == SpreaderVariant.REDSTONE ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader;
|
||||
return variant == Variant.MANA ? LexiconData.spreader : variant == Variant.REDSTONE ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -229,12 +210,6 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
|
||||
return FULL_BLOCK_AABB.offset(pos).shrink(1.0/16.0);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelHandler.registerBlockToState(this, SpreaderVariant.values().length);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) {
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -24,6 +25,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.RadiusDescriptor;
|
||||
import vazkii.botania.api.subtile.SubTileGenerating;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.mana.BlockSpreader;
|
||||
import vazkii.botania.common.core.handler.ModSounds;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
@@ -61,7 +63,7 @@ public class SubTileEndoflame extends SubTileGenerating {
|
||||
if(stack.isEmpty() || stack.getItem().hasContainerItem(stack))
|
||||
continue;
|
||||
|
||||
int burnTime = stack.getItem() == Item.getItemFromBlock(ModBlocks.spreader) ? 0 : TileEntityFurnace.getItemBurnTime(stack);
|
||||
int burnTime = Block.getBlockFromItem(stack.getItem()) instanceof BlockSpreader ? 0 : TileEntityFurnace.getItemBurnTime(stack);
|
||||
if(burnTime > 0 && stack.getCount() > 0) {
|
||||
this.burnTime = Math.min(FUEL_CAP, burnTime) / 2;
|
||||
|
||||
|
||||
@@ -51,7 +51,6 @@ import vazkii.botania.api.mana.IManaSpreader;
|
||||
import vazkii.botania.api.mana.IThrottledPacket;
|
||||
import vazkii.botania.api.mana.ManaNetworkEvent;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
import vazkii.botania.api.wand.IWandBindable;
|
||||
import vazkii.botania.client.core.handler.HUDHandler;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
@@ -150,15 +149,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
List<PositionProperties> lastTentativeBurst;
|
||||
boolean invalidTentativeBurst = false;
|
||||
|
||||
@Override
|
||||
public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) {
|
||||
if(oldState.getBlock() != newState.getBlock())
|
||||
return true;
|
||||
if(oldState.getBlock() != ModBlocks.spreader || newState.getBlock() != ModBlocks.spreader)
|
||||
return true;
|
||||
return oldState.getValue(BotaniaStateProps.SPREADER_VARIANT) != newState.getValue(BotaniaStateProps.SPREADER_VARIANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFull() {
|
||||
return mana >= getMaxMana();
|
||||
@@ -452,18 +442,17 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
|
||||
public boolean isRedstone() {
|
||||
updateContainingBlockInfo();
|
||||
return world == null ? staticRedstone : getBlockMetadata() == SpreaderVariant.REDSTONE.ordinal();
|
||||
return world == null ? staticRedstone : getBlockType() == ModBlocks.redstoneSpreader;
|
||||
}
|
||||
|
||||
public boolean isDreamwood() {
|
||||
updateContainingBlockInfo();
|
||||
int variant = getBlockMetadata();
|
||||
return world == null ? staticDreamwood : variant == SpreaderVariant.ELVEN.ordinal();
|
||||
return world == null ? staticDreamwood : getBlockType() == ModBlocks.elvenSpreader;
|
||||
}
|
||||
|
||||
public boolean isULTRA_SPREADER() {
|
||||
updateContainingBlockInfo();
|
||||
return world == null ? staticUltra : getBlockMetadata() == SpreaderVariant.GAIA.ordinal();
|
||||
return world == null ? staticUltra : getBlockType() == ModBlocks.gaiaSpreader;
|
||||
}
|
||||
|
||||
public void checkForReceiver() {
|
||||
@@ -569,7 +558,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void renderHUD(Minecraft mc, ScaledResolution res) {
|
||||
String name = I18n.format(new ItemStack(ModBlocks.spreader, 1, world.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name");
|
||||
String name = new ItemStack(getBlockType()).getDisplayName();
|
||||
int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00;
|
||||
HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res);
|
||||
|
||||
|
||||
@@ -362,7 +362,10 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addItem(ModItems.poolMinecart);
|
||||
addBlock(ModBlocks.pump);
|
||||
addBlock(ModBlocks.rfGenerator);
|
||||
addBlock(ModBlocks.spreader);
|
||||
addBlock(ModBlocks.manaSpreader);
|
||||
addBlock(ModBlocks.redstoneSpreader);
|
||||
addBlock(ModBlocks.elvenSpreader);
|
||||
addBlock(ModBlocks.gaiaSpreader);
|
||||
addBlock(ModBlocks.turntable);
|
||||
addBlock(ModBlocks.prism);
|
||||
addItem(ModItems.lensNormal);
|
||||
|
||||
@@ -202,7 +202,7 @@ public class InternalMethodHandler extends DummyMethodHandler {
|
||||
|
||||
@Override
|
||||
public ItemStack getBindDisplayForFlowerType(SubTileEntity e) {
|
||||
return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.spreader) : e instanceof SubTileFunctional ? new ItemStack(ModBlocks.manaPool) : new ItemStack(ModItems.twigWand);
|
||||
return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.manaSpreader) : e instanceof SubTileFunctional ? new ItemStack(ModBlocks.manaPool) : new ItemStack(ModItems.twigWand);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -439,7 +439,7 @@ public final class ModCraftingRecipes {
|
||||
recipeEndPortal = gogPath("end_portal_frame");
|
||||
}
|
||||
|
||||
recipesSpreader = allOfGroup(ModBlocks.spreader.getRegistryName());
|
||||
recipesSpreader = allOfGroup("spreader");
|
||||
|
||||
recipePool = ModBlocks.manaPool.getRegistryName();
|
||||
recipePoolDiluted = ModBlocks.dilutedPool.getRegistryName();
|
||||
@@ -482,9 +482,9 @@ public final class ModCraftingRecipes {
|
||||
recipeManaTablet = ModItems.manaTablet.getRegistryName();
|
||||
recipeManaMirror = ModItems.manaMirror.getRegistryName();
|
||||
recipeManaDetector = ModBlocks.manaDetector.getRegistryName();
|
||||
recipeRedstoneSpreader = path("spreader_1");
|
||||
recipeDreamwoodSpreader = path("spreader_2");
|
||||
recipeUltraSpreader = path("spreader_3");
|
||||
recipeRedstoneSpreader = ModBlocks.redstoneSpreader.getRegistryName();
|
||||
recipeDreamwoodSpreader = ModBlocks.elvenSpreader.getRegistryName();
|
||||
recipeUltraSpreader = ModBlocks.gaiaSpreader.getRegistryName();
|
||||
recipePrism = ModBlocks.prism.getRegistryName();
|
||||
recipePoolCart = ModItems.poolMinecart.getRegistryName();
|
||||
recipePump = ModBlocks.pump.getRegistryName();
|
||||
|
||||
@@ -199,6 +199,15 @@ public class FlattenItems implements IFixableData {
|
||||
return ModBlocks.openCrate.getRegistryName().toString();
|
||||
}
|
||||
});
|
||||
LOOKUP.put("botania:spreader", i -> {
|
||||
switch(i) {
|
||||
default:
|
||||
case 0: return ModBlocks.manaSpreader.getRegistryName().toString();
|
||||
case 1: return ModBlocks.redstoneSpreader.getRegistryName().toString();
|
||||
case 2: return ModBlocks.elvenSpreader.getRegistryName().toString();
|
||||
case 3: return ModBlocks.gaiaSpreader.getRegistryName().toString();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -19,6 +19,7 @@ public final class LibBlockNames {
|
||||
public static final String LIVING_ROCK = "livingrock";
|
||||
public static final String LIVING_WOOD = "livingwood";
|
||||
public static final String SPREADER = "spreader";
|
||||
public static final String SPREADER_SUFFIX = "_" + SPREADER;
|
||||
public static final String POOL = "pool";
|
||||
public static final String POOL_PREFIX = POOL + "_";
|
||||
public static final String RUNE_ALTAR = "runeAltar";
|
||||
|
||||
Reference in new issue
Block a user