Compare commits

..
9 Commits
Author SHA1 Message Date
Martin Robertz 3acc18c5bb Merge remote-tracking branch 'dibbydoda/Remove-deprecated-capacitorbank' into dev 2025-05-23 23:46:36 +02:00
dibbydoda 7583e2f39d Remove unused lines from Langs 2025-05-23 19:44:48 +10:00
dibbydoda b5dba458bc SA 2025-05-20 19:55:42 +10:00
dibbydoda 835e4c57a4 Unify texture names 2025-05-20 19:51:28 +10:00
dibbydoda 43105b2291 Remove old textures 2025-05-20 19:30:48 +10:00
dibbydoda ac14a6c4e0 Move single remaining class to power folder 2025-05-20 19:22:23 +10:00
dibbydoda 9ee3f7c4fa Remove conversion recipe 2025-05-20 19:12:49 +10:00
dibbydoda 055378b683 Remove bulk 2025-05-20 19:09:31 +10:00
dibbydoda 2628477db7 Start removal 2025-05-20 18:30:40 +10:00
44 changed files with 225 additions and 130 deletions

No files matched your search

+12 -12
View File
@@ -2,23 +2,23 @@
dependencies {
api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.11:dev')
compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.52-GTNH:dev')
api("com.github.GTNewHorizons:GTNHLib:0.6.31:dev")
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.43:dev')
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.8:dev')
compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.45-GTNH:dev')
api("com.github.GTNewHorizons:GTNHLib:0.6.22:dev")
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:dev')
api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
shadowImplementation('cglib:cglib-nodep:3.3.0')
api("com.github.GTNewHorizons:TinkersConstruct:1.13.35-GTNH:dev")
api("com.github.GTNewHorizons:TinkersConstruct:1.13.28-GTNH:dev")
compileOnly('com.github.GTNewHorizons:waila:1.8.7:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-632-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:waila:1.8.4:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-613-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.339:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.291:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.15-1.7.10:dev") {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.16.30:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.2-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.16.28:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.0-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Chisel:2.16.4-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.16-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.15-GTNH:api') {transitive = false}
compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
@@ -26,5 +26,5 @@ dependencies {
compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta46:api') {transitive = false}
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta42:api') {transitive = false}
}
+1 -1
View File
@@ -80,7 +80,7 @@ apiPackage = api
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
# There can be multiple files in a space-separated list.
# Example value: mymodid_at.cfg nei_at.cfg
accessTransformersFile = enderio_at.cfg
accessTransformersFile =
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
usesMixins = false
@@ -38,7 +38,7 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase<TileAlloySmelter> {
vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE);
vanillaFurnaceTooltip = new GuiToolTip(
new Rectangle(xSize - 5 - BUTTON_SIZE, 43, BUTTON_SIZE, BUTTON_SIZE),
new Rectangle(xSize - 5 - BUTTON_SIZE, 62, BUTTON_SIZE, BUTTON_SIZE),
(String[]) null);
addProgressTooltip(55, 35, 14, 14);
@@ -93,6 +93,11 @@ public class GuiBuffer extends GuiPoweredMachineBase<TileBuffer> {
PacketHandler.INSTANCE.sendToServer(new PacketBufferIO(getTileEntity(), lastInput, lastOutput));
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
protected boolean renderPowerBar() {
return getTileEntity().hasPower();
@@ -271,9 +271,9 @@ public class BlockCapBank extends BlockEio
@SideOnly(Side.CLIENT)
@Override
public void registerBlockIcons(IIconRegister IIconRegister) {
blockIcon = IIconRegister.registerIcon("enderio:capacitorBank");
gaugeIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays");
fillBarIcon = IIconRegister.registerIcon("enderio:capacitorBankFillBar");
blockIcon = IIconRegister.registerIcon("enderio:capBank");
gaugeIcon = IIconRegister.registerIcon("enderio:capBankOverlays");
fillBarIcon = IIconRegister.registerIcon("enderio:capBankFillBar");
infoPanelIcon = IIconRegister.registerIcon("enderio:capBankInfoPanel");
blockIcons = new IIcon[CapBankType.types().size()];
@@ -17,11 +17,11 @@ public class CapBankType {
Config.capacitorBankTierTwoMaxStorageRF,
false,
true,
"enderio:capacitorBank",
"enderio:capacitorBankCreativeBorder",
"enderio:capacitorBankInput",
"enderio:capacitorBankOutput",
"enderio:capacitorBankLocked");
"enderio:capBank",
"enderio:capBankCreativeBorder",
"enderio:capBankInput",
"enderio:capBankOutput",
"enderio:capBankLocked");
public static final CapBankType SIMPLE = new CapBankType(
"SIMPLE",
@@ -30,11 +30,11 @@ public class CapBankType {
Config.capacitorBankTierOneMaxStorageRF,
true,
false,
"enderio:capacitorBank",
"enderio:capacitorBankSimpleBorder",
"enderio:capacitorBankInput",
"enderio:capacitorBankOutput",
"enderio:capacitorBankLocked");
"enderio:capBank",
"enderio:capBankSimpleBorder",
"enderio:capBankInput",
"enderio:capBankOutput",
"enderio:capBankLocked");
public static final CapBankType ACTIVATED = new CapBankType(
"ACTIVATED",
@@ -43,11 +43,11 @@ public class CapBankType {
Config.capacitorBankTierTwoMaxStorageRF,
true,
false,
"enderio:capacitorBank",
"enderio:capacitorBankActivatedBorder",
"enderio:capacitorBankInput",
"enderio:capacitorBankOutput",
"enderio:capacitorBankLocked");
"enderio:capBank",
"enderio:capBankActivatedBorder",
"enderio:capBankInput",
"enderio:capBankOutput",
"enderio:capBankLocked");
public static final CapBankType VIBRANT = new CapBankType(
"VIBRANT",
@@ -56,11 +56,11 @@ public class CapBankType {
Config.capacitorBankTierThreeMaxStorageRF,
true,
false,
"enderio:capacitorBank",
"enderio:capacitorBankVibrantBorder",
"enderio:capacitorBankInput",
"enderio:capacitorBankOutput",
"enderio:capacitorBankLocked");
"enderio:capBank",
"enderio:capBankVibrantBorder",
"enderio:capBankInput",
"enderio:capBankOutput",
"enderio:capBankLocked");
private static final List<CapBankType> TYPES = new ArrayList<CapBankType>();
@@ -75,7 +75,7 @@ public class GuiCapBank extends GuiContainerBaseEIO {
private final ContainerCapBank container;
public GuiCapBank(Entity player, InventoryPlayer playerInv, TileCapBank te) {
super(new ContainerCapBank(playerInv, te), "capacitorBank");
super(new ContainerCapBank(playerInv, te), "capBank");
capBank = te;
container = (ContainerCapBank) inventorySlots;
@@ -67,6 +67,11 @@ public class GuiCrafter extends GuiPoweredMachineBase<TileCrafter> {
}
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
public final int getXSize() {
return 219;
@@ -7,23 +7,34 @@ import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11;
import com.enderio.core.client.gui.button.IconButton;
import crazypants.enderio.EnderIO;
import crazypants.enderio.gui.GuiContainerBaseEIO;
import crazypants.enderio.gui.IconEIO;
public class GuiEnchanter extends GuiContainerBaseEIO {
private TileEnchanter te;
private ContainerEnchanter container;
private IconButton recipeButton;
public GuiEnchanter(EntityPlayer player, InventoryPlayer inventory, TileEnchanter te) {
super(new ContainerEnchanter(player, inventory, te), "enchanter");
container = (ContainerEnchanter) inventorySlots;
this.te = te;
recipeButton = new IconButton(this, 100, 154, 8, IconEIO.RECIPE);
recipeButton.visible = false;
recipeButton.setIconMargin(1, 1);
}
@Override
public void initGui() {
super.initGui();
container.createGhostSlots(getGhostSlots());
recipeButton.onGuiInit();
recipeButton.visible = EnderIO.proxy.isNeiInstalled();
((ContainerEnchanter) inventorySlots).createGhostSlots(getGhostSlots());
}
@Override
@@ -34,6 +45,10 @@ public class GuiEnchanter extends GuiContainerBaseEIO {
int sy = (height - ySize) / 2;
drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize);
if (EnderIO.proxy.isNeiInstalled()) {
IconEIO.map.render(IconEIO.RECIPE, sx + 155, sy + 8, 16, 16, 0, true);
}
int curCost = te.getCurrentEnchantmentCost();
if (curCost > 0) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -138,6 +138,11 @@ public class GuiFarmStation extends GuiPoweredMachineBase<TileFarmStation> {
super.actionPerformed(b);
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
protected String getPowerOutputLabel() {
return EnderIO.lang.localize("farm.gui.baseUse");
@@ -52,6 +52,11 @@ public class GuiCombustionGenerator extends GuiPoweredMachineBase<TileCombustion
});
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
public void renderSlotHighlights(IoMode mode) {
super.renderSlotHighlights(mode);
@@ -58,6 +58,11 @@ public class GuiStirlingGenerator extends GuiPoweredMachineBase<TileEntityStirli
return fmt.format(args, new StringBuffer(), null).toString();
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
protected String formatProgressTooltip(int scaledProgress, float remaining) {
int totalBurnTime = getTileEntity().totalBurnTime;
@@ -41,6 +41,11 @@ public class GuiZombieGenerator extends GuiPoweredMachineBase<TileZombieGenerato
});
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
public void renderSlotHighlights(IoMode mode) {
super.renderSlotHighlights(mode);
@@ -12,6 +12,7 @@ import net.minecraft.inventory.Slot;
import org.lwjgl.opengl.GL11;
import com.enderio.core.api.common.util.IProgressTile;
import com.enderio.core.client.gui.button.IconButton;
import com.enderio.core.client.gui.button.ToggleButton;
import com.enderio.core.client.gui.widget.GuiToolTip;
import com.enderio.core.client.render.RenderUtil;
@@ -21,6 +22,7 @@ import com.enderio.core.common.vecmath.Vector4f;
import crazypants.enderio.EnderIO;
import crazypants.enderio.gui.GuiContainerBaseEIO;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.gui.IoConfigRenderer.SelectedFace;
import crazypants.enderio.gui.RedstoneModeButton;
import crazypants.enderio.machine.AbstractMachineEntity;
@@ -44,6 +46,8 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
protected final GuiButtonIoConfig configB;
protected IconButton recipeButton;
protected List<GuiToolTip> progressTooltips;
protected int lastProgressTooltipValue = -1;
@@ -62,6 +66,11 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
y += 19;
configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, machine, configOverlay);
y += 19;
recipeButton = new IconButton(this, RECIPE_ID, x, y, IconEIO.RECIPE);
recipeButton.visible = false;
recipeButton.setIconMargin(1, 1);
}
@Override
@@ -69,6 +78,11 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
super.initGui();
redstoneButton.onGuiInit();
configB.onGuiInit();
recipeButton.onGuiInit();
}
protected boolean showRecipeButton() {
return EnderIO.proxy.isNeiInstalled();
}
@Override
@@ -82,6 +96,10 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
guibutton.drawButton(mc, 0, 0);
}
if (showRecipeButton()) {
recipeButton.visible = true;
}
super.drawGuiContainerBackgroundLayer(par1, par2, par3);
renderSlotHighlights();
@@ -536,6 +536,11 @@ public class GuiInventoryPanel extends GuiMachineBase<TileInventoryPanel> {
}
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
public int getXSize() {
return 280;
@@ -102,6 +102,11 @@ public class GuiKillerJoe extends GuiMachineBase<TileKillerJoe> {
}
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
public void renderSlotHighlights(IoMode mode) {
super.renderSlotHighlights(mode);
@@ -76,4 +76,8 @@ public class GuiAttractor extends GuiPoweredMachineBase<TileAttractor> {
ColorUtil.getRGB(Color.white));
}
@Override
protected boolean showRecipeButton() {
return false;
}
}
@@ -75,4 +75,8 @@ public class GuiAversionObelisk extends GuiPoweredMachineBase<TileAversionObelis
}
}
@Override
protected boolean showRecipeButton() {
return false;
}
}
@@ -113,6 +113,11 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk>
return WeatherTask.fromFluid(fs.getFluid());
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
bindGuiTexture();
@@ -157,4 +157,8 @@ public class GuiExperienceObelisk extends GuiMachineBase<TileExperienceObelisk>
super.drawGuiContainerBackgroundLayer(par1, par2, par3);
}
@Override
protected boolean showRecipeButton() {
return false;
}
}
@@ -39,6 +39,11 @@ public class GuiPainter extends GuiPoweredMachineBase<TileEntityPainter> {
super.drawGuiContainerBackgroundLayer(par1, par2, par3);
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
protected void renderSlotHighlight(int slot, Vector4f col) {
if (getTileEntity().getSlotDefinition().isOutputSlot(slot)) {
@@ -132,4 +132,8 @@ public class GuiPoweredSpawner extends GuiPoweredMachineBase<TilePoweredSpawner>
}
}
@Override
protected boolean showRecipeButton() {
return false;
}
}
@@ -112,6 +112,11 @@ public class GuiTank extends GuiMachineBase<TileTank> {
}
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -51,6 +51,11 @@ public class GuiTransceiver extends GuiPoweredMachineBase<TileTransceiver> {
generalTab.updatePowerBarTooltip(text);
}
@Override
protected boolean showRecipeButton() {
return false;
}
@Override
public int getXSize() {
return ContainerTransceiver.GUI_WIDTH;
@@ -11,12 +11,14 @@ import net.minecraftforge.oredict.OreDictionary;
import org.lwjgl.opengl.GL11;
import com.enderio.core.client.render.EnderWidget;
import com.enderio.core.common.util.ItemUtil;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.ItemList;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.machine.alloy.AlloyRecipeManager;
import crazypants.enderio.machine.alloy.GuiAlloySmelter;
import crazypants.enderio.machine.recipe.IRecipe;
@@ -49,7 +51,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler {
public void loadTransferRects() {
transferRects.add(
new TemplateRecipeHandler.RecipeTransferRect(
new Rectangle(72, 19, 22, 19),
new Rectangle(149, 32, 16, 16),
"EnderIOAlloySmelter",
new Object[0]));
}
@@ -115,6 +117,10 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler {
AlloySmelterRecipe recipe = (AlloySmelterRecipe) arecipes.get(recipeIndex);
String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
GuiDraw.drawString(energyString, 100, 52, 0x808080, false);
int x = 149, y = 32;
EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true);
IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true);
}
public List<ItemStack> getInputs(RecipeInput input) {
@@ -15,10 +15,13 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import com.enderio.core.client.render.EnderWidget;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
import crazypants.enderio.gui.GuiContainerBaseEIO;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.machine.enchanter.EnchanterRecipe;
import crazypants.enderio.machine.enchanter.EnchanterRecipeManager;
import crazypants.enderio.machine.enchanter.GuiEnchanter;
@@ -51,7 +54,7 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler {
public void loadTransferRects() {
transferRects.add(
new TemplateRecipeHandler.RecipeTransferRect(
new Rectangle(97, 24, 22, 17),
new Rectangle(149, -3, 16, 16),
"EIOEnchanter",
new Object[0]));
}
@@ -128,6 +131,9 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler {
GuiDraw.drawStringC(s, 83, 46, 0x80FF20);
}
int x = 149, y = -3;
EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true);
IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true);
}
public List<ItemStack> getInputs(RecipeInput input) {
@@ -7,13 +7,9 @@ import codechicken.nei.api.IConfigureNEI;
import crazypants.enderio.EnderIO;
import crazypants.enderio.conduit.gas.GasUtil;
import crazypants.enderio.config.Config;
import crazypants.enderio.machine.alloy.GuiAlloySmelter;
import crazypants.enderio.machine.crusher.GuiCrusher;
import crazypants.enderio.machine.invpanel.GuiInventoryPanel;
import crazypants.enderio.machine.invpanel.client.InventoryPanelNEIOverlayHandler;
import crazypants.enderio.machine.painter.PainterUtil;
import crazypants.enderio.machine.slicensplice.GuiSliceAndSplice;
import crazypants.enderio.machine.soul.GuiSoulBinder;
public class NEIEnderIOConfig implements IConfigureNEI {
@@ -21,11 +17,9 @@ public class NEIEnderIOConfig implements IConfigureNEI {
public void loadConfig() {
API.registerRecipeHandler(new AlloySmelterRecipeHandler());
API.registerUsageHandler(new AlloySmelterRecipeHandler());
API.setGuiOffset(GuiAlloySmelter.class, 4, 6);
API.registerRecipeHandler(new SagMillRecipeHandler());
API.registerUsageHandler(new SagMillRecipeHandler());
API.setGuiOffset(GuiCrusher.class, 6, 11);
API.registerRecipeHandler(new VatRecipeHandler());
API.registerUsageHandler(new VatRecipeHandler());
@@ -35,11 +29,9 @@ public class NEIEnderIOConfig implements IConfigureNEI {
API.registerRecipeHandler(new SliceAndSpliceRecipeHandler());
API.registerUsageHandler(new SliceAndSpliceRecipeHandler());
API.setGuiOffset(GuiSliceAndSplice.class, 13, 11);
API.registerRecipeHandler(new SoulBinderRecipeHandler());
API.registerUsageHandler(new SoulBinderRecipeHandler());
API.setGuiOffset(GuiSoulBinder.class, 11, 11);
API.registerGuiOverlayHandler(GuiInventoryPanel.class, new InventoryPanelNEIOverlayHandler(), "crafting");
@@ -14,10 +14,13 @@ import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import com.enderio.core.client.render.EnderWidget;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.recipe.TemplateRecipeHandler;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.machine.crusher.CrusherRecipeManager;
import crazypants.enderio.machine.crusher.GrindingBall;
import crazypants.enderio.machine.crusher.GuiCrusher;
@@ -58,7 +61,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler {
public void loadTransferRects() {
transferRects.add(
new TemplateRecipeHandler.RecipeTransferRect(
new Rectangle(74, 21, 17, 22),
new Rectangle(149, 32, 16, 16),
"EnderIOSagMill",
new Object[0]));
}
@@ -124,6 +127,10 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler {
MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex);
String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
GuiDraw.drawString(energyString, 96, 33, 0x808080, false);
int x = 149, y = 32;
EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true);
IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true);
}
@Override
@@ -12,10 +12,13 @@ import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import com.enderio.core.client.render.EnderWidget;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
import crazypants.enderio.gui.GuiContainerBaseEIO;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.machine.recipe.IRecipe;
import crazypants.enderio.machine.recipe.RecipeInput;
import crazypants.enderio.machine.slicensplice.ContainerSliceAndSplice;
@@ -49,7 +52,7 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler {
public void loadTransferRects() {
transferRects.add(
new TemplateRecipeHandler.RecipeTransferRect(
new Rectangle(91, 37, 22, 17),
new Rectangle(149, 32, 16, 16),
"EnderIOSliceAndSplice",
new Object[0]));
}
@@ -110,6 +113,10 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler {
SliceAndSpliceRecipe recipe = (SliceAndSpliceRecipe) arecipes.get(recipeIndex);
String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
GuiDraw.drawString(energyString, 100, 57, 0x808080, false);
int x = 149, y = 32;
EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true);
IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true);
}
public List<ItemStack> getInputs(RecipeInput input) {
@@ -13,12 +13,15 @@ import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import com.enderio.core.client.render.EnderWidget;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
import crazypants.enderio.EnderIO;
import crazypants.enderio.ModObject;
import crazypants.enderio.gui.GuiContainerBaseEIO;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.machine.IMachineRecipe;
import crazypants.enderio.machine.MachineRecipeRegistry;
import crazypants.enderio.machine.soul.GuiSoulBinder;
@@ -51,7 +54,7 @@ public class SoulBinderRecipeHandler extends TemplateRecipeHandler {
public void loadTransferRects() {
transferRects.add(
new TemplateRecipeHandler.RecipeTransferRect(
new Rectangle(70, 23, 22, 17),
new Rectangle(149, 32, 16, 16),
"EnderIOSoulBinder",
new Object[0]));
}
@@ -139,6 +142,10 @@ public class SoulBinderRecipeHandler extends TemplateRecipeHandler {
String s = I18n.format("container.repair.cost", new Object[] { Integer.valueOf(cost) });
GuiDraw.drawStringC(s, 83, 55, 0x80FF20);
}
int x = 149, y = 32;
EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true);
IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true);
}
private static final ArrayList<PositionedStack> EMPTY_VIAL_OUTPUT = new ArrayList<PositionedStack>();
@@ -3,32 +3,28 @@ package crazypants.enderio.nei;
import java.awt.Point;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.opengl.GL11;
import com.enderio.core.client.render.EnderWidget;
import com.enderio.core.client.render.RenderUtil;
import com.enderio.core.common.util.FluidUtil;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.ItemStackMap;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.GuiCraftingRecipe;
import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.recipe.GuiUsageRecipe;
import codechicken.nei.recipe.TemplateRecipeHandler;
import crazypants.enderio.fluid.Fluids;
import crazypants.enderio.gui.GuiContainerBaseEIO;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.machine.recipe.IRecipe;
import crazypants.enderio.machine.recipe.RecipeInput;
import crazypants.enderio.machine.vat.GuiVat;
@@ -70,7 +66,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
public void loadTransferRects() {
transferRects.add(
new TemplateRecipeHandler.RecipeTransferRect(
new Rectangle(70, 8, 28, 43),
new Rectangle(149, 32, 16, 16),
"EnderIOVat",
new Object[0]));
}
@@ -161,8 +157,8 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
if (rec.inFluid != null && rec.inFluid.getFluid() != null) {
RenderUtil.renderGuiTank(
rec.inFluid,
FluidContainerRegistry.BUCKET_VOLUME * 8,
rec.getInputFluidAmount(),
rec.inFluid.amount,
rec.inFluid.amount,
inTankBounds.x,
inTankBounds.y,
0,
@@ -173,8 +169,8 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
if (rec.result != null && rec.result.getFluid() != null) {
RenderUtil.renderGuiTank(
rec.result,
FluidContainerRegistry.BUCKET_VOLUME * 8,
rec.getResultFluidAmount(),
rec.result.amount,
rec.result.amount,
outTankBounds.x,
outTankBounds.y,
0,
@@ -194,6 +190,9 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, 0x808080, false);
}
int x = 149, y = 32;
EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true);
IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true);
}
@Override
@@ -203,19 +202,24 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
@Override
public List<String> handleTooltip(GuiRecipe<?> gui, List<String> currenttip, int recipeIndex) {
final InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex);
final Point pos = GuiDraw.getMousePosition();
final Point offset = gui.getRecipePosition(recipeIndex);
final Point relMouse = new Point(pos.x - gui.guiLeft - offset.x, pos.y - gui.guiTop - offset.y);
InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex);
Point pos = GuiDraw.getMousePosition();
Point offset = gui.getRecipePosition(recipeIndex);
Point relMouse = new Point(
pos.x - ((gui.width - 176) / 2) - offset.x,
pos.y - ((gui.height - 166) / 2) - offset.y);
if (inTankBounds.contains(relMouse) && rec.inFluid != null && rec.inFluid.getFluid() != null) {
currenttip.add(rec.inFluid.getFluid().getLocalizedName(rec.inFluid));
currenttip.add(EnumChatFormatting.GRAY.toString() + rec.getInputFluidAmount() + " " + Fluids.MB());
} else if (outTankBounds.contains(relMouse) && rec.result != null && rec.result.getFluid() != null) {
currenttip.add(rec.result.getFluid().getLocalizedName(rec.result));
currenttip.add(EnumChatFormatting.GRAY.toString() + rec.getResultFluidAmount() + " " + Fluids.MB());
if (inTankBounds.contains(relMouse) || outTankBounds.contains(relMouse)) {
if (inTankBounds.contains(relMouse)) {
if (rec.inFluid != null && rec.inFluid.getFluid() != null) {
currenttip.add(rec.inFluid.getFluid().getLocalizedName(rec.inFluid));
}
} else {
if (rec.result != null && rec.result.getFluid() != null) {
currenttip.add(rec.result.getFluid().getLocalizedName(rec.result));
}
}
}
return super.handleTooltip(gui, currenttip, recipeIndex);
}
@@ -237,7 +241,9 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex);
Point pos = GuiDraw.getMousePosition();
Point offset = gui.getRecipePosition(recipeIndex);
Point relMouse = new Point(pos.x - gui.guiLeft - offset.x, pos.y - gui.guiTop - offset.y);
Point relMouse = new Point(
pos.x - ((gui.width - 176) / 2) - offset.x,
pos.y - ((gui.height - 166) / 2) - offset.y);
if (inTankBounds.contains(relMouse)) {
transferFluidTank(rec.inFluid, usage);
@@ -277,10 +283,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
public class InnerVatRecipe extends TemplateRecipeHandler.CachedRecipe {
private List<PositionedStack> inputs = new ArrayList<>();
private ItemStackMap<Float> firstItemMultiplier = new ItemStackMap();
private ItemStackMap<Float> secondItemMultiplier = new ItemStackMap();
private Map<FluidStack, Float> fluidMultiplier = new HashMap<>();
private ArrayList<PositionedStack> inputs;
private int energy;
private FluidStack result;
private FluidStack inFluid;
@@ -291,31 +294,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
@Override
public List<PositionedStack> getIngredients() {
return getCycledIngredients(cycleticks / 30, this.inputs);
}
public int getInputFluidAmount() {
return (int) Math
.round(FluidContainerRegistry.BUCKET_VOLUME * getFirstItemMultiplier() * getSecondItemMultiplier());
}
public int getResultFluidAmount() {
return (int) Math.round(
FluidContainerRegistry.BUCKET_VOLUME * getFirstItemMultiplier()
* getSecondItemMultiplier()
* getFluidMultiplier());
}
public float getFirstItemMultiplier() {
return this.inputs.isEmpty() ? 1f : this.firstItemMultiplier.getOrDefault(this.inputs.get(0).item, 1f);
}
public float getSecondItemMultiplier() {
return this.inputs.size() < 2 ? 1f : this.secondItemMultiplier.getOrDefault(this.inputs.get(1).item, 1f);
}
public float getFluidMultiplier() {
return this.fluidMultiplier.getOrDefault(this.inFluid, 1f);
return getCycledIngredients(cycleticks / 30, inputs);
}
@Override
@@ -324,41 +303,28 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
}
public InnerVatRecipe(int energy, RecipeInput[] ingredients, FluidStack result) {
final List<ItemStack> inputsOne = new ArrayList<>();
final List<ItemStack> inputsTwo = new ArrayList<>();
ArrayList<ItemStack> inputsOne = new ArrayList<ItemStack>();
ArrayList<ItemStack> inputsTwo = new ArrayList<ItemStack>();
for (RecipeInput input : ingredients) {
float multi = input.getMulitplier();
if (input.getInput() != null) {
final List<ItemStack> equivs = getInputs(input);
List<ItemStack> equivs = getInputs(input);
if (input.getSlotNumber() == 0) {
inputsOne.addAll(equivs);
for (ItemStack stack : equivs) {
this.firstItemMultiplier.put(stack, multi);
}
} else if (input.getSlotNumber() == 1) {
inputsTwo.addAll(equivs);
for (ItemStack stack : equivs) {
this.secondItemMultiplier.put(stack, multi);
}
}
} else if (input.getFluidInput() != null) {
this.inFluid = input.getFluidInput();
this.fluidMultiplier.put(this.inFluid, multi);
inFluid = input.getFluidInput();
}
}
inputs = new ArrayList<PositionedStack>();
if (!inputsOne.isEmpty()) {
this.inputs.add(new PositionedStack(inputsOne, 51, 1));
inputs.add(new PositionedStack(inputsOne, 51, 1));
}
if (!inputsTwo.isEmpty()) {
this.inputs.add(new PositionedStack(inputsTwo, 100, 1));
inputs.add(new PositionedStack(inputsTwo, 100, 1));
}
this.energy = energy;
@@ -1,5 +0,0 @@
# Access Transformer configuration file
public net.minecraft.client.gui.inventory.GuiContainer field_146999_f #xSize
public net.minecraft.client.gui.inventory.GuiContainer field_147000_g #ySize
public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft
public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop
File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB