Skip to content

Commit

Permalink
Misc texture fixes (#1974)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuiceyBeans
JuiceyBeans authored Sep 18, 2024
1 parent c6be9dc commit 569eb61
Show file tree
Hide file tree
Showing 109 changed files with 66 additions and 219 deletions.
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/models/block/empty_tier_i_battery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/empty_tier_i/top",
"side": "gtceu:block/casings/battery/empty_tier_i/top",
"top": "gtceu:block/casings/battery/empty_tier_i/side"
"side": "gtceu:block/casings/battery/empty_tier_i/side",
"top": "gtceu:block/casings/battery/empty_tier_i/top"
}
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/models/block/empty_tier_ii_battery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/empty_tier_ii/top",
"side": "gtceu:block/casings/battery/empty_tier_ii/top",
"top": "gtceu:block/casings/battery/empty_tier_ii/side"
"side": "gtceu:block/casings/battery/empty_tier_ii/side",
"top": "gtceu:block/casings/battery/empty_tier_ii/top"
}
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/models/block/empty_tier_iii_battery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/empty_tier_iii/top",
"side": "gtceu:block/casings/battery/empty_tier_iii/top",
"top": "gtceu:block/casings/battery/empty_tier_iii/side"
"side": "gtceu:block/casings/battery/empty_tier_iii/side",
"top": "gtceu:block/casings/battery/empty_tier_iii/top"
}
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/models/block/ev_lapotronic_battery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/ev_lapotronic/top",
"side": "gtceu:block/casings/battery/ev_lapotronic/top",
"top": "gtceu:block/casings/battery/ev_lapotronic/side"
"side": "gtceu:block/casings/battery/ev_lapotronic/side",
"top": "gtceu:block/casings/battery/ev_lapotronic/top"
}
}
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/models/block/industrial_tnt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "minecraft:block/tnt_bottom",
"side": "gtceu:block/industrial_tnt_side",
"side": "gtceu:block/misc/industrial_tnt_side",
"top": "minecraft:block/tnt_top"
}
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/models/block/iv_lapotronic_battery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/iv_lapotronic/top",
"side": "gtceu:block/casings/battery/iv_lapotronic/top",
"top": "gtceu:block/casings/battery/iv_lapotronic/side"
"side": "gtceu:block/casings/battery/iv_lapotronic/side",
"top": "gtceu:block/casings/battery/iv_lapotronic/top"
}
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/models/block/luv_lapotronic_battery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/luv_lapotronic/top",
"side": "gtceu:block/casings/battery/luv_lapotronic/top",
"top": "gtceu:block/casings/battery/luv_lapotronic/side"
"side": "gtceu:block/casings/battery/luv_lapotronic/side",
"top": "gtceu:block/casings/battery/luv_lapotronic/top"
}
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/models/block/uhv_ultimate_battery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/uhv_ultimate/top",
"side": "gtceu:block/casings/battery/uhv_ultimate/top",
"top": "gtceu:block/casings/battery/uhv_ultimate/side"
"side": "gtceu:block/casings/battery/uhv_ultimate/side",
"top": "gtceu:block/casings/battery/uhv_ultimate/top"
}
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/models/block/uv_lapotronic_battery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/uv_lapotronic/top",
"side": "gtceu:block/casings/battery/uv_lapotronic/top",
"top": "gtceu:block/casings/battery/uv_lapotronic/side"
"side": "gtceu:block/casings/battery/uv_lapotronic/side",
"top": "gtceu:block/casings/battery/uv_lapotronic/top"
}
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/models/block/zpm_lapotronic_battery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "gtceu:block/casings/battery/zpm_lapotronic/top",
"side": "gtceu:block/casings/battery/zpm_lapotronic/top",
"top": "gtceu:block/casings/battery/zpm_lapotronic/side"
"side": "gtceu:block/casings/battery/zpm_lapotronic/side",
"top": "gtceu:block/casings/battery/zpm_lapotronic/top"
}
}
8 changes: 4 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/api/gui/GuiTextures.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ public class GuiTextures {
public static final ResourceTexture TOOL_DISABLE_AUTO_OUTPUT = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_disable_auto_output.png");
public static final ResourceTexture TOOL_SWITCH_CONVERTER_NATIVE = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_wire_block.png"); // switch to tool_switch_converter_native once that gets
// made
"gtceu:textures/gui/overlay/tool_wire_block.png"); // todo switch to tool_switch_converter_native once that
// gets made
public static final ResourceTexture TOOL_SWITCH_CONVERTER_EU = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_wire_connect.png"); // switch to tool_switch_converter_eu once that gets
// made
"gtceu:textures/gui/overlay/tool_wire_connect.png"); // todo switch to tool_switch_converter_eu once that
// gets made

