Now the multipart system depends on Qlib, wont load if not installed.
Also a code format of the system
This commit is contained in:
parent
d6797868fb
commit
e2467caede
22 changed files with 1542 additions and 1852 deletions
|
@ -1,22 +1,5 @@
|
|||
package techreborn;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import techreborn.achievement.TRAchievements;
|
||||
import techreborn.client.GuiHandler;
|
||||
import techreborn.compat.CompatManager;
|
||||
import techreborn.compat.recipes.RecipeManager;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.init.ModParts;
|
||||
import techreborn.init.ModRecipes;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.packets.PacketHandler;
|
||||
import techreborn.proxies.CommonProxy;
|
||||
import techreborn.util.LogHelper;
|
||||
import techreborn.world.TROreGen;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
|
@ -27,6 +10,22 @@ import cpw.mods.fml.common.network.NetworkRegistry;
|
|||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import erogenousbeef.coreTR.multiblock.MultiblockEventHandler;
|
||||
import erogenousbeef.coreTR.multiblock.MultiblockServerTickHandler;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import techreborn.achievement.TRAchievements;
|
||||
import techreborn.client.GuiHandler;
|
||||
import techreborn.compat.CompatManager;
|
||||
import techreborn.compat.recipes.RecipeManager;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.init.ModRecipes;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.packets.PacketHandler;
|
||||
import techreborn.proxies.CommonProxy;
|
||||
import techreborn.util.LogHelper;
|
||||
import techreborn.world.TROreGen;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS)
|
||||
public class Core {
|
||||
|
@ -56,8 +55,6 @@ public class Core {
|
|||
ModBlocks.init();
|
||||
// Register ModItems
|
||||
ModItems.init();
|
||||
// Register Multiparts
|
||||
ModParts.init();
|
||||
// Recipes
|
||||
ModRecipes.init();
|
||||
// Compat
|
||||
|
|
|
@ -3,6 +3,7 @@ package techreborn.compat;
|
|||
import techreborn.compat.waila.CompatModuleWaila;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import techreborn.init.ModParts;
|
||||
|
||||
public class CompatManager {
|
||||
|
||||
|
@ -12,5 +13,9 @@ public class CompatManager {
|
|||
{
|
||||
new CompatModuleWaila().init(event);
|
||||
}
|
||||
if(Loader.isModLoaded("qmunitylib")){
|
||||
// Register Multiparts
|
||||
ModParts.init();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package techreborn.partSystem;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public interface ICustomHighlight {
|
||||
|
||||
ArrayList<AxisAlignedBB> getBoxes(World world, int x, int y, int z,
|
||||
|
|
|
@ -4,13 +4,8 @@
|
|||
|
||||
package techreborn.partSystem;
|
||||
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -21,9 +16,6 @@ import uk.co.qmunity.lib.client.render.RenderHelper;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
/**
|
||||
* This is based of
|
||||
* https://github.com/Qmunity/QmunityLib/blob/master/src/main/java
|
||||
|
|
|
@ -27,8 +27,7 @@ public abstract class ModPart extends TileEntity implements IModPart {
|
|||
* This is the world
|
||||
*/
|
||||
@Override
|
||||
public World getWorld()
|
||||
{
|
||||
public World getWorld() {
|
||||
|
||||
return world;
|
||||
}
|
||||
|
@ -36,8 +35,7 @@ public abstract class ModPart extends TileEntity implements IModPart {
|
|||
/**
|
||||
* This sets the world Don't use this unless you know what you are doing.
|
||||
*/
|
||||
public void setWorld(World world)
|
||||
{
|
||||
public void setWorld(World world) {
|
||||
this.world = world;
|
||||
setWorldObj(world);
|
||||
}
|
||||
|
@ -46,8 +44,7 @@ public abstract class ModPart extends TileEntity implements IModPart {
|
|||
* Gets the x position in the world
|
||||
*/
|
||||
@Override
|
||||
public int getX()
|
||||
{
|
||||
public int getX() {
|
||||
return location.getX();
|
||||
}
|
||||
|
||||
|
@ -55,8 +52,7 @@ public abstract class ModPart extends TileEntity implements IModPart {
|
|||
* Gets the y position in the world
|
||||
*/
|
||||
@Override
|
||||
public int getY()
|
||||
{
|
||||
public int getY() {
|
||||
return location.getY();
|
||||
}
|
||||
|
||||
|
@ -64,24 +60,21 @@ public abstract class ModPart extends TileEntity implements IModPart {
|
|||
* Gets the z position in the world
|
||||
*/
|
||||
@Override
|
||||
public int getZ()
|
||||
{
|
||||
public int getZ() {
|
||||
return location.getZ();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the location of the part
|
||||
*/
|
||||
public Location getLocation()
|
||||
{
|
||||
public Location getLocation() {
|
||||
return location;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the x position in the world
|
||||
*/
|
||||
public void setLocation(Location location)
|
||||
{
|
||||
public void setLocation(Location location) {
|
||||
this.location = location;
|
||||
this.xCoord = location.getX();
|
||||
this.yCoord = location.getY();
|
||||
|
@ -89,14 +82,12 @@ public abstract class ModPart extends TileEntity implements IModPart {
|
|||
}
|
||||
|
||||
@Override
|
||||
public World getWorldObj()
|
||||
{
|
||||
public World getWorldObj() {
|
||||
return getWorld();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setWorldObj(World p_145834_1_)
|
||||
{
|
||||
public void setWorldObj(World p_145834_1_) {
|
||||
super.setWorldObj(p_145834_1_);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,50 +14,37 @@ public class ModPartItem extends Item {
|
|||
|
||||
ModPart modPart;
|
||||
|
||||
public ModPartItem(ModPart part)
|
||||
{
|
||||
public ModPartItem(ModPart part) {
|
||||
modPart = part;
|
||||
setUnlocalizedName(Names.Unlocalized.Items.MULTIPART);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(ItemStack item, EntityPlayer player, World world,
|
||||
int x, int y, int z, int face, float x_, float y_, float z_)
|
||||
{
|
||||
if (ModPartRegistry.masterProvider != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
int x, int y, int z, int face, float x_, float y_, float z_) {
|
||||
if (ModPartRegistry.masterProvider != null) {
|
||||
try {
|
||||
if (ModPartRegistry.masterProvider.placePart(item, player,
|
||||
world, x, y, z, face, x_, y_, z_, modPart.getClass()
|
||||
.newInstance()))
|
||||
{
|
||||
.newInstance())) {
|
||||
return true;
|
||||
}
|
||||
} catch (InstantiationException e)
|
||||
{
|
||||
} catch (InstantiationException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalAccessException e)
|
||||
{
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return false;
|
||||
} else
|
||||
{
|
||||
for (IPartProvider partProvider : ModPartRegistry.providers)
|
||||
{
|
||||
try
|
||||
{
|
||||
} else {
|
||||
for (IPartProvider partProvider : ModPartRegistry.providers) {
|
||||
try {
|
||||
if (partProvider.placePart(item, player, world, x, y, z,
|
||||
face, x_, y_, z_, modPart.getClass().newInstance()))
|
||||
{
|
||||
face, x_, y_, z_, modPart.getClass().newInstance())) {
|
||||
return true;
|
||||
}
|
||||
} catch (InstantiationException e)
|
||||
{
|
||||
} catch (InstantiationException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalAccessException e)
|
||||
{
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
@ -66,13 +53,11 @@ public class ModPartItem extends Item {
|
|||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack stack)
|
||||
{
|
||||
public String getUnlocalizedName(ItemStack stack) {
|
||||
return modPart.getName();
|
||||
}
|
||||
|
||||
public ModPart getModPart()
|
||||
{
|
||||
public ModPart getModPart() {
|
||||
return modPart;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,15 +4,15 @@
|
|||
|
||||
package techreborn.partSystem;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.item.Item;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.util.LogHelper;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class ModPartRegistry {
|
||||
|
||||
|
@ -24,17 +24,14 @@ public class ModPartRegistry {
|
|||
|
||||
public static Map<Item, String> itemParts = new HashMap<Item, String>();
|
||||
|
||||
public static void registerPart(ModPart iModPart)
|
||||
{
|
||||
public static void registerPart(ModPart iModPart) {
|
||||
parts.add(iModPart);
|
||||
}
|
||||
|
||||
public static void addAllPartsToSystems()
|
||||
{
|
||||
public static void addAllPartsToSystems() {
|
||||
LogHelper.info("Started to load all parts");
|
||||
|
||||
for (ModPart modPart : ModPartRegistry.parts)
|
||||
{
|
||||
for (ModPart modPart : ModPartRegistry.parts) {
|
||||
Item part = new ModPartItem(modPart)
|
||||
.setUnlocalizedName(modPart.getName())
|
||||
.setCreativeTab(TechRebornCreativeTab.instance)
|
||||
|
@ -43,46 +40,36 @@ public class ModPartRegistry {
|
|||
itemParts.put(part, modPart.getName());
|
||||
}
|
||||
|
||||
for (IPartProvider iPartProvider : providers)
|
||||
{
|
||||
for (IPartProvider iPartProvider : providers) {
|
||||
iPartProvider.registerPart();
|
||||
}
|
||||
}
|
||||
|
||||
public static Item getItem(String string)
|
||||
{
|
||||
for (Map.Entry<Item, String> entry : itemParts.entrySet())
|
||||
{
|
||||
if (entry.getValue().equals(string))
|
||||
{
|
||||
public static Item getItem(String string) {
|
||||
for (Map.Entry<Item, String> entry : itemParts.entrySet()) {
|
||||
if (entry.getValue().equals(string)) {
|
||||
return entry.getKey();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void addProvider(String className, String modid)
|
||||
{
|
||||
if (Loader.isModLoaded(modid) || modid.equals("Minecraft"))
|
||||
{
|
||||
try
|
||||
{
|
||||
public static void addProvider(String className, String modid) {
|
||||
if (Loader.isModLoaded(modid) || modid.equals("Minecraft")) {
|
||||
try {
|
||||
IPartProvider iPartProvider = null;
|
||||
iPartProvider = (IPartProvider) Class.forName(className)
|
||||
.newInstance();
|
||||
providers.add(iPartProvider);
|
||||
} catch (ClassNotFoundException e)
|
||||
{
|
||||
} catch (ClassNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
LogHelper.error("Failed to load " + className
|
||||
+ " to the part system!");
|
||||
} catch (InstantiationException e)
|
||||
{
|
||||
} catch (InstantiationException e) {
|
||||
e.printStackTrace();
|
||||
LogHelper.error("Failed to load " + className
|
||||
+ " to the part system!");
|
||||
} catch (IllegalAccessException e)
|
||||
{
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
LogHelper.error("Failed to load " + className
|
||||
+ " to the part system!");
|
||||
|
@ -91,11 +78,9 @@ public class ModPartRegistry {
|
|||
}
|
||||
|
||||
// Only use this one if it is a standalone Provider
|
||||
public static void addProvider(IPartProvider iPartProvider)
|
||||
{
|
||||
public static void addProvider(IPartProvider iPartProvider) {
|
||||
if (Loader.isModLoaded(iPartProvider.modID())
|
||||
|| iPartProvider.modID().equals("Minecraft"))
|
||||
{
|
||||
|| iPartProvider.modID().equals("Minecraft")) {
|
||||
providers.add(iPartProvider);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,47 +4,39 @@
|
|||
|
||||
package techreborn.partSystem;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.world.World;
|
||||
import techreborn.lib.Location;
|
||||
import techreborn.lib.vecmath.Vecs3dCube;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class ModPartUtils {
|
||||
|
||||
public static boolean checkOcclusion(World world, Location location,
|
||||
Vecs3dCube cube)
|
||||
{
|
||||
if (world == null)
|
||||
{
|
||||
Vecs3dCube cube) {
|
||||
if (world == null) {
|
||||
return false;
|
||||
}
|
||||
IPartProvider partProvider = getPartProvider(world, location);
|
||||
if (partProvider != null)
|
||||
{
|
||||
if (partProvider != null) {
|
||||
return partProvider.checkOcclusion(world, location, cube);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean checkOcclusion(World world, int x, int y, int z,
|
||||
Vecs3dCube cube)
|
||||
{
|
||||
Vecs3dCube cube) {
|
||||
return checkOcclusion(world, new Location(x, y, z), cube);
|
||||
}
|
||||
|
||||
public static boolean checkOcclusionInvert(World world, Location location,
|
||||
Vecs3dCube cube)
|
||||
{
|
||||
if (world == null)
|
||||
{
|
||||
Vecs3dCube cube) {
|
||||
if (world == null) {
|
||||
return false;
|
||||
}
|
||||
for (IPartProvider iPartProvider : ModPartRegistry.providers)
|
||||
{
|
||||
if (!iPartProvider.checkOcclusion(world, location, cube))
|
||||
{
|
||||
for (IPartProvider iPartProvider : ModPartRegistry.providers) {
|
||||
if (!iPartProvider.checkOcclusion(world, location, cube)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -52,48 +44,37 @@ public class ModPartUtils {
|
|||
}
|
||||
|
||||
public static boolean checkOcclusionInvert(World world, int x, int y,
|
||||
int z, Vecs3dCube cube)
|
||||
{
|
||||
int z, Vecs3dCube cube) {
|
||||
return checkOcclusionInvert(world, new Location(x, y, z), cube);
|
||||
}
|
||||
|
||||
public static boolean hasPart(World world, Location location, String name)
|
||||
{
|
||||
for (IPartProvider iPartProvider : ModPartRegistry.providers)
|
||||
{
|
||||
if (iPartProvider.hasPart(world, location, name))
|
||||
{
|
||||
public static boolean hasPart(World world, Location location, String name) {
|
||||
for (IPartProvider iPartProvider : ModPartRegistry.providers) {
|
||||
if (iPartProvider.hasPart(world, location, name)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean hasPart(World world, int x, int y, int z, String name)
|
||||
{
|
||||
public static boolean hasPart(World world, int x, int y, int z, String name) {
|
||||
return hasPart(world, new Location(x, y, z), name);
|
||||
}
|
||||
|
||||
public static Item getItemForPart(String string)
|
||||
{
|
||||
public static Item getItemForPart(String string) {
|
||||
for (Map.Entry<Item, String> item : ModPartRegistry.itemParts
|
||||
.entrySet())
|
||||
{
|
||||
if (item.getValue().equals(string))
|
||||
{
|
||||
.entrySet()) {
|
||||
if (item.getValue().equals(string)) {
|
||||
return item.getKey();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static IPartProvider getPartProvider(World world, Location location)
|
||||
{
|
||||
for (IPartProvider partProvider : ModPartRegistry.providers)
|
||||
{
|
||||
public static IPartProvider getPartProvider(World world, Location location) {
|
||||
for (IPartProvider partProvider : ModPartRegistry.providers) {
|
||||
if (partProvider.isTileFromProvider(world.getTileEntity(
|
||||
location.getX(), location.getY(), location.getZ())))
|
||||
{
|
||||
location.getX(), location.getY(), location.getZ()))) {
|
||||
return partProvider;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,44 +4,38 @@
|
|||
|
||||
package techreborn.partSystem.QLib;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import techreborn.lib.vecmath.Vecs3d;
|
||||
import techreborn.lib.vecmath.Vecs3dCube;
|
||||
import uk.co.qmunity.lib.vec.Vec3d;
|
||||
import uk.co.qmunity.lib.vec.Vec3dCube;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by mark on 09/12/14.
|
||||
*/
|
||||
public class ModLib2QLib {
|
||||
|
||||
public static Vec3d convert(Vecs3d input)
|
||||
{
|
||||
public static Vec3d convert(Vecs3d input) {
|
||||
return new Vec3d(input.getX(), input.getY(), input.getZ());
|
||||
}
|
||||
|
||||
public static Vec3dCube convert(Vecs3dCube input)
|
||||
{
|
||||
public static Vec3dCube convert(Vecs3dCube input) {
|
||||
return new Vec3dCube(input.toAABB());
|
||||
}
|
||||
|
||||
public static Vecs3d convert(Vec3d input)
|
||||
{
|
||||
public static Vecs3d convert(Vec3d input) {
|
||||
return new Vecs3d(input.getX(), input.getY(), input.getZ());
|
||||
}
|
||||
|
||||
public static Vecs3dCube convert(Vec3dCube input)
|
||||
{
|
||||
public static Vecs3dCube convert(Vec3dCube input) {
|
||||
return new Vecs3dCube(input.toAABB());
|
||||
}
|
||||
|
||||
public static List<Vecs3dCube> convert(List<Vec3dCube> input)
|
||||
{
|
||||
public static List<Vecs3dCube> convert(List<Vec3dCube> input) {
|
||||
List<Vecs3dCube> list = new ArrayList<Vecs3dCube>();
|
||||
for (Vec3dCube cube : input)
|
||||
{
|
||||
for (Vec3dCube cube : input) {
|
||||
list.add(new Vecs3dCube(cube.toAABB()));
|
||||
}
|
||||
return list;
|
||||
|
@ -49,11 +43,9 @@ public class ModLib2QLib {
|
|||
|
||||
// Its got to be called becuase of some weird thing see:
|
||||
// https://stackoverflow.com/questions/1998544/method-has-the-same-erasure-as-another-method-in-type
|
||||
public static List<Vec3dCube> convert2(List<Vecs3dCube> input)
|
||||
{
|
||||
public static List<Vec3dCube> convert2(List<Vecs3dCube> input) {
|
||||
List<Vec3dCube> list = new ArrayList<Vec3dCube>();
|
||||
for (Vecs3dCube cube : input)
|
||||
{
|
||||
for (Vecs3dCube cube : input) {
|
||||
list.add(new Vec3dCube(cube.toAABB()));
|
||||
}
|
||||
return list;
|
||||
|
|
|
@ -4,9 +4,6 @@
|
|||
|
||||
package techreborn.partSystem.QLib;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -23,51 +20,47 @@ import uk.co.qmunity.lib.vec.Vec3d;
|
|||
import uk.co.qmunity.lib.vec.Vec3dCube;
|
||||
import uk.co.qmunity.lib.vec.Vec3i;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class QModPart extends PartBase implements IPartCollidable,
|
||||
IPartSelectable, IPartRenderPlacement, IPartTicking,
|
||||
IPartUpdateListener {
|
||||
|
||||
ModPart iModPart;
|
||||
|
||||
public QModPart(ModPart iModPart)
|
||||
{
|
||||
public QModPart(ModPart iModPart) {
|
||||
this.iModPart = iModPart;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setParent(ITilePartHolder parent)
|
||||
{
|
||||
public void setParent(ITilePartHolder parent) {
|
||||
super.setParent(parent);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType()
|
||||
{
|
||||
public String getType() {
|
||||
return iModPart.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getItem()
|
||||
{
|
||||
public ItemStack getItem() {
|
||||
return iModPart.getItem();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addCollisionBoxesToList(List<Vec3dCube> boxes, Entity entity)
|
||||
{
|
||||
public void addCollisionBoxesToList(List<Vec3dCube> boxes, Entity entity) {
|
||||
List<Vecs3dCube> cubes = new ArrayList<Vecs3dCube>();
|
||||
iModPart.addCollisionBoxesToList(cubes, entity);
|
||||
for (Vecs3dCube cube : cubes)
|
||||
{
|
||||
for (Vecs3dCube cube : cubes) {
|
||||
if (cube != null)
|
||||
boxes.add(ModLib2QLib.convert(cube));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderDynamic(Vec3d translation, double delta, int pass)
|
||||
{
|
||||
public void renderDynamic(Vec3d translation, double delta, int pass) {
|
||||
iModPart.renderDynamic(ModLib2QLib.convert(translation), delta);
|
||||
}
|
||||
|
||||
|
@ -78,28 +71,23 @@ public class QModPart extends PartBase implements IPartCollidable,
|
|||
|
||||
|
||||
@Override
|
||||
public QMovingObjectPosition rayTrace(Vec3d start, Vec3d end)
|
||||
{
|
||||
public QMovingObjectPosition rayTrace(Vec3d start, Vec3d end) {
|
||||
return RayTracer.instance().rayTraceCubes(this, start, end);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Vec3dCube> getSelectionBoxes()
|
||||
{
|
||||
public List<Vec3dCube> getSelectionBoxes() {
|
||||
return ModLib2QLib.convert2(iModPart.getSelectionBoxes());
|
||||
}
|
||||
|
||||
@Override
|
||||
public World getWorld()
|
||||
{
|
||||
public World getWorld() {
|
||||
return getParent().getWorld();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update()
|
||||
{
|
||||
if (iModPart.world == null || iModPart.location == null)
|
||||
{
|
||||
public void update() {
|
||||
if (iModPart.world == null || iModPart.location == null) {
|
||||
iModPart.setWorld(getWorld());
|
||||
iModPart.setLocation(new Location(getX(), getY(), getZ()));
|
||||
}
|
||||
|
@ -107,22 +95,18 @@ public class QModPart extends PartBase implements IPartCollidable,
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onPartChanged(IPart part)
|
||||
{
|
||||
public void onPartChanged(IPart part) {
|
||||
iModPart.nearByChange();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNeighborBlockChange()
|
||||
{
|
||||
public void onNeighborBlockChange() {
|
||||
iModPart.nearByChange();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNeighborTileChange()
|
||||
{
|
||||
if (iModPart.world == null || iModPart.location == null)
|
||||
{
|
||||
public void onNeighborTileChange() {
|
||||
if (iModPart.world == null || iModPart.location == null) {
|
||||
iModPart.setWorld(getWorld());
|
||||
iModPart.setLocation(new Location(getX(), getY(), getZ()));
|
||||
}
|
||||
|
@ -130,26 +114,21 @@ public class QModPart extends PartBase implements IPartCollidable,
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onAdded()
|
||||
{
|
||||
if (iModPart.location != null)
|
||||
{
|
||||
public void onAdded() {
|
||||
if (iModPart.location != null) {
|
||||
iModPart.nearByChange();
|
||||
iModPart.onAdded();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRemoved()
|
||||
{
|
||||
public void onRemoved() {
|
||||
iModPart.onRemoved();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoaded()
|
||||
{
|
||||
if (iModPart.world == null || iModPart.location == null)
|
||||
{
|
||||
public void onLoaded() {
|
||||
if (iModPart.world == null || iModPart.location == null) {
|
||||
iModPart.setWorld(getWorld());
|
||||
iModPart.setLocation(new Location(getX(), getY(), getZ()));
|
||||
}
|
||||
|
@ -157,14 +136,12 @@ public class QModPart extends PartBase implements IPartCollidable,
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onUnloaded()
|
||||
{
|
||||
public void onUnloaded() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConverted()
|
||||
{
|
||||
public void onConverted() {
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,8 +4,6 @@
|
|||
|
||||
package techreborn.partSystem.QLib;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
@ -27,22 +25,18 @@ import uk.co.qmunity.lib.tile.TileMultipart;
|
|||
import uk.co.qmunity.lib.vec.Vec3dCube;
|
||||
import uk.co.qmunity.lib.vec.Vec3i;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class QModPartFactory implements IPartFactory, IPartProvider {
|
||||
@Override
|
||||
public IPart createPart(String type, boolean client)
|
||||
{
|
||||
for (ModPart modPart : ModPartRegistry.parts)
|
||||
{
|
||||
if (modPart.getName().equals(type))
|
||||
{
|
||||
try
|
||||
{
|
||||
public IPart createPart(String type, boolean client) {
|
||||
for (ModPart modPart : ModPartRegistry.parts) {
|
||||
if (modPart.getName().equals(type)) {
|
||||
try {
|
||||
return new QModPart(modPart.getClass().newInstance());
|
||||
} catch (InstantiationException e)
|
||||
{
|
||||
} catch (InstantiationException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalAccessException e)
|
||||
{
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
@ -53,8 +47,7 @@ public class QModPartFactory implements IPartFactory, IPartProvider {
|
|||
@Override
|
||||
public boolean placePart(ItemStack item, EntityPlayer player, World world,
|
||||
int x, int y, int z, int face, float x_, float y_, float z_,
|
||||
ModPart modPart)
|
||||
{
|
||||
ModPart modPart) {
|
||||
IPart part = createPart(
|
||||
item,
|
||||
player,
|
||||
|
@ -71,20 +64,17 @@ public class QModPartFactory implements IPartFactory, IPartProvider {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean isTileFromProvider(TileEntity tileEntity)
|
||||
{
|
||||
public boolean isTileFromProvider(TileEntity tileEntity) {
|
||||
return tileEntity instanceof TileMultipart;
|
||||
}
|
||||
|
||||
public String getCreatedPartType(ItemStack item, EntityPlayer player,
|
||||
World world, MovingObjectPosition mop, ModPart modPart)
|
||||
{
|
||||
World world, MovingObjectPosition mop, ModPart modPart) {
|
||||
return modPart.getName();
|
||||
}
|
||||
|
||||
public IPart createPart(ItemStack item, EntityPlayer player, World world,
|
||||
MovingObjectPosition mop, ModPart modPart)
|
||||
{
|
||||
MovingObjectPosition mop, ModPart modPart) {
|
||||
|
||||
return PartRegistry.createPart(
|
||||
getCreatedPartType(item, player, world, mop, modPart),
|
||||
|
@ -92,41 +82,33 @@ public class QModPartFactory implements IPartFactory, IPartProvider {
|
|||
}
|
||||
|
||||
@Override
|
||||
public String modID()
|
||||
{
|
||||
public String modID() {
|
||||
return QLModInfo.MODID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerPart()
|
||||
{
|
||||
public void registerPart() {
|
||||
PartRegistry.registerFactory(new QModPartFactory());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkOcclusion(World world, Location location,
|
||||
Vecs3dCube cube)
|
||||
{
|
||||
Vecs3dCube cube) {
|
||||
return MultipartCompatibility.checkOcclusion(world, location.x,
|
||||
location.y, location.z, new Vec3dCube(cube.toAABB()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPart(World world, Location location, String name)
|
||||
{
|
||||
public boolean hasPart(World world, Location location, String name) {
|
||||
TileEntity tileEntity = world.getTileEntity(location.getX(),
|
||||
location.getY(), location.getZ());
|
||||
if (tileEntity instanceof TileMultipart)
|
||||
{
|
||||
if (tileEntity instanceof TileMultipart) {
|
||||
TileMultipart mp = (TileMultipart) tileEntity;
|
||||
boolean ret = false;
|
||||
List<IPart> t = mp.getParts();
|
||||
for (IPart p : t)
|
||||
{
|
||||
if (ret == false)
|
||||
{
|
||||
if (p.getType().equals(name))
|
||||
{
|
||||
for (IPart p : t) {
|
||||
if (ret == false) {
|
||||
if (p.getType().equals(name)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,9 +4,6 @@
|
|||
|
||||
package techreborn.partSystem.block;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
@ -24,18 +21,19 @@ import techreborn.partSystem.ICustomHighlight;
|
|||
import techreborn.partSystem.IModPart;
|
||||
import techreborn.partSystem.ModPart;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by mark on 10/12/14.
|
||||
*/
|
||||
public class BlockModPart extends BlockContainer implements ICustomHighlight {
|
||||
|
||||
public BlockModPart(Material met)
|
||||
{
|
||||
public BlockModPart(Material met) {
|
||||
super(met);
|
||||
}
|
||||
|
||||
public static TileEntityModPart get(IBlockAccess world, int x, int y, int z)
|
||||
{
|
||||
public static TileEntityModPart get(IBlockAccess world, int x, int y, int z) {
|
||||
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if (te == null)
|
||||
|
@ -46,8 +44,7 @@ public class BlockModPart extends BlockContainer implements ICustomHighlight {
|
|||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int i)
|
||||
{
|
||||
public TileEntity createNewTileEntity(World world, int i) {
|
||||
return new TileEntityModPart();
|
||||
}
|
||||
|
||||
|
@ -55,8 +52,7 @@ public class BlockModPart extends BlockContainer implements ICustomHighlight {
|
|||
{"rawtypes", "unchecked"})
|
||||
@Override
|
||||
public void addCollisionBoxesToList(World world, int x, int y, int z,
|
||||
AxisAlignedBB bounds, List l, Entity entity)
|
||||
{
|
||||
AxisAlignedBB bounds, List l, Entity entity) {
|
||||
TileEntityModPart te = get(world, x, y, z);
|
||||
if (te == null)
|
||||
return;
|
||||
|
@ -68,15 +64,13 @@ public class BlockModPart extends BlockContainer implements ICustomHighlight {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean isOpaqueCube()
|
||||
{
|
||||
public boolean isOpaqueCube() {
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRenderType()
|
||||
{
|
||||
public int getRenderType() {
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
@ -84,20 +78,17 @@ public class BlockModPart extends BlockContainer implements ICustomHighlight {
|
|||
@Override
|
||||
// TODO move to array list
|
||||
public ArrayList<AxisAlignedBB> getBoxes(World world, int x, int y, int z,
|
||||
EntityPlayer player)
|
||||
{
|
||||
EntityPlayer player) {
|
||||
TileEntityModPart te = get(world, x, y, z);
|
||||
if (te == null)
|
||||
return null;
|
||||
|
||||
List<Vecs3dCube> boxes = new ArrayList<Vecs3dCube>();
|
||||
ArrayList<AxisAlignedBB> list = new ArrayList<AxisAlignedBB>();
|
||||
if (!te.getParts().isEmpty())
|
||||
{
|
||||
if (!te.getParts().isEmpty()) {
|
||||
for (ModPart modPart : te.getParts())
|
||||
boxes.addAll(modPart.getSelectionBoxes());
|
||||
for (int i = 0; i < boxes.size(); i++)
|
||||
{
|
||||
for (int i = 0; i < boxes.size(); i++) {
|
||||
Vecs3dCube cube = boxes.get(i);
|
||||
list.add(cube.toAABB());
|
||||
}
|
||||
|
@ -107,39 +98,31 @@ public class BlockModPart extends BlockContainer implements ICustomHighlight {
|
|||
}
|
||||
|
||||
public void onNeighborBlockChange(World world, int x, int y, int z,
|
||||
Block block)
|
||||
{
|
||||
for (ModPart part : get(world, x, y, z).getParts())
|
||||
{
|
||||
Block block) {
|
||||
for (ModPart part : get(world, x, y, z).getParts()) {
|
||||
part.nearByChange();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public MovingObjectPosition collisionRayTrace(World wrd, int x, int y,
|
||||
int z, Vec3 origin, Vec3 direction)
|
||||
{
|
||||
int z, Vec3 origin, Vec3 direction) {
|
||||
ArrayList<AxisAlignedBB> aabbs = getBoxes(wrd, x, y, z, null);
|
||||
MovingObjectPosition closest = null;
|
||||
for (AxisAlignedBB aabb : aabbs)
|
||||
{
|
||||
for (AxisAlignedBB aabb : aabbs) {
|
||||
MovingObjectPosition mop = aabb.getOffsetBoundingBox(x, y, z)
|
||||
.calculateIntercept(origin, direction);
|
||||
if (mop != null)
|
||||
{
|
||||
if (mop != null) {
|
||||
if (closest != null
|
||||
&& mop.hitVec.distanceTo(origin) < closest.hitVec
|
||||
.distanceTo(origin))
|
||||
{
|
||||
.distanceTo(origin)) {
|
||||
closest = mop;
|
||||
} else
|
||||
{
|
||||
} else {
|
||||
closest = mop;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (closest != null)
|
||||
{
|
||||
if (closest != null) {
|
||||
closest.blockX = x;
|
||||
closest.blockY = y;
|
||||
closest.blockZ = z;
|
||||
|
@ -148,10 +131,8 @@ public class BlockModPart extends BlockContainer implements ICustomHighlight {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onBlockAdded(World world, int x, int y, int z)
|
||||
{
|
||||
for (ModPart part : get(world, x, y, z).getParts())
|
||||
{
|
||||
public void onBlockAdded(World world, int x, int y, int z) {
|
||||
for (ModPart part : get(world, x, y, z).getParts()) {
|
||||
part.onAdded();
|
||||
}
|
||||
super.onBlockAdded(world, x, y, z);
|
||||
|
@ -159,10 +140,8 @@ public class BlockModPart extends BlockContainer implements ICustomHighlight {
|
|||
|
||||
@Override
|
||||
public void breakBlock(World world, int x, int y, int z, Block oldid,
|
||||
int oldmeta)
|
||||
{
|
||||
for (ModPart part : get(world, x, y, z).getParts())
|
||||
{
|
||||
int oldmeta) {
|
||||
for (ModPart part : get(world, x, y, z).getParts()) {
|
||||
part.onRemoved();
|
||||
}
|
||||
super.breakBlock(world, x, y, z, oldid, oldmeta);
|
||||
|
@ -170,14 +149,11 @@ public class BlockModPart extends BlockContainer implements ICustomHighlight {
|
|||
|
||||
@Override
|
||||
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z,
|
||||
int metadata, int fortune)
|
||||
{
|
||||
int metadata, int fortune) {
|
||||
ArrayList<ItemStack> l = new ArrayList<ItemStack>();
|
||||
TileEntityModPart te = get(world, x, y, z);
|
||||
if (te != null)
|
||||
{
|
||||
for (IModPart p : te.getParts())
|
||||
{
|
||||
if (te != null) {
|
||||
for (IModPart p : te.getParts()) {
|
||||
ItemStack item = p.getItem();
|
||||
if (item != null)
|
||||
l.add(item);
|
||||
|
|
|
@ -6,24 +6,20 @@ package techreborn.partSystem.block;
|
|||
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import techreborn.lib.vecmath.Vecs3d;
|
||||
import techreborn.partSystem.ModPart;
|
||||
|
||||
public class RenderModPart extends TileEntitySpecialRenderer {
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileEntity, double x, double y,
|
||||
double z, float delta)
|
||||
{
|
||||
double z, float delta) {
|
||||
TileEntityModPart te = (TileEntityModPart) tileEntity;
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslated(x, y, z);
|
||||
{
|
||||
for (ModPart modPart : te.getParts())
|
||||
{
|
||||
for (ModPart modPart : te.getParts()) {
|
||||
modPart.renderDynamic(new Vecs3d(0, 0, 0), delta);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,11 +4,6 @@
|
|||
|
||||
package techreborn.partSystem.block;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
|
@ -24,94 +19,83 @@ import techreborn.partSystem.ModPart;
|
|||
import techreborn.partSystem.ModPartRegistry;
|
||||
import techreborn.partSystem.parts.NullPart;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class TileEntityModPart extends TileEntity {
|
||||
|
||||
private Map<String, ModPart> parts = new HashMap<String, ModPart>();
|
||||
|
||||
public void addCollisionBoxesToList(List<Vecs3dCube> l,
|
||||
AxisAlignedBB bounds, Entity entity)
|
||||
{
|
||||
AxisAlignedBB bounds, Entity entity) {
|
||||
if (getParts().size() == 0)
|
||||
addPart(new NullPart());
|
||||
List<Vecs3dCube> boxes2 = new ArrayList<Vecs3dCube>();
|
||||
for (ModPart mp : getParts())
|
||||
{
|
||||
for (ModPart mp : getParts()) {
|
||||
List<Vecs3dCube> boxes = new ArrayList<Vecs3dCube>();
|
||||
mp.addCollisionBoxesToList(boxes, entity);
|
||||
|
||||
for (int i = 0; i < boxes.size(); i++)
|
||||
{
|
||||
for (int i = 0; i < boxes.size(); i++) {
|
||||
Vecs3dCube cube = boxes.get(i).clone();
|
||||
cube.add(getX(), getY(), getZ());
|
||||
boxes2.add(cube);
|
||||
}
|
||||
}
|
||||
|
||||
for (Vecs3dCube c : boxes2)
|
||||
{
|
||||
for (Vecs3dCube c : boxes2) {
|
||||
// if (c.toAABB().intersectsWith(bounds))
|
||||
l.add(c);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public List<Vecs3dCube> getOcclusionBoxes()
|
||||
{
|
||||
public List<Vecs3dCube> getOcclusionBoxes() {
|
||||
List<Vecs3dCube> boxes = new ArrayList<Vecs3dCube>();
|
||||
for (ModPart mp : getParts())
|
||||
{
|
||||
for (ModPart mp : getParts()) {
|
||||
boxes.addAll(mp.getOcclusionBoxes());
|
||||
}
|
||||
return boxes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AxisAlignedBB getRenderBoundingBox()
|
||||
{
|
||||
public AxisAlignedBB getRenderBoundingBox() {
|
||||
|
||||
return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1,
|
||||
yCoord + 1, zCoord + 1);
|
||||
}
|
||||
|
||||
public World getWorld()
|
||||
{
|
||||
public World getWorld() {
|
||||
return getWorldObj();
|
||||
}
|
||||
|
||||
public int getX()
|
||||
{
|
||||
public int getX() {
|
||||
return xCoord;
|
||||
}
|
||||
|
||||
public int getY()
|
||||
{
|
||||
public int getY() {
|
||||
return yCoord;
|
||||
}
|
||||
|
||||
public int getZ()
|
||||
{
|
||||
public int getZ() {
|
||||
return zCoord;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateEntity()
|
||||
{
|
||||
if (parts.isEmpty())
|
||||
{
|
||||
public void updateEntity() {
|
||||
if (parts.isEmpty()) {
|
||||
worldObj.setBlockToAir(xCoord, yCoord, zCoord);
|
||||
}
|
||||
for (ModPart mp : getParts())
|
||||
{
|
||||
if (mp.world != null && mp.location != null)
|
||||
{
|
||||
for (ModPart mp : getParts()) {
|
||||
if (mp.world != null && mp.location != null) {
|
||||
mp.tick();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
public void writeToNBT(NBTTagCompound tag) {
|
||||
|
||||
super.writeToNBT(tag);
|
||||
|
||||
|
@ -121,29 +105,23 @@ public class TileEntityModPart extends TileEntity {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound tag)
|
||||
{
|
||||
public void readFromNBT(NBTTagCompound tag) {
|
||||
|
||||
super.readFromNBT(tag);
|
||||
|
||||
NBTTagList l = tag.getTagList("parts", new NBTTagCompound().getId());
|
||||
try
|
||||
{
|
||||
try {
|
||||
readParts(l);
|
||||
} catch (IllegalAccessException e)
|
||||
{
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
} catch (InstantiationException e)
|
||||
{
|
||||
} catch (InstantiationException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private void writeParts(NBTTagList l, boolean update)
|
||||
{
|
||||
private void writeParts(NBTTagList l, boolean update) {
|
||||
|
||||
for (ModPart p : getParts())
|
||||
{
|
||||
for (ModPart p : getParts()) {
|
||||
String id = getIdentifier(p);
|
||||
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
|
@ -159,21 +137,16 @@ public class TileEntityModPart extends TileEntity {
|
|||
}
|
||||
|
||||
private void readParts(NBTTagList l) throws IllegalAccessException,
|
||||
InstantiationException
|
||||
{
|
||||
InstantiationException {
|
||||
|
||||
for (int i = 0; i < l.tagCount(); i++)
|
||||
{
|
||||
for (int i = 0; i < l.tagCount(); i++) {
|
||||
NBTTagCompound tag = l.getCompoundTagAt(i);
|
||||
|
||||
String id = tag.getString("id");
|
||||
ModPart p = getPart(id);
|
||||
if (p == null)
|
||||
{
|
||||
for (ModPart modPart : ModPartRegistry.parts)
|
||||
{
|
||||
if (modPart.getName().equals(id))
|
||||
{
|
||||
if (p == null) {
|
||||
for (ModPart modPart : ModPartRegistry.parts) {
|
||||
if (modPart.getName().equals(id)) {
|
||||
p = modPart.getClass().newInstance();
|
||||
}
|
||||
}
|
||||
|
@ -187,25 +160,20 @@ public class TileEntityModPart extends TileEntity {
|
|||
}
|
||||
}
|
||||
|
||||
public void addPart(ModPart modPart)
|
||||
{
|
||||
try
|
||||
{
|
||||
public void addPart(ModPart modPart) {
|
||||
try {
|
||||
ModPart newPart = modPart.getClass().newInstance();
|
||||
newPart.setWorld(getWorldObj());
|
||||
newPart.setLocation(new Location(xCoord, yCoord, zCoord));
|
||||
parts.put(newPart.getName(), newPart);
|
||||
} catch (InstantiationException e)
|
||||
{
|
||||
} catch (InstantiationException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalAccessException e)
|
||||
{
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private ModPart getPart(String id)
|
||||
{
|
||||
private ModPart getPart(String id) {
|
||||
for (String s : parts.keySet())
|
||||
if (s.equals(id))
|
||||
return parts.get(s);
|
||||
|
@ -213,8 +181,7 @@ public class TileEntityModPart extends TileEntity {
|
|||
return null;
|
||||
}
|
||||
|
||||
private String getIdentifier(ModPart part)
|
||||
{
|
||||
private String getIdentifier(ModPart part) {
|
||||
for (String s : parts.keySet())
|
||||
if (parts.get(s).equals(part))
|
||||
return s;
|
||||
|
@ -223,42 +190,35 @@ public class TileEntityModPart extends TileEntity {
|
|||
}
|
||||
|
||||
@Override
|
||||
public Packet getDescriptionPacket()
|
||||
{
|
||||
public Packet getDescriptionPacket() {
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
writeToNBT(tag);
|
||||
return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, tag);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt)
|
||||
{
|
||||
public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
|
||||
readFromNBT(pkt.func_148857_g());
|
||||
}
|
||||
|
||||
public List<ModPart> getParts()
|
||||
{
|
||||
public List<ModPart> getParts() {
|
||||
List<ModPart> parts = new ArrayList<ModPart>();
|
||||
for (String s : this.parts.keySet())
|
||||
{
|
||||
for (String s : this.parts.keySet()) {
|
||||
ModPart p = this.parts.get(s);
|
||||
parts.add(p);
|
||||
}
|
||||
return parts;
|
||||
}
|
||||
|
||||
public List<String> getPartsByName()
|
||||
{
|
||||
public List<String> getPartsByName() {
|
||||
List<String> parts = new ArrayList<String>();
|
||||
for (String s : this.parts.keySet())
|
||||
{
|
||||
for (String s : this.parts.keySet()) {
|
||||
parts.add(s);
|
||||
}
|
||||
return parts;
|
||||
}
|
||||
|
||||
public boolean canAddPart(ModPart modpart)
|
||||
{
|
||||
public boolean canAddPart(ModPart modpart) {
|
||||
List<Vecs3dCube> cubes = new ArrayList<Vecs3dCube>();
|
||||
modpart.addCollisionBoxesToList(cubes, null);
|
||||
for (Vecs3dCube c : cubes)
|
||||
|
|
|
@ -4,6 +4,8 @@
|
|||
|
||||
package techreborn.partSystem.block;
|
||||
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -16,8 +18,6 @@ import techreborn.lib.Location;
|
|||
import techreborn.lib.vecmath.Vecs3dCube;
|
||||
import techreborn.partSystem.IPartProvider;
|
||||
import techreborn.partSystem.ModPart;
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
/**
|
||||
* Created by mark on 10/12/14.
|
||||
|
@ -26,14 +26,12 @@ public class WorldProvider implements IPartProvider {
|
|||
Block blockModPart;
|
||||
|
||||
@Override
|
||||
public String modID()
|
||||
{
|
||||
public String modID() {
|
||||
return "Minecraft";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerPart()
|
||||
{
|
||||
public void registerPart() {
|
||||
// Loads all of the items
|
||||
|
||||
blockModPart = new BlockModPart(Material.ground)
|
||||
|
@ -45,30 +43,24 @@ public class WorldProvider implements IPartProvider {
|
|||
"TileEntityModPart");
|
||||
}
|
||||
|
||||
public void clientRegister()
|
||||
{
|
||||
public void clientRegister() {
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityModPart.class,
|
||||
new RenderModPart());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkOcclusion(World world, Location location,
|
||||
Vecs3dCube cube)
|
||||
{
|
||||
Vecs3dCube cube) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPart(World world, Location location, String name)
|
||||
{
|
||||
public boolean hasPart(World world, Location location, String name) {
|
||||
TileEntity tileEntity = world.getTileEntity(location.getX(),
|
||||
location.getY(), location.getZ());
|
||||
if (tileEntity instanceof TileEntityModPart)
|
||||
{
|
||||
for (ModPart part : ((TileEntityModPart) tileEntity).getParts())
|
||||
{
|
||||
if (part.getName().equals(name))
|
||||
{
|
||||
if (tileEntity instanceof TileEntityModPart) {
|
||||
for (ModPart part : ((TileEntityModPart) tileEntity).getParts()) {
|
||||
if (part.getName().equals(name)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -79,12 +71,10 @@ public class WorldProvider implements IPartProvider {
|
|||
@Override
|
||||
public boolean placePart(ItemStack item, EntityPlayer player, World world,
|
||||
int x, int y, int z, int side, float hitX, float hitY, float hitZ,
|
||||
ModPart modPart)
|
||||
{
|
||||
ModPart modPart) {
|
||||
ForgeDirection forgeDirection = ForgeDirection.getOrientation(side);
|
||||
if (world.getBlock(x + forgeDirection.offsetX, y
|
||||
+ forgeDirection.offsetY, z + forgeDirection.offsetZ) == Blocks.air)
|
||||
{
|
||||
+ forgeDirection.offsetY, z + forgeDirection.offsetZ) == Blocks.air) {
|
||||
TileEntityModPart modPart1;
|
||||
world.setBlock(x + forgeDirection.offsetX, y
|
||||
+ forgeDirection.offsetY, z + forgeDirection.offsetZ,
|
||||
|
@ -98,8 +88,7 @@ public class WorldProvider implements IPartProvider {
|
|||
// }
|
||||
}
|
||||
// this adds a part to a block
|
||||
if (world.getBlock(x, y, z) == blockModPart)
|
||||
{
|
||||
if (world.getBlock(x, y, z) == blockModPart) {
|
||||
TileEntityModPart tileEntityModPart = (TileEntityModPart) world
|
||||
.getTileEntity(x + forgeDirection.offsetX, y
|
||||
+ forgeDirection.offsetY, z
|
||||
|
@ -110,8 +99,7 @@ public class WorldProvider implements IPartProvider {
|
|||
return true;
|
||||
}
|
||||
if (world.getBlock(x + forgeDirection.offsetX, y
|
||||
+ forgeDirection.offsetY, z + forgeDirection.offsetZ) == blockModPart)
|
||||
{
|
||||
+ forgeDirection.offsetY, z + forgeDirection.offsetZ) == blockModPart) {
|
||||
TileEntityModPart tileEntityModPart = (TileEntityModPart) world
|
||||
.getTileEntity(x + forgeDirection.offsetX, y
|
||||
+ forgeDirection.offsetY, z
|
||||
|
@ -125,8 +113,7 @@ public class WorldProvider implements IPartProvider {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean isTileFromProvider(TileEntity tileEntity)
|
||||
{
|
||||
public boolean isTileFromProvider(TileEntity tileEntity) {
|
||||
return tileEntity instanceof TileEntityModPart;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
package techreborn.partSystem.client;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
|
@ -10,16 +13,11 @@ import net.minecraft.util.MovingObjectPosition;
|
|||
import net.minecraft.util.Vec3;
|
||||
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import techreborn.lib.Location;
|
||||
import techreborn.lib.vecmath.Vecs3d;
|
||||
import techreborn.partSystem.IModPart;
|
||||
import techreborn.partSystem.ModPartItem;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
/**
|
||||
* This is based of
|
||||
|
@ -35,8 +33,7 @@ public class PartPlacementRenderer {
|
|||
private int width = 0, height = 0;
|
||||
|
||||
@SubscribeEvent
|
||||
public void onRenderTick(RenderWorldLastEvent event)
|
||||
{
|
||||
public void onRenderTick(RenderWorldLastEvent event) {
|
||||
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||
ItemStack item = player.getCurrentEquippedItem();
|
||||
if (item == null)
|
||||
|
@ -57,8 +54,7 @@ public class PartPlacementRenderer {
|
|||
ForgeDirection faceHit = ForgeDirection.getOrientation(mop.sideHit);
|
||||
Location location = new Location(mop.blockX, mop.blockY, mop.blockZ);
|
||||
if (fb == null || width != Minecraft.getMinecraft().displayWidth
|
||||
|| height != Minecraft.getMinecraft().displayHeight)
|
||||
{
|
||||
|| height != Minecraft.getMinecraft().displayHeight) {
|
||||
width = Minecraft.getMinecraft().displayWidth;
|
||||
height = Minecraft.getMinecraft().displayHeight;
|
||||
fb = new Framebuffer(width, height, true);
|
||||
|
|
|
@ -4,8 +4,12 @@
|
|||
|
||||
package techreborn.partSystem.fmp;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.multipart.MultiPartRegistry;
|
||||
import codechicken.multipart.NormallyOccludedPart;
|
||||
import codechicken.multipart.TMultiPart;
|
||||
import codechicken.multipart.TileMultipart;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
@ -15,12 +19,8 @@ import techreborn.lib.vecmath.Vecs3dCube;
|
|||
import techreborn.partSystem.IPartProvider;
|
||||
import techreborn.partSystem.ModPart;
|
||||
import techreborn.partSystem.ModPartRegistry;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.multipart.MultiPartRegistry;
|
||||
import codechicken.multipart.NormallyOccludedPart;
|
||||
import codechicken.multipart.TMultiPart;
|
||||
import codechicken.multipart.TileMultipart;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by mark on 09/12/14.
|
||||
|
@ -28,20 +28,14 @@ import codechicken.multipart.TileMultipart;
|
|||
public class FMPFactory implements MultiPartRegistry.IPartFactory,
|
||||
IPartProvider {
|
||||
@Override
|
||||
public TMultiPart createPart(String type, boolean client)
|
||||
{
|
||||
for (ModPart modPart : ModPartRegistry.parts)
|
||||
{
|
||||
if (modPart.getName().equals(type))
|
||||
{
|
||||
try
|
||||
{
|
||||
public TMultiPart createPart(String type, boolean client) {
|
||||
for (ModPart modPart : ModPartRegistry.parts) {
|
||||
if (modPart.getName().equals(type)) {
|
||||
try {
|
||||
return new FMPModPart(modPart.getClass().newInstance());
|
||||
} catch (InstantiationException e)
|
||||
{
|
||||
} catch (InstantiationException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IllegalAccessException e)
|
||||
{
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
@ -51,29 +45,24 @@ public class FMPFactory implements MultiPartRegistry.IPartFactory,
|
|||
|
||||
public boolean placePart(ItemStack item, EntityPlayer player, World world,
|
||||
int x, int y, int z, int side, float hitX, float hitY, float hitZ,
|
||||
ModPart modPart)
|
||||
{
|
||||
ModPart modPart) {
|
||||
return new FakeFMPPlacerItem(modPart).onItemUse(item, player, world, x,
|
||||
y, z, side, hitX, hitY, hitZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTileFromProvider(TileEntity tileEntity)
|
||||
{
|
||||
public boolean isTileFromProvider(TileEntity tileEntity) {
|
||||
return tileEntity instanceof TileMultipart;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String modID()
|
||||
{
|
||||
public String modID() {
|
||||
return "ForgeMultipart";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerPart()
|
||||
{
|
||||
for (ModPart modPart : ModPartRegistry.parts)
|
||||
{
|
||||
public void registerPart() {
|
||||
for (ModPart modPart : ModPartRegistry.parts) {
|
||||
MultiPartRegistry.registerParts(new FMPFactory(), new String[]
|
||||
{modPart.getName()});
|
||||
}
|
||||
|
@ -81,8 +70,7 @@ public class FMPFactory implements MultiPartRegistry.IPartFactory,
|
|||
|
||||
@Override
|
||||
public boolean checkOcclusion(World world, Location location,
|
||||
Vecs3dCube cube)
|
||||
{
|
||||
Vecs3dCube cube) {
|
||||
codechicken.multipart.TileMultipart tmp = codechicken.multipart.TileMultipart
|
||||
.getOrConvertTile(world, new BlockCoord(location.getX(),
|
||||
location.getY(), location.getZ()));
|
||||
|
@ -93,21 +81,16 @@ public class FMPFactory implements MultiPartRegistry.IPartFactory,
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPart(World world, Location location, String name)
|
||||
{
|
||||
public boolean hasPart(World world, Location location, String name) {
|
||||
TileEntity tileEntity = world.getTileEntity(location.getX(),
|
||||
location.getY(), location.getZ());
|
||||
if (tileEntity instanceof TileMultipart)
|
||||
{
|
||||
if (tileEntity instanceof TileMultipart) {
|
||||
TileMultipart mp = (TileMultipart) tileEntity;
|
||||
boolean ret = false;
|
||||
List<TMultiPart> t = mp.jPartList();
|
||||
for (TMultiPart p : t)
|
||||
{
|
||||
if (ret == false)
|
||||
{
|
||||
if (p.getType().equals(name))
|
||||
{
|
||||
for (TMultiPart p : t) {
|
||||
if (ret == false) {
|
||||
if (p.getType().equals(name)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,17 +4,6 @@
|
|||
|
||||
package techreborn.partSystem.fmp;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
import techreborn.lib.Location;
|
||||
import techreborn.lib.vecmath.Vecs3d;
|
||||
import techreborn.lib.vecmath.Vecs3dCube;
|
||||
import techreborn.partSystem.ModPart;
|
||||
import codechicken.lib.raytracer.IndexedCuboid6;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
|
@ -25,7 +14,6 @@ import codechicken.multipart.TMultiPart;
|
|||
import codechicken.multipart.TSlottedPart;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
@ -35,26 +23,26 @@ import techreborn.lib.vecmath.Vecs3dCube;
|
|||
import techreborn.partSystem.ModPart;
|
||||
import uk.co.qmunity.lib.client.render.RenderHelper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class FMPModPart extends TMultiPart implements TSlottedPart,
|
||||
JNormalOcclusion, ISidedHollowConnect {
|
||||
|
||||
ModPart iModPart;
|
||||
|
||||
public FMPModPart(ModPart iModPart)
|
||||
{
|
||||
public FMPModPart(ModPart iModPart) {
|
||||
this.iModPart = iModPart;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getHollowSize(int i)
|
||||
{
|
||||
public int getHollowSize(int i) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Iterable<Cuboid6> getOcclusionBoxes()
|
||||
{
|
||||
public Iterable<Cuboid6> getOcclusionBoxes() {
|
||||
List<Cuboid6> cubes = new ArrayList<Cuboid6>();
|
||||
for (Vecs3dCube c : iModPart.getOcclusionBoxes())
|
||||
cubes.add(new Cuboid6(c.toAABB()));
|
||||
|
@ -62,40 +50,34 @@ public class FMPModPart extends TMultiPart implements TSlottedPart,
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean occlusionTest(TMultiPart npart)
|
||||
{
|
||||
public boolean occlusionTest(TMultiPart npart) {
|
||||
return NormalOcclusionTest.apply(this, npart);
|
||||
}
|
||||
|
||||
public void addCollisionBoxesToList(List<Vecs3dCube> l,
|
||||
AxisAlignedBB bounds, Entity entity)
|
||||
{
|
||||
AxisAlignedBB bounds, Entity entity) {
|
||||
List<Vecs3dCube> boxes = new ArrayList<Vecs3dCube>();
|
||||
List<Vecs3dCube> boxes_ = new ArrayList<Vecs3dCube>();
|
||||
iModPart.addCollisionBoxesToList(boxes_, entity);
|
||||
for (Vecs3dCube c : boxes_)
|
||||
{
|
||||
for (Vecs3dCube c : boxes_) {
|
||||
Vecs3dCube cube = c.clone();
|
||||
cube.add(getX(), getY(), getZ());
|
||||
boxes.add(cube);
|
||||
}
|
||||
boxes_.clear();
|
||||
|
||||
for (Vecs3dCube c : boxes)
|
||||
{
|
||||
for (Vecs3dCube c : boxes) {
|
||||
if (c.toAABB().intersectsWith(bounds))
|
||||
l.add(c);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Iterable<Cuboid6> getCollisionBoxes()
|
||||
{
|
||||
public Iterable<Cuboid6> getCollisionBoxes() {
|
||||
List<Cuboid6> cubes = new ArrayList<Cuboid6>();
|
||||
List<Vecs3dCube> boxes = new ArrayList<Vecs3dCube>();
|
||||
iModPart.addCollisionBoxesToList(boxes, null);
|
||||
for (Vecs3dCube c : boxes)
|
||||
{
|
||||
for (Vecs3dCube c : boxes) {
|
||||
if (c != null)
|
||||
cubes.add(new Cuboid6(c.toAABB()));
|
||||
}
|
||||
|
@ -104,11 +86,9 @@ public class FMPModPart extends TMultiPart implements TSlottedPart,
|
|||
}
|
||||
|
||||
@Override
|
||||
public Iterable<IndexedCuboid6> getSubParts()
|
||||
{
|
||||
public Iterable<IndexedCuboid6> getSubParts() {
|
||||
List<IndexedCuboid6> cubes = new ArrayList<IndexedCuboid6>();
|
||||
if (iModPart.getSelectionBoxes() != null)
|
||||
{
|
||||
if (iModPart.getSelectionBoxes() != null) {
|
||||
for (Vecs3dCube c : iModPart.getSelectionBoxes())
|
||||
if (c != null)
|
||||
cubes.add(new IndexedCuboid6(0, new Cuboid6(c.toAABB())));
|
||||
|
@ -122,52 +102,42 @@ public class FMPModPart extends TMultiPart implements TSlottedPart,
|
|||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void renderDynamic(Vector3 pos, float frame, int pass)
|
||||
{
|
||||
public void renderDynamic(Vector3 pos, float frame, int pass) {
|
||||
iModPart.renderDynamic(new Vecs3d(pos.x, pos.y, pos.z), frame);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType()
|
||||
{
|
||||
public String getType() {
|
||||
return iModPart.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSlotMask()
|
||||
{
|
||||
public int getSlotMask() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
public World getWorld()
|
||||
{
|
||||
public World getWorld() {
|
||||
return world();
|
||||
}
|
||||
|
||||
public int getX()
|
||||
{
|
||||
if (iModPart.world == null || iModPart.location == null)
|
||||
{
|
||||
public int getX() {
|
||||
if (iModPart.world == null || iModPart.location == null) {
|
||||
iModPart.setWorld(world());
|
||||
iModPart.setLocation(new Location(x(), y(), z()));
|
||||
}
|
||||
return x();
|
||||
}
|
||||
|
||||
public int getY()
|
||||
{
|
||||
if (iModPart.world == null || iModPart.location == null)
|
||||
{
|
||||
public int getY() {
|
||||
if (iModPart.world == null || iModPart.location == null) {
|
||||
iModPart.setWorld(world());
|
||||
iModPart.setLocation(new Location(x(), y(), z()));
|
||||
}
|
||||
return y();
|
||||
}
|
||||
|
||||
public int getZ()
|
||||
{
|
||||
if (iModPart.world == null || iModPart.location == null)
|
||||
{
|
||||
public int getZ() {
|
||||
if (iModPart.world == null || iModPart.location == null) {
|
||||
iModPart.setWorld(world());
|
||||
iModPart.setLocation(new Location(x(), y(), z()));
|
||||
}
|
||||
|
@ -175,8 +145,7 @@ public class FMPModPart extends TMultiPart implements TSlottedPart,
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onAdded()
|
||||
{
|
||||
public void onAdded() {
|
||||
iModPart.setWorld(world());
|
||||
iModPart.setLocation(new Location(x(), y(), z()));
|
||||
iModPart.nearByChange();
|
||||
|
@ -184,35 +153,29 @@ public class FMPModPart extends TMultiPart implements TSlottedPart,
|
|||
}
|
||||
|
||||
@Override
|
||||
public void update()
|
||||
{
|
||||
if (iModPart.location != null)
|
||||
{
|
||||
public void update() {
|
||||
if (iModPart.location != null) {
|
||||
iModPart.tick();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNeighborChanged()
|
||||
{
|
||||
public void onNeighborChanged() {
|
||||
super.onNeighborChanged();
|
||||
if (iModPart.world == null || iModPart.location == null)
|
||||
{
|
||||
if (iModPart.world == null || iModPart.location == null) {
|
||||
iModPart.setWorld(world());
|
||||
iModPart.setLocation(new Location(x(), y(), z()));
|
||||
}
|
||||
iModPart.nearByChange();
|
||||
}
|
||||
|
||||
public void onRemoved()
|
||||
{
|
||||
public void onRemoved() {
|
||||
iModPart.onRemoved();
|
||||
super.onRemoved();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderStatic(Vector3 pos, int pass)
|
||||
{
|
||||
public boolean renderStatic(Vector3 pos, int pass) {
|
||||
boolean render = false;
|
||||
render = iModPart.renderStatic(new Vecs3d(pos.x, pos.y, pos.z), uk.co.qmunity.lib.client.render.RenderHelper.instance, pass);
|
||||
RenderHelper.instance.resetRenderedSides();
|
||||
|
|
|
@ -4,15 +4,15 @@
|
|||
|
||||
package techreborn.partSystem.fmp;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import techreborn.partSystem.ModPart;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
import codechicken.multipart.JItemMultiPart;
|
||||
import codechicken.multipart.MultiPartRegistry;
|
||||
import codechicken.multipart.TMultiPart;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import techreborn.partSystem.ModPart;
|
||||
|
||||
/**
|
||||
* This item is never added into the game, it is only used to add the part to
|
||||
|
@ -21,15 +21,13 @@ import codechicken.multipart.TMultiPart;
|
|||
public class FakeFMPPlacerItem extends JItemMultiPart {
|
||||
ModPart modPart;
|
||||
|
||||
public FakeFMPPlacerItem(ModPart part)
|
||||
{
|
||||
public FakeFMPPlacerItem(ModPart part) {
|
||||
modPart = part;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TMultiPart newPart(ItemStack item, EntityPlayer player, World world,
|
||||
BlockCoord pos, int side, Vector3 vhit)
|
||||
{
|
||||
BlockCoord pos, int side, Vector3 vhit) {
|
||||
TMultiPart w = MultiPartRegistry.createPart(modPart.getName(), false);
|
||||
return w;
|
||||
}
|
||||
|
|
|
@ -36,8 +36,7 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
private boolean[] connections = new boolean[6];
|
||||
public boolean addedToEnergyNet = false;
|
||||
|
||||
public static void refreshBounding()
|
||||
{
|
||||
public static void refreshBounding() {
|
||||
float centerFirst = center - offset;
|
||||
double w = 0.2D / 2;
|
||||
boundingBoxes[6] = new Vecs3dCube(centerFirst - w - 0.03, centerFirst
|
||||
|
@ -49,8 +48,7 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
+ w);
|
||||
|
||||
int i = 0;
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
||||
{
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
|
||||
double xMin1 = (dir.offsetX < 0 ? 0.0
|
||||
: (dir.offsetX == 0 ? centerFirst - w : centerFirst + w));
|
||||
double xMax1 = (dir.offsetX > 0 ? 1.0
|
||||
|
@ -73,18 +71,14 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void addCollisionBoxesToList(List<Vecs3dCube> boxes, Entity entity)
|
||||
{
|
||||
if (world != null || location != null)
|
||||
{
|
||||
public void addCollisionBoxesToList(List<Vecs3dCube> boxes, Entity entity) {
|
||||
if (world != null || location != null) {
|
||||
checkConnectedSides();
|
||||
} else
|
||||
{
|
||||
} else {
|
||||
connectedSides = new HashMap<ForgeDirection, TileEntity>();
|
||||
}
|
||||
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
||||
{
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
|
||||
if (connectedSides.containsKey(dir))
|
||||
boxes.add(boundingBoxes[Functions.getIntDirFromDirection(dir)]);
|
||||
}
|
||||
|
@ -92,12 +86,10 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
}
|
||||
|
||||
@Override
|
||||
public List<Vecs3dCube> getSelectionBoxes()
|
||||
{
|
||||
public List<Vecs3dCube> getSelectionBoxes() {
|
||||
List<Vecs3dCube> vec3dCubeList = new ArrayList<Vecs3dCube>();
|
||||
checkConnectedSides();
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
||||
{
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
|
||||
if (connectedSides.containsKey(dir))
|
||||
vec3dCubeList.add(boundingBoxes[Functions
|
||||
.getIntDirFromDirection(dir)]);
|
||||
|
@ -107,13 +99,11 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
}
|
||||
|
||||
@Override
|
||||
public List<Vecs3dCube> getOcclusionBoxes()
|
||||
{
|
||||
public List<Vecs3dCube> getOcclusionBoxes() {
|
||||
checkConnectedSides();
|
||||
List<Vecs3dCube> vecs3dCubesList = new ArrayList<Vecs3dCube>();
|
||||
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
||||
{
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
|
||||
if (connectedSides.containsKey(dir))
|
||||
vecs3dCubesList.add(boundingBoxes[Functions
|
||||
.getIntDirFromDirection(dir)]);
|
||||
|
@ -122,8 +112,7 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void renderDynamic(Vecs3d translation, double delta)
|
||||
{
|
||||
public void renderDynamic(Vecs3d translation, double delta) {
|
||||
|
||||
}
|
||||
|
||||
|
@ -141,46 +130,37 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
public void writeToNBT(NBTTagCompound tag) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound tag)
|
||||
{
|
||||
public void readFromNBT(NBTTagCompound tag) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
public String getName() {
|
||||
return "Cable";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemTextureName()
|
||||
{
|
||||
public String getItemTextureName() {
|
||||
return "network:networkCable";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick()
|
||||
{
|
||||
if (ticks == 0)
|
||||
{
|
||||
public void tick() {
|
||||
if (ticks == 0) {
|
||||
checkConnectedSides();
|
||||
ticks += 1;
|
||||
} else if (ticks == 40)
|
||||
{
|
||||
} else if (ticks == 40) {
|
||||
ticks = 0;
|
||||
} else
|
||||
{
|
||||
} else {
|
||||
ticks += 1;
|
||||
}
|
||||
|
||||
if (IC2.platform.isSimulating())
|
||||
{
|
||||
if (IC2.platform.isSimulating()) {
|
||||
MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));
|
||||
this.addedToEnergyNet = true;
|
||||
checkConnectedSides();
|
||||
|
@ -189,8 +169,7 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void nearByChange()
|
||||
{
|
||||
public void nearByChange() {
|
||||
checkConnectedSides();
|
||||
}
|
||||
|
||||
|
@ -200,51 +179,40 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onRemoved()
|
||||
{
|
||||
if (IC2.platform.isSimulating() && this.addedToEnergyNet)
|
||||
{
|
||||
public void onRemoved() {
|
||||
if (IC2.platform.isSimulating() && this.addedToEnergyNet) {
|
||||
MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));
|
||||
this.addedToEnergyNet = false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getItem()
|
||||
{
|
||||
public ItemStack getItem() {
|
||||
return new ItemStack(ModPartUtils.getItemForPart(getName()));
|
||||
}
|
||||
|
||||
public boolean shouldConnectTo(TileEntity entity, ForgeDirection dir)
|
||||
{
|
||||
if (entity == null)
|
||||
{
|
||||
public boolean shouldConnectTo(TileEntity entity, ForgeDirection dir) {
|
||||
if (entity == null) {
|
||||
return false;
|
||||
} else if (entity instanceof IEnergyTile)
|
||||
{
|
||||
} else if (entity instanceof IEnergyTile) {
|
||||
return true;
|
||||
} else
|
||||
{
|
||||
} else {
|
||||
return ModPartUtils.hasPart(entity.getWorldObj(), entity.xCoord,
|
||||
entity.yCoord, entity.zCoord, this.getName());
|
||||
}
|
||||
}
|
||||
|
||||
public void checkConnectedSides()
|
||||
{
|
||||
public void checkConnectedSides() {
|
||||
refreshBounding();
|
||||
connectedSides = new HashMap<ForgeDirection, TileEntity>();
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
||||
{
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
|
||||
int d = Functions.getIntDirFromDirection(dir);
|
||||
if (world == null)
|
||||
{
|
||||
if (world == null) {
|
||||
return;
|
||||
}
|
||||
TileEntity te = world.getTileEntity(getX() + dir.offsetX, getY()
|
||||
+ dir.offsetY, getZ() + dir.offsetZ);
|
||||
if (shouldConnectTo(te, dir))
|
||||
{
|
||||
if (shouldConnectTo(te, dir)) {
|
||||
// TODO if (ModPartUtils.checkOcclusion(getWorld(), getX(),
|
||||
// getY(), getZ(), boundingBoxes[d])) {
|
||||
connectedSides.put(dir, te);
|
||||
|
@ -255,10 +223,8 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
getWorld().markBlockForUpdate(getX(), getY(), getZ());
|
||||
}
|
||||
|
||||
public void checkConnections(World world, int x, int y, int z)
|
||||
{
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
public void checkConnections(World world, int x, int y, int z) {
|
||||
for (int i = 0; i < 6; i++) {
|
||||
ForgeDirection dir = dirs[i];
|
||||
int dx = x + dir.offsetX;
|
||||
int dy = y + dir.offsetY;
|
||||
|
@ -271,52 +237,44 @@ public class CablePart extends ModPart implements IEnergyConductor {
|
|||
}
|
||||
|
||||
@Override
|
||||
public double getConductionLoss()
|
||||
{
|
||||
public double getConductionLoss() {
|
||||
return 0D;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getInsulationEnergyAbsorption()
|
||||
{
|
||||
public double getInsulationEnergyAbsorption() {
|
||||
return 256;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getInsulationBreakdownEnergy()
|
||||
{
|
||||
public double getInsulationBreakdownEnergy() {
|
||||
return 2048;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getConductorBreakdownEnergy()
|
||||
{
|
||||
public double getConductorBreakdownEnergy() {
|
||||
return 2048;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeInsulation()
|
||||
{
|
||||
public void removeInsulation() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeConductor()
|
||||
{
|
||||
public void removeConductor() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean acceptsEnergyFrom(TileEntity tileEntity,
|
||||
ForgeDirection forgeDirection)
|
||||
{
|
||||
ForgeDirection forgeDirection) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean emitsEnergyTo(TileEntity tileEntity,
|
||||
ForgeDirection forgeDirection)
|
||||
{
|
||||
ForgeDirection forgeDirection) {
|
||||
return true;
|
||||
}
|
||||
}
|
|
@ -4,10 +4,6 @@
|
|||
|
||||
package techreborn.partSystem.parts;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -16,33 +12,32 @@ import techreborn.lib.vecmath.Vecs3dCube;
|
|||
import techreborn.partSystem.ModPart;
|
||||
import uk.co.qmunity.lib.client.render.RenderHelper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by mark on 11/12/14.
|
||||
*/
|
||||
public class NullPart extends ModPart {
|
||||
@Override
|
||||
public void addCollisionBoxesToList(List<Vecs3dCube> boxes, Entity entity)
|
||||
{
|
||||
public void addCollisionBoxesToList(List<Vecs3dCube> boxes, Entity entity) {
|
||||
boxes.add(new Vecs3dCube(0, 0, 0, 1, 1, 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Vecs3dCube> getSelectionBoxes()
|
||||
{
|
||||
public List<Vecs3dCube> getSelectionBoxes() {
|
||||
List<Vecs3dCube> cubes = new ArrayList<Vecs3dCube>();
|
||||
cubes.add(new Vecs3dCube(0, 0, 0, 1, 1, 1));
|
||||
return cubes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Vecs3dCube> getOcclusionBoxes()
|
||||
{
|
||||
public List<Vecs3dCube> getOcclusionBoxes() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderDynamic(Vecs3d translation, double delta)
|
||||
{
|
||||
public void renderDynamic(Vecs3d translation, double delta) {
|
||||
|
||||
}
|
||||
|
||||
|
@ -52,56 +47,47 @@ public class NullPart extends ModPart {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
public void writeToNBT(NBTTagCompound tag) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound tag)
|
||||
{
|
||||
public void readFromNBT(NBTTagCompound tag) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getItem()
|
||||
{
|
||||
public ItemStack getItem() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
public String getName() {
|
||||
return "NullPart";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemTextureName()
|
||||
{
|
||||
public String getItemTextureName() {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick()
|
||||
{
|
||||
public void tick() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void nearByChange()
|
||||
{
|
||||
public void nearByChange() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAdded()
|
||||
{
|
||||
public void onAdded() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRemoved()
|
||||
{
|
||||
public void onRemoved() {
|
||||
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue