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

Commit 2db1b0a

Browse files
htmlcsjshtmlcsjs
committed
v0.2.3
update to support GT 2.5.3
1 parent b920dfc commit 2db1b0a

File tree

4 files changed

+37
-11
lines changed

4 files changed

+37
-11
lines changed

‎build.gradle.kts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ apply {
2727
val mcVersion = "1.12.2"
2828
val forgeVersion = "14.23.5.2847"
2929
val mcFullVersion = "$mcVersion-$forgeVersion"
30-
val modVersion = "0.2.2-beta"
30+
val modVersion = "0.2.3-beta"
3131
version = "$mcVersion-$modVersion"
3232
group = "net.htmlcsjs.htmlTech"
3333

@@ -65,16 +65,21 @@ repositories {
6565
name = "CraftTweaker Maven"
6666
setUrl("https://maven.blamejared.com/")
6767
}
68+
maven {
69+
setUrl("https://maven.cleanroommc.com")
70+
}
6871
}
6972

7073
dependencies {
7174
"deobfCompile"("mezz.jei:jei_1.12.2:+")
72-
"deobfCompile"("curse.maven:ceu-557242:3941501")
75+
"deobfCompile"("curse.maven:ceu-557242:4422409")
7376
"deobfCompile"("codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.358:universal")
7477
"deobfCompile"("codechicken:ChickenASM:1.12-1.0.2.9")
7578
"deobfCompile"("mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.23-16")
7679
"deobfCompile"("team.chisel.ctm:CTM:MC1.12.2-1.0.2.31")
7780
"deobfCompile"("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.655")
81+
"deobfCompile"("curse.maven:groovyscript-687577:4399621")
82+
"deobfCompile"("zone.rong:mixinbooter:4.2") // fuck rong
7883
}
7984