// BASE TEXTURES
public static final ResourceBorderTexture BACKGROUND = new ResourceBorderTexture(
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ private static BlockEntry<ActiveBlock> createFireboxCasing(BoilerFireboxType typ
.properties(p -> p.mapColor(MapColor.FIRE).instabreak().sound(SoundType.GRASS).ignitedByLava())
.tag(BlockTags.MINEABLE_WITH_AXE)
.blockstate((ctx, prov) -> prov.simpleBlock(ctx.get(), prov.models().cubeBottomTop(ctx.getName(),
prov.blockTexture(ctx.get()).withSuffix("_side"),
GTCEu.id("block/misc/industrial_tnt_side"),
new ResourceLocation("minecraft", "block/tnt_bottom"),
new ResourceLocation("minecraft", "block/tnt_top"))))
.simpleItem()
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/common/data/GTModels.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,9 @@ public static NonNullBiConsumer<DataGenContext<Block, BatteryBlock>, RegistrateB
IBatteryData batteryData) {
return (ctx, prov) -> {
prov.simpleBlock(ctx.getEntry(), prov.models().cubeBottomTop(name,
GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/side"),
GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/top"),
GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/top"),
GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/side")));
GTCEu.id("block/casings/battery/" + batteryData.getBatteryName() + "/top")));
};
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_16a.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"gearbox": "gtceu:block/gearbox",
"gearbox": "gtceu:block/machines/gearbox",
"bottom": "gtceu:block/casings/voltage/lv/bottom",
"top": "gtceu:block/casings/voltage/lv/top",
"particle": "gtceu:block/casings/voltage/lv/side",
Expand Down Expand Up @@ -141,4 +141,4 @@
"children": [10, 11, 12, 13]
}
]
}
}
4 changes: 2 additions & 2 deletions src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_2a.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"gearbox": "gtceu:block/gearbox",
"gearbox": "gtceu:block/machines/gearbox",
"bottom": "gtceu:block/casings/voltage/lv/bottom",
"top": "gtceu:block/casings/voltage/lv/top",
"particle": "gtceu:block/casings/voltage/lv/side",
Expand Down Expand Up @@ -141,4 +141,4 @@
"children": [10, 11, 12, 13]
}
]
}
}
4 changes: 2 additions & 2 deletions src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_32a.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"gearbox": "gtceu:block/gearbox",
"gearbox": "gtceu:block/machines/gearbox",
"bottom": "gtceu:block/casings/voltage/lv/bottom",
"top": "gtceu:block/casings/voltage/lv/top",
"particle": "gtceu:block/casings/voltage/lv/side",
Expand Down Expand Up @@ -141,4 +141,4 @@
"children": [10, 11, 12, 13]
}
]
}
}
4 changes: 2 additions & 2 deletions src/main/resources/assets/gtceu/models/block/machine/electric_gear_box_8a.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"gearbox": "gtceu:block/gearbox",
"gearbox": "gtceu:block/machines/gearbox",
"bottom": "gtceu:block/casings/voltage/lv/bottom",
"top": "gtceu:block/casings/voltage/lv/top",
"particle": "gtceu:block/casings/voltage/lv/side",
Expand Down Expand Up @@ -141,4 +141,4 @@
"children": [10, 11, 12, 13]
}
]
}
}
4 changes: 2 additions & 2 deletions src/main/resources/assets/gtceu/models/block/machine/kinetic_electric_machine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"gearbox": "gtceu:block/gearbox",
"gearbox": "gtceu:block/machines/gearbox",
"bottom": "gtceu:block/casings/voltage/lv/bottom",
"top": "gtceu:block/casings/voltage/lv/top",
"particle": "gtceu:block/casings/voltage/lv/side",
Expand Down Expand Up @@ -135,4 +135,4 @@
"children": [10, 11, 12, 13]
}
]
}
}
4 changes: 2 additions & 2 deletions src/main/resources/assets/gtceu/models/block/machine/part/kinetic_input_box.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"parent": "block/block",
"textures": {
"overlay": "gtceu:block/overlay/machine/overlay_pipe_in",
"gearbox": "gtceu:block/gearbox",
"gearbox": "gtceu:block/machines/gearbox",
"bottom": "gtceu:block/casings/voltage/lv/bottom",
"top": "gtceu:block/casings/voltage/lv/top",
"particle": "gtceu:block/casings/voltage/lv/side",
Expand Down Expand Up @@ -152,4 +152,4 @@
"children": [11, 12, 13, 14]
}
]
}
}
4 changes: 2 additions & 2 deletions src/main/resources/assets/gtceu/models/block/machine/part/kinetic_output_box.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"parent": "block/block",
"textures": {
"overlay": "gtceu:block/overlay/machine/overlay_pipe_out",
"gearbox": "gtceu:block/gearbox",
"gearbox": "gtceu:block/machines/gearbox",
"bottom": "gtceu:block/casings/voltage/lv/bottom",
"top": "gtceu:block/casings/voltage/lv/top",
"particle": "gtceu:block/casings/voltage/lv/side",
Expand Down Expand Up @@ -152,4 +152,4 @@
"children": [11, 12, 13, 14]
}
]
}
}
Binary file removed src/main/resources/assets/gtceu/textures/block/black_lamp.png
View file
Binary file not shown.
Binary file removed src/main/resources/assets/gtceu/textures/block/blue_lamp.png
View file
Binary file not shown.
Binary file removed src/main/resources/assets/gtceu/textures/block/brown_lamp.png
View file
Binary file not shown.
0 ...u/textures/block/cover/OVERLAY_SCREEN.png → ...u/textures/block/cover/overlay_screen.png
View file
File renamed without changes
Binary file removed src/main/resources/assets/gtceu/textures/block/cyan_lamp.png
View file
Binary file not shown.
Binary file removed src/main/resources/assets/gtceu/textures/block/gray_lamp.png
View file
Binary file not shown.
Binary file removed src/main/resources/assets/gtceu/textures/block/green_lamp.png
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/resources/assets/gtceu/textures/block/lamps/light_gray.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ldlib": {
"connection": "gtceu:block/lamps/silver_ctm"
"connection": "gtceu:block/lamps/light_gray_ctm"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/gtceu/textures/block/lamps/light_gray_emissive.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"ldlib": {
"connection": "gtceu:block/lamps/silver_ctm_emissive"
"connection": "gtceu:block/lamps/light_gray_ctm_emissive"
},
"shimmer": {
"bloom": true
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/gtceu/textures/block/lamps/light_gray_off.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ldlib": {
"connection": "gtceu:block/lamps/silver_off_ctm"
"connection": "gtceu:block/lamps/light_gray_off_ctm"
}
}
Binary file removed src/main/resources/assets/gtceu/textures/block/light_blue_lamp.png
View file
Binary file not shown.
Binary file removed src/main/resources/assets/gtceu/textures/block/light_gray_lamp.png
View file
Binary file not shown.
Binary file removed src/main/resources/assets/gtceu/textures/block/lime_lamp.png
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions .../resources/assets/gtceu/textures/block/machines/fermenter/overlay_front_active.png.mcmeta
View file

