Skip to content

Commit 3ef502e

Browse files
authored
Merge pull request #1009 from Nxer/silksong
Commemorating the Silksong finally is on sale.
2 parents d14a067 + 2c70c62 commit 3ef502e

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_Silksong.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import net.minecraft.nbt.NBTTagCompound;
2424
import net.minecraftforge.common.util.ForgeDirection;
2525

26-
import com.Nxer.TwistSpaceTechnology.common.machine.multiMachineClasses.GTCM_MultiMachineBase;
26+
import com.Nxer.TwistSpaceTechnology.common.machine.multiMachineClasses.WirelessEnergyMultiMachineBase;
27+
import com.Nxer.TwistSpaceTechnology.util.TextEnums;
2728
import com.Nxer.TwistSpaceTechnology.util.TextLocalization;
2829
import com.Nxer.TwistSpaceTechnology.util.TstUtils;
2930
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -46,7 +47,7 @@
4647
import gregtech.common.blocks.BlockCasings1;
4748
import gregtech.common.blocks.BlockCasings8;
4849

49-
public class GT_TileEntity_Silksong extends GTCM_MultiMachineBase<GT_TileEntity_Silksong> {
50+
public class GT_TileEntity_Silksong extends WirelessEnergyMultiMachineBase<GT_TileEntity_Silksong> {
5051

5152
// region Class Constructor
5253
public GT_TileEntity_Silksong(int aID, String aName, String aNameRegional) {
@@ -88,6 +89,11 @@ public void loadNBTData(final NBTTagCompound aNBT) {
8889
piece = aNBT.getInteger("piece");
8990
}
9091

92+
@Override
93+
public int getWirelessModeProcessingTime() {
94+
return 188;
95+
}
96+
9197
@Override
9298
public RecipeMap<?> getRecipeMap() {
9399
return RecipeMaps.wiremillRecipes;
@@ -120,6 +126,15 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a
120126
speedBonus = (float) (Math.pow(SpeedBonus_MultiplyPerVoltageTier_Silksong, getTotalPowerTier())
121127
/ (getCoilTier() * SpeedMultiplier_CoilTier_Silksong));
122128

129+
// allow machine use perfect overclock when piece reach 94, and enter wireless mode if no energy hatch
130+
if (piece >= 94) {
131+
enablePerfectOverclock = true;
132+
wirelessMode = mEnergyHatches.isEmpty() && mExoticEnergyHatches.isEmpty();
133+
} else {
134+
enablePerfectOverclock = false;
135+
wirelessMode = false;
136+
}
137+
123138
return true;
124139
}
125140
// endregion
@@ -304,6 +319,10 @@ protected MultiblockTooltipBuilder createTooltip() {
304319
.addInputBus(TextLocalization.textUseBlueprint, 3)
305320
.addOutputBus(TextLocalization.textUseBlueprint, 2)
306321
.addEnergyHatch(TextLocalization.textUseBlueprint, 1)
322+
// #tr Tooltip_Silksong_SilksongReleaseDate
323+
// # {\BLACK}Something special when piece reaches 94.
324+
// #zh_CN {\BLACK}层数达到94层后有一些特别的东西.
325+
.addStructureInfo(TextEnums.tr("Tooltip_Silksong_SilksongReleaseDate"))
307326
.toolTipFinisher(TextLocalization.ModName);
308327
return tt;
309328
}

src/main/java/com/Nxer/TwistSpaceTechnology/loader/MachineLoader.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ public static void loadMachines() {
613613

614614
// #tr NameLargeSolarBoiler
615615
// # Large Solar Boiler
616+
// #zh_CN 大型太阳能锅炉
616617
GTCMItemList.LargeSolarBoiler
617618
.set(new TST_LargeSolarBoiler(19076, "NameLargeSolarBoiler", TextEnums.tr("NameLargeSolarBoiler")));
618619

src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,3 +2240,4 @@ TST_LargeSolarBoiler.gui.03=Calcification Level:
22402240
TST_LargeSolarBoiler.gui.01=Press to clear the machine
22412241
NameLargeSolarBoiler=Large Solar Boiler
22422242
Author_Faotik=Author: §eFaotik
2243+
Tooltip_Silksong_SilksongReleaseDate=§0Something special when piece reaches 94.

src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,3 +2240,4 @@ TST_LargeSolarBoiler.gui.03=钙化程度:
22402240
TST_LargeSolarBoiler.gui.01=点击以清洁机器的钙化
22412241
NameLargeSolarBoiler=Large Solar Boiler
22422242
Author_Faotik=作者: §eFaotik
2243+
Tooltip_Silksong_SilksongReleaseDate=§0层数达到94层后有一些特别的东西.

0 commit comments

Comments
 (0)