Corporea blocks, luminizers, comment out nei and cbmp stuff so it can actually build.

This commit is contained in:
Vincent Lee committed 2015-12-30 18:27:06 -06:00
1 parent a67aeee496
commit 4dd62fae37
28 files changed
+212 -34

No files matched your search

@@ -37,6 +37,7 @@ import vazkii.botania.api.state.enums.EndBrickVariant;
import vazkii.botania.api.state.enums.FutureStoneVariant;
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.PrismarineVariant;
import vazkii.botania.api.state.enums.PylonVariant;
import vazkii.botania.api.state.enums.StorageVariant;
@@ -128,6 +129,7 @@ public final class ModelHandler {
registerPanes();
registerAltars();
registerQuartzBlocks();
registerLuminizers();
/** Normal Items **/
registerStandardItems();
@@ -308,6 +310,10 @@ public final class ModelHandler {
registerItemModel(ModBlocks.floatingSpecialFlower);
registerItemModel(ModBlocks.sparkChanger);
registerItemModel(ModBlocks.terraPlate);
registerItemModel(ModBlocks.corporeaRetainer);
registerItemModel(ModBlocks.corporeaInterceptor);
registerItemModel(ModBlocks.corporeaFunnel);
registerItemModel(ModBlocks.lightLauncher);
registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length);
@@ -551,9 +557,6 @@ public final class ModelHandler {
ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build());
ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build());
// Ignore redstone power state in some blocks
ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build());
// Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier)
ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build());
ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build());
@@ -849,6 +852,15 @@ public final class ModelHandler {
}
}
private static void registerLuminizers() {
Item item = Item.getItemFromBlock(ModBlocks.lightRelay);
String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.lightRelay).toString();
for (LuminizerVariant v : LuminizerVariant.values()) {
ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "powered=false,variant=" + v.getName()));
ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName()));
}
}
private static <T extends Enum<T> & IStringSerializable> void registerVariantsDefaulted(Block b, Class<T> enumclazz, String variantHeader) {
Item item = Item.getItemFromBlock(b);
for (T e : enumclazz.getEnumConstants()) {
@@ -1,3 +1,4 @@
/*
package vazkii.botania.client.integration.nei;
import org.lwjgl.input.Keyboard;
@@ -60,3 +61,4 @@ public class NEIBotaniaConfig implements IConfigureNEI {
}
}
*/
@@ -7,7 +7,8 @@
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Dec 15, 2014, 6:09:38 PM (GMT)]
*/
*//*
package vazkii.botania.client.integration.nei;
import vazkii.botania.client.gui.crafting.GuiCraftingHalo;
@@ -22,3 +23,4 @@ public class NEIGuiHooks {
}
}
*/
@@ -7,7 +7,8 @@
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [25/12/2015, 02:22:32 (GMT)]
*/
*//*
package vazkii.botania.client.integration.nei;
import vazkii.botania.api.corporea.CorporeaHelper;
@@ -101,3 +102,4 @@ public class NEIInputHandler implements IContainerInputHandler {
}
}
*/
@@ -1,3 +1,4 @@
/*
package vazkii.botania.client.integration.nei.recipe;
import java.awt.Rectangle;
@@ -138,3 +139,4 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler {
}
}
*/
@@ -1,3 +1,4 @@
/*
package vazkii.botania.client.integration.nei.recipe;
import java.awt.Rectangle;
@@ -98,7 +99,8 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler {
}
private static boolean hasElvenKnowledge() {
/*EntityPlayer player = Minecraft.getMinecraft().thePlayer;
*/
/*EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (player != null) {
for (ItemStack stack : player.inventory.mainInventory) {
if (stack != null && stack.getItem() instanceof ILexicon) {
@@ -109,7 +111,8 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler {
}
}
}
return false;*/
return false;*//*
return true;
}
@@ -166,3 +169,4 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler {
}
}
*/
@@ -1,3 +1,4 @@
/*
package vazkii.botania.client.integration.nei.recipe;
import java.awt.Rectangle;
@@ -79,3 +80,4 @@ public class RecipeHandlerFloatingFlowers extends TemplateRecipeHandler {
}
}
*/
@@ -7,7 +7,8 @@
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [12/12/2015, 23:25:47 (GMT)]
*/
*//*
package vazkii.botania.client.integration.nei.recipe;
import java.awt.Rectangle;
@@ -169,3 +170,4 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler {
}
}
*/
@@ -1,3 +1,4 @@
/*
package vazkii.botania.client.integration.nei.recipe;
import java.awt.Rectangle;
@@ -155,3 +156,4 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler {
}
}
*/
@@ -1,3 +1,4 @@
/*
package vazkii.botania.client.integration.nei.recipe;
import java.awt.Rectangle;
@@ -141,3 +142,4 @@ public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler {
}
*/
@@ -1,3 +1,4 @@
/*
package vazkii.botania.client.integration.nei.recipe;
import java.awt.Rectangle;
@@ -136,3 +137,4 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler {
}
}
*/
@@ -1,3 +1,4 @@
/*
package vazkii.botania.client.integration.nei.recipe;
import java.util.List;
@@ -55,3 +56,4 @@ public class RecipeHandlerRunicAltar extends RecipeHandlerPetalApothecary {
}
}
*/
@@ -138,7 +138,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe
@Override
public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) {
return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT
return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR
&& state.getValue(BotaniaStateProps.POWERED) ? 15 : 0;
}
@@ -154,7 +154,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe
@Override
public int getRenderType() {
return LibRenderIDs.idLightRelay;
return 2;
}
@Override
@@ -68,7 +68,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi
@Override
public int getRenderType() {
return LibRenderIDs.idCorporeaCrystalCybe;
return 2;
}
@Override
@@ -44,7 +44,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl
@Override
public int getRenderType() {
return LibRenderIDs.idCorporeaIndex;
return 2;
}
@Override
@@ -48,11 +48,6 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory,
int manaLastTick = 0;
public int signal = 0;
@Override
public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}
public boolean addItem(EntityPlayer player, ItemStack stack) {
if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer)
return false;
@@ -10,14 +10,24 @@
*/
package vazkii.botania.common.block.tile;
import net.minecraft.block.state.IBlockState;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
public class TileMod extends TileEntity {
@Override
public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) {
// todo: review all subclasses. this could potentially leave stragglers hanging.
// todo: example: open crate and crafty crate should refresh when variants change
return oldState.getBlock() != newState.getBlock();
}
@Override
public void writeToNBT(NBTTagCompound par1nbtTagCompound) {
super.writeToNBT(par1nbtTagCompound);
@@ -44,11 +44,6 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil
public String subTileName = "";
SubTileEntity subTile;
@Override
public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) {
return oldState.getBlock() != newState.getBlock();
}
@Override
public SubTileEntity getSubTile() {
return subTile;
@@ -35,7 +35,7 @@ public class TileCorporeaRetainer extends TileMod {
private static final int REQUEST_STRING = 2;
boolean pendingRequest = false;
BlockPos requestPos;
BlockPos requestPos = BlockPos.ORIGIN;
Object request;
int requestCount;
@@ -7,7 +7,8 @@
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Sep 1, 2015, 5:32:15 PM (GMT)]
*/
*//*
package vazkii.botania.common.integration.multipart;
import java.util.ArrayList;
@@ -70,4 +71,4 @@ public class MultipartHandler {
MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta));
}
}
}*/