DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
DBotThePony 2022-09-01 14:53:01 +07:00
commit db6c637ef7
Signed by: DBot
GPG Key ID: DCC23B5715498507
38 changed files with 102 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
View File

@ -400,6 +400,8 @@ object DataGen {
component(MItems.TRITANIUM_INGOT) component(MItems.TRITANIUM_INGOT)
resource(MItems.TRITANIUM_ORE_CLUMP) resource(MItems.TRITANIUM_ORE_CLUMP)
generated(MItems.EXOSUIT_PROBE)
handheld(MItems.TRITANIUM_TOOLS) handheld(MItems.TRITANIUM_TOOLS)
generated(MItems.TRITANIUM_ARMOR) generated(MItems.TRITANIUM_ARMOR)
@ -411,6 +413,10 @@ object DataGen {
generated(MItems.MATTER_CAPACITOR_DENSE, ResourceLocation(MOD_ID, "item/matter_capacitor_tier3")) generated(MItems.MATTER_CAPACITOR_DENSE, ResourceLocation(MOD_ID, "item/matter_capacitor_tier3"))
generated(MItems.MATTER_CAPACITOR_CREATIVE) generated(MItems.MATTER_CAPACITOR_CREATIVE)
generated(MItems.QUANTUM_BATTERY)
generated(MItems.QUANTUM_CAPACITOR)
generated(MItems.QUANTUM_BATTERY_CREATIVE)
generated(MItems.PATTERN_DRIVE_CREATIVE) generated(MItems.PATTERN_DRIVE_CREATIVE)
generated(MItems.MATTER_DUST) generated(MItems.MATTER_DUST)

138
src/main/resources/assets/overdrive_that_matters/models/block/android_station.json
View File

@ -1,8 +1,8 @@
{ {
"parent": "block/slab", "parent": "block/cube_all",
"texture_size": [32, 64], "render_type": "translucent",
"textures": { "textures": {
"texture": "overdrive_that_matters:block/android_station", "0": "overdrive_that_matters:block/android_station",
"particle": "overdrive_that_matters:block/android_station" "particle": "overdrive_that_matters:block/android_station"
}, },
"elements": [ "elements": [
@ -11,12 +11,12 @@
"from": [0, 7, 0], "from": [0, 7, 0],
"to": [16, 9, 16], "to": [16, 9, 16],
"faces": { "faces": {
"north": {"uv": [8, 4, 16, 4.5], "texture": "#texture"}, "north": {"uv": [8, 4, 16, 4.5], "texture": "#0"},
"east": {"uv": [0, 4, 8, 4.5], "texture": "#texture"}, "east": {"uv": [0, 4, 8, 4.5], "texture": "#0"},
"south": {"uv": [8, 4, 16, 4.5], "texture": "#texture"}, "south": {"uv": [8, 4, 16, 4.5], "texture": "#0"},
"west": {"uv": [0, 4, 8, 4.5], "texture": "#texture"}, "west": {"uv": [0, 4, 8, 4.5], "texture": "#0"},
"up": {"uv": [8, 0, 16, 4], "texture": "#texture"}, "up": {"uv": [8, 0, 16, 4], "texture": "#0"},
"down": {"uv": [8, 4.5, 16, 8.5], "texture": "#texture"} "down": {"uv": [8, 4.5, 16, 8.5], "texture": "#0"}
} }
}, },
{ {
@ -24,12 +24,12 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [16, 4, 16], "to": [16, 4, 16],
"faces": { "faces": {
"north": {"uv": [0, 8.5, 8, 9.5], "texture": "#texture"}, "north": {"uv": [0, 8.5, 8, 9.5], "texture": "#0"},
"east": {"uv": [0, 8.5, 8, 9.5], "texture": "#texture"}, "east": {"uv": [0, 8.5, 8, 9.5], "texture": "#0"},
"south": {"uv": [8, 8.5, 16, 9.5], "texture": "#texture"}, "south": {"uv": [8, 8.5, 16, 9.5], "texture": "#0"},
"west": {"uv": [8, 8.5, 16, 9.5], "texture": "#texture"}, "west": {"uv": [8, 8.5, 16, 9.5], "texture": "#0"},
"up": {"uv": [8, 4.5, 16, 8.5], "texture": "#texture"}, "up": {"uv": [8, 4.5, 16, 8.5], "texture": "#0"},
"down": {"uv": [8, 9.5, 16, 13.5], "texture": "#texture"} "down": {"uv": [8, 9.5, 16, 13.5], "texture": "#0"}
} }
}, },
{ {
@ -37,12 +37,12 @@
"from": [2, 4, 2], "from": [2, 4, 2],
"to": [14, 7, 14], "to": [14, 7, 14],
"faces": { "faces": {
"north": {"uv": [1, 0, 7, 0.75], "texture": "#texture"}, "north": {"uv": [1, 0, 7, 0.75], "texture": "#0"},
"east": {"uv": [1, 0, 7, 0.75], "texture": "#texture"}, "east": {"uv": [1, 0, 7, 0.75], "texture": "#0"},
"south": {"uv": [1, 0, 7, 0.75], "texture": "#texture"}, "south": {"uv": [1, 0, 7, 0.75], "texture": "#0"},
"west": {"uv": [1, 0, 7, 0.75], "texture": "#texture"}, "west": {"uv": [1, 0, 7, 0.75], "texture": "#0"},
"up": {"uv": [9, 5, 15, 8], "texture": "#texture"}, "up": {"uv": [9, 5, 15, 8], "texture": "#0"},
"down": {"uv": [9, 5, 15, 8], "texture": "#texture"} "down": {"uv": [9, 5, 15, 8], "texture": "#0"}
} }
}, },
{ {
@ -50,12 +50,12 @@
"from": [1, 4, 13], "from": [1, 4, 13],
"to": [3, 7, 15], "to": [3, 7, 15],
"faces": { "faces": {
"north": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, "north": {"uv": [7, 0, 8, 0.75], "texture": "#0"},
"east": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "east": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"south": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, "south": {"uv": [7, 0, 8, 0.75], "texture": "#0"},
"west": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "west": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"up": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"}, "up": {"uv": [0, 0, 1, 0.58182], "texture": "#0"},
"down": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"} "down": {"uv": [0, 0, 1, 0.58182], "texture": "#0"}
} }
}, },
{ {
@ -63,12 +63,12 @@
"from": [13, 4, 13], "from": [13, 4, 13],
"to": [15, 7, 15], "to": [15, 7, 15],
"faces": { "faces": {
"north": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "north": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"east": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, "east": {"uv": [7, 0, 8, 0.75], "texture": "#0"},
"south": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "south": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"west": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "west": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"up": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"}, "up": {"uv": [0, 0, 1, 0.58182], "texture": "#0"},
"down": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"} "down": {"uv": [0, 0, 1, 0.58182], "texture": "#0"}
} }
}, },
{ {
@ -76,12 +76,12 @@
"from": [13, 4, 1], "from": [13, 4, 1],
"to": [15, 7, 3], "to": [15, 7, 3],
"faces": { "faces": {
"north": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, "north": {"uv": [7, 0, 8, 0.75], "texture": "#0"},
"east": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "east": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"south": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, "south": {"uv": [7, 0, 8, 0.75], "texture": "#0"},
"west": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "west": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"up": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"}, "up": {"uv": [0, 0, 1, 0.58182], "texture": "#0"},
"down": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"} "down": {"uv": [0, 0, 1, 0.58182], "texture": "#0"}
} }
}, },
{ {
@ -89,13 +89,59 @@
"from": [1, 4, 1], "from": [1, 4, 1],
"to": [3, 7, 3], "to": [3, 7, 3],
"faces": { "faces": {
"north": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "north": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"east": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "east": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"south": {"uv": [0, 0, 1, 0.75], "texture": "#texture"}, "south": {"uv": [0, 0, 1, 0.75], "texture": "#0"},
"west": {"uv": [7, 0, 8, 0.75], "texture": "#texture"}, "west": {"uv": [7, 0, 8, 0.75], "texture": "#0"},
"up": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"}, "up": {"uv": [0, 0, 1, 0.58182], "texture": "#0"},
"down": {"uv": [0, 0, 1, 0.58182], "texture": "#texture"} "down": {"uv": [0, 0, 1, 0.58182], "texture": "#0"}
}
},
{
"from": [-1, 10, -1],
"to": [17, 10, 17],
"faces": {
"north": {"uv": [0, 0, 8, 0], "texture": "#missing"},
"east": {"uv": [0, 0, 8, 0], "texture": "#missing"},
"south": {"uv": [0, 0, 8, 0], "texture": "#missing"},
"west": {"uv": [0, 0, 8, 0], "texture": "#missing"},
"up": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"},
"down": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"}
} }
} }
] ],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 225, 0],
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625]
},
"head": {
"translation": [0, 13, 0]
},
"fixed": {
"scale": [0.5, 0.5, 0.5]
}
}
} }

1
src/main/resources/assets/overdrive_that_matters/optifine/emissive.properties Normal file
View File

@ -0,0 +1 @@
suffix.emissive=_em

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 421 B

After

Width:  |  Height:  |  Size: 939 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 487 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 166 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 200 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 261 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 189 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 216 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 227 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 221 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/matter_panel_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 216 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 242 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 227 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 214 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 178 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 246 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 175 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/storage_power_supplier_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 269 B

After

Width:  |  Height:  |  Size: 271 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_io_port.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 257 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_transform_matrix.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 280 B

After

Width:  |  Height:  |  Size: 280 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

1
src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge_em.png.mcmeta Normal file
View File

@ -0,0 +1 @@
{ "animation": { "frametime": 1 } }

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_probe.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 410 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/matter_io_port.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 258 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/matter_transform_matrix.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 280 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 207 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2_em.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 207 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 259 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery_creative.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 421 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/quantum_capacitor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 270 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/tritanium_helmet.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 251 B