mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-16 10:44:47 +00:00
Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a614038a18 | ||
|
|
cd58ee6866 | ||
|
|
88ac45d6b6 | ||
|
|
187ba74826 | ||
|
|
10a05d75bc | ||
|
|
b9d405312d | ||
|
|
067d602a9d | ||
|
|
9b54770785 | ||
|
|
51d553d6a0 |
No files matched your search
@@ -0,0 +1,24 @@
|
||||
|
||||
# EnderIO
|
||||
|
||||
Changelog of EnderIO.
|
||||
|
||||
|
||||
### [#28 Fix Burn Time tooltip](https://github.com/GTNewHorizons/EnderIO/pull/28)
|
||||
**Merge pull request #28 from GTNewHorizons/fix_burn_time_tooltip**
|
||||
* Fix Burn Time tooltip
|
||||
|
||||
[a40e48f5d87b0be](https://github.com/GTNewHorizons/EnderIO/commit/a40e48f5d87b0be)
|
||||
by Martin Robertz *2021-01-24 21:37:43*
|
||||
### No issue
|
||||
**bump version**
|
||||
|
||||
[a2da1c4832993a3](https://github.com/GTNewHorizons/EnderIO/commit/a2da1c4832993a3)
|
||||
by DreamMasterXXL *2021-01-29 18:56:32*
|
||||
|
||||
**Revert "Update TooltipHandlerBurnTime.java"**
|
||||
* This reverts commit 3093ea6180beec8329087a1f91bda448683331d8.
|
||||
|
||||
[0e7bf1c530797f8](https://github.com/GTNewHorizons/EnderIO/commit/0e7bf1c530797f8)
|
||||
by Jason Mitchell *2021-01-24 21:02:17*
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url = "http://files.minecraftforge.net/maven" }
|
||||
maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
|
||||
maven { url = "https://jitpack.io" }
|
||||
maven { url = "https://gregtech.overminddl1.com/" }
|
||||
}
|
||||
dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' }
|
||||
dependencies { classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT' }
|
||||
}
|
||||
plugins {
|
||||
id 'idea'
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
|
||||
forge_version=10.13.4.1614-1.7.10
|
||||
forgeDep_version=10.13.4.1614
|
||||
|
||||
mod_version=2.3.1.16_beta
|
||||
mod_version=2.3.1.17
|
||||
|
||||
#Comment out this line to get rid of the appendix
|
||||
#mod_appendix=beta
|
||||
|
||||
@@ -1182,7 +1182,11 @@ enderio.gui.conduit.item.channel=Channel
|
||||
enderio.gui.conduit.item.ignoreMetaData=Ignore Meta Data
|
||||
enderio.gui.conduit.item.matchMetaData=Match Meta Data
|
||||
enderio.gui.conduit.item.whitelist=Whitelist
|
||||
enderio.gui.conduit.item.whitelist.tooltip.0=If item list is empty, no item
|
||||
enderio.gui.conduit.item.whitelist.tooltip.1=will be allowed to pass
|
||||
enderio.gui.conduit.item.blacklist=Blacklist
|
||||
enderio.gui.conduit.item.blacklist.tooltip.0=If item list is empty, all items
|
||||
enderio.gui.conduit.item.blacklist.tooltip.1=will be allowed to pass
|
||||
enderio.gui.conduit.item.stickyEnabled=Sticky Mode Enabled|Selected items will only|be sent to this or other|Sticky outputs.
|
||||
enderio.gui.conduit.item.stickyDisbaled=Sticky Mode Disabled
|
||||
enderio.gui.conduit.item.ignoreNBT=Ignore NBT Data
|
||||
@@ -1195,11 +1199,14 @@ enderio.gui.conduit.item.roundRobinEnabled=Round Robin Enabled
|
||||
enderio.gui.conduit.item.roundRobinDisabled=Round Robin Disabled
|
||||
enderio.gui.conduit.item.priority=Priority
|
||||
|
||||
enderio.gui.conduit.item.fuzzy.disabled=Fuzzy Mode disabled
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_25=Fuzzy match for 25% damage
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_50=Fuzzy match for 50% damage
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_75=Fuzzy match for 75% damage
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_99=Fuzzy match for any damage
|
||||
enderio.gui.conduit.item.fuzzy.disabled=Damage Mode: Disabled
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_25=Damage Mode: Damaged by 25% or more
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_50=Damage Mode: Damaged by 50% or more
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_75=Damage Mode: Damaged by 75% or more
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_99=Damage Mode: Damaged at least once
|
||||
enderio.gui.conduit.item.fuzzy.tooltip.0=Can work without items in the filter
|
||||
enderio.gui.conduit.item.fuzzy.tooltip.1=In this case its logic can be
|
||||
enderio.gui.conduit.item.fuzzy.tooltip.2=controlled by %s button
|
||||
|
||||
enderio.gui.conduit.item.filterupgrade=Insert Item Filter
|
||||
enderio.gui.conduit.item.speedupgrade=Insert Item Conduit Speed Upgrades/Downgrade
|
||||
|
||||
@@ -1009,7 +1009,11 @@ enderio.gui.conduit.item.channel=Канал
|
||||
enderio.gui.conduit.item.ignoreMetaData=Игнорировать метаданные
|
||||
enderio.gui.conduit.item.matchMetaData=Соблюдать метаданные
|
||||
enderio.gui.conduit.item.whitelist=Белый список
|
||||
enderio.gui.conduit.item.whitelist.tooltip.0=Если список предметов пуст, ни один
|
||||
enderio.gui.conduit.item.whitelist.tooltip.1=предмет не будет принят
|
||||
enderio.gui.conduit.item.blacklist=Чёрный список
|
||||
enderio.gui.conduit.item.blacklist.tooltip.0=Если список предметов пуст,
|
||||
enderio.gui.conduit.item.blacklist.tooltip.1=все предметы будут приняты
|
||||
enderio.gui.conduit.item.stickyEnabled=Включён "липкий" режим|Выбранные предметы будут|отправляться только на этот|или другие "липкие" выходы.
|
||||
enderio.gui.conduit.item.stickyDisbaled="Липкий" режим выключен
|
||||
enderio.gui.conduit.item.ignoreNBT=Игнорировать NBT
|
||||
@@ -1022,11 +1026,14 @@ enderio.gui.conduit.item.roundRobinEnabled=Цикл включён
|
||||
enderio.gui.conduit.item.roundRobinDisabled=Цикл отключен
|
||||
enderio.gui.conduit.item.priority=Приоритет
|
||||
|
||||
enderio.gui.conduit.item.fuzzy.disabled=Нечёткий режим отключен
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_25=Нечёткое совпадение на 25% урона
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_50=Нечёткое совпадение на 50% урона
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_75=Нечёткое совпадение на 75% урона
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_99=Нечёткое совпадение при любом уроне
|
||||
enderio.gui.conduit.item.fuzzy.disabled=Сравнение повреждения: Отключено
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_25=Сравнение повреждения: Повреждено на 25% или более
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_50=Сравнение повреждения: Повреждено на 50% или более
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_75=Сравнение повреждения: Повреждено на 75% или более
|
||||
enderio.gui.conduit.item.fuzzy.fuzzy_99=Сравнение повреждения: Повреждено хотя бы раз
|
||||
enderio.gui.conduit.item.fuzzy.tooltip.0=Может работать без предметов в фильтре
|
||||
enderio.gui.conduit.item.fuzzy.tooltip.1=В таком случае логика его работы
|
||||
enderio.gui.conduit.item.fuzzy.tooltip.2=контролируется кнопкой %s
|
||||
|
||||
enderio.gui.conduit.item.filterupgrade=Вставить предметный фильтр
|
||||
enderio.gui.conduit.item.speedupgrade=Вставить улучшения скорости/понижение скорости
|
||||
|
||||
@@ -1,20 +1,16 @@
|
||||
package crazypants.enderio.conduit.gui.item;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.enderio.core.client.gui.GuiContainerBase;
|
||||
import com.enderio.core.client.gui.button.CycleButton;
|
||||
import com.enderio.core.client.gui.button.IconButton;
|
||||
import com.enderio.core.client.gui.button.ToggleButton;
|
||||
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.conduit.gui.GuiExternalConnection;
|
||||
import crazypants.enderio.conduit.item.filter.FuzzyMode;
|
||||
import crazypants.enderio.conduit.item.filter.ItemFilter;
|
||||
import crazypants.enderio.gui.GuiContainerBaseEIO;
|
||||
import crazypants.enderio.gui.IconEIO;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class BasicItemFilterGui implements IItemFilterGui {
|
||||
|
||||
@@ -66,7 +62,7 @@ public class BasicItemFilterGui implements IItemFilterGui {
|
||||
int x = butLeft;
|
||||
int y = yOffset + 1;
|
||||
whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST);
|
||||
whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
|
||||
whiteListB.setToolTip(getWhitelistTooltips(false));
|
||||
|
||||
x += 20;
|
||||
useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META);
|
||||
@@ -135,16 +131,14 @@ public class BasicItemFilterGui implements IItemFilterGui {
|
||||
useMetaB.setSelected(activeFilter.isMatchMeta());
|
||||
|
||||
whiteListB.onGuiInit();
|
||||
whiteListB.setToolTip(getWhitelistTooltips(activeFilter.isBlacklist()));
|
||||
if(activeFilter.isBlacklist()) {
|
||||
whiteListB.setIcon(IconEIO.FILTER_BLACKLIST);
|
||||
whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist"));
|
||||
} else {
|
||||
whiteListB.setIcon(IconEIO.FILTER_WHITELIST);
|
||||
whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void actionPerformed(GuiButton guiButton) {
|
||||
|
||||
@@ -193,5 +187,20 @@ public class BasicItemFilterGui implements IItemFilterGui {
|
||||
gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private String[] getWhitelistTooltips(boolean isBlacklist) {
|
||||
if(isBlacklist) {
|
||||
return new String[]{
|
||||
EnderIO.lang.localize("gui.conduit.item.blacklist"),
|
||||
EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.0"),
|
||||
EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.1")
|
||||
};
|
||||
} else {
|
||||
return new String[]{
|
||||
EnderIO.lang.localize("gui.conduit.item.whitelist"),
|
||||
EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.0"),
|
||||
EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.1")
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,15 @@
|
||||
package crazypants.enderio.conduit.item.filter;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import com.enderio.core.api.client.render.IWidgetIcon;
|
||||
import com.enderio.core.client.gui.button.CycleButton;
|
||||
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.gui.IconEIO;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
public enum FuzzyMode implements CycleButton.ICycleEnum {
|
||||
DISABLED(IconEIO.FILTER_FUZZY_DISABLED) {
|
||||
@@ -63,7 +62,13 @@ public enum FuzzyMode implements CycleButton.ICycleEnum {
|
||||
|
||||
@Override
|
||||
public List<String> getTooltipLines() {
|
||||
return Collections.singletonList(EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase(Locale.US))));
|
||||
return Arrays.asList(
|
||||
EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase(Locale.US))),
|
||||
EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.0"),
|
||||
EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.1"),
|
||||
EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.2",
|
||||
EnderIO.lang.localize("gui.conduit.item.whitelist"))
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,16 +1,16 @@
|
||||
package crazypants.enderio.conduit.item.filter;
|
||||
|
||||
import com.enderio.core.client.gui.widget.GhostSlot;
|
||||
import com.enderio.core.common.network.NetworkUtil;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.conduit.gui.GuiExternalConnection;
|
||||
import crazypants.enderio.conduit.gui.item.BasicItemFilterGui;
|
||||
import crazypants.enderio.conduit.gui.item.IItemFilterGui;
|
||||
import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.item.NetworkedInventory;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -19,12 +19,9 @@ import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import com.enderio.core.client.gui.widget.GhostSlot;
|
||||
import com.enderio.core.common.network.NetworkUtil;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.conduit.item.NetworkedInventory;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
public class ItemFilter implements IInventory, IItemFilter {
|
||||
|
||||
@@ -93,43 +90,56 @@ public class ItemFilter implements IInventory, IItemFilter {
|
||||
return doesItemPassFilter(item);
|
||||
}
|
||||
|
||||
@SuppressWarnings("SimplifiableConditionalExpression")
|
||||
public boolean doesItemPassFilter(ItemStack item) {
|
||||
if(!isValid()) {
|
||||
return true;
|
||||
}
|
||||
boolean matched = itemMatched(item);
|
||||
return isBlacklist ? !matched : matched;
|
||||
boolean allow = isValid() && itemMatched(item);
|
||||
|
||||
return isBlacklist ? !allow : allow;
|
||||
}
|
||||
|
||||
private boolean itemMatched(ItemStack item) {
|
||||
if(item == null) {
|
||||
return false;
|
||||
}
|
||||
boolean doFuzzy = false;
|
||||
boolean fuzzyValue = false;
|
||||
if(fuzzyMode != FuzzyMode.DISABLED && item.getItem().isDamageable()) {
|
||||
doFuzzy = true;
|
||||
fuzzyValue = fuzzyMode.compare(item);
|
||||
|
||||
boolean checkDamage = fuzzyMode != FuzzyMode.DISABLED;
|
||||
boolean damageMatched = false;
|
||||
if(checkDamage && item.getItem().isDamageable()) {
|
||||
damageMatched = fuzzyMode.compare(item);
|
||||
}
|
||||
|
||||
if(isItemListEmpty()) {
|
||||
if (checkDamage) {
|
||||
return damageMatched;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
boolean matched = false;
|
||||
int i = 0;
|
||||
for (ItemStack it : items) {
|
||||
if(it != null && Item.getIdFromItem(item.getItem()) == Item.getIdFromItem(it.getItem())) {
|
||||
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
ItemStack it = items[i];
|
||||
|
||||
if (it != null && Item.getIdFromItem(item.getItem()) == Item.getIdFromItem(it.getItem())) {
|
||||
matched = true;
|
||||
boolean fuzzyOk = doFuzzy && fuzzyMode.compare(it) == fuzzyValue;
|
||||
if(matchMeta && !fuzzyOk && item.getItemDamage() != it.getItemDamage()) {
|
||||
|
||||
if(checkDamage && !damageMatched) {
|
||||
matched = false;
|
||||
} else if(matchNBT && !isNBTMatch(item, it)) {
|
||||
} else if (matchMeta && item.getItemDamage() != it.getItemDamage()) {
|
||||
matched = false;
|
||||
}else if (matchNBT && !isNBTMatch(item, it)) {
|
||||
matched = false;
|
||||
}
|
||||
}
|
||||
if(!matched && useOreDict && isOreDicMatch(i, item)) {
|
||||
|
||||
if (!matched && useOreDict && isOreDicMatch(i, item)) {
|
||||
matched = true;
|
||||
}
|
||||
if(matched) {
|
||||
|
||||
if (matched) {
|
||||
break;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
return matched;
|
||||
}
|
||||
@@ -184,12 +194,21 @@ public class ItemFilter implements IInventory, IItemFilter {
|
||||
|
||||
@Override
|
||||
public boolean isValid() {
|
||||
//allows fuzzy mode to be not dependent from filter items
|
||||
if(fuzzyMode != FuzzyMode.DISABLED) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return !isItemListEmpty();
|
||||
}
|
||||
|
||||
private boolean isItemListEmpty() {
|
||||
for (ItemStack item : items) {
|
||||
if(item != null) {
|
||||
return true;
|
||||
if (item != null) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean isBlacklist() {
|
||||
|
||||
@@ -14,15 +14,15 @@ import crazypants.enderio.network.PacketHandler;
|
||||
public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile {
|
||||
|
||||
// Power
|
||||
private Capacitors capacitorType = Capacitors.BASIC_CAPACITOR;
|
||||
private ICapacitor capacitor = Capacitors.BASIC_CAPACITOR.capacitor;
|
||||
private Capacitors capacitorType;
|
||||
private ICapacitor capacitor;
|
||||
|
||||
private int storedEnergyRF = 0;
|
||||
private int storedEnergyRF;
|
||||
protected float lastSyncPowerStored = -1;
|
||||
|
||||
protected AbstractPoweredMachineEntity(SlotDefinition slotDefinition) {
|
||||
super(slotDefinition);
|
||||
setCapacitor(Capacitors.BASIC_CAPACITOR);
|
||||
capacitorType = Capacitors.BASIC_CAPACITOR;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -40,7 +40,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
return;
|
||||
}
|
||||
boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(5));
|
||||
if(powerChanged) {
|
||||
if (powerChanged) {
|
||||
lastSyncPowerStored = storedEnergyRF;
|
||||
PacketHandler.sendToAllAround(new PacketPowerStorage(this), this);
|
||||
}
|
||||
@@ -55,7 +55,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
|
||||
@Override
|
||||
public int getMaxEnergyRecieved(ForgeDirection dir) {
|
||||
if(isSideDisabled(dir.ordinal())) {
|
||||
if (isSideDisabled(dir.ordinal())) {
|
||||
return 0;
|
||||
}
|
||||
return getCapacitor().getMaxEnergyReceived();
|
||||
@@ -93,18 +93,16 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
|
||||
public ICapacitor getCapacitor() {
|
||||
|
||||
if(capacitor != null) {
|
||||
return capacitor;
|
||||
}
|
||||
if (capacitor != null) {
|
||||
return capacitor;
|
||||
} else if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) {
|
||||
ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
|
||||
if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) {
|
||||
return EnderIO.itemBasicCapacitor.getCapacitor(contents);
|
||||
}
|
||||
}
|
||||
|
||||
else if(capacitorType == Capacitors.TOTEMIC_CAPACITOR) {
|
||||
ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
|
||||
if(contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) {
|
||||
return EnderIO.itemBasicCapacitor.getCapacitor(contents);
|
||||
}
|
||||
}
|
||||
|
||||
return capacitorType.capacitor;
|
||||
return capacitorType.capacitor;
|
||||
|
||||
}
|
||||
|
||||
@@ -122,15 +120,13 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
public void setCapacitor(Capacitors capacitorType) {
|
||||
this.capacitorType = capacitorType;
|
||||
|
||||
if(capacitorType == Capacitors.TOTEMIC_CAPACITOR) {
|
||||
ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
|
||||
if(contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) {
|
||||
setCapacitor(EnderIO.itemBasicCapacitor.getCapacitor(contents));
|
||||
}
|
||||
}
|
||||
|
||||
else {
|
||||
this.capacitor = capacitorType.capacitor;
|
||||
if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) {
|
||||
ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
|
||||
if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) {
|
||||
setCapacitor(EnderIO.itemBasicCapacitor.getCapacitor(contents));
|
||||
}
|
||||
} else {
|
||||
this.capacitor = capacitorType.capacitor;
|
||||
}
|
||||
|
||||
onCapacitorTypeChange();
|
||||
@@ -148,7 +144,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack contents) {
|
||||
super.setInventorySlotContents(slot, contents);
|
||||
if(slotDefinition.isUpgradeSlot(slot)) {
|
||||
if (slotDefinition.isUpgradeSlot(slot)) {
|
||||
updateCapacitorFromSlot();
|
||||
}
|
||||
}
|
||||
@@ -156,19 +152,19 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
@Override
|
||||
public ItemStack decrStackSize(int fromSlot, int amount) {
|
||||
ItemStack res = super.decrStackSize(fromSlot, amount);
|
||||
if(slotDefinition.isUpgradeSlot(fromSlot)) {
|
||||
if (slotDefinition.isUpgradeSlot(fromSlot)) {
|
||||
updateCapacitorFromSlot();
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
private void updateCapacitorFromSlot() {
|
||||
if(slotDefinition.getNumUpgradeSlots() <= 0) {
|
||||
if (slotDefinition.getNumUpgradeSlots() <= 0) {
|
||||
setCapacitor(Capacitors.BASIC_CAPACITOR);
|
||||
return;
|
||||
}
|
||||
ItemStack contents = inventory[slotDefinition.minUpgradeSlot];
|
||||
if(contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) {
|
||||
if (contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) {
|
||||
setCapacitor(Capacitors.BASIC_CAPACITOR);
|
||||
} else {
|
||||
setCapacitor(Capacitors.values()[contents.getItemDamage()]);
|
||||
@@ -183,54 +179,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
@Override
|
||||
public void readCommon(NBTTagCompound nbtRoot) {
|
||||
super.readCommon(nbtRoot);
|
||||
handleCapacitorLoading(nbtRoot);
|
||||
handleStoredEnergyLoading(nbtRoot);
|
||||
}
|
||||
|
||||
/**
|
||||
* Write state common to both block and item
|
||||
*/
|
||||
@Override
|
||||
public void writeCommon(NBTTagCompound nbtRoot) {
|
||||
super.writeCommon(nbtRoot);
|
||||
|
||||
//Write Energy
|
||||
nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF);
|
||||
//Write Capacitor Type DEPRECATED
|
||||
nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal());
|
||||
//Write Actual Capacitor
|
||||
writeCap(nbtRoot);
|
||||
}
|
||||
|
||||
private static final String CAPACITOR_TAG_STRING = "internalCapacitor";
|
||||
|
||||
private void writeCap(NBTTagCompound nbtRoot) {
|
||||
NBTTagCompound cap = new NBTTagCompound();
|
||||
cap.setInteger("MaxEnergyStored", capacitor.getMaxEnergyStored());
|
||||
cap.setInteger("MaxEnergyExtracted", capacitor.getMaxEnergyExtracted());
|
||||
cap.setInteger("MaxEnergyReceived", capacitor.getMaxEnergyReceived());
|
||||
cap.setInteger("Tier", capacitor.getTier());
|
||||
nbtRoot.setTag(CAPACITOR_TAG_STRING, cap);
|
||||
}
|
||||
|
||||
private void readCap(NBTTagCompound nbtRoot) {
|
||||
NBTTagCompound cap = nbtRoot.getCompoundTag(CAPACITOR_TAG_STRING);
|
||||
setCapacitor(new BasicCapacitor(
|
||||
cap.getInteger("Tier"),
|
||||
cap.getInteger("MaxEnergyReceived"),
|
||||
cap.getInteger("MaxEnergyStored"),
|
||||
cap.getInteger("MaxEnergyExtracted")
|
||||
));
|
||||
}
|
||||
|
||||
private void handleCapacitorLoading(NBTTagCompound nbtRoot){
|
||||
if (nbtRoot.hasKey(CAPACITOR_TAG_STRING))
|
||||
readCap(nbtRoot);
|
||||
else //Read Capacitor Type DEPRECATED
|
||||
setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]);
|
||||
}
|
||||
|
||||
private void handleStoredEnergyLoading(NBTTagCompound nbtRoot){
|
||||
setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]);
|
||||
int energy;
|
||||
if (nbtRoot.hasKey("storedEnergy")) {
|
||||
float storedEnergyMJ = nbtRoot.getFloat("storedEnergy");
|
||||
@@ -240,4 +189,14 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
}
|
||||
setEnergyStored(energy);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Write state common to both block and item
|
||||
*/
|
||||
@Override
|
||||
public void writeCommon(NBTTagCompound nbtRoot) {
|
||||
super.writeCommon(nbtRoot);
|
||||
nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF);
|
||||
nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal());
|
||||
}
|
||||
}
|
||||
@@ -409,7 +409,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceiver
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public AxisAlignedBB getRenderBoundingBox() {
|
||||
if(!type.isMultiblock() || !(network instanceof CapBankClientNetwork)) {
|
||||
if(!getType().isMultiblock() || !(network instanceof CapBankClientNetwork)) {
|
||||
return super.getRenderBoundingBox();
|
||||
}
|
||||
|
||||
|
||||
@@ -48,6 +48,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
|
||||
private final SetMultimap<ChannelType, Channel> sendChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build();
|
||||
private final SetMultimap<ChannelType, Channel> recieveChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build();
|
||||
|
||||
private final ICapacitor capacitor = new BasicCapacitor(0, Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF);
|
||||
private boolean sendChannelsDirty = false;
|
||||
private boolean recieveChannelsDirty = false;
|
||||
private boolean registered = false;
|
||||
@@ -73,7 +74,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
|
||||
|
||||
sendItemFilter = new ItemFilter(true);
|
||||
recieveItemFilter = new ItemFilter(true);
|
||||
setCapacitor(new BasicCapacitor(0,Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF));
|
||||
}
|
||||
|
||||
public EnderRailController getRailController() {
|
||||
@@ -160,6 +160,12 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
|
||||
return hasPower();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ICapacitor getCapacitor() {
|
||||
return capacitor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPowerUsePerTick() {
|
||||
return Config.transceiverUpkeepCostRF;
|
||||
|
||||
Reference in new issue
Block a user