mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 04:09:40 +00:00
Revert "Upload remapping code for troubleshooting"
This reverts commit 9309355af2.
This commit is contained in:
17 files changed
+402
-86
No files matched your search
@@ -10,11 +10,9 @@
|
||||
*/
|
||||
package vazkii.botania.client.core.handler;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
||||
@@ -73,12 +71,6 @@ public final class DebugHandler {
|
||||
} else if(Minecraft.isRunningOnMac)
|
||||
event.getLeft().add(PREFIX + "SHIFT+CMD for context");
|
||||
else event.getLeft().add(PREFIX + "SHIFT+CTRL for context");
|
||||
|
||||
RayTraceResult ray = Minecraft.getMinecraft().objectMouseOver;
|
||||
if(ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK && ray.getBlockPos() != null) {
|
||||
IBlockState state = world.getBlockState(ray.getBlockPos());
|
||||
event.getRight().add("META: " + state.getBlock().getMetaFromState(state));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -325,6 +325,7 @@ public final class ModelHandler {
|
||||
registerItemModel(ModBlocks.rfGenerator);
|
||||
registerItemModel(ModBlocks.root);
|
||||
registerItemModel(ModBlocks.runeAltar);
|
||||
registerItemModel(ModBlocks.seaLamp);
|
||||
registerItemModel(ModBlocks.shimmerrock);
|
||||
registerItemModel(ModBlocks.shimmerwoodPlanks);
|
||||
registerItemModel(ModBlocks.sparkChanger);
|
||||
@@ -358,6 +359,7 @@ public final class ModelHandler {
|
||||
registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant");
|
||||
registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant");
|
||||
registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant");
|
||||
// todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture
|
||||
registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant");
|
||||
@@ -622,6 +624,7 @@ public final class ModelHandler {
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build());
|
||||
|
||||
@@ -639,7 +642,7 @@ public final class ModelHandler {
|
||||
}
|
||||
|
||||
List<Block> otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab,
|
||||
ModFluffBlocks.dreamwoodPlankSlab,
|
||||
ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab,
|
||||
ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab,
|
||||
ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab,
|
||||
ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab,
|
||||
@@ -665,7 +668,7 @@ public final class ModelHandler {
|
||||
}
|
||||
|
||||
List<Block> otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull,
|
||||
ModFluffBlocks.dreamwoodPlankSlabFull,
|
||||
ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull,
|
||||
ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull,
|
||||
ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull,
|
||||
ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull,
|
||||
@@ -771,6 +774,7 @@ public final class ModelHandler {
|
||||
}
|
||||
|
||||
registerItemModel(ModFluffBlocks.blazeQuartzStairs);
|
||||
registerItemModel(ModFluffBlocks.darkPrismarineStairs);
|
||||
if (ConfigHandler.darkQuartzEnabled)
|
||||
registerItemModel(ModFluffBlocks.darkQuartzStairs);
|
||||
registerItemModel(ModFluffBlocks.dreamwoodStairs);
|
||||
@@ -785,6 +789,8 @@ public final class ModelHandler {
|
||||
registerItemModel(ModFluffBlocks.livingwoodPlankStairs);
|
||||
registerItemModel(ModFluffBlocks.manaQuartzStairs);
|
||||
registerItemModel(ModFluffBlocks.netherBrickStairs);
|
||||
registerItemModel(ModFluffBlocks.prismarineStairs);
|
||||
registerItemModel(ModFluffBlocks.prismarineBrickStairs);
|
||||
registerItemModel(ModFluffBlocks.redQuartzStairs);
|
||||
registerItemModel(ModFluffBlocks.reedStairs);
|
||||
registerItemModel(ModFluffBlocks.shimmerrockStairs);
|
||||
@@ -825,6 +831,9 @@ public final class ModelHandler {
|
||||
|
||||
registerItemModel(ModFluffBlocks.dreamwoodSlab);
|
||||
registerItemModel(ModFluffBlocks.dreamwoodPlankSlab);
|
||||
registerItemModel(ModFluffBlocks.prismarineSlab);
|
||||
registerItemModel(ModFluffBlocks.prismarineBrickSlab);
|
||||
registerItemModel(ModFluffBlocks.darkPrismarineSlab);
|
||||
registerItemModel(ModFluffBlocks.dirtPathSlab);
|
||||
registerItemModel(ModFluffBlocks.shimmerrockSlab);
|
||||
registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab);
|
||||
@@ -855,6 +864,7 @@ public final class ModelHandler {
|
||||
registerItemModel(ModFluffBlocks.livingrockWall);
|
||||
registerItemModel(ModFluffBlocks.livingwoodWall);
|
||||
registerItemModel(ModFluffBlocks.dreamwoodWall);
|
||||
registerItemModel(ModFluffBlocks.prismarineWall);
|
||||
registerItemModel(ModFluffBlocks.reedWall);
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@ import net.minecraftforge.fml.common.ModAPIManager;
|
||||
import net.minecraftforge.fml.common.SidedProxy;
|
||||
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLInterModComms;
|
||||
import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
|
||||
@@ -35,8 +34,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
|
||||
import vazkii.botania.client.core.handler.DebugHandler;
|
||||
import vazkii.botania.common.core.Remapper;
|
||||
import vazkii.botania.common.core.handler.IMCHandler;
|
||||
import vazkii.botania.common.core.handler.ManaNetworkHandler;
|
||||
import vazkii.botania.common.core.proxy.CommonProxy;
|
||||
@@ -57,7 +54,6 @@ public class Botania {
|
||||
public static boolean etFuturumLoaded = false;
|
||||
public static boolean rfApiLoaded = false;
|
||||
public static boolean storageDrawersLoaded = false;
|
||||
public static boolean quarkLoaded = false;
|
||||
|
||||
public static ILightHelper lightHelper;
|
||||
|
||||
@@ -77,7 +73,7 @@ public class Botania {
|
||||
coloredLightsLoaded = Loader.isModLoaded("easycoloredlights");
|
||||
etFuturumLoaded = Loader.isModLoaded("etfuturum");
|
||||
rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy");
|
||||
quarkLoaded = Loader.isModLoaded("Quark");
|
||||
|
||||
storageDrawersLoaded = Loader.isModLoaded("StorageDrawers");
|
||||
|
||||
lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla();
|
||||
@@ -135,9 +131,4 @@ public class Botania {
|
||||
IMCHandler.processMessages(event.getMessages());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void remap(FMLMissingMappingsEvent event) {
|
||||
Remapper.process(event.getAll());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -41,7 +41,9 @@ import vazkii.botania.common.block.decor.BlockManaFlame;
|
||||
import vazkii.botania.common.block.decor.BlockManaGlass;
|
||||
import vazkii.botania.common.block.decor.BlockModMushroom;
|
||||
import vazkii.botania.common.block.decor.BlockPetalBlock;
|
||||
import vazkii.botania.common.block.decor.BlockPrismarine;
|
||||
import vazkii.botania.common.block.decor.BlockReeds;
|
||||
import vazkii.botania.common.block.decor.BlockSeaLamp;
|
||||
import vazkii.botania.common.block.decor.BlockShimmerrock;
|
||||
import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks;
|
||||
import vazkii.botania.common.block.decor.BlockShinyFlower;
|
||||
@@ -210,6 +212,8 @@ public final class ModBlocks {
|
||||
public static Block bifrost;
|
||||
public static Block solidVines;
|
||||
public static Block buriedPetals;
|
||||
public static Block prismarine;
|
||||
public static Block seaLamp;
|
||||
public static Block floatingFlower;
|
||||
public static Block tinyPotato;
|
||||
public static Block spawnerClaw;
|
||||
@@ -300,6 +304,8 @@ public final class ModBlocks {
|
||||
bifrost = new BlockBifrost();
|
||||
solidVines = new BlockSolidVines();
|
||||
buriedPetals = new BlockBuriedPetals();
|
||||
prismarine = new BlockPrismarine();
|
||||
seaLamp = new BlockSeaLamp();
|
||||
floatingFlower = new BlockFloatingFlower();
|
||||
tinyPotato = new BlockTinyPotato();
|
||||
spawnerClaw = new BlockSpawnerClaw();
|
||||
@@ -372,6 +378,7 @@ public final class ModBlocks {
|
||||
OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i + 8], new ItemStack(doubleFlower2, 1, i));
|
||||
}
|
||||
|
||||
OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(prismarine, 1, OreDictionary.WILDCARD_VALUE));
|
||||
OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock);
|
||||
|
||||
for(int i = 0; i < 16; i++)
|
||||
|
||||
@@ -48,6 +48,9 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.prismarine.BlockDarkPrismarineSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineBrickSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab;
|
||||
import vazkii.botania.common.block.decor.stairs.Block18StoneStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs;
|
||||
@@ -67,8 +70,12 @@ import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStair
|
||||
import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.prismarine.BlockDarkPrismarineStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineBrickStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineStairs;
|
||||
import vazkii.botania.common.block.decor.walls.Block18StoneWall;
|
||||
import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall;
|
||||
import vazkii.botania.common.block.decor.walls.BlockPrismarineWall;
|
||||
import vazkii.botania.common.block.decor.walls.BlockReedWall;
|
||||
import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall;
|
||||
import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall;
|
||||
@@ -103,6 +110,17 @@ public final class ModFluffBlocks {
|
||||
public static Block dreamwoodPlankSlab;
|
||||
public static Block dreamwoodPlankSlabFull;
|
||||
|
||||
public static Block prismarineStairs;
|
||||
public static Block prismarineSlab;
|
||||
public static Block prismarineSlabFull;
|
||||
public static Block prismarineWall;
|
||||
public static Block prismarineBrickStairs;
|
||||
public static Block prismarineBrickSlab;
|
||||
public static Block prismarineBrickSlabFull;
|
||||
public static Block darkPrismarineStairs;
|
||||
public static Block darkPrismarineSlab;
|
||||
public static Block darkPrismarineSlabFull;
|
||||
|
||||
public static Block reedStairs;
|
||||
public static Block reedSlab;
|
||||
public static Block reedSlabFull;
|
||||
@@ -216,6 +234,17 @@ public final class ModFluffBlocks {
|
||||
dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false);
|
||||
dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true);
|
||||
|
||||
prismarineStairs = new BlockPrismarineStairs();
|
||||
prismarineSlab = new BlockPrismarineSlab(false);
|
||||
prismarineSlabFull = new BlockPrismarineSlab(true);
|
||||
prismarineWall = new BlockPrismarineWall();
|
||||
prismarineBrickStairs = new BlockPrismarineBrickStairs();
|
||||
prismarineBrickSlab = new BlockPrismarineBrickSlab(false);
|
||||
prismarineBrickSlabFull = new BlockPrismarineBrickSlab(true);
|
||||
darkPrismarineStairs = new BlockDarkPrismarineStairs();
|
||||
darkPrismarineSlab = new BlockDarkPrismarineSlab(false);
|
||||
darkPrismarineSlabFull = new BlockDarkPrismarineSlab(true);
|
||||
|
||||
reedStairs = new BlockReedStairs();
|
||||
reedSlab = new BlockReedSlab(false);
|
||||
reedSlabFull = new BlockReedSlab(true);
|
||||
@@ -376,6 +405,13 @@ public final class ModFluffBlocks {
|
||||
((BlockModSlab) thatchSlab).register();
|
||||
((BlockModSlab) thatchSlabFull).register();
|
||||
|
||||
((BlockModSlab) prismarineSlab).register();
|
||||
((BlockModSlab) prismarineSlabFull).register();
|
||||
((BlockModSlab) prismarineBrickSlab).register();
|
||||
((BlockModSlab) prismarineBrickSlabFull).register();
|
||||
((BlockModSlab) darkPrismarineSlab).register();
|
||||
((BlockModSlab) darkPrismarineSlabFull).register();
|
||||
|
||||
((BlockModSlab) netherBrickSlab).register();
|
||||
((BlockModSlab) netherBrickSlabFull).register();
|
||||
((BlockModSlab) soulBrickSlab).register();
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
/**
|
||||
* 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 @ [Jun 28, 2014, 8:25:39 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor;
|
||||
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PrismarineVariant;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class BlockPrismarine extends BlockMod implements ILexiconable {
|
||||
|
||||
private static final int TYPES = 3;
|
||||
|
||||
public BlockPrismarine() {
|
||||
super(Material.rock, LibBlockNames.PRISMARINE);
|
||||
setHardness(2.0F);
|
||||
setResistance(10.0F);
|
||||
setSoundType(SoundType.STONE);
|
||||
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockStateContainer createBlockState() {
|
||||
return new BlockStateContainer(this, BotaniaStateProps.PRISMARINE_VARIANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.PRISMARINE_VARIANT).ordinal();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
if (meta >= PrismarineVariant.values().length) {
|
||||
meta = 0;
|
||||
}
|
||||
return getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.values()[meta]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(IBlockState state) {
|
||||
return getMetaFromState(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemForm() {
|
||||
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
|
||||
for(int i = 0; i < TYPES; i++)
|
||||
par3List.add(new ItemStack(par1, 1, i));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
|
||||
return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.prismarine;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
/**
|
||||
* 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 @ [Jun 28, 2014, 9:24:43 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor;
|
||||
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockSeaLamp extends BlockMod implements ILexiconable {
|
||||
|
||||
private int coloredLight = -1;
|
||||
|
||||
public BlockSeaLamp() {
|
||||
super(Material.glass, LibBlockNames.SEA_LAMP);
|
||||
setHardness(0.3F);
|
||||
setSoundType(SoundType.GLASS);
|
||||
setLightLevel(1.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "easycoloredlights")
|
||||
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) {
|
||||
return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.prismarine;
|
||||
}
|
||||
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package vazkii.botania.common.block.decor.slabs.prismarine;
|
||||
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import vazkii.botania.api.state.enums.PrismarineVariant;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
|
||||
public class BlockDarkPrismarineSlab extends BlockPrismarineSlab {
|
||||
|
||||
public BlockDarkPrismarineSlab(boolean full) {
|
||||
super(full, PrismarineVariant.DARK_PRISMARINE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.darkPrismarineSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.darkPrismarineSlab;
|
||||
}
|
||||
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package vazkii.botania.common.block.decor.slabs.prismarine;
|
||||
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import vazkii.botania.api.state.enums.PrismarineVariant;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
|
||||
public class BlockPrismarineBrickSlab extends BlockPrismarineSlab {
|
||||
|
||||
public BlockPrismarineBrickSlab(boolean full) {
|
||||
super(full, PrismarineVariant.PRISMARINE_BRICKS);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.prismarineBrickSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.prismarineBrickSlab;
|
||||
}
|
||||
|
||||
}
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
package vazkii.botania.common.block.decor.slabs.prismarine;
|
||||
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PrismarineVariant;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class BlockPrismarineSlab extends BlockLivingSlab {
|
||||
|
||||
public BlockPrismarineSlab(boolean full) {
|
||||
this(full, PrismarineVariant.PRISMARINE);
|
||||
}
|
||||
|
||||
public BlockPrismarineSlab(boolean full, PrismarineVariant variant) {
|
||||
super(full, ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant));
|
||||
setHardness(2.0F);
|
||||
setResistance(10.0F);
|
||||
setSoundType(SoundType.STONE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.prismarineSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModFluffBlocks.prismarineSlab;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.prismarine;
|
||||
}
|
||||
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package vazkii.botania.common.block.decor.stairs.prismarine;
|
||||
|
||||
|
||||
import vazkii.botania.api.state.enums.PrismarineVariant;
|
||||
|
||||
public class BlockDarkPrismarineStairs extends BlockPrismarineStairs {
|
||||
|
||||
public BlockDarkPrismarineStairs() {
|
||||
super(PrismarineVariant.DARK_PRISMARINE);
|
||||
}
|
||||
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package vazkii.botania.common.block.decor.stairs.prismarine;
|
||||
|
||||
|
||||
import vazkii.botania.api.state.enums.PrismarineVariant;
|
||||
|
||||
public class BlockPrismarineBrickStairs extends BlockPrismarineStairs {
|
||||
|
||||
public BlockPrismarineBrickStairs() {
|
||||
super(PrismarineVariant.PRISMARINE_BRICKS);
|
||||
}
|
||||
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package vazkii.botania.common.block.decor.stairs.prismarine;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PrismarineVariant;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class BlockPrismarineStairs extends BlockLivingStairs {
|
||||
|
||||
public BlockPrismarineStairs() {
|
||||
this(PrismarineVariant.PRISMARINE);
|
||||
}
|
||||
|
||||
public BlockPrismarineStairs(PrismarineVariant variant) {
|
||||
super(ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant));
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.prismarine;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
/**
|
||||
* 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 @ [Jul 18, 2015, 8:30:00 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.decor.walls;
|
||||
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class BlockPrismarineWall extends BlockModWall {
|
||||
|
||||
public BlockPrismarineWall() {
|
||||
super(ModBlocks.prismarine, 0);
|
||||
setHardness(2.0F);
|
||||
setResistance(10.0F);
|
||||
setSoundType(SoundType.STONE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.prismarine;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -303,6 +303,16 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addBlock(ModBlocks.dirtPath);
|
||||
addBlock(ModFluffBlocks.dirtPathSlab);
|
||||
|
||||
addBlock(ModBlocks.prismarine);
|
||||
addBlock(ModBlocks.seaLamp);
|
||||
addBlock(ModFluffBlocks.prismarineStairs);
|
||||
addBlock(ModFluffBlocks.prismarineSlab);
|
||||
addBlock(ModFluffBlocks.prismarineWall);
|
||||
addBlock(ModFluffBlocks.prismarineBrickStairs);
|
||||
addBlock(ModFluffBlocks.prismarineBrickSlab);
|
||||
addBlock(ModFluffBlocks.darkPrismarineStairs);
|
||||
addBlock(ModFluffBlocks.darkPrismarineSlab);
|
||||
|
||||
addBlock(ModBlocks.blazeBlock);
|
||||
|
||||
addBlock(ModBlocks.reedBlock);
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
package vazkii.botania.common.core;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import vazkii.botania.common.Botania;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public final class Remapper {
|
||||
|
||||
public static void process(List<FMLMissingMappingsEvent.MissingMapping> mappings) {
|
||||
boolean quark = Botania.quarkLoaded;
|
||||
List<FMLMissingMappingsEvent.MissingMapping> items = mappings.stream().filter(m -> m.type == GameRegistry.Type.ITEM).collect(Collectors.toList());
|
||||
List<FMLMissingMappingsEvent.MissingMapping> blocks = mappings.stream().filter(m -> m.type == GameRegistry.Type.BLOCK).collect(Collectors.toList());
|
||||
|
||||
for(FMLMissingMappingsEvent.MissingMapping m : blocks) {
|
||||
switch (m.name) {
|
||||
// Prismarine
|
||||
case "botania:prismarine": m.remap(getBlock("minecraft:prismarine")); break;
|
||||
case "botania:seaLamp": m.remap(getBlock("minecraft:sea_lantern")); break;
|
||||
case "botania:prismarine0Stairs": if (quark) m.remap(getBlock("quark:prismarine_stairs")); else m.warn(); break;
|
||||
case "botania:prismarine0Slab": if (quark) m.remap(getBlock("quark:prismarine_slab")); else m.warn(); break;
|
||||
case "botania:prismarine0SlabFull": if (quark) m.remap(getBlock("quark:prismarine_slab_double")); else m.warn(); break;
|
||||
case "botania:prismarine0Wall": if (quark) m.remap(getBlock("quark:prismarine_rough_wall")); else m.warn(); break;
|
||||
case "botania:prismarine1Stairs": if (quark) m.remap(getBlock("quark:prismarine_bricks_stairs")); else m.warn(); break;
|
||||
case "botania:prismarine1Slab": if (quark) m.remap(getBlock("quark:prismarine_bricks_slab")); else m.warn(); break;
|
||||
case "botania:prismarine1SlabFull": if (quark) m.remap(getBlock("quark:prismarine_bricks_slab_double")); else m.warn(); break;
|
||||
case "botania:prismarine2Stairs": if (quark) m.remap(getBlock("quark:prismarine_dark_stairs")); else m.warn(); break;
|
||||
case "botania:prismarine2Slab": if (quark) m.remap(getBlock("quark:prismarine_dark_slab")); else m.warn(); break;
|
||||
case "botania:prismarine2SlabFull": if (quark) m.remap(getBlock("quark:prismarine_dark_slab_double")); else m.warn(); break;
|
||||
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
for(FMLMissingMappingsEvent.MissingMapping m : items) {
|
||||
switch (m.name) {
|
||||
// Prismarine
|
||||
case "botania:prismarine": m.remap(getItem("minecraft:prismarine")); break;
|
||||
case "botania:seaLamp": m.remap(getItem("minecraft:sea_lantern")); break;
|
||||
case "botania:prismarine0Stairs": if (quark) m.remap(getItem("quark:prismarine_stairs")); else m.warn(); break;
|
||||
case "botania:prismarine0Slab": if (quark) m.remap(getItem("quark:prismarine_slab")); else m.warn(); break;
|
||||
case "botania:prismarine0Wall": if (quark) m.remap(getItem("quark:prismarine_rough_wall")); else m.warn(); break;
|
||||
case "botania:prismarine1Stairs": if (quark) m.remap(getItem("quark:prismarine_bricks_stairs")); else m.warn(); break;
|
||||
case "botania:prismarine1Slab": if (quark) m.remap(getItem("quark:prismarine_bricks_slab")); else m.warn(); break;
|
||||
case "botania:prismarine2Stairs": if (quark) m.remap(getItem("quark:prismarine_dark_stairs")); else m.warn(); break;
|
||||
case "botania:prismarine2Slab": if (quark) m.remap(getItem("quark:prismarine_dark_slab")); else m.warn(); break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static Block getBlock(String name) {
|
||||
return Block.blockRegistry.getObject(new ResourceLocation(name));
|
||||
}
|
||||
|
||||
private static Item getItem(String name) {
|
||||
return Item.itemRegistry.getObject(new ResourceLocation(name));
|
||||
}
|
||||
|
||||
private Remapper() {}
|
||||
|
||||
}
|
||||
@@ -325,6 +325,12 @@ public final class ModCraftingRecipes {
|
||||
// The future is now (botania -> vanilla recipes for future added items and blocks)
|
||||
addShapelessOreDictRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(ModItems.manaResource, 1, 10));
|
||||
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2));
|
||||
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.sea_lantern), new ItemStack(ModBlocks.seaLamp));
|
||||
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal()));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal()));
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal()));
|
||||
@@ -2175,6 +2181,12 @@ public final class ModCraftingRecipes {
|
||||
addStairsAndSlabs(ModBlocks.livingrock, 1, ModFluffBlocks.livingrockBrickStairs, ModFluffBlocks.livingrockBrickSlab);
|
||||
addStairsAndSlabs(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodStairs, ModFluffBlocks.dreamwoodSlab);
|
||||
addStairsAndSlabs(ModBlocks.dreamwood, 1, ModFluffBlocks.dreamwoodPlankStairs, ModFluffBlocks.dreamwoodPlankSlab);
|
||||
addStairsAndSlabs(Blocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab);
|
||||
addStairsAndSlabs(Blocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab);
|
||||
addStairsAndSlabs(Blocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab);
|
||||
addStairsAndSlabs(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab);
|
||||
addStairsAndSlabs(ModBlocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab);
|
||||
addStairsAndSlabs(ModBlocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab);
|
||||
addStairsAndSlabs(ModBlocks.reedBlock, 0, ModFluffBlocks.reedStairs, ModFluffBlocks.reedSlab);
|
||||
addStairsAndSlabs(ModBlocks.thatch, 0, ModFluffBlocks.thatchStairs, ModFluffBlocks.thatchSlab);
|
||||
addStairsAndSlabs(ModBlocks.customBrick, 0, ModFluffBlocks.netherBrickStairs, ModFluffBlocks.netherBrickSlab);
|
||||
@@ -2190,6 +2202,8 @@ public final class ModCraftingRecipes {
|
||||
addWall(ModBlocks.livingrock, 0, ModFluffBlocks.livingrockWall, 0);
|
||||
addWall(ModBlocks.livingwood, 0, ModFluffBlocks.livingwoodWall, 0);
|
||||
addWall(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodWall, 0);
|
||||
addWall(Blocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0);
|
||||
addWall(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0);
|
||||
addWall(ModBlocks.reedBlock, 0, ModFluffBlocks.reedWall, 0);
|
||||
for(int i = 0; i < 8; i++)
|
||||
addWall(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneWall, i);
|
||||
|
||||
Reference in new issue
Block a user