Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.

Commit e74649d

Browse files
committed
balance floppa dust
1 parent 060e88c commit e74649d

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

src/main/java/net/htmlcsjs/htmlTech/HtmlTech.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.htmlcsjs.htmlTech.api.capability.ILaserContainer;
77
import net.htmlcsjs.htmlTech.common.blocks.HTMetaBlocks;
88
import net.htmlcsjs.htmlTech.common.command.HtmlTechCommand;
9+
import net.htmlcsjs.htmlTech.common.item.HTMetaItems;
910
import net.htmlcsjs.htmlTech.common.metatileentity.HTMetaTileEntities;
1011
import net.htmlcsjs.htmlTech.integration.theoneprobe.HTTOPCompatibility;
1112
import net.htmlcsjs.htmlTech.proxy.CommonProxy;
@@ -33,6 +34,7 @@ public class HtmlTech {
3334
public void preInit(FMLPreInitializationEvent event) {
3435
logger = event.getModLog();
3536
SimpleCapabilityManager.registerCapabilityWithNoDefault(ILaserContainer.class);
37+
HTMetaItems.init();
3638
HTMetaBlocks.init();
3739
HTMetaTileEntities.init();
3840
proxy.preLoad();
@@ -42,6 +44,8 @@ public void preInit(FMLPreInitializationEvent event) {
4244
public void init(FMLInitializationEvent event) {
4345
proxy.init();
4446

47+
GTValues.HT = true;
48+
4549
if (GTValues.isModLoaded(HTValues.MODID_TOP)) {
4650
logger.info("TheOneProbe found. Enabling integration...");
4751
HTTOPCompatibility.registerCompatibility();

src/main/java/net/htmlcsjs/htmlTech/common/command/CommandDumpMaterials.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import java.util.List;
1919
import java.util.Map;
2020

21+
import static gregtech.api.GTValues.VN;
22+
2123
public class CommandDumpMaterials extends CommandTreeBase {
2224
@Override
2325
public String getName() {
@@ -50,7 +52,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
5052

5153
if (properties.hasProperty(PropertyKey.WIRE)) {
5254
WireProperties wireProperties = material.getProperty(PropertyKey.WIRE);
53-
propertiesMap.put("wire", String.format("Voltage: %s, Amperage: %d, Loss: %d", GTUtility.getTierByVoltage(wireProperties.getVoltage()), wireProperties.getAmperage(), wireProperties.getLossPerBlock()));
55+
propertiesMap.put("wire", String.format("Voltage: %s, Amperage: %d, Loss: %d", VN[GTUtility.getTierByVoltage(wireProperties.getVoltage())], wireProperties.getAmperage(), wireProperties.getLossPerBlock()));
5456
}
5557
if (properties.hasProperty(PropertyKey.TOOL)) {
5658
ToolProperty toolProperty = material.getProperty(PropertyKey.TOOL);

src/main/java/net/htmlcsjs/htmlTech/loaders/recipe/MaterialLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
public class MaterialLoader {
1111
public static void init() {
12-
MIXER_RECIPES.recipeBuilder().EUt(VA[ZPM]).duration(200)
12+
MIXER_RECIPES.recipeBuilder().EUt(HT ? VA[MAX] : VA[UV]).duration(200)
1313
.input(dust, Flerovium, 1)
1414
.fluidInputs(Oxygen.getFluid(1000))
1515
.input(dust, Phosphorus, 1)

src/main/java/net/htmlcsjs/htmlTech/proxy/CommonProxy.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import net.htmlcsjs.htmlTech.api.HTValues;
77
import net.htmlcsjs.htmlTech.api.unification.materials.HTMaterials;
88
import net.htmlcsjs.htmlTech.api.unification.materials.HTOrePrefix;
9-
import net.htmlcsjs.htmlTech.common.item.HTMetaItems;
109
import net.htmlcsjs.htmlTech.common.laserpipe.BlockLaserPipe;
1110
import net.htmlcsjs.htmlTech.common.laserpipe.ItemBlockLaserPipe;
1211
import net.htmlcsjs.htmlTech.loaders.HTRecipeManiger;
@@ -28,7 +27,6 @@
2827
public class CommonProxy {
2928

3029
public void preLoad() {
31-
HTMetaItems.init();
3230
}
3331

3432
public void init() {

0 commit comments

Comments
 (0)