This file was deleted.

10 changes: 0 additions & 10 deletions ...s/assets/gtceu/textures/block/machines/fermenter/overlay_front_active_emissive.png.mcmeta
View file

This file was deleted.

0 ...s/assets/gtceu/textures/block/gearbox.png → ...gtceu/textures/block/machines/gearbox.png
View file
File renamed without changes
Binary file removed src/main/resources/assets/gtceu/textures/block/magenta_lamp.png
View file
Binary file not shown.
0 ...eu/textures/block/industrial_tnt_side.png → ...xtures/block/misc/industrial_tnt_side.png
View file
File renamed without changes
Binary file removed ...main/resources/assets/gtceu/textures/block/molybdenum_disilicide_coil_block.png
View file
Binary file not shown.
5 changes: 0 additions & 5 deletions src/main/resources/assets/gtceu/textures/block/molybdenum_disilicide_coil_block.png.mcmeta
View file

This file was deleted.

Binary file removed .../resources/assets/gtceu/textures/block/molybdenum_disilicide_coil_block_ctm.png
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions ...assets/gtceu/textures/block/multiblock/fluid_drilling_rig/overlay_front_active.png.mcmeta
View file

This file was deleted.

10 changes: 0 additions & 10 deletions ...ceu/textures/block/multiblock/fluid_drilling_rig/overlay_front_active_emissive.png.mcmeta
View file

This file was deleted.

10 changes: 0 additions & 10 deletions ...eu/textures/block/multiblock/generator/large_steel_boiler/overlay_front_active.png.mcmeta
View file

This file was deleted.

10 changes: 0 additions & 10 deletions ...es/block/multiblock/generator/large_steel_boiler/overlay_front_active_emissive.png.mcmeta
View file

This file was deleted.

10 changes: 0 additions & 10 deletions ...textures/block/multiblock/generator/large_titanium_boiler/overlay_front_active.png.mcmeta
View file

This file was deleted.

10 changes: 0 additions & 10 deletions ...block/multiblock/generator/large_titanium_boiler/overlay_front_active_emissive.png.mcmeta
View file

This file was deleted.

10 changes: 0 additions & 10 deletions ...sets/gtceu/textures/block/multiblock/implosion_compressor/overlay_front_active.png.mcmeta
View file

This file was deleted.

Loading

0 comments on commit 569eb61

Please sign in to comment.