diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index b9ef360b6ac..7667cd7f27d 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -883,16 +883,16 @@ public static void register() { NaquadahAlloy.setCableProperties(GTValues.V[8], 2, 4); Duranium.setCableProperties(GTValues.V[8], 1, 8); - Copper.setFluidPipeProperties(25, 1000, true); - Bronze.setFluidPipeProperties(35, 2000, true); - Steel.setFluidPipeProperties(50, 2500, true); - StainlessSteel.setFluidPipeProperties(100, 3000, true); - Titanium.setFluidPipeProperties(200, 5000, true); - TungstenSteel.setFluidPipeProperties(300, 7500, true); - Ultimet.setFluidPipeProperties(12000, 1500, true); - - Polyethylene.setFluidPipeProperties(200, 350, true); - Polytetrafluoroethylene.setFluidPipeProperties(200, 600, true); + Copper.setFluidPipeProperties(1000, 10, true); + Bronze.setFluidPipeProperties(2000, 20, true); + Steel.setFluidPipeProperties(2500, 40, true); + StainlessSteel.setFluidPipeProperties(3000, 60, true); + Titanium.setFluidPipeProperties(5000, 80, true); + TungstenSteel.setFluidPipeProperties(7500, 100, true); + Ultimet.setFluidPipeProperties(1500, 12000, true); + + Polyethylene.setFluidPipeProperties(350, 60, true); + Polytetrafluoroethylene.setFluidPipeProperties(600, 80, true); } } diff --git a/src/main/java/gregtech/api/unification/material/type/IngotMaterial.java b/src/main/java/gregtech/api/unification/material/type/IngotMaterial.java index 55312cd1167..51168875a2f 100644 --- a/src/main/java/gregtech/api/unification/material/type/IngotMaterial.java +++ b/src/main/java/gregtech/api/unification/material/type/IngotMaterial.java @@ -167,7 +167,7 @@ public void setCableProperties(long voltage, int baseAmperage, int lossPerBlock) } @ZenMethod - public void setFluidPipeProperties(int throughput, int maxTemperature, boolean gasProof) { + public void setFluidPipeProperties(int maxTemperature, int throughput, boolean gasProof) { this.fluidPipeProperties = new FluidPipeProperties(maxTemperature, throughput, gasProof); } diff --git a/src/main/java/gregtech/api/unification/ore/OrePrefix.java b/src/main/java/gregtech/api/unification/ore/OrePrefix.java index b206200adba..82452eda291 100644 --- a/src/main/java/gregtech/api/unification/ore/OrePrefix.java +++ b/src/main/java/gregtech/api/unification/ore/OrePrefix.java @@ -131,7 +131,8 @@ public enum OrePrefix { pipeTiny("Tiny Pipes", M / 2, null, MaterialIconType.pipeTiny, ENABLE_UNIFICATION, null), pipeSmall("Small Pipes", M, null, MaterialIconType.pipeSmall, ENABLE_UNIFICATION, null), pipeMedium("Medium Pipes", M * 3, null, MaterialIconType.pipeMedium, ENABLE_UNIFICATION, null), - pipeLarge("Large pipes", M * 6, null, MaterialIconType.pipeLarge, ENABLE_UNIFICATION, null), + pipeLarge("Large Pipes", M * 6, null, MaterialIconType.pipeLarge, ENABLE_UNIFICATION, null), + pipeHuge("Huge Pipes", M * 12, null, MaterialIconType.pipeHuge, ENABLE_UNIFICATION, null), wireGtHex("Hex wires", M * 8, null, null, ENABLE_UNIFICATION, null), wireGtOctal("Octal wires", M * 4, null, null, ENABLE_UNIFICATION, null), diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/FluidPipeType.java b/src/main/java/gregtech/common/pipelike/fluidpipe/FluidPipeType.java index b032970a518..73f2052c490 100644 --- a/src/main/java/gregtech/common/pipelike/fluidpipe/FluidPipeType.java +++ b/src/main/java/gregtech/common/pipelike/fluidpipe/FluidPipeType.java @@ -5,10 +5,11 @@ public enum FluidPipeType implements IMaterialPipeType { - TINY_OPAQUE("tiny", 0.2f, 1, OrePrefix.pipeTiny, true), - SMALL_OPAQUE("small", 0.4f, 2, OrePrefix.pipeSmall, true), - MEDIUM_OPAQUE("medium", 0.6f, 4, OrePrefix.pipeMedium, true), - LARGE_OPAQUE("large", 0.8f, 8, OrePrefix.pipeLarge, true); + TINY_OPAQUE("tiny", 0.25f, 1, OrePrefix.pipeTiny, true), + SMALL_OPAQUE("small", 0.375f, 2, OrePrefix.pipeSmall, true), + MEDIUM_OPAQUE("medium", 0.5f, 6, OrePrefix.pipeMedium, true), + LARGE_OPAQUE("large", 0.75f, 12, OrePrefix.pipeLarge, true), + HUGE_OPAQUE("huge", 0.875f, 24, OrePrefix.pipeHuge, true); public final String name; public final float thickness; diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/ItemBlockFluidPipe.java b/src/main/java/gregtech/common/pipelike/fluidpipe/ItemBlockFluidPipe.java index 36b090dccc6..5170f6020ad 100644 --- a/src/main/java/gregtech/common/pipelike/fluidpipe/ItemBlockFluidPipe.java +++ b/src/main/java/gregtech/common/pipelike/fluidpipe/ItemBlockFluidPipe.java @@ -21,7 +21,7 @@ public ItemBlockFluidPipe(BlockFluidPipe block) { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { FluidPipeProperties pipeProperties = blockPipe.createItemProperties(stack); - tooltip.add(I18n.format("gregtech.fluid_pipe.throughput", pipeProperties.throughput)); + tooltip.add(I18n.format("gregtech.fluid_pipe.throughput", pipeProperties.throughput * 20)); tooltip.add(I18n.format("gregtech.fluid_pipe.max_temperature", pipeProperties.maxFluidTemperature)); if (!pipeProperties.gasProof) tooltip.add(I18n.format("gregtech.fluid_pipe.non_gas_proof")); } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 99a2a82fb45..759e4e145e7 100755 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -3554,8 +3554,8 @@ gregtech.cable.voltage=Voltage: §a%,d §7(§a%s§7) gregtech.cable.amperage=Amperage: §e%,d gregtech.cable.loss_per_block=Loss per block: §c%,d -gregtech.fluid_pipe.throughput=Transfer: §e%,d mb/t -gregtech.fluid_pipe.max_temperature=Max Temperature: §c%,dK +gregtech.fluid_pipe.throughput=Transfer Rate: §9%,d mb/s +gregtech.fluid_pipe.max_temperature=Temperature Limit: §c%,dK gregtech.fluid_pipe.non_gas_proof=Can't transfer gases. gregtech.multiblock.work_paused=Work Paused. diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot_hot.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot_hot.json index 16f62ef0752..d537d42c3ca 100644 --- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot_hot.json +++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/ingot_hot.json @@ -1,26 +1,7 @@ { "parent": "item/generated", - "ambientocclusion": false, "textures": { - "layer0": "gregtech:items/material_sets/dull/ingot_hot", - "layer1": "gregtech:items/material_sets/dull/ingot_hot_overlay" - }, - "elements": [ - { - "from": [ 0, 0.26, 0 ], - "to": [ 16, 0.26, 16 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#layer0", "tintindex": 0 } - } - }, - { - "from": [ 0, 0.26, 0 ], - "to": [ 16, 0.26, 16 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#layer1" } - } - } - ] + "layer0": "gregtech:items/material_sets/dull/ingot_hot", + "layer1": "gregtech:items/material_sets/dull/ingot_hot_overlay" + } } diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_huge_in.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_huge_in.png new file mode 100644 index 00000000000..79856266669 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_huge_in.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_huge_side.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_huge_side.png new file mode 100644 index 00000000000..aec8883d6a8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_huge_side.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_large_in.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_large_in.png index a57ffc253cf..65529e27720 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_large_in.png and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_large_in.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_large_side.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_large_side.png index 49fa4defa48..aec8883d6a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_large_side.png and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_large_side.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_medium_in.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_medium_in.png index 40739725999..06b3e0d1894 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_medium_in.png and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_medium_in.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_medium_side.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_medium_side.png index e75befadbfb..aec8883d6a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_medium_side.png and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_medium_side.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_nonuple_in.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_nonuple_in.png new file mode 100644 index 00000000000..b33a1bac918 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_nonuple_in.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_nonuple_side.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_nonuple_side.png new file mode 100644 index 00000000000..aec8883d6a8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_nonuple_side.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_quadruple_in.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_quadruple_in.png new file mode 100644 index 00000000000..343e8ff5b87 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_quadruple_in.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_quadruple_side.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_quadruple_side.png new file mode 100644 index 00000000000..aec8883d6a8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_quadruple_side.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_small_in.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_small_in.png index a4359412dab..b5e620f045c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_small_in.png and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_small_in.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_small_side.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_small_side.png index 1ad0b26b7e1..aec8883d6a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_small_side.png and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_small_side.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_tiny_in.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_tiny_in.png index 83f86024c27..c1ef2951980 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_tiny_in.png and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_tiny_in.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_tiny_side.png b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_tiny_side.png index df9c00a559c..aec8883d6a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_tiny_side.png and b/src/main/resources/assets/gregtech/textures/blocks/pipe/pipe_tiny_side.png differ