8085
configure<JavaPluginConvention> {

‎src/api/java/com/enderio/core/common/interfaces/IOverlayRenderAware.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.enderio.core.common.interfaces;
2+
3+
import net.minecraft.item.ItemStack;
4+
5+
import javax.annotation.Nonnull;
6+
7+
public interface IOverlayRenderAware {
8+
9+
public void renderItemOverlayIntoGUI(@Nonnull ItemStack stack, int xPosition, int yPosition);
10+
11+
}

‎src/main/java/net/htmlcsjs/htmlTech/api/unification/materials/HTMaterials.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import gregtech.api.unification.material.info.MaterialFlag;
66
import gregtech.api.unification.material.properties.DustProperty;
77
import gregtech.api.unification.material.properties.PropertyKey;
8+
import gregtech.api.unification.material.properties.ToolProperty;
89

910
import static gregtech.api.GTValues.*;
1011
import static gregtech.api.unification.material.Materials.*;
@@ -30,13 +31,16 @@ public class HTMaterials {
3031

3132
public static void register() {
3233
// New Materials
34+
35+
// Maybe balance?
3336
FlOPPa = new Material.Builder(21000, "floppa")
3437
.ingot(32).blastTemp(6900)
3538
.color(0xac8353).iconSet(SHINY)
3639
.components(Flerovium, 1, Oxygen, 1, Phosphorus, 1, Protactinium, 1)
3740
.flags(EXT2_METAL, DECOMPOSITION_BY_ELECTROLYZING)
3841
//.properties.setProperty(LASER, new LaserProperties((int) GTValues.V[5], 128, 2))
39-
.toolStats(128, 50, 2621440, 128)
42+
.toolStats(new ToolProperty(128F, 50.0F, 4390983, 128))
43+
.rotorStats(128F, 10F, 11888800)
4044
.build();
4145

4246
NaquadriaTetratrinite = new Material.Builder(21001, "naquadria_tetratrinite")

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public String getUsage(ICommandSender sender) {
3232
return "htmltech.command.usage";
3333
}
3434

35+
// TODO, rewrite this shit
3536
@Override
3637
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
3738
Map<String, Object> materialsData = new HashMap<>();
@@ -53,17 +54,22 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
5354

5455
if (properties.hasProperty(PropertyKey.WIRE)) {
5556
WireProperties wireProperties = material.getProperty(PropertyKey.WIRE);
56-
propertiesMap.put("wire", String.format("Voltage: %s, Amperage: %d, Loss: %d",
57+
propertiesMap.put("wire", String.format("Voltage: %s, Amperage: %,d, Loss: %,d",
5758
VN[GTUtility.getTierByVoltage(wireProperties.getVoltage())],
5859
wireProperties.getAmperage(),
5960
wireProperties.getLossPerBlock()));
6061
}
6162
if (properties.hasProperty(PropertyKey.TOOL)) {
6263
ToolProperty toolProperty = material.getProperty(PropertyKey.TOOL);
63-
propertiesMap.put("tool", String.format("Speed: %f, Durability: %d, Dmg: %f",
64+
propertiesMap.put("tool", String.format("Speed: %,.2f, Durability: %,d, Damage: %,.2f, Harvest Level: %,d",
6465
toolProperty.getToolSpeed(),
6566
toolProperty.getToolDurability(),
66-
toolProperty.getToolAttackDamage()));
67+
toolProperty.getToolAttackDamage(),
68+
toolProperty.getToolHarvestLevel()));
69+
}
70+
if (properties.hasProperty(PropertyKey.ROTOR)) {
71+
RotorProperty rotorProperty = material.getProperty(PropertyKey.ROTOR);
72+
propertiesMap.put("rotor", String.format("Damage: %,.2f, Durability: %,d, Speed: %,.2f,", rotorProperty.getDamage(), rotorProperty.getDurability(), rotorProperty.getSpeed()));
6773
}
6874
if (properties.hasProperty(PropertyKey.ORE)) {
6975
propertiesMap.put("ore", true);
@@ -75,7 +81,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
7581
BlastProperty blastProperty = material.getProperty(PropertyKey.BLAST);
7682
Method reflectedGetTempTeir = TemperatureProperty.class.getDeclaredMethod("getMinTierForTemperature", Integer.class);
7783
reflectedGetTempTeir.setAccessible(true);
78-
propertiesMap.put("blast", String.format("Temp: %dK (%s), Gas Tier: %s",
84+
propertiesMap.put("blast", String.format("Temp: %,dK (%s), Gas Tier: %s",
7985
blastProperty.getBlastTemperature(),
8086
reflectedGetTempTeir.invoke(TemperatureProperty.getInstance(), blastProperty.getBlastTemperature()),
8187
blastProperty.getGasTier().toString()));
@@ -85,7 +91,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
8591
}
8692
if (properties.hasProperty(PropertyKey.FLUID_PIPE)) {
8793
FluidPipeProperties fluidPipeProperties = properties.getProperty(PropertyKey.FLUID_PIPE);
88-
propertiesMap.put("fluid_pipe", String.format("Throughput: %d, Max Temp: %dK, Acid proof: %b, Cryo proof: %b, Gas proof: %b, Plasma proof: %b",
94+
propertiesMap.put("fluid_pipe", String.format("Throughput: %,d, Max Temp: %,dK, Acid proof: %b, Cryo proof: %b, Gas proof: %b, Plasma proof: %b",
8995
fluidPipeProperties.getThroughput(),
9096
fluidPipeProperties.getMaxFluidTemperature(),
9197
fluidPipeProperties.isAcidProof(),
@@ -95,20 +101,20 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
95101
}
96102
if (properties.hasProperty(PropertyKey.ITEM_PIPE)) {
97103
ItemPipeProperties itemPipeProperties = properties.getProperty(PropertyKey.ITEM_PIPE);
98-
propertiesMap.put("item_pipe", String.format("Throughput: %f, Priority: %d", itemPipeProperties.getTransferRate() * 64, itemPipeProperties.getPriority()));
104+
propertiesMap.put("item_pipe", String.format("Throughput: %f, Priority: %,d", itemPipeProperties.getTransferRate() * 64, itemPipeProperties.getPriority()));
99105
}
100106
if (properties.hasProperty(PropertyKey.FLUID)) {
101107
FluidProperty fluidProperty = properties.getProperty(PropertyKey.FLUID);
102108
fluidProperty.isGas();
103109
fluidProperty.getFluidType().getName();
104-
propertiesMap.put("fluid", String.format("Temp: %dK, Gas: %b, Type: %s",
110+
propertiesMap.put("fluid", String.format("Temp: %,dK, Gas: %b, Type: %s",
105111
fluidProperty.getFluidTemperature(),
106112
fluidProperty.isGas(),
107113
fluidProperty.getFluidType().getName()));
108114
}
109115
if (properties.hasProperty(PropertyKey.PLASMA)) {
110116
PlasmaProperty plasmaProperty = properties.getProperty(PropertyKey.PLASMA);
111-
propertiesMap.put("plasma_temp", String.format("Plasma Temp: %dK", plasmaProperty.getPlasma().getTemperature()));
117+
propertiesMap.put("plasma_temp", String.format("Plasma Temp: %,dK", plasmaProperty.getPlasma().getTemperature()));
112118
}
113119

114120
materialData.put("properties", propertiesMap);

0 commit comments

Comments
 (0)