Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed IC2 reactor laser cooler misnaming

Browse source
This commit is contained in:
Unknown 2018-07-01 02:56:32 +02:00
parent 3a776fa394
commit 62784d16fd
12 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/cr0s/warpdrive/WarpDrive.java
View file

@ -36,7 +36,7 @@ import cr0s.warpdrive.block.detection.BlockWarpIsolation;
import cr0s.warpdrive.block.energy.BlockEnanReactorCore;
import cr0s.warpdrive.block.energy.BlockEnanReactorLaser;
import cr0s.warpdrive.block.energy.BlockEnergyBank;
import cr0s.warpdrive.block.energy.BlockIC2reactorLaserMonitor;
import cr0s.warpdrive.block.energy.BlockIC2reactorLaserCooler;
import cr0s.warpdrive.block.forcefield.BlockForceField;
import cr0s.warpdrive.block.forcefield.BlockForceFieldProjector;
import cr0s.warpdrive.block.forcefield.BlockForceFieldRelay;
@ -196,7 +196,7 @@ public class WarpDrive {
public static Block blockTransporterCore;
public static Block blockTransporterContainment;
public static Block blockTransporterScanner;
public static Block blockIC2reactorLaserMonitor;
public static Block blockIC2reactorLaserCooler;
public static Block blockEnanReactorCore;
public static Block blockEnanReactorLaser;
public static Block blockEnergyBank;
@ -357,7 +357,7 @@ public class WarpDrive {
blockEnergyBank = new BlockEnergyBank("block_subspace_capacitor");
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
blockIC2reactorLaserMonitor = new BlockIC2reactorLaserMonitor("block_ic2_reactor_laser_monitor");
blockIC2reactorLaserCooler = new BlockIC2reactorLaserCooler("block_ic2_reactor_laser_cooler");
itemIC2reactorLaserFocus = new ItemIC2reactorLaserFocus("item_ic2_reactor_laser_focus");
}
@ -620,7 +620,7 @@ public class WarpDrive {
mapping.remap(itemIC2reactorLaserFocus);
break;
case "WarpDrive:reactorMonitor":
mapping.remap(Item.getItemFromBlock(blockIC2reactorLaserMonitor));
mapping.remap(Item.getItemFromBlock(blockIC2reactorLaserCooler));
break;
case "WarpDrive:scannerBlock":
mapping.remap(Item.getItemFromBlock(blockShipScanner));
@ -716,7 +716,7 @@ public class WarpDrive {
mapping.remap(blockRadar);
break;
case "WarpDrive:reactorMonitor":
mapping.remap(blockIC2reactorLaserMonitor);
mapping.remap(blockIC2reactorLaserCooler);
break;
case "WarpDrive:scannerBlock":
mapping.remap(blockShipScanner);

6
src/main/java/cr0s/warpdrive/block/energy/BlockIC2reactorLaserMonitor.java → src/main/java/cr0s/warpdrive/block/energy/BlockIC2reactorLaserCooler.java
View file

@ -18,11 +18,11 @@ import net.minecraft.world.World;
import javax.annotation.Nonnull;
public class BlockIC2reactorLaserMonitor extends BlockAbstractContainer {
public class BlockIC2reactorLaserCooler extends BlockAbstractContainer {
public BlockIC2reactorLaserMonitor(final String registryName) {
public BlockIC2reactorLaserCooler(final String registryName) {
super(registryName, Material.IRON);
setUnlocalizedName("warpdrive.energy.ic2_reactor_laser_monitor");
setUnlocalizedName("warpdrive.energy.ic2_reactor_laser_cooler");
registerTileEntity(TileEntityIC2reactorLaserMonitor.class, new ResourceLocation(WarpDrive.MODID, registryName));
setDefaultState(blockState.getBaseState()

4
src/main/java/cr0s/warpdrive/block/energy/TileEntityIC2reactorLaserMonitor.java
View file

@ -192,11 +192,11 @@ public class TileEntityIC2reactorLaserMonitor extends TileEntityAbstractLaser {
if (facing != null) {
return super.getStatus()
.appendSibling(new TextComponentTranslation("warpdrive.ic2_reactor_laser_monitor.reactor_found",
.appendSibling(new TextComponentTranslation("warpdrive.ic2_reactor_laser_cooler.reactor_found",
facing.name().toLowerCase()));
} else {
return super.getStatus()
.appendSibling(new TextComponentTranslation("warpdrive.ic2_reactor_laser_monitor.no_reactor"));
.appendSibling(new TextComponentTranslation("warpdrive.ic2_reactor_laser_cooler.no_reactor"));
}
}
}

16
src/main/java/cr0s/warpdrive/config/Recipes.java
View file

@ -1000,14 +1000,14 @@ public class Recipes {
'd', itemStackReactorCoolant2));
WarpDrive.register(new ShapedOreRecipe(groupMachines,
new ItemStack(WarpDrive.blockIC2reactorLaserMonitor), false, "gCp", "lme", "gCc",
'l', ItemComponent.getItemStack(EnumComponentType.LENS),
'e', ItemComponent.getItemStack(EnumComponentType.EMERALD_CRYSTAL),
'C', ItemComponent.getItemStack(EnumComponentType.CAPACITIVE_CRYSTAL),
'c', ItemComponent.getItemStack(EnumComponentType.COMPUTER_INTERFACE),
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
'g', "paneGlassColorless",
'm', itemStackMachineCasings[1]));
new ItemStack(WarpDrive.blockIC2reactorLaserCooler), false, "gCp", "lme", "gCc",
'l', ItemComponent.getItemStack(EnumComponentType.LENS),
'e', ItemComponent.getItemStack(EnumComponentType.EMERALD_CRYSTAL),
'C', ItemComponent.getItemStack(EnumComponentType.CAPACITIVE_CRYSTAL),
'c', ItemComponent.getItemStack(EnumComponentType.COMPUTER_INTERFACE),
'p', ItemComponent.getItemStack(EnumComponentType.POWER_INTERFACE),
'g', "paneGlassColorless",
'm', itemStackMachineCasings[1]));
}
// Cloaking core is 3 Cloaking coils, 4 iridium blocks, 1 ship controller, 1 power interface

0
src/main/resources/assets/warpdrive/blockstates/block_ic2_reactor_cooling_laser.json → src/main/resources/assets/warpdrive/blockstates/block_ic2_reactor_laser_cooler.json
View file

6
src/main/resources/assets/warpdrive/lang/de_de.lang
View file

@ -271,7 +271,7 @@ tile.warpdrive.energy.energy_bank.0.tooltip=Kreativ Subraum Kondensator
tile.warpdrive.energy.energy_bank.1.name=Standard Subraum Kondensator
tile.warpdrive.energy.energy_bank.2.name=Weiterentwickelter Subraum Kondensator
tile.warpdrive.energy.energy_bank.3.name=Überlegener Subraum Kondensator
tile.warpdrive.energy.ic2_reactor_laser_monitor.name=IC2 Reaktor Laser Monitor
tile.warpdrive.energy.ic2_reactor_laser_cooler.name=IC2 Reaktor Laser Cooler
tile.warpdrive.forcefield.block1.name=Standard Kraftfeld
tile.warpdrive.forcefield.block2.name=Weiterentwickeltes Kraftfeld
@ -685,8 +685,8 @@ warpdrive.cloaking_core.disabled=Tarnfeld ist deaktiviert!
warpdrive.cloaking_core.low_power=§cTarnfeld ist ausgefallen, wir brauchen mehr Energie, Captain!
warpdrive.cloaking_core.cloaking=Ein Stufe %1$d Tarnfeld überdeckt jetzt %2$d Blöcke!
warpdrive.ic2_reactor_laser_monitor.no_reactor=Kein Reaktor gefunden!
warpdrive.ic2_reactor_laser_monitor.reactor_found=Reactor connected on %1$s.
warpdrive.ic2_reactor_laser_cooler.no_reactor=Kein Reaktor gefunden!
warpdrive.ic2_reactor_laser_cooler.reactor_found=Reactor connected on %1$s.
warpdrive.transporter.status=Von (%1$.0f %2$.0f %3$.0f) zu (%4$.0f %5$.0f %6$.0f)
warpdrive.transporter_beacon.status.invalid=§cNo transporter room linked

6
src/main/resources/assets/warpdrive/lang/en_us.lang
View file

@ -269,7 +269,7 @@ tile.warpdrive.energy.energy_bank.0.tooltip=Creative Subspace Capacitor
tile.warpdrive.energy.energy_bank.1.name=Basic Subspace Capacitor
tile.warpdrive.energy.energy_bank.2.name=Advanced Subspace Capacitor
tile.warpdrive.energy.energy_bank.3.name=Superior Subspace Capacitor
tile.warpdrive.energy.ic2_reactor_laser_monitor.name=IC2 Reactor Laser Monitor
tile.warpdrive.energy.ic2_reactor_laser_cooler.name=IC2 Reactor Laser Cooler
tile.warpdrive.forcefield.block1.name=Basic Force Field Block
tile.warpdrive.forcefield.block2.name=Advanced Force Field Block
@ -683,8 +683,8 @@ warpdrive.cloaking_core.disabled=Cloak is disabled
warpdrive.cloaking_core.low_power=§cCloak is down, we need more power Captain!
warpdrive.cloaking_core.cloaking=A tier %1$d cloak is currently covering %2$d blocks!
warpdrive.ic2_reactor_laser_monitor.no_reactor=No reactor found!
warpdrive.ic2_reactor_laser_monitor.reactor_found=Reactor connected on %1$s.
warpdrive.ic2_reactor_laser_cooler.no_reactor=No reactor found!
warpdrive.ic2_reactor_laser_cooler.reactor_found=Reactor connected on %1$s.
warpdrive.transporter.status=From (%1$.0f %2$.0f %3$.0f) to (%4$.0f %5$.0f %6$.0f)
warpdrive.transporter_beacon.status.invalid=§cNo transporter room linked

6
src/main/resources/assets/warpdrive/lang/fr_fr.lang
View file

@ -269,7 +269,7 @@ tile.warpdrive.energy.energy_bank.0.tooltip=Condensateur subspatial creatif
tile.warpdrive.energy.energy_bank.1.name=Condensateur subspatial élémentaire
tile.warpdrive.energy.energy_bank.2.name=Condensateur subspatial avancé
tile.warpdrive.energy.energy_bank.3.name=Condensateur subspatial supérieur
tile.warpdrive.energy.ic2_reactor_laser_monitor.name=Laser de monitoring pour réacteur IC2
tile.warpdrive.energy.ic2_reactor_laser_cooler.name=Laser de refroidissement pour réacteur IC2
tile.warpdrive.forcefield.block1.name=Bloc de champ de force élémentaire
tile.warpdrive.forcefield.block2.name=Bloc de champ de force avancé
@ -683,8 +683,8 @@ warpdrive.cloaking_core.disabled=Le champ d'invisibilité est désactivé
warpdrive.cloaking_core.low_power=§cLe champ d'invisibilité est en panne. Il nous faut plus d'énergie, Capitaine!
warpdrive.cloaking_core.cloaking=Un champ de niveau %1$d couvre actuellement %2$d blocs!
warpdrive.ic2_reactor_laser_monitor.no_reactor=Pas de réacteur IC2 trouvé!
warpdrive.ic2_reactor_laser_monitor.reactor_found=Réacteur connecté au %1$s.
warpdrive.ic2_reactor_laser_cooler.no_reactor=Pas de réacteur IC2 trouvé!
warpdrive.ic2_reactor_laser_cooler.reactor_found=Réacteur connecté au %1$s.
warpdrive.transporter.status=De (%1$.0f %2$.0f %3$.0f) à (%4$.0f %5$.0f %6$.0f)
warpdrive.transporter_beacon.status.invalid=§cNo transporter room linked

6
src/main/resources/assets/warpdrive/lang/nl_nl.lang
View file

@ -266,7 +266,7 @@ tile.warpdrive.energy.energy_bank.0.tooltip=Creative Subruimte Condensator
tile.warpdrive.energy.energy_bank.1.name=Normale Subruimte Condensator
tile.warpdrive.energy.energy_bank.2.name=Geavanceerde Subruimte Condensator
tile.warpdrive.energy.energy_bank.3.name=Superieure Subruimte Condensator
tile.warpdrive.energy.ic2_reactor_laser_monitor.name=IC2 Reactor Laser Monitor
tile.warpdrive.energy.ic2_reactor_laser_cooler.name=IC2 Reactor Laser Cooler
tile.warpdrive.forcefield.block1.name=Normale Krachtvelds-blok
tile.warpdrive.forcefield.block2.name=Geavanceerde Krachtvelds-blok
@ -679,8 +679,8 @@ warpdrive.cloaking_core.disabled=Dekmantelveld is uitgeschakeld
warpdrive.cloaking_core.low_power=§cDekmantelveld is uit, We hebben meer stroom nodig kapitein!
warpdrive.cloaking_core.cloaking=Een Niveau %1$d dekmantelveld bedekt huidig %2$d blokken!
warpdrive.ic2_reactor_laser_monitor.no_reactor=Geen reactor gevonden!
warpdrive.ic2_reactor_laser_monitor.reactor_found=Reactor connected on %1$s.
warpdrive.ic2_reactor_laser_cooler.no_reactor=Geen reactor gevonden!
warpdrive.ic2_reactor_laser_cooler.reactor_found=Reactor connected on %1$s.
warpdrive.transporter.status=Van (%1$.0f %2$.0f %3$.0f) naar (%4$.0f %5$.0f %6$.0f)
warpdrive.transporter_beacon.status.invalid=§cNo transporter room linked

6
src/main/resources/assets/warpdrive/lang/ru_ru.lang
View file

@ -269,7 +269,7 @@ tile.warpdrive.energy.energy_bank.0.tooltip=Creative Subspace Capacitor
tile.warpdrive.energy.energy_bank.1.name=Basic Subspace Capacitor
tile.warpdrive.energy.energy_bank.2.name=Advanced Subspace Capacitor
tile.warpdrive.energy.energy_bank.3.name=Superior Subspace Capacitor
tile.warpdrive.energy.ic2_reactor_laser_monitor.name=Лазерный монитор реактора IC2
tile.warpdrive.energy.ic2_reactor_laser_cooler.name=IC2 Reactor Laser Cooler
tile.warpdrive.forcefield.block1.name=Basic Force Field Block
tile.warpdrive.forcefield.block2.name=Advanced Force Field Block
@ -683,8 +683,8 @@ warpdrive.cloaking_core.disabled=Маскировка выключена
warpdrive.cloaking_core.low_power=§cМаскировка выключилась, нужно больше энергии, капитан!
warpdrive.cloaking_core.cloaking=Маскировка %1$d уровня покрывает %2$d блоков.
warpdrive.ic2_reactor_laser_monitor.no_reactor=Реактор не найден!
warpdrive.ic2_reactor_laser_monitor.reactor_found=Reactor connected on %1$s.
warpdrive.ic2_reactor_laser_cooler.no_reactor=Реактор не найден!
warpdrive.ic2_reactor_laser_cooler.reactor_found=Reactor connected on %1$s.
warpdrive.transporter.status=Из (%1$.0f %2$.0f %3$.0f) в (%4$.0f %5$.0f %6$.0f)
warpdrive.transporter_beacon.status.invalid=§cNo transporter room linked

6
src/main/resources/assets/warpdrive/lang/zh_cn.lang
View file

@ -266,7 +266,7 @@ tile.warpdrive.energy.energy_bank.0.tooltip=创造子空间电容
tile.warpdrive.energy.energy_bank.1.name=基础子空间电容
tile.warpdrive.energy.energy_bank.2.name=先进子空间电容
tile.warpdrive.energy.energy_bank.3.name=卓越子空间电容
tile.warpdrive.energy.ic2_reactor_laser_monitor.name=IC2反应堆激光监控器
tile.warpdrive.energy.ic2_reactor_laser_cooler.name=IC2 Reactor Laser Cooler
tile.warpdrive.forcefield.block1.name=基础力场方块
tile.warpdrive.forcefield.block2.name=先进力场方块
@ -680,8 +680,8 @@ warpdrive.cloaking_core.disabled=伪装被禁用
warpdrive.cloaking_core.low_power=§c伪装失效，我们需要更多的能量.
warpdrive.cloaking_core.cloaking=一个层级 %1$d 伪装目前覆盖 %2$d方块!
warpdrive.ic2_reactor_laser_monitor.no_reactor=未发现反应堆!
warpdrive.ic2_reactor_laser_monitor.reactor_found=Reactor connected on %1$s.
warpdrive.ic2_reactor_laser_cooler.no_reactor=未发现反应堆!
warpdrive.ic2_reactor_laser_cooler.reactor_found=Reactor connected on %1$s.
warpdrive.transporter.status=从 (%1$.0f %2$.0f %3$.0f) 到 (%4$.0f %5$.0f %6$.0f)
warpdrive.transporter_beacon.status.invalid=§cNo transporter room linked

6
src/main/resources/assets/warpdrive/lang/zh_tw.lang
View file

@ -266,7 +266,7 @@ tile.warpdrive.energy.energy_bank.0.tooltip=創造子空間電容
tile.warpdrive.energy.energy_bank.1.name=基本子空間電容
tile.warpdrive.energy.energy_bank.2.name=進階子空間電容
tile.warpdrive.energy.energy_bank.3.name=高級子空間電容器
tile.warpdrive.energy.ic2_reactor_laser_monitor.name=IC2 反應堆激光監視器
tile.warpdrive.energy.ic2_reactor_laser_cooler.name=IC2 Reactor Laser Cooler
tile.warpdrive.forcefield.block1.name=基本力場方塊
tile.warpdrive.forcefield.block2.name=進階力場方塊
@ -678,8 +678,8 @@ warpdrive.cloaking_core.disabled=僞裝無效！
warpdrive.cloaking_core.low_power=§c僞裝失效了，我們需要更多的能量！艦長！
warpdrive.cloaking_core.cloaking=A 層 %1$d 僞裝目前正確覆蓋 %2$d 區域！
warpdrive.ic2_reactor_laser_monitor.no_reactor=沒有反應堆！
warpdrive.ic2_reactor_laser_monitor.reactor_found=Reactor connected on %1$s.
warpdrive.ic2_reactor_laser_cooler.no_reactor=沒有反應堆！
warpdrive.ic2_reactor_laser_cooler.reactor_found=Reactor connected on %1$s.
warpdrive.transporter.status=From (%1$.0f %2$.0f %3$.0f) to (%4$.0f %5$.0f %6$.0f)
warpdrive.transporter_beacon.status.invalid=§cNo transporter room linked