chore: abstract blocks
All checks were successful
ci/woodpecker/push/central-override Pipeline was successful

This commit is contained in:
LordMZTE 2023-07-27 18:48:14 +02:00
parent f812442a4f
commit 4dfffe967b
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
29 changed files with 197 additions and 396 deletions

View file

@ -1,8 +1,17 @@
package net.anvilcraft.pccompat;
import net.minecraft.tileentity.TileEntity;
public interface IModProxy {
public void registerPowerSystem();
public void registerBlocks();
public void registerTiles();
public void registerRecipes();
public default int getMetaCount() {
return 2;
}
public String getModPrefix();
public TileEntity createTileEntity(int meta);
}

View file

@ -2,29 +2,30 @@ package net.anvilcraft.pccompat.blocks;
import covers1624.powerconverters.block.BlockPowerConverter;
import covers1624.powerconverters.gui.PCCreativeTab;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.Utils;
import net.anvilcraft.pccompat.tiles.TileEntityRailcraftConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityRailcraftProducer;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockPowerConverterRailcraft extends BlockPowerConverter {
public class BlockPCCConverter extends BlockPowerConverter {
public IModProxy proxy;
public BlockPowerConverterRailcraft() {
super(2);
public BlockPCCConverter(IModProxy proxy) {
super(proxy.getMetaCount());
this.proxy = proxy;
this.setCreativeTab(PCCreativeTab.tab);
}
@Override
public void registerBlockIcons(IIconRegister reg) {
Utils.registerStandardPowerConverterBlockIcons(reg, this._icons, "rc");
Utils.registerStandardPowerConverterBlockIcons(
reg, this._icons, this.proxy.getModPrefix()
);
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return meta == 0 ? new TileEntityRailcraftConsumer()
: new TileEntityRailcraftProducer();
return this.proxy.createTileEntity(meta);
}
}

View file

@ -1,28 +0,0 @@
package net.anvilcraft.pccompat.blocks;
import covers1624.powerconverters.block.BlockPowerConverter;
import covers1624.powerconverters.gui.PCCreativeTab;
import net.anvilcraft.pccompat.Utils;
import net.anvilcraft.pccompat.tiles.TileEntityAppliedEnergisticsConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityAppliedEnergisticsProducer;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockPowerConverterAppliedEnergistics extends BlockPowerConverter {
public BlockPowerConverterAppliedEnergistics() {
super(2);
this.setCreativeTab(PCCreativeTab.tab);
}
@Override
public void registerBlockIcons(IIconRegister reg) {
Utils.registerStandardPowerConverterBlockIcons(reg, this._icons, "ae");
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return meta == 0 ? new TileEntityAppliedEnergisticsConsumer()
: new TileEntityAppliedEnergisticsProducer();
}
}

View file

@ -1,23 +1,17 @@
package net.anvilcraft.pccompat.blocks;
import covers1624.powerconverters.block.BlockPowerConverter;
import covers1624.powerconverters.gui.PCCreativeTab;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.Utils;
import net.anvilcraft.pccompat.tiles.TileEntityGregTechConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityGregTechProducer;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockPowerConverterGregTech extends BlockPowerConverter {
public BlockPowerConverterGregTech() {
super(8); // 4 Consumers, 4 Producers
this.setCreativeTab(PCCreativeTab.tab);
public class BlockPowerConverterGregTech extends BlockPCCConverter {
public BlockPowerConverterGregTech(IModProxy proxy) {
super(proxy);
}
@Override
public void registerBlockIcons(IIconRegister reg) {
Utils.registerStandardPowerConverterBlockIcons(reg, this._icons, "gt");
Utils.registerStandardPowerConverterBlockIcons(reg, this._icons, this.proxy.getModPrefix());
// TODO: textures for voltage levels
for (int i = 1; i <= 3; i++) {
@ -27,10 +21,4 @@ public class BlockPowerConverterGregTech extends BlockPowerConverter {
this._icons[i * 4 + 3] = this._icons[3];
}
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return meta % 2 != 0 ? new TileEntityGregTechProducer(meta / 2)
: new TileEntityGregTechConsumer(meta / 2);
}
}

View file

@ -1,17 +1,11 @@
package net.anvilcraft.pccompat.blocks;
import covers1624.powerconverters.block.BlockPowerConverter;
import covers1624.powerconverters.gui.PCCreativeTab;
import net.anvilcraft.pccompat.tiles.TileEntityHBMConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityHBMProducer;
import net.anvilcraft.pccompat.IModProxy;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockPowerConverterHBM extends BlockPowerConverter {
public BlockPowerConverterHBM() {
super(2);
this.setCreativeTab(PCCreativeTab.tab);
public class BlockPowerConverterHBM extends BlockPCCConverter {
public BlockPowerConverterHBM(IModProxy proxy) {
super(proxy);
}
@Override
@ -20,12 +14,9 @@ public class BlockPowerConverterHBM extends BlockPowerConverter {
String state = i % 2 == 0 ? "off" : "on";
String type = i < 2 ? "consumer" : "producer";
this._icons[i] = reg.registerIcon("pccompat:ue_mv_" + type + "_" + state); //TODO: create unique textures for HBM
this._icons[i] = reg.registerIcon(
"pccompat:ue_mv_" + type + "_" + state
); //TODO: create unique textures for HBM
}
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return meta == 0 ? new TileEntityHBMConsumer() : new TileEntityHBMProducer();
}
}

View file

@ -1,28 +0,0 @@
package net.anvilcraft.pccompat.blocks;
import covers1624.powerconverters.block.BlockPowerConverter;
import covers1624.powerconverters.gui.PCCreativeTab;
import net.anvilcraft.pccompat.Utils;
import net.anvilcraft.pccompat.tiles.TileEntityMagneticraftConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityMagneticraftProducer;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockPowerConverterMagneticraft extends BlockPowerConverter {
public BlockPowerConverterMagneticraft() {
super(2); // 1 Consumer, 1 Producer
this.setCreativeTab(PCCreativeTab.tab);
}
@Override
public void registerBlockIcons(IIconRegister reg) {
Utils.registerStandardPowerConverterBlockIcons(reg, this._icons, "mc");
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return meta == 0 ? new TileEntityMagneticraftConsumer()
: new TileEntityMagneticraftProducer();
}
}

View file

@ -1,28 +0,0 @@
package net.anvilcraft.pccompat.blocks;
import covers1624.powerconverters.block.BlockPowerConverter;
import covers1624.powerconverters.gui.PCCreativeTab;
import net.anvilcraft.pccompat.Utils;
import net.anvilcraft.pccompat.tiles.TileEntityProjectRedConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityProjectRedProducer;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockPowerConverterProjectRed extends BlockPowerConverter {
public BlockPowerConverterProjectRed() {
super(2); // 1 Consumer, 1 Producer
this.setCreativeTab(PCCreativeTab.tab);
}
@Override
public void registerBlockIcons(IIconRegister reg) {
Utils.registerStandardPowerConverterBlockIcons(reg, this._icons, "pr");
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return meta == 0 ? new TileEntityProjectRedConsumer()
: new TileEntityProjectRedProducer();
}
}

View file

@ -1,36 +0,0 @@
package net.anvilcraft.pccompat.blocks;
import covers1624.powerconverters.block.BlockPowerConverter;
import covers1624.powerconverters.gui.PCCreativeTab;
import net.anvilcraft.pccompat.Utils;
import net.anvilcraft.pccompat.tiles.TileEntityRedPowerConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityRedPowerProducer;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockPowerConverterRedPower extends BlockPowerConverter {
public BlockPowerConverterRedPower() {
super(2); // 1 Consumer, 1 Producer
this.setCreativeTab(PCCreativeTab.tab);
}
@Override
public void registerBlockIcons(IIconRegister reg) {
Utils.registerStandardPowerConverterBlockIcons(reg, this._icons, "rp");
}
@Override
public TileEntity createNewTileEntity(World world, int metadata) {
switch (metadata) {
case 0:
return new TileEntityRedPowerConsumer();
case 1:
return new TileEntityRedPowerProducer();
default:
return null;
}
}
}

View file

@ -1,28 +0,0 @@
package net.anvilcraft.pccompat.blocks;
import covers1624.powerconverters.block.BlockPowerConverter;
import covers1624.powerconverters.gui.PCCreativeTab;
import net.anvilcraft.pccompat.Utils;
import net.anvilcraft.pccompat.tiles.TileEntityUltraTechConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityUltraTechProducer;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockPowerConverterUltraTech extends BlockPowerConverter {
public BlockPowerConverterUltraTech() {
super(2); // 1 Consumer, 1 Producer
this.setCreativeTab(PCCreativeTab.tab);
}
@Override
public void registerBlockIcons(IIconRegister reg) {
Utils.registerStandardPowerConverterBlockIcons(reg, this._icons, "ut");
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return meta == 0 ? new TileEntityUltraTechConsumer()
: new TileEntityUltraTechProducer();
}
}

View file

@ -1,20 +1,11 @@
package net.anvilcraft.pccompat.blocks;
import covers1624.powerconverters.block.BlockPowerConverter;
import covers1624.powerconverters.gui.PCCreativeTab;
import net.anvilcraft.pccompat.tiles.TileEntityUniversalElectricityConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityUniversalElectricityProducer;
import net.anvilcraft.pccompat.IModProxy;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class BlockPowerConverterUniversalElectricity extends BlockPowerConverter {
public IIcon[] icons;
public BlockPowerConverterUniversalElectricity() {
super(8); // 4 Consumers, 4 Producers
this.setCreativeTab(PCCreativeTab.tab);
public class BlockPowerConverterUniversalElectricity extends BlockPCCConverter {
public BlockPowerConverterUniversalElectricity(IModProxy proxy) {
super(proxy);
}
@Override
@ -43,14 +34,9 @@ public class BlockPowerConverterUniversalElectricity extends BlockPowerConverter
break;
}
String texture_name = "pccompat:ue_" + voltage + "_" + type + "_" + state;
String texture_name = "pccompat:" + this.proxy.getModPrefix() + "_" + voltage
+ "_" + type + "_" + state;
this._icons[i] = reg.registerIcon(texture_name);
}
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return meta % 2 != 0 ? new TileEntityUniversalElectricityProducer(meta / 2)
: new TileEntityUniversalElectricityConsumer(meta / 2);
}
}

View file

@ -3,25 +3,23 @@ package net.anvilcraft.pccompat.items;
import java.util.List;
import java.util.stream.IntStream;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPCCConverter;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public abstract class AbstractItemBlockPowerConverter extends ItemBlock {
public AbstractItemBlockPowerConverter(Block block) {
public class ItemBlockPowerConverter extends ItemBlock {
public IModProxy proxy;
public ItemBlockPowerConverter(Block block) {
super(block);
this.proxy = ((BlockPCCConverter) block).proxy;
this.setHasSubtypes(true);
this.setMaxDamage(0);
}
public abstract String getModPrefix();
public int getSubItemCount() {
return 2;
}
@Override
public int getMetadata(int meta) {
return meta;
@ -29,14 +27,14 @@ public abstract class AbstractItemBlockPowerConverter extends ItemBlock {
@Override
public String getUnlocalizedName(ItemStack stack) {
return "pccompat:power_converter_" + this.getModPrefix() + "_"
return "pccompat:power_converter_" + this.proxy.getModPrefix() + "_"
+ stack.getItemDamage();
}
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item alec1, CreativeTabs alec2, List list) {
IntStream.range(0, this.getSubItemCount())
IntStream.range(0, this.proxy.getMetaCount())
.mapToObj((i) -> new ItemStack(this, 1, i))
.forEach(list::add);
}

View file

@ -1,15 +0,0 @@
package net.anvilcraft.pccompat.items;
import net.minecraft.block.Block;
public class ItemBlockPowerConverterAppliedEnergistics
extends AbstractItemBlockPowerConverter {
public ItemBlockPowerConverterAppliedEnergistics(Block block) {
super(block);
}
@Override
public String getModPrefix() {
return "ae";
}
}

View file

@ -1,19 +0,0 @@
package net.anvilcraft.pccompat.items;
import net.minecraft.block.Block;
public class ItemBlockPowerConverterGregTech extends AbstractItemBlockPowerConverter {
public ItemBlockPowerConverterGregTech(Block block) {
super(block);
}
@Override
public int getSubItemCount() {
return 8;
}
@Override
public String getModPrefix() {
return "gt";
}
}

View file

@ -1,14 +0,0 @@
package net.anvilcraft.pccompat.items;
import net.minecraft.block.Block;
public class ItemBlockPowerConverterHBM extends AbstractItemBlockPowerConverter {
public ItemBlockPowerConverterHBM(Block block) {
super(block);
}
@Override
public String getModPrefix() {
return "hbm";
}
}

View file

@ -1,14 +0,0 @@
package net.anvilcraft.pccompat.items;
import net.minecraft.block.Block;
public class ItemBlockPowerConverterMagneticraft extends AbstractItemBlockPowerConverter {
public ItemBlockPowerConverterMagneticraft(Block block) {
super(block);
}
@Override
public String getModPrefix() {
return "mc";
}
}

View file

@ -1,14 +0,0 @@
package net.anvilcraft.pccompat.items;
import net.minecraft.block.Block;
public class ItemBlockPowerConverterProjectRed extends AbstractItemBlockPowerConverter {
public ItemBlockPowerConverterProjectRed(Block block) {
super(block);
}
@Override
public String getModPrefix() {
return "pr";
}
}

View file

@ -1,16 +0,0 @@
package net.anvilcraft.pccompat.items;
import net.minecraft.block.Block;
public class ItemBlockPowerConverterRailcraft extends AbstractItemBlockPowerConverter {
public ItemBlockPowerConverterRailcraft(Block block) {
super(block);
}
@Override
public String getModPrefix() {
return "rc";
}
}

View file

@ -1,14 +0,0 @@
package net.anvilcraft.pccompat.items;
import net.minecraft.block.Block;
public class ItemBlockPowerConverterRedPower extends AbstractItemBlockPowerConverter {
public ItemBlockPowerConverterRedPower(Block block) {
super(block);
}
@Override
public String getModPrefix() {
return "rp";
}
}

View file

@ -1,14 +0,0 @@
package net.anvilcraft.pccompat.items;
import net.minecraft.block.Block;
public class ItemBlockPowerConverterUltraTech extends AbstractItemBlockPowerConverter {
public ItemBlockPowerConverterUltraTech(Block block) {
super(block);
}
@Override
public String getModPrefix() {
return "ut";
}
}

View file

@ -1,19 +0,0 @@
package net.anvilcraft.pccompat.items;
import net.minecraft.block.Block;
public class ItemBlockPowerConverterUniversalElectricity extends AbstractItemBlockPowerConverter {
public ItemBlockPowerConverterUniversalElectricity(Block block) {
super(block);
}
@Override
public int getSubItemCount() {
return 8;
}
@Override
public String getModPrefix() {
return "ue";
}
}

View file

@ -1,13 +1,14 @@
package net.anvilcraft.pccompat.mods;
import appeng.api.AEApi;
import com.google.common.base.Optional;
import appeng.api.AEApi;
import covers1624.powerconverters.api.registry.PowerSystemRegistry;
import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPowerConverterAppliedEnergistics;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverterAppliedEnergistics;
import net.anvilcraft.pccompat.blocks.BlockPCCConverter;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverter;
import net.anvilcraft.pccompat.recipe.RecipeBuilder;
import net.anvilcraft.pccompat.recipe.ShapedOreRecipeAdapter;
import net.anvilcraft.pccompat.recipe.ShapelessOreRecipeAdapter;
@ -15,6 +16,7 @@ import net.anvilcraft.pccompat.tiles.TileEntityAppliedEnergisticsConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityAppliedEnergisticsProducer;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
public class AppliedEnergisticsProxy implements IModProxy {
public static PowerSystem powerSystem;
@ -30,8 +32,8 @@ public class AppliedEnergisticsProxy implements IModProxy {
@Override
public void registerBlocks() {
GameRegistry.registerBlock(
blockPowerConverter = new BlockPowerConverterAppliedEnergistics(),
ItemBlockPowerConverterAppliedEnergistics.class,
blockPowerConverter = new BlockPCCConverter(this),
ItemBlockPowerConverter.class,
"power_converter_applied_energistics"
);
}
@ -72,4 +74,15 @@ public class AppliedEnergisticsProxy implements IModProxy {
.output(new ItemStack(blockPowerConverter, 1, 0))
.register();
}
@Override
public String getModPrefix() {
return "ae";
}
@Override
public TileEntity createTileEntity(int meta) {
return meta == 0 ? new TileEntityAppliedEnergisticsConsumer()
: new TileEntityAppliedEnergisticsProducer();
}
}

View file

@ -5,10 +5,11 @@ import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPowerConverterGregTech;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverterGregTech;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverter;
import net.anvilcraft.pccompat.tiles.TileEntityGregTechConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityGregTechProducer;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
public class GregTechProxy implements IModProxy {
public static PowerSystem powerSystem;
@ -31,8 +32,8 @@ public class GregTechProxy implements IModProxy {
@Override
public void registerBlocks() {
GameRegistry.registerBlock(
blockPowerConverter = new BlockPowerConverterGregTech(),
ItemBlockPowerConverterGregTech.class,
blockPowerConverter = new BlockPowerConverterGregTech(this),
ItemBlockPowerConverter.class,
"power_converter_gregtech"
);
}
@ -49,4 +50,20 @@ public class GregTechProxy implements IModProxy {
@Override
public void registerRecipes() {}
@Override
public int getMetaCount() {
return 8;
}
@Override
public String getModPrefix() {
return "gt";
}
@Override
public TileEntity createTileEntity(int meta) {
return meta % 2 != 0 ? new TileEntityGregTechProducer(meta / 2)
: new TileEntityGregTechConsumer(meta / 2);
}
}

View file

@ -1,12 +1,13 @@
package net.anvilcraft.pccompat.mods;
import com.hbm.blocks.ModBlocks;
import covers1624.powerconverters.api.registry.PowerSystemRegistry;
import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPowerConverterHBM;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverterHBM;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverter;
import net.anvilcraft.pccompat.recipe.RecipeBuilder;
import net.anvilcraft.pccompat.recipe.ShapedOreRecipeAdapter;
import net.anvilcraft.pccompat.recipe.ShapelessOreRecipeAdapter;
@ -14,6 +15,7 @@ import net.anvilcraft.pccompat.tiles.TileEntityHBMConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityHBMProducer;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
public class HBMProxy implements IModProxy {
public static PowerSystem powerSystem;
@ -29,8 +31,8 @@ public class HBMProxy implements IModProxy {
@Override
public void registerBlocks() {
GameRegistry.registerBlock(
blockPowerConverter = new BlockPowerConverterHBM(),
ItemBlockPowerConverterHBM.class,
blockPowerConverter = new BlockPowerConverterHBM(this),
ItemBlockPowerConverter.class,
"power_converter_hbm"
);
}
@ -62,4 +64,14 @@ public class HBMProxy implements IModProxy {
.output(new ItemStack(blockPowerConverter, 1, 0))
.register();
}
@Override
public String getModPrefix() {
return "hbm";
}
@Override
public TileEntity createTileEntity(int meta) {
return meta == 0 ? new TileEntityHBMConsumer() : new TileEntityHBMProducer();
}
}

View file

@ -4,11 +4,12 @@ import covers1624.powerconverters.api.registry.PowerSystemRegistry;
import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPowerConverterMagneticraft;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverterMagneticraft;
import net.anvilcraft.pccompat.blocks.BlockPCCConverter;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverter;
import net.anvilcraft.pccompat.tiles.TileEntityMagneticraftConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityMagneticraftProducer;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
public class MagneticraftProxy implements IModProxy {
public static PowerSystem powerSystem;
@ -24,8 +25,8 @@ public class MagneticraftProxy implements IModProxy {
@Override
public void registerBlocks() {
GameRegistry.registerBlock(
blockPowerConverter = new BlockPowerConverterMagneticraft(),
ItemBlockPowerConverterMagneticraft.class,
blockPowerConverter = new BlockPCCConverter(this),
ItemBlockPowerConverter.class,
"power_converter_magneticraft"
);
}
@ -42,4 +43,15 @@ public class MagneticraftProxy implements IModProxy {
@Override
public void registerRecipes() {}
@Override
public String getModPrefix() {
return "mc";
}
@Override
public TileEntity createTileEntity(int meta) {
return meta == 0 ? new TileEntityMagneticraftConsumer()
: new TileEntityMagneticraftProducer();
}
}

View file

@ -4,11 +4,12 @@ import covers1624.powerconverters.api.registry.PowerSystemRegistry;
import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPowerConverterProjectRed;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverterProjectRed;
import net.anvilcraft.pccompat.blocks.BlockPCCConverter;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverter;
import net.anvilcraft.pccompat.tiles.TileEntityProjectRedConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityProjectRedProducer;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
public class ProjectRedProxy implements IModProxy {
public static PowerSystem powerSystem;
@ -24,8 +25,8 @@ public class ProjectRedProxy implements IModProxy {
@Override
public void registerBlocks() {
GameRegistry.registerBlock(
blockPowerConverter = new BlockPowerConverterProjectRed(),
ItemBlockPowerConverterProjectRed.class,
blockPowerConverter = new BlockPCCConverter(this),
ItemBlockPowerConverter.class,
"power_converter_project_red"
);
}
@ -42,4 +43,15 @@ public class ProjectRedProxy implements IModProxy {
@Override
public void registerRecipes() {}
@Override
public String getModPrefix() {
return "pr";
}
@Override
public TileEntity createTileEntity(int meta) {
return meta == 0 ? new TileEntityProjectRedConsumer()
: new TileEntityProjectRedProducer();
}
}

View file

@ -4,14 +4,14 @@ import covers1624.powerconverters.api.registry.PowerSystemRegistry;
import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPowerConverterRailcraft;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverterRailcraft;
import net.anvilcraft.pccompat.blocks.BlockPCCConverter;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverter;
import net.anvilcraft.pccompat.tiles.TileEntityRailcraftConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityRailcraftProducer;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
public class RailcraftProxy implements IModProxy {
public static PowerSystem powerSystem;
public static Block blockPowerConverter;
@ -25,8 +25,8 @@ public class RailcraftProxy implements IModProxy {
@Override
public void registerBlocks() {
GameRegistry.registerBlock(
blockPowerConverter = new BlockPowerConverterRailcraft(),
ItemBlockPowerConverterRailcraft.class,
blockPowerConverter = new BlockPCCConverter(this),
ItemBlockPowerConverter.class,
"power_converter_railcraft"
);
}
@ -42,8 +42,16 @@ public class RailcraftProxy implements IModProxy {
}
@Override
public void registerRecipes() {
public void registerRecipes() {}
@Override
public String getModPrefix() {
return "rc";
}
@Override
public TileEntity createTileEntity(int meta) {
return meta == 0 ? new TileEntityRailcraftConsumer()
: new TileEntityRailcraftProducer();
}
}

View file

@ -4,11 +4,12 @@ import covers1624.powerconverters.api.registry.PowerSystemRegistry;
import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPowerConverterRedPower;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverterRedPower;
import net.anvilcraft.pccompat.blocks.BlockPCCConverter;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverter;
import net.anvilcraft.pccompat.tiles.TileEntityRedPowerConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityRedPowerProducer;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
public class RedPowerProxy implements IModProxy {
public static PowerSystem powerSystem;
@ -24,8 +25,8 @@ public class RedPowerProxy implements IModProxy {
@Override
public void registerBlocks() {
GameRegistry.registerBlock(
blockPowerConverter = new BlockPowerConverterRedPower(),
ItemBlockPowerConverterRedPower.class,
blockPowerConverter = new BlockPCCConverter(this),
ItemBlockPowerConverter.class,
"power_converter_red_power"
);
}
@ -42,4 +43,15 @@ public class RedPowerProxy implements IModProxy {
@Override
public void registerRecipes() {}
@Override
public String getModPrefix() {
return "rp";
}
@Override
public TileEntity createTileEntity(int meta) {
return meta == 0 ? new TileEntityRedPowerConsumer()
: new TileEntityRedPowerProducer();
}
}

View file

@ -4,11 +4,12 @@ import covers1624.powerconverters.api.registry.PowerSystemRegistry;
import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPowerConverterUltraTech;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverterUltraTech;
import net.anvilcraft.pccompat.blocks.BlockPCCConverter;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverter;
import net.anvilcraft.pccompat.tiles.TileEntityUltraTechConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityUltraTechProducer;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
public class UltraTechProxy implements IModProxy {
public static PowerSystem powerSystem;
@ -24,8 +25,8 @@ public class UltraTechProxy implements IModProxy {
@Override
public void registerBlocks() {
GameRegistry.registerBlock(
blockPowerConverter = new BlockPowerConverterUltraTech(),
ItemBlockPowerConverterUltraTech.class,
blockPowerConverter = new BlockPCCConverter(this),
ItemBlockPowerConverter.class,
"power_converter_ultra_tech"
);
}
@ -42,4 +43,15 @@ public class UltraTechProxy implements IModProxy {
@Override
public void registerRecipes() {}
@Override
public String getModPrefix() {
return "ut";
}
@Override
public TileEntity createTileEntity(int meta) {
return meta == 0 ? new TileEntityUltraTechConsumer()
: new TileEntityUltraTechProducer();
}
}

View file

@ -6,7 +6,7 @@ import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem;
import cpw.mods.fml.common.registry.GameRegistry;
import net.anvilcraft.pccompat.IModProxy;
import net.anvilcraft.pccompat.blocks.BlockPowerConverterUniversalElectricity;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverterUniversalElectricity;
import net.anvilcraft.pccompat.items.ItemBlockPowerConverter;
import net.anvilcraft.pccompat.recipe.RecipeBuilder;
import net.anvilcraft.pccompat.recipe.ShapedOreRecipeAdapter;
import net.anvilcraft.pccompat.recipe.ShapelessOreRecipeAdapter;
@ -14,6 +14,7 @@ import net.anvilcraft.pccompat.tiles.TileEntityUniversalElectricityConsumer;
import net.anvilcraft.pccompat.tiles.TileEntityUniversalElectricityProducer;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
public class UniversalElectricityProxy implements IModProxy {
public static PowerSystem powerSystem;
@ -36,8 +37,8 @@ public class UniversalElectricityProxy implements IModProxy {
@Override
public void registerBlocks() {
GameRegistry.registerBlock(
blockPowerConverter = new BlockPowerConverterUniversalElectricity(),
ItemBlockPowerConverterUniversalElectricity.class,
blockPowerConverter = new BlockPowerConverterUniversalElectricity(this),
ItemBlockPowerConverter.class,
"power_converter_universal_electrictity"
);
}
@ -96,4 +97,20 @@ public class UniversalElectricityProxy implements IModProxy {
.register();
}
}
@Override
public int getMetaCount() {
return 8;
}
@Override
public String getModPrefix() {
return "ue";
}
@Override
public TileEntity createTileEntity(int meta) {
return meta % 2 != 0 ? new TileEntityUniversalElectricityProducer(meta / 2)
: new TileEntityUniversalElectricityConsumer(meta / 2);
}
}