mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 12:19:55 +00:00
Add dense ME conduits and touch up conduit item rendering a bit
This commit is contained in:
1 parent
ac080aa282
commit
59e8f099e8
10 files changed
+51
-12
No files matched your search
@@ -117,6 +117,10 @@ public class ConduitRecipes {
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', fluix, 'q', quartzFiber));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', pureFluix, 'q', quartzFiber));
|
||||
|
||||
res.stackSize = 1;
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.itemMEConduit, 1, 1), "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res));
|
||||
|
||||
} else {
|
||||
throw new RuntimeException("EnderIO ME Conduits only support AE2 rv1 or rv2 build 16+");
|
||||
}
|
||||
|
||||
@@ -10,5 +10,7 @@ public interface IMEConduit extends IConduit {
|
||||
MEConduitGrid getGrid();
|
||||
|
||||
EnumSet<ForgeDirection> getConnections();
|
||||
|
||||
boolean isDense();
|
||||
|
||||
}
|
||||
@@ -10,6 +10,7 @@ public class ItemMEConduit extends AbstractItemConduit {
|
||||
|
||||
private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
|
||||
new ItemConduitSubtype(ModObject.itemMEConduit.name(), "enderio:itemMeConduit"),
|
||||
new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMEConduitDense")
|
||||
};
|
||||
|
||||
public static ItemMEConduit create() {
|
||||
@@ -31,6 +32,6 @@ public class ItemMEConduit extends AbstractItemConduit {
|
||||
|
||||
@Override
|
||||
public IConduit createConduit(ItemStack item) {
|
||||
return new MEConduit();
|
||||
return new MEConduit(item.getItemDamage());
|
||||
}
|
||||
}
|
||||
@@ -40,18 +40,34 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
protected MEConduitNetwork network;
|
||||
protected MEConduitGrid grid;
|
||||
|
||||
public static IIcon coreTexture;
|
||||
public static IIcon longTexture;
|
||||
public static IIcon[] coreTextures;
|
||||
public static IIcon[] longTextures;
|
||||
|
||||
private boolean isDense;
|
||||
|
||||
EnumSet<ForgeDirection> validConnections = EnumSet.copyOf(Arrays.asList(ForgeDirection.VALID_DIRECTIONS));
|
||||
|
||||
public MEConduit() {
|
||||
this(0);
|
||||
}
|
||||
|
||||
public MEConduit(int itemDamage) {
|
||||
isDense = itemDamage == 1;
|
||||
}
|
||||
|
||||
public static void initIcons() {
|
||||
IconUtil.addIconProvider(new IconUtil.IIconProvider() {
|
||||
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
coreTexture = register.registerIcon(EnderIO.MODID + ":meConduitCore");
|
||||
longTexture = register.registerIcon(EnderIO.MODID + ":meConduit");
|
||||
coreTextures = new IIcon[2];
|
||||
longTextures = new IIcon[2];
|
||||
|
||||
coreTextures[0] = register.registerIcon(EnderIO.MODID + ":meConduitCore");
|
||||
coreTextures[1] = register.registerIcon(EnderIO.MODID + ":meConduitCoreDense");
|
||||
|
||||
longTextures[0] = register.registerIcon(EnderIO.MODID + ":meConduit");
|
||||
longTextures[1] = register.registerIcon(EnderIO.MODID + ":meConduitDense");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -61,6 +77,10 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
public static int getDamageForState(boolean isDense) {
|
||||
return isDense ? 1 : 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<? extends IConduit> getBaseConduitType() {
|
||||
@@ -69,7 +89,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
|
||||
@Override
|
||||
public ItemStack createItem() {
|
||||
return new ItemStack(EnderIO.itemMEConduit);
|
||||
return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -92,6 +112,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
list.appendTag(name);
|
||||
}
|
||||
nbtRoot.setTag("validConnections", list);
|
||||
nbtRoot.setBoolean("isDense", isDense);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -104,6 +125,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
validConnections.add(ForgeDirection.valueOf(connections.getStringTagAt(i)));
|
||||
}
|
||||
}
|
||||
this.isDense = nbtRoot.getBoolean("isDense");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -132,10 +154,11 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
|
||||
@Override
|
||||
public IIcon getTextureForState(CollidableComponent component) {
|
||||
int state = getDamageForState(isDense);
|
||||
if(component.dir == ForgeDirection.UNKNOWN) {
|
||||
return coreTexture;
|
||||
return coreTextures[state];
|
||||
} else {
|
||||
return longTexture;
|
||||
return longTextures[state];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -205,7 +228,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
@Override
|
||||
public void conduitConnectionRemoved(ForgeDirection fromDirection) {
|
||||
super.conduitConnectionRemoved(fromDirection);
|
||||
validConnections.remove(fromDirection);
|
||||
// validConnections.remove(fromDirection); // this causes more annoying behavior than wanted behavior. Let's leave it out for now.
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -304,4 +327,9 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
public EnumSet<ForgeDirection> getConnections() {
|
||||
return validConnections;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDense() {
|
||||
return isDense;
|
||||
}
|
||||
}
|
||||
@@ -22,7 +22,7 @@ public class MEConduitGrid implements IGridBlock {
|
||||
|
||||
@Override
|
||||
public double getIdlePowerUsage() {
|
||||
return 0; // TODO Balance
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -42,7 +42,7 @@ public class MEConduitGrid implements IGridBlock {
|
||||
|
||||
@Override
|
||||
public EnumSet<GridFlags> getFlags() {
|
||||
return EnumSet.noneOf(GridFlags.class);
|
||||
return conduit.isDense() ? EnumSet.of(GridFlags.DENSE_CAPACITY) : EnumSet.noneOf(GridFlags.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -33,15 +33,18 @@ public class ItemConduitRenderer implements IItemRenderer {
|
||||
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
|
||||
RenderBlocks renderBlocks = (RenderBlocks) data[0];
|
||||
if(type == ItemRenderType.INVENTORY) {
|
||||
GL11.glTranslatef(0, -0.1f, 0);
|
||||
renderToInventory(item, renderBlocks);
|
||||
} else if(type == ItemRenderType.EQUIPPED) {
|
||||
renderEquipped(item, renderBlocks);
|
||||
} else if(type == ItemRenderType.ENTITY) {
|
||||
renderEntity(item, renderBlocks);
|
||||
} else if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
|
||||
GL11.glTranslatef(0.3f, 0.2f, 0);
|
||||
GL11.glScalef(1.25f, 1.25f, 1.25f);
|
||||
renderEntity(item, renderBlocks);
|
||||
} else {
|
||||
System.out.println("FacadeRenderer.renderItem: Unsupported render type");
|
||||
System.out.println("ItemConduitRenderer.renderItem: Unsupported render type");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user