diff options
Diffstat (limited to 'src')
85 files changed, 2 insertions, 927 deletions
diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index d2fb863968..4003e8e9e4 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -17,9 +17,6 @@ public class Blocks { public static Block yszUnit; public static Block gdcUnit; public static Block tfftStorageField; - public static Block reactorChamberOFF; - public static Block reactorChamberON; - public static Block reactorControlRod; public static Block jarThaumiumReinforced; public static Block jarIchor; public static Block lscLapotronicEnergyUnit; diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java index 0f6600be83..540e6ced89 100644 --- a/src/main/java/common/CommonProxy.java +++ b/src/main/java/common/CommonProxy.java @@ -2,7 +2,6 @@ package common; import common.items.ErrorItem; import common.items.MetaItem_CraftingComponent; -import common.items.MetaItem_ReactorComponent; import common.tileentities.GTMTE_TFFTHatch; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -15,7 +14,6 @@ public class CommonProxy { public void preInit(final FMLPreInitializationEvent e) { // Items ErrorItem.getInstance().registerItem(); - MetaItem_ReactorComponent.getInstance().registerItem(); MetaItem_CraftingComponent.getInstance().registerItem(); Items.registerOreDictNames(); // Blocks diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java index 0825b872f0..31246ac5d8 100644 --- a/src/main/java/common/TileEntities.java +++ b/src/main/java/common/TileEntities.java @@ -17,7 +17,6 @@ public class TileEntities { // Multiblock controllers public static GTMTE_SOFuelCellMK1 sofc1; public static GTMTE_SOFuelCellMK2 sofc2; - // public static GTMTE_ModularNuclearReactor mdr; public static GTMTE_TFFT tfft; public static GTMTE_LapotronicSuperCapacitor lsc; diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java deleted file mode 100644 index 7c86c9910f..0000000000 --- a/src/main/java/common/blocks/Block_ControlRod.java +++ /dev/null @@ -1,29 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; - -public class Block_ControlRod extends BaseGTUpdateableBlock { - - private static final Block_ControlRod instance = new Block_ControlRod(); - - private Block_ControlRod() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_controlrod_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "ControlRod"); - instance.setHardness(5.0f); - instance.setResistance(6.0f); - GameRegistry.registerBlock(instance, blockName); - - return instance; - } -} diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java deleted file mode 100644 index 3c8b29c3cc..0000000000 --- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java +++ /dev/null @@ -1,29 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; - -public class Block_ReactorChamber_OFF extends BaseGTUpdateableBlock { - - private static final Block_ReactorChamber_OFF instance = new Block_ReactorChamber_OFF(); - - private Block_ReactorChamber_OFF() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_reactorchamberoff_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_OFF"); - instance.setHardness(10.0f); - instance.setResistance(16.0f); - GameRegistry.registerBlock(instance, blockName); - - return instance; - } -} diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java deleted file mode 100644 index 7a894561ae..0000000000 --- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java +++ /dev/null @@ -1,34 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; - -public class Block_ReactorChamber_ON extends BaseGTUpdateableBlock { - - private static final Block_ReactorChamber_ON instance = new Block_ReactorChamber_ON(); - - private Block_ReactorChamber_ON() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_reactorchamberon_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_ON"); - instance.setHardness(-1.0f); - instance.setResistance(16.0f); - GameRegistry.registerBlock(instance, blockName); - - return instance; - } - - @Override - public int getLightValue() { - return 15; - } -} diff --git a/src/main/java/common/container/Container_ModularNuclearReactor.java b/src/main/java/common/container/Container_ModularNuclearReactor.java deleted file mode 100644 index d3a06a2f61..0000000000 --- a/src/main/java/common/container/Container_ModularNuclearReactor.java +++ /dev/null @@ -1,77 +0,0 @@ -package common.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import reactor.ButtonSlot; - -public class Container_ModularNuclearReactor extends Container { - - private int nextSlotID = 0; - private final Slot[] REACTOR_SLOTS = new Slot[54]; - private final Slot SLOT_CONFIGURATION; - private final Slot BUTTON_EU_MODE; - private final Slot BUTTON_FLUID_MODE; - private final Slot BUTTON_CONDITION; - private final Slot BUTTON_CONFIGURE; - private final Slot BUTTON_RESET; - - public Container_ModularNuclearReactor(IGregTechTileEntity te, EntityPlayer player) { - - // Add the reactor chamber - for (int x = 0; x < 9; x++) { - for (int y = 0; y < 6; y++) { - REACTOR_SLOTS[nextSlotID] = super.addSlotToContainer( - new Slot(te, getNextSlotID(), (16 + 67 * x), (16 + 67 * y))); - } - } - // Add the configuration slot - SLOT_CONFIGURATION = super.addSlotToContainer(new Slot(te, getNextSlotID(), 0, 0)); - - // Add buttons (they're also slots) - BUTTON_EU_MODE = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - BUTTON_FLUID_MODE = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - BUTTON_CONDITION = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - BUTTON_CONFIGURE = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - BUTTON_RESET = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - } - - private int getNextSlotID() { - nextSlotID++; - return nextSlotID - 1; - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw) { - ItemStack stack = null; - final Slot slot = (Slot) inventorySlots.get(slotRaw); - - if (slot != null && slot.getHasStack()) { - final ItemStack stackInSlot = slot.getStack(); - stack = stackInSlot.copy(); - - if (slotRaw < 3 * 9) { - if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true)) { - return null; - } - } else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false)) { - return null; - } - - if (stackInSlot.stackSize == 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - return stack; - } - - @Override - public boolean canInteractWith(EntityPlayer p_75145_1_) { - return true; - } -} diff --git a/src/main/java/common/items/MetaItem_CraftingComponent.java b/src/main/java/common/items/MetaItem_CraftingComponent.java index 3b5d9238b1..205e7392c5 100644 --- a/src/main/java/common/items/MetaItem_CraftingComponent.java +++ b/src/main/java/common/items/MetaItem_CraftingComponent.java @@ -35,17 +35,6 @@ public class MetaItem_CraftingComponent extends Item { @Override public void registerIcons(IIconRegister reg) { int counter = 9; - // Raw heat pipes - /* - * icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "CopperHeatPipe"); icons[counter++] = - * reg.registerIcon(KekzCore.MODID + ":" + "SilverHeatPipe"); icons[counter++] = reg.registerIcon(KekzCore.MODID - * + ":" + "BoronArsenideHeatPipe"); icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + - * "DiamondHeatPipe"); // Dust icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideDust"); - * icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondDust"); icons[counter++] = - * reg.registerIcon(KekzCore.MODID + ":" + "AmineCarbamateDust"); // Crystal icons[counter++] = - * reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideCrystal"); icons[counter++] = - * reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondCrystal"); - */ // Ceramics icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YSZCeramicDust"); icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "GDCCeramicDust"); diff --git a/src/main/java/common/items/MetaItem_ReactorComponent.java b/src/main/java/common/items/MetaItem_ReactorComponent.java deleted file mode 100644 index 45e3a17798..0000000000 --- a/src/main/java/common/items/MetaItem_ReactorComponent.java +++ /dev/null @@ -1,119 +0,0 @@ -package common.items; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; - -import org.lwjgl.input.Keyboard; - -import kekztech.KekzCore; -import reactor.items.CoolantCell; -import reactor.items.FuelRod; -import reactor.items.HeatExchanger; -import reactor.items.HeatVent; -import reactor.items.NeutronReflector; - -public class MetaItem_ReactorComponent extends Item { - - private static final MetaItem_ReactorComponent INSTANCE = new MetaItem_ReactorComponent(); - private final IIcon[] icons = new IIcon[50]; - - private MetaItem_ReactorComponent() {} - - public static MetaItem_ReactorComponent getInstance() { - return INSTANCE; - } - - public void registerItem() { - super.setHasSubtypes(true); - final String unlocalizedName = "kekztech_reactor_item"; - super.setUnlocalizedName(unlocalizedName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setMaxStackSize(1); - // GameRegistry.registerItem(getInstance(), unlocalizedName); - } - - @Override - public void registerIcons(IIconRegister reg) { - int counter = 0; - for (String s : HeatVent.RESOURCE_NAMES) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : HeatExchanger.RESOURCE_NAME) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : FuelRod.RESOURCE_NAME) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : FuelRod.RESOURCE_NAME_DEPLETED) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : NeutronReflector.RESOURCE_NAME) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : CoolantCell.RESOURCE_NAME) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - } - - @Override - public IIcon getIconFromDamage(int meta) { - return icons[meta]; - } - - @SuppressWarnings({ "unchecked" }) - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < icons.length; i++) { - list.add(new ItemStack(item, 1, i)); - } - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName() + "." + stack.getItemDamage(); - } - - @SuppressWarnings({ "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - list.add("Property = 1"); - } else { - list.add("Part for the Modular Nuclear Reactor"); - list.add( - "Hold " + EnumChatFormatting.BOLD - + "[LSHIFT]" - + EnumChatFormatting.RESET - + EnumChatFormatting.GRAY - + " to display properties"); - } - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - NBTTagCompound nbt = (stack.getTagCompound() == null) ? new NBTTagCompound() : stack.getTagCompound(); - if (nbt.getInteger("HEALTH") != 0 && nbt.getInteger("MAXHEALTH") != 0) { - return 1 - (double) (nbt.getInteger("HEALTH") / nbt.getInteger("MAXHEALTH")); - } else { - return 0.0d; - } - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - final int meta = stack.getItemDamage(); - return meta < 31 || meta > 45; - } - - public ItemStack getStackFromDamage(int meta) { - return new ItemStack(getInstance(), 1, meta); - } -} diff --git a/src/main/java/common/reactorItem/AbstractReactorItem.java b/src/main/java/common/reactorItem/AbstractReactorItem.java deleted file mode 100644 index 876d8b4811..0000000000 --- a/src/main/java/common/reactorItem/AbstractReactorItem.java +++ /dev/null @@ -1,29 +0,0 @@ -package common.reactorItem; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public abstract class AbstractReactorItem extends Item { - - private final int[] behaviourID; - - protected AbstractReactorItem(int... behaviourID) { - this.behaviourID = behaviourID; - } - - @Override - public abstract double getDurabilityForDisplay(ItemStack stack); - - @Override - public abstract boolean showDurabilityBar(ItemStack stack); - - @Override - public final String getUnlocalizedName(ItemStack stack) { - return super.hasSubtypes ? (super.getUnlocalizedName() + "." + stack.getItemDamage()) - : super.getUnlocalizedName(); - } - - public final int getBehaviourID(int meta) { - return behaviourID[meta]; - } -} diff --git a/src/main/java/common/reactorItem/ReactorItem.java b/src/main/java/common/reactorItem/ReactorItem.java deleted file mode 100644 index 8e69e40e95..0000000000 --- a/src/main/java/common/reactorItem/ReactorItem.java +++ /dev/null @@ -1,47 +0,0 @@ -package common.reactorItem; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.common.registry.GameRegistry; - -public class ReactorItem extends AbstractReactorItem { - - private static final ReactorItem INSTANCE = new ReactorItem(); - - private final IIcon[] icons = new IIcon[50]; - - private ReactorItem() { - super(); - } - - public static ReactorItem registerItem() { - INSTANCE.setHasSubtypes(true); - INSTANCE.setCreativeTab(CreativeTabs.tabMisc); - INSTANCE.setMaxStackSize(1); - final String unloc = "kekztech_reactor_item"; - INSTANCE.setUnlocalizedName(unloc); - GameRegistry.registerItem(INSTANCE, unloc); - return INSTANCE; - } - - @Override - public void registerIcons(IIconRegister reg) {} - - @Override - public IIcon getIconFromDamage(int meta) { - return icons[meta]; - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - return 0; - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return false; - } -} diff --git a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java deleted file mode 100644 index 1875a097e5..0000000000 --- a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java +++ /dev/null @@ -1,224 +0,0 @@ -package common.tileentities; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -import org.joml.Vector3i; - -import common.Blocks; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.api.objects.GT_RenderedTexture; - -public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBase { - - private final Block CASING = GregTech_API.sBlockCasings3; - private final int CASING_META = 12; - private final int CASING_TEXTURE_ID = 44; - - private final Block CHAMBER_OFF = Blocks.reactorChamberOFF; - private final Block CHAMBER_ON = Blocks.reactorChamberON; - private final Block CONTROL_ROD = Blocks.reactorControlRod; - - private boolean euMode = true; - - public GTMTE_ModularNuclearReactor(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public GTMTE_ModularNuclearReactor(String aName) { - super(aName); - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity var1) { - return new GTMTE_ModularNuclearReactor(super.mName); - } - - @Override - public String[] getDescription() { - return new String[] { "Disabled" }; - /* - * final MultiBlockTooltipBuilder b = new MultiBlockTooltipBuilder(); - * b.addInfo("Can be built, BUT DOES NOT WORK") .addInfo("Converts fissile material and outputs power or heat") - * .addSeparator() .addInfo("EU-MODE:") - * .addInfo(" Directly outputs electricity depending on inserted fuel rods") .addSeparator() - * .addInfo("COOLANT-MODE:") .addInfo(" Requires coolant to be pumped into the reactor.") - * .addInfo(" Coolant is heated and should be drained and converted to electricity by other means.") - * .addSeparator() .addInfo("NOTES:") .addInfo(" Does NOT use Industrialcraft 2 reactor components!") - * .addInfo(" Consult controller GUI on how to arrange the outer casings.") .addSeparator() - * .beginStructureBlock(7, 6, 7) .addController("Front bottom Center") - * .addCasingInfo("Radiation Proof Machine Casing", 100) .addOtherStructurePart("Control Rods", - * "Four pillars, four blocks high each. Diagonal to the inner edges of the shell") - * .addOtherStructurePart("Nuclear Reactor Chamber", - * "17 of them to fill out the rest of the floor inside the shell") - * .addDynamoHatch("ONLY in EU-mode, at least one") .addOtherStructurePart("Input Bus, Output Bus", - * "Optional but required for automation") .addOtherStructurePart("Input Hatch, Output Hatch", - * "ONLY in Coolant-Mode, at least one each") .signAndFinalize("Kekzdealer"); - * if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { return b.getInformation(); } else { return - * b.getStructureInformation(); } - */ - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int colorIndex, final boolean aActive, final boolean aRedstone) { - return side == facing - ? new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID), - new GT_RenderedTexture( - aActive ? Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE - : Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER) } - : new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID) }; - } - - @Override - public boolean isCorrectMachinePart(ItemStack stack) { - return true; - } - - @Override - public boolean checkRecipe(ItemStack stack) { - return false; - } - - @Override - public void onPostTick(IGregTechTileEntity thisController, long aTick) { - super.onPostTick(thisController, aTick); - - if (super.getBaseMetaTileEntity().isActive()) { - // Switch to ON blocks - } else { - // Switch to OFF blocks - } - } - - @Override - public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { - // Figure out the vector for the direction the back face of the controller is facing - final int dirX = thisController.getBackFacing().offsetX; - final int dirZ = thisController.getBackFacing().offsetZ; - int minCasingAmount = 100; - boolean checklist = true; // if this is still true at the end, machine is good to go :) - - // Determine the ground level center of the structure - final Vector3i center = new Vector3i( - thisController.getXCoord(), - thisController.getYCoord(), - thisController.getZCoord()).add(dirX * 3, 0, dirZ * 3); - // Scan for outer tube - // - Scan sides - for (int x = -3; x <= 3; x++) { - for (int z = -3; z <= 3; z++) { - // Only scan the three wide even sides, skip rest - if ((Math.abs(x) <= 1 && Math.abs(z) == 3) || (Math.abs(z) <= 1 && Math.abs(x) == 3)) { - for (int h = 0; h < 6; h++) { - final Vector3i pos = new Vector3i(center.x() + x, center.y() + h, center.z() + z); - if (h == 0 && pos.x() == thisController.getXCoord() - && pos.y() == thisController.getYCoord() - && pos.z() == thisController.getZCoord()) { - // Ignore controller - continue; - } else if (thisController.getBlock(pos.x(), pos.y(), pos.z()) == CASING - && thisController.getMetaID(pos.x(), pos.y(), pos.z()) == CASING_META) { - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - } - // - Scan corners of tube - for (int x = -2; x <= 2; x++) { - for (int z = -2; z <= 2; z++) { - // Only scan the four corners, skip rest - if (Math.abs(x) + Math.abs(z) == 4) { - for (int h = 0; h < 6; h++) { - final Vector3i pos = new Vector3i(center.x() + x, center.y() + h, center.z() + z); - if (h == 0 && pos.x() == thisController.getXCoord() - && pos.y() == thisController.getYCoord() - && pos.z() == thisController.getZCoord()) { - // Ignore controller - continue; - } else if (thisController.getBlock(pos.x(), pos.y(), pos.z()) == CASING - && thisController.getMetaID(pos.x(), pos.y(), pos.z()) == CASING_META) { - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - } - // Scan ground layer - for (int x = -2; x <= 2; x++) { - for (int z = -2; z <= 2; z++) { - if (!(thisController.getBlock(center.x() + x, center.y(), center.z() + z) == CASING - && thisController.getMetaID(center.x() + x, center.y(), center.z() + z) == CASING_META)) { - checklist = false; - } else { - minCasingAmount--; - } - } - } - // Scan reactor chambers - for (int x = -2; x <= 2; x++) { - for (int z = -2; z <= 2; z++) { - // Skip if diagonal, don't skip center - if (Math.abs(x) == Math.abs(z) && !(x == 0 && z == 0)) { - continue; - } - if (!(thisController.getBlock(center.x() + x, center.y() + 1, center.z() + z) == CHAMBER_OFF - || thisController.getBlock(center.x() + x, center.y() + 1, center.z() + z) == CHAMBER_ON)) { - checklist = false; - } - } - } - // Scan control rods - for (int h = 1; h < 5; h++) { - for (int x = -1; x <= 1; x++) { - for (int z = -1; z <= 1; z++) { - // Only check diagonal - if (x == 0 || z == 0) { - continue; - } - if (!(thisController.getBlock(center.x() + x, center.y() + h, center.z() + z) == CONTROL_ROD)) { - checklist = false; - } - } - } - } - - if (minCasingAmount > 0) { - checklist = false; - } - - return checklist; - } - - @Override - public int getMaxEfficiency(ItemStack stack) { - return 10000; - } - - @Override - public int getPollutionPerTick(ItemStack stack) { - return 0; - } - - @Override - public int getDamageToComponent(ItemStack stack) { - return 0; - } - - @Override - public boolean explodesOnComponentBreak(ItemStack stack) { - return false; - } -} diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java index e1243820b4..5e0066cd5e 100644 --- a/src/main/java/kekztech/Items.java +++ b/src/main/java/kekztech/Items.java @@ -6,31 +6,11 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import common.items.MetaItem_CraftingComponent; -import common.items.MetaItem_ReactorComponent; import util.Util; public enum Items { - /* - * // Heat Vents T1HeatVent(0,0), T2HeatVent(1,0), T3HeatVent(2,0), T4HeatVent(3,0), T1ComponentHeatVent(4,0), - * T2ComponentHeatVent(5,0), T3ComponentHeatVent(6,0), T4ComponentHeatVent(7,0), T1OverclockedHeatVent(8,0), - * T2OverclockedHeatVent(9,0), T3OverclockedHeatVent(10,0), T4OverclockedHeatVent(11,0), // Heat Exchanger - * T1HeatExchanger(12,0), T2HeatExchanger(13,0), T3HeatExchanger(14,0), T4HeatExchanger(15,0), // Fuel Rods - * UraniumFuelRod(16,0), UraniumDualFuelRod(17,0), UraniumQuadFuelRod(18,0), ThoriumFuelRod(19,0), - * ThoriumDualFuelRod(20,0), ThoriumQuadFuelRod(21,0), MOXFuelRod(22,0), MOXDualFuelRod(23,0), MOXQuadFuelRod(24,0), - * NaquadahFuelRod(25,0), NaquadahDualFuelRod(26,0), NaquadahQuadFuelRod(27,0), Th_MOXFuelRod(28,0), - * Th_MOXDualFuelRod(29,0), Th_MOXQuadFuelRod(30,0), // Depleted Fuel Rods DepletedUraniumFuelRod(31,0), - * DepletedUraniumDualFuelRod(32,0), DepletedUraniumQuadFuelRod(33,0), DepletedThoriumFuelRod(34,0), - * DepletedThoriumDualFuelRod(35,0), DepletedThoriumQuadFuelRod(36,0), DepletedMOXFuelRod(37,0), - * DepletedMOXDualFuelRod(38,0), DepletedMOXQuadFuelRod(39,0), DepletedNaquadahFuelRod(40,0), - * DepletedNaquadahDualFuelRod(41,0), DepletedNaquadahQuadFuelRod(42,0), Th_DepletedMOXFuelRod(43,0), - * Th_DepletedMOXDualFuelRod(44,0), Th_DepletedMOXQuadFuelRod(45,0), // Neutron Reflectors T1NeutronReflector(46,0), - * T2NeutronReflector(47,0), // Coolant Cells HeliumCoolantCell360k(48,0), NaKCoolantCell360k(49,0), // Heat Pipes - * CopperHeatPipe(0,1), SilverHeatPipe(1,1), BoronArsenideHeatPipe(2,1), DiamondHeatPipe(3,1), - * BoronArsenideDust(4,1), IsotopicallyPureDiamondDust(5,1), AmineCarbamiteDust(6,1), BoronArsenideCrystal(7,1), - * IsotopicallyPureDiamondCrystal(8,1), - */ // Ceramics YSZCeramicDust(9, 1), GDCCeramicDust(10, 1), @@ -72,14 +52,12 @@ public enum Items { } public ItemStack getNonOreDictedItemStack(int amount) { - return identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID()) - : new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID()); + return new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID()); } public ItemStack getOreDictedItemStack(int amount) { return this.getOreDictName() != null ? Util.getStackofAmountFromOreDict(this.getOreDictName(), amount) - : identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID()) - : new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID()); + : new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID()); } public String getOreDictName() { diff --git a/src/main/java/reactor/ButtonSlot.java b/src/main/java/reactor/ButtonSlot.java deleted file mode 100644 index 2c059e363a..0000000000 --- a/src/main/java/reactor/ButtonSlot.java +++ /dev/null @@ -1,11 +0,0 @@ -package reactor; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; - -public class ButtonSlot extends Slot { - - public ButtonSlot(IInventory playerIventory, int slotID, int posX, int posY) { - super(playerIventory, slotID, posX, posY); - } -} diff --git a/src/main/java/reactor/Reactor.java b/src/main/java/reactor/Reactor.java deleted file mode 100644 index 024daf102b..0000000000 --- a/src/main/java/reactor/Reactor.java +++ /dev/null @@ -1,8 +0,0 @@ -package reactor; - -public class Reactor { - - private long energyPerSecond; - private long heat; - private long maxHeat; -} diff --git a/src/main/java/reactor/itemBehaviour/IReactorItemBehaviour.java b/src/main/java/reactor/itemBehaviour/IReactorItemBehaviour.java deleted file mode 100644 index 1990938270..0000000000 --- a/src/main/java/reactor/itemBehaviour/IReactorItemBehaviour.java +++ /dev/null @@ -1,20 +0,0 @@ -package reactor.itemBehaviour; - -import java.util.HashMap; - -public abstract class IReactorItemBehaviour { - - protected final HashMap<String, String> properties; - - protected IReactorItemBehaviour(String propertiesKey) { - // load - - properties = new HashMap<>(); - } - - public abstract void apply(); - - public abstract boolean hasDurabilityBar(); - - public abstract double getDurabilityForDisplay(); -} diff --git a/src/main/java/reactor/items/CoolantCell.java b/src/main/java/reactor/items/CoolantCell.java deleted file mode 100644 index 2f59d6cfaa..0000000000 --- a/src/main/java/reactor/items/CoolantCell.java +++ /dev/null @@ -1,10 +0,0 @@ -package reactor.items; - -public class CoolantCell { - - public static String TYPE = "CoolantCell"; - - public static String[] RESOURCE_NAME = { "HeliumCoolantCell360k", "NaKCoolantCell360k" }; - - public static int[] HEAT_CAPACITY = { 360000, 360000 }; -} diff --git a/src/main/java/reactor/items/FuelRod.java b/src/main/java/reactor/items/FuelRod.java deleted file mode 100644 index f9e41e6ced..0000000000 --- a/src/main/java/reactor/items/FuelRod.java +++ /dev/null @@ -1,44 +0,0 @@ -package reactor.items; - -public class FuelRod { - - public static final int METAOFFSET = 17; - public static final int METAOFFSET_DEPLETED = 29; - - public static final String TYPE = "FuelRod"; - public static final String TYPE_DEPLETED = "DepletedFuelRod"; - public static final String LIFETIME = "LIFETIME"; - public static final String PULSES = "PULSES"; - public static final String HEAT_PER_SECOND = "HEAT_PER_SECOND"; - public static final String HEAT_PER_PULSE = "HEAT_PER_PULSE"; - public static final String HEAT_BOOST_RATE = "HEAT_BOOST_RATE"; - public static final String EU_PER_TICK = "EU_PER_TICK"; - public static final String EU_PER_PULSE = "EU_PER_PULSE"; - - public static final String[] RESOURCE_NAME = { "UraniumFuelRod", "UraniumDualFuelRod", "UraniumQuadFuelRod", - "ThoriumFuelRod", "ThoriumDualFuelRod", "ThoriumQuadFuelRod", "MOXFuelRod", "MOXDualFuelRod", - "MOXQuadFuelRod", "NaquadahFuelRod", "NaquadahDualFuelRod", "NaquadahQuadFuelRod", "Th_MOXFuelRod", - "Th_MOXDualFuelRod", "Th_MOXQuadFuelRod" }; - - public static final String[] RESOURCE_NAME_DEPLETED = { "DepletedUraniumFuelRod", "DepletedUraniumDualFuelRod", - "DepletedUraniumQuadFuelRod", "DepletedThoriumFuelRod", "DepletedThoriumDualFuelRod", - "DepletedThoriumQuadFuelRod", "DepletedMOXFuelRod", "DepletedMOXDualFuelRod", "DepletedMOXQuadFuelRod", - "DepletedNaquadahFuelRod", "DepletedNaquadahDualFuelRod", "DepletedNaquadahQuadFuelRod", - "Th_DepletedMOXFuelRod", "Th_DepletedMOXDualFuelRod", "Th_DepletedMOXQuadFuelRod" }; - - public static final int[] VALUES_LIFETIME = { 20000, 20000, 20000, 100000, 100000, 100000, 10000, 10000, 10000, - 100000, 100000, 100000, 50000, 50000, 50000 }; - - public static final int[] VALUES_PULSES = { 1, 2, 4, 1, 2, 4, 1, 2, 4, 1, 2, 4, 1, 2, 4 }; - - public static final int[] VALUES_HEAT_PER_SECOND = { 4, 24, 96, 1, 6, 24, 4, 24, 96, 80, 480, 1920, 1, 6, 24 }; - - public static final int[] VALUES_HEAT_PER_PULSE = { 4, 4, 4, 1, 1, 1, 4, 4, 4, 80, 80, 80, 1, 1, 1 }; - - public static final double[] VALUES_HEAT_BOOST_RATE = { 1, 1, 1, 1, 1, 1, 5, 5, 5, 1, 1, 1, 2, 2, 2 }; - - public static final int[] VALUES_EU_PER_TICK = { 50, 200, 600, 10, 40, 120, 50, 200, 600, 100, 400, 1200, 10, 40, - 120 }; - - public static final int[] VALUES_EU_PER_PULSE = { 50, 50, 50, 10, 10, 10, 50, 50, 50, 100, 100, 100, 10, 10, 10 }; -} diff --git a/src/main/java/reactor/items/HeatExchanger.java b/src/main/java/reactor/items/HeatExchanger.java deleted file mode 100644 index 5be68d1541..0000000000 --- a/src/main/java/reactor/items/HeatExchanger.java +++ /dev/null @@ -1,15 +0,0 @@ -package reactor.items; - -public class HeatExchanger { - - public static String TYPE = "HeatExchanger"; - - public static String[] RESOURCE_NAME = { "T1HeatExchanger", "T2HeatExchanger", "T3HeatExchanger", - "T4HeatExchanger" }; - - public static int[] HEAT_CAPACITY = { 2000, 8000, 32000, 128000 }; - - public static int[] COMPONENT_EXCHANGE_RATE = { 12, 24, 96, 384 }; - - public static int[] HULL_EXCHANGE_RATE = { 4, 8, 32, 128 }; -} diff --git a/src/main/java/reactor/items/HeatVent.java b/src/main/java/reactor/items/HeatVent.java deleted file mode 100644 index 3ff65d97bd..0000000000 --- a/src/main/java/reactor/items/HeatVent.java +++ /dev/null @@ -1,24 +0,0 @@ -package reactor.items; - -public class HeatVent { - - public static final String TYPE = "HeatVent"; - public static final String HEAT = "HEAT"; - public static final String RESOURCE_NAME = "RESOURCE_NAME"; - public static final String HEAT_CAPACITY = "HEAT_CAPACITY"; - public static final String COMPONENT_VENT_RATE = "COMPONENT_VENT_RATE"; - public static final String HULL_DRAW_RATE = "HULL_DRAW_RATE"; - public static final String SELF_COOL_RATE = "SELF_COOL_RATE"; - - public static String[] RESOURCE_NAMES = { "T1HeatVent", "T2HeatVent", "T3HeatVent", "T4HeatVent", - "T1ComponentHeatVent", "T2ComponentHeatVent", "T3ComponentHeatVent", "T4ComponentHeatVent", - "T1OverclockedHeatVent", "T2OverclockedHeatVent", "T3OverclockedHeatVent", "T4OverclockedHeatVent" }; - - public static int[] HEAT_CAPACITIES = { 1000, 4000, 8000, 32000, 1000, 4000, 8000, 32000, 1000, 4000, 8000, 32000 }; - - public static int[] COMPONENT_VENT_RATES = { 0, 0, 0, 0, 6, 12, 48, 96, 0, 0, 0, 0 }; - - public static int[] HULL_DRAW_RATES = { 0, 0, 0, 0, 0, 0, 0, 0, 18, 36, 144, 288 }; - - public static int[] SELF_COOL_RATES = { 6, 12, 48, 96, 0, 0, 0, 0, 10, 20, 80, 160 }; -} diff --git a/src/main/java/reactor/items/NeutronReflector.java b/src/main/java/reactor/items/NeutronReflector.java deleted file mode 100644 index 44f04e32c9..0000000000 --- a/src/main/java/reactor/items/NeutronReflector.java +++ /dev/null @@ -1,10 +0,0 @@ -package reactor.items; - -public class NeutronReflector { - - public static String TYPE = "NeutronReflector"; - - public static String[] RESOURCE_NAME = { "T1NeutronReflector", "T2NeutronReflector" }; - - public static int[] DURABILITY = { 512000, 2147483647 }; -} diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang index 39f26ae06e..a77f21bcbe 100644 --- a/src/main/resources/assets/kekztech/lang/en_US.lang +++ b/src/main/resources/assets/kekztech/lang/en_US.lang @@ -18,84 +18,6 @@ mbdesc.signAndFinalize.Hold=Hold mbdesc.signAndFinalize.todisplay=to display structure guidelines mbdesc.signAndFinalize.createdby=Created by -# -------- Reactor: Structure Blocks -tile.kekztech_controlrod_block.name=Nuclear Reactor Control Rod -tile.kekztech_reactorchamberoff_block.name=Nuclear Reactor Chamber (OFF) -tile.kekztech_reactorchamberon_block.name=Nuclear Reactor Chamber (ON) - -# -------- Reactor: Heat Vents -item.kekztech_reactor_item.0.name=Weak Heat Vent -item.kekztech_reactor_item.1.name=Basic Heat Vent -item.kekztech_reactor_item.2.name=Advanced Heat Vent -item.kekztech_reactor_item.3.name=High-Tech Heat Vent -item.kekztech_reactor_item.4.name=Weak Component Heat Vent -item.kekztech_reactor_item.5.name=Basic Component Heat Vent -item.kekztech_reactor_item.6.name=Advanced Component Heat Vent -item.kekztech_reactor_item.7.name=High-Tech Component Heat Vent -item.kekztech_reactor_item.8.name=Weak Overclocked Heat Vent -item.kekztech_reactor_item.9.name=Basic Overclocked Heat Vent -item.kekztech_reactor_item.10.name=Advanced Overclocked Heat Vent -item.kekztech_reactor_item.11.name=High-Tech Overclocked Heat Vent - -# -------- Reactor: Heat Exchangers -item.kekztech_reactor_item.12.name=Weak Heat Exchanger -item.kekztech_reactor_item.13.name=Basic Heat Exchanger -item.kekztech_reactor_item.14.name=Advanced Heat Exchanger -item.kekztech_reactor_item.15.name=High-Tech Heat Exchanger - -# -------- Reactor: Fuel Rods -item.kekztech_reactor_item.16.name=Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.17.name=Dual Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.18.name=Quad Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.19.name=Fuel Rod (Thorium) -item.kekztech_reactor_item.20.name=Dual Fuel Rod (Thorium) -item.kekztech_reactor_item.21.name=Quad Fuel Rod (Thorium) -item.kekztech_reactor_item.22.name=Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.23.name=Dual Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.24.name=Quad Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.25.name=Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.26.name=Dual Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.27.name=Quad Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.28.name=Fuel Rod (Thorium MOX) -item.kekztech_reactor_item.29.name=Dual Fuel Rod (Thorium MOX) -item.kekztech_reactor_item.30.name=Quad Fuel Rod (Thorium MOX) - -# -------- Reactor: Fuel Rods (Depleted) -item.kekztech_reactor_item.31.name=Depleted Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.32.name=Depleted Dual Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.33.name=Depleted Quad Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.34.name=Depleted Fuel Rod (Thorium) -item.kekztech_reactor_item.35.name=Depleted Dual Fuel Rod (Thorium) -item.kekztech_reactor_item.36.name=Depleted Quad Fuel Rod (Thorium) -item.kekztech_reactor_item.37.name=Depleted Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.38.name=Depleted Dual Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.39.name=Depleted Quad Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.40.name=Depleted Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.41.name=Depleted Dual Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.42.name=Depleted Quad Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.43.name=Depleted Fuel Rod (Thorium MOX) -item.kekztech_reactor_item.44.name=Depleted Fuel Rod (Thorium MOX) -item.kekztech_reactor_item.45.name=Depleted Fuel Rod (Thorium MOX) - -# -------- Reactor: Neutron Reflectors -item.kekztech_reactor_item.46.name=Neutron Reflector -item.kekztech_reactor_item.47.name=Neutron Supermirror (Unbreakable) - -# -------- Reactor: Coolant Cells -item.kekztech_reactor_item.48.name=Helium Coolant Cell -item.kekztech_reactor_item.49.name=NaK Coolant Cell - -# -------- Reactor: Crafting Components -item.kekztech_crafting_item.0.name=Copper Heat Pipe -item.kekztech_crafting_item.1.name=Silver Heat Pipe -item.kekztech_crafting_item.2.name=Boron Arsenide Heat Pipe -item.kekztech_crafting_item.3.name=Diamond Heat Pipe -item.kekztech_crafting_item.4.name=Boron Arsenide Dust -item.kekztech_crafting_item.5.name=Isotopically Pure Diamond Dust -item.kekztech_crafting_item.6.name=Amine Carbamate Dust -item.kekztech_crafting_item.7.name=Boron Arsenide Crystal -item.kekztech_crafting_item.8.name=Isotopically Pure Diamond Crystal - # -------- Fuel Cell: Structure Blocks tile.kekztech_gdcceramicelectrolyteunit_block.name=GDC Ceramic Electrolyte Unit tile.kekztech_yszceramicelectrolyteunit_block.name=YSZ Ceramic Electrolyte Unit diff --git a/src/main/resources/assets/kekztech/lang/zh_CN.lang b/src/main/resources/assets/kekztech/lang/zh_CN.lang index 8676f84c10..360e4d540f 100644 --- a/src/main/resources/assets/kekztech/lang/zh_CN.lang +++ b/src/main/resources/assets/kekztech/lang/zh_CN.lang @@ -18,84 +18,6 @@ mbdesc.signAndFinalize.Hold=按住 mbdesc.signAndFinalize.todisplay=以显示结构指导 mbdesc.signAndFinalize.createdby=添加者: -# -------- Reactor: Structure Blocks -tile.kekztech_controlrod_block.name=核反应堆控制棒 -tile.kekztech_reactorchamberoff_block.name=核反应堆室(OFF) -tile.kekztech_reactorchamberon_block.name=核反应堆室(ON) - -# -------- Reactor: Heat Vents -item.kekztech_reactor_item.0.name=简易散热风扇 -item.kekztech_reactor_item.1.name=基础散热风扇 -item.kekztech_reactor_item.2.name=进阶散热风扇 -item.kekztech_reactor_item.3.name=高科技散热风扇 -item.kekztech_reactor_item.4.name=简易散热风扇组件 -item.kekztech_reactor_item.5.name=基础散热风扇组件 -item.kekztech_reactor_item.6.name=进阶散热风扇组件 -item.kekztech_reactor_item.7.name=高科技散热风扇组件 -item.kekztech_reactor_item.8.name=简易超频散热风扇 -item.kekztech_reactor_item.9.name=基础超频散热风扇 -item.kekztech_reactor_item.10.name=进阶超频散热风扇 -item.kekztech_reactor_item.11.name=高科技超频散热风扇 - -# -------- Reactor: Heat Exchangers -item.kekztech_reactor_item.12.name=简易热交换器 -item.kekztech_reactor_item.13.name=基础热交换器 -item.kekztech_reactor_item.14.name=进阶热交换器 -item.kekztech_reactor_item.15.name=高科技热交换器 - -# -------- Reactor: Fuel Rods -item.kekztech_reactor_item.16.name=燃料棒(浓缩铀) -item.kekztech_reactor_item.17.name=二联燃料棒(浓缩铀) -item.kekztech_reactor_item.18.name=四联燃料棒(浓缩铀) -item.kekztech_reactor_item.19.name=燃料棒(钍) -item.kekztech_reactor_item.20.name=二联燃料棒(钍) -item.kekztech_reactor_item.21.name=四联燃料棒(钍) -item.kekztech_reactor_item.22.name=燃料棒(钚MOX) -item.kekztech_reactor_item.23.name=二联燃料棒(钚MOX) -item.kekztech_reactor_item.24.name=四联燃料棒(钚MOX) -item.kekztech_reactor_item.25.name=燃料棒(富集硅岩) -item.kekztech_reactor_item.26.name=二联燃料棒(富集硅岩) -item.kekztech_reactor_item.27.name=四联燃料棒(富集硅岩) -item.kekztech_reactor_item.28.name=燃料棒(钍MOX) -item.kekztech_reactor_item.29.name=二联燃料棒(钍MOX) -item.kekztech_reactor_item.30.name=四联燃料棒(钍MOX) - -# -------- Reactor: Fuel Rods (Depleted) -item.kekztech_reactor_item.31.name=枯竭燃料棒(浓缩铀) -item.kekztech_reactor_item.32.name=枯竭二联燃料棒(浓缩铀) -item.kekztech_reactor_item.33.name=枯竭四联燃料棒(浓缩铀) -item.kekztech_reactor_item.34.name=枯竭燃料棒(钍) -item.kekztech_reactor_item.35.name=枯竭二联燃料棒(钍) -item.kekztech_reactor_item.36.name=枯竭四联燃料棒(钍) -item.kekztech_reactor_item.37.name=枯竭燃料棒(钚MOX) -item.kekztech_reactor_item.38.name=枯竭二联燃料棒(钚MOX) -item.kekztech_reactor_item.39.name=枯竭四联燃料棒(钚MOX) -item.kekztech_reactor_item.40.name=枯竭燃料棒(富集硅岩) -item.kekztech_reactor_item.41.name=枯竭二联燃料棒(富集硅岩) -item.kekztech_reactor_item.42.name=枯竭四联燃料棒(富集硅岩) -item.kekztech_reactor_item.43.name=枯竭燃料棒(钍MOX) -item.kekztech_reactor_item.44.name=枯竭燃料棒(钍MOX) -item.kekztech_reactor_item.45.name=枯竭燃料棒(钍MOX) - -# -------- Reactor: Neutron Reflectors -item.kekztech_reactor_item.46.name=中子反射板 -item.kekztech_reactor_item.47.name=超级中子反射板(坚不可摧) - -# -------- Reactor: Coolant Cells -item.kekztech_reactor_item.48.name=氦冷却单元 -item.kekztech_reactor_item.49.name=钠钾冷却单元 - -# -------- Reactor: Crafting Components -item.kekztech_crafting_item.0.name=铜导热管 -item.kekztech_crafting_item.1.name=银导热管 -item.kekztech_crafting_item.2.name=砷化硼导热管 -item.kekztech_crafting_item.3.name=钻石导热管 -item.kekztech_crafting_item.4.name=砷化硼粉 -item.kekztech_crafting_item.5.name=钻石同位素粉 -item.kekztech_crafting_item.6.name=氨基甲酸酯粉 -item.kekztech_crafting_item.7.name=砷化硼晶体 -item.kekztech_crafting_item.8.name=钻石同位素晶体 - # -------- Fuel Cell: Structure Blocks tile.kekztech_gdcceramicelectrolyteunit_block.name=钆铈陶瓷电解质单元 tile.kekztech_yszceramicelectrolyteunit_block.name=钇锆陶瓷电解质单元 diff --git a/src/main/resources/assets/kekztech/textures/blocks/ControlRod.png b/src/main/resources/assets/kekztech/textures/blocks/ControlRod.png Binary files differdeleted file mode 100644 index 177e5c7231..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ControlRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_OFF.png b/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_OFF.png Binary files differdeleted file mode 100644 index 40a33e52a9..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_OFF.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_ON.png b/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_ON.png Binary files differdeleted file mode 100644 index 6480a8ab9b..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_ON.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/AmineCarbamateDust.png b/src/main/resources/assets/kekztech/textures/items/AmineCarbamateDust.png Binary files differdeleted file mode 100644 index d52f6c823c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/AmineCarbamateDust.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/BoronArsenideCrystal.png b/src/main/resources/assets/kekztech/textures/items/BoronArsenideCrystal.png Binary files differdeleted file mode 100644 index b5f4bfcfa6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/BoronArsenideCrystal.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/BoronArsenideDust.png b/src/main/resources/assets/kekztech/textures/items/BoronArsenideDust.png Binary files differdeleted file mode 100644 index d6475829ed..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/BoronArsenideDust.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/BoronArsenideHeatPipe.png b/src/main/resources/assets/kekztech/textures/items/BoronArsenideHeatPipe.png Binary files differdeleted file mode 100644 index 3dba0931da..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/BoronArsenideHeatPipe.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/CopperHeatPipe.png b/src/main/resources/assets/kekztech/textures/items/CopperHeatPipe.png Binary files differdeleted file mode 100644 index 4f6fe9583b..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/CopperHeatPipe.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedMOXDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedMOXDualFuelRod.png Binary files differdeleted file mode 100644 index b74dd955d4..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedMOXDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedMOXFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedMOXFuelRod.png Binary files differdeleted file mode 100644 index fea49e3594..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedMOXFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedMOXQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedMOXQuadFuelRod.png Binary files differdeleted file mode 100644 index 1f4c95d5ac..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedMOXQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahDualFuelRod.png Binary files differdeleted file mode 100644 index b5f1019022..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahFuelRod.png Binary files differdeleted file mode 100644 index 808c45ff8a..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahQuadFuelRod.png Binary files differdeleted file mode 100644 index 0854d0426c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedThoriumDualFuelRod.png Binary files differdeleted file mode 100644 index 680e8be89c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedThoriumFuelRod.png Binary files differdeleted file mode 100644 index 0fd9e646c4..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedThoriumQuadFuelRod.png Binary files differdeleted file mode 100644 index 3521deea10..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedUraniumDualFuelRod.png Binary files differdeleted file mode 100644 index 8f55e7b9e3..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedUraniumFuelRod.png Binary files differdeleted file mode 100644 index 6e4dec95c4..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedUraniumQuadFuelRod.png Binary files differdeleted file mode 100644 index 83492ea5aa..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DiamondHeatPipe.png b/src/main/resources/assets/kekztech/textures/items/DiamondHeatPipe.png Binary files differdeleted file mode 100644 index 0c67b69b21..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DiamondHeatPipe.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/HeliumCoolantCell360k.png b/src/main/resources/assets/kekztech/textures/items/HeliumCoolantCell360k.png Binary files differdeleted file mode 100644 index 421eac6879..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/HeliumCoolantCell360k.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondCrystal.png b/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondCrystal.png Binary files differdeleted file mode 100644 index 0e7d47f02e..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondCrystal.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondDust.png b/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondDust.png Binary files differdeleted file mode 100644 index eb552c5ab3..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondDust.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/MOXDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/MOXDualFuelRod.png Binary files differdeleted file mode 100644 index bacbf5a087..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/MOXDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/MOXFuelRod.png b/src/main/resources/assets/kekztech/textures/items/MOXFuelRod.png Binary files differdeleted file mode 100644 index 3af0cf956f..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/MOXFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/MOXQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/MOXQuadFuelRod.png Binary files differdeleted file mode 100644 index fa1c0b1ba6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/MOXQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/NaKCoolantCell360k.png b/src/main/resources/assets/kekztech/textures/items/NaKCoolantCell360k.png Binary files differdeleted file mode 100644 index c006ea245a..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/NaKCoolantCell360k.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/NaquadahDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/NaquadahDualFuelRod.png Binary files differdeleted file mode 100644 index 082ef703fa..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/NaquadahDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/NaquadahFuelRod.png b/src/main/resources/assets/kekztech/textures/items/NaquadahFuelRod.png Binary files differdeleted file mode 100644 index b4099a19b7..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/NaquadahFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/NaquadahQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/NaquadahQuadFuelRod.png Binary files differdeleted file mode 100644 index c860a3a2bd..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/NaquadahQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/SilverHeatPipe.png b/src/main/resources/assets/kekztech/textures/items/SilverHeatPipe.png Binary files differdeleted file mode 100644 index 278de757c7..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/SilverHeatPipe.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1ComponentHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T1ComponentHeatVent.png Binary files differdeleted file mode 100644 index 50cfaf3500..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1ComponentHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1HeatExchanger.png b/src/main/resources/assets/kekztech/textures/items/T1HeatExchanger.png Binary files differdeleted file mode 100644 index 3de49b2a8e..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1HeatExchanger.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1HeatVent.png b/src/main/resources/assets/kekztech/textures/items/T1HeatVent.png Binary files differdeleted file mode 100644 index 5d898e72f8..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1HeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1NeutronReflector.png b/src/main/resources/assets/kekztech/textures/items/T1NeutronReflector.png Binary files differdeleted file mode 100644 index 5c16d10365..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1NeutronReflector.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1OverclockedHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T1OverclockedHeatVent.png Binary files differdeleted file mode 100644 index 3e463d03d6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1OverclockedHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2ComponentHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T2ComponentHeatVent.png Binary files differdeleted file mode 100644 index 01d7514ca2..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2ComponentHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2HeatExchanger.png b/src/main/resources/assets/kekztech/textures/items/T2HeatExchanger.png Binary files differdeleted file mode 100644 index a67693cd15..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2HeatExchanger.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2HeatVent.png b/src/main/resources/assets/kekztech/textures/items/T2HeatVent.png Binary files differdeleted file mode 100644 index 8e30ff11e5..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2HeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2NeutronReflector.png b/src/main/resources/assets/kekztech/textures/items/T2NeutronReflector.png Binary files differdeleted file mode 100644 index b85428abed..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2NeutronReflector.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2OverclockedHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T2OverclockedHeatVent.png Binary files differdeleted file mode 100644 index 6e3d8447c5..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2OverclockedHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T3ComponentHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T3ComponentHeatVent.png Binary files differdeleted file mode 100644 index 46e717f2c7..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T3ComponentHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T3HeatExchanger.png b/src/main/resources/assets/kekztech/textures/items/T3HeatExchanger.png Binary files differdeleted file mode 100644 index bdc6dc25af..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T3HeatExchanger.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T3HeatVent.png b/src/main/resources/assets/kekztech/textures/items/T3HeatVent.png Binary files differdeleted file mode 100644 index d53f010af6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T3HeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T3OverclockedHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T3OverclockedHeatVent.png Binary files differdeleted file mode 100644 index 1e12e2480d..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T3OverclockedHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T4ComponentHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T4ComponentHeatVent.png Binary files differdeleted file mode 100644 index 37b3de63c7..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T4ComponentHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T4HeatExchanger.png b/src/main/resources/assets/kekztech/textures/items/T4HeatExchanger.png Binary files differdeleted file mode 100644 index fb890073eb..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T4HeatExchanger.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T4HeatVent.png b/src/main/resources/assets/kekztech/textures/items/T4HeatVent.png Binary files differdeleted file mode 100644 index b9de168eea..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T4HeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T4OverclockedHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T4OverclockedHeatVent.png Binary files differdeleted file mode 100644 index 44d14ce35c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T4OverclockedHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXDualFuelRod.png Binary files differdeleted file mode 100644 index f7b9319a6c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXFuelRod.png Binary files differdeleted file mode 100644 index 64c40e0e7d..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXQuadFuelRod.png Binary files differdeleted file mode 100644 index ec3086224b..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_MOXDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_MOXDualFuelRod.png Binary files differdeleted file mode 100644 index f23128cfc1..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_MOXDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_MOXFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_MOXFuelRod.png Binary files differdeleted file mode 100644 index 78731f7089..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_MOXFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_MOXQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_MOXQuadFuelRod.png Binary files differdeleted file mode 100644 index 23e8626fc6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_MOXQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/ThoriumDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/ThoriumDualFuelRod.png Binary files differdeleted file mode 100644 index f876b8c761..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/ThoriumDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/ThoriumFuelRod.png b/src/main/resources/assets/kekztech/textures/items/ThoriumFuelRod.png Binary files differdeleted file mode 100644 index c8dbf6d4a5..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/ThoriumFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/ThoriumQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/ThoriumQuadFuelRod.png Binary files differdeleted file mode 100644 index bbe4757d0d..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/ThoriumQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/UraniumDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/UraniumDualFuelRod.png Binary files differdeleted file mode 100644 index 531a018694..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/UraniumDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png b/src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png Binary files differdeleted file mode 100644 index 96e1fb32bf..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/UraniumQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/UraniumQuadFuelRod.png Binary files differdeleted file mode 100644 index 2b111de025..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/UraniumQuadFuelRod.png +++ /dev/null |
