From 0e59b438c9ee1da685a109db139eb82b8fcf6084 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Sun, 30 Jul 2023 12:36:48 +0200 Subject: T9 Planets + new Textures (#35) * Add T9 planets ... and move Deep Dark to T10 * Update buildscript * Apply spotless * Make all six side use different icons * Apply spotless --- build.gradle | 162 ++++++++++++++------- .../plugin/block/BlockDimensionDisplay.java | 32 ++-- .../renderer/ItemDimensionDisplayRenderer.java | 3 +- .../pers/gwyog/gtneioreplugin/util/CSVMaker.java | 20 ++- .../gwyog/gtneioreplugin/util/DimensionHelper.java | 25 +++- .../pers/gwyog/gtneioreplugin/util/Oremix.java | 66 +++++++++ .../assets/gtneioreplugin/lang/en_US.lang | 6 + .../gtneioreplugin/textures/blocks/An_back.png | Bin 0 -> 314 bytes .../gtneioreplugin/textures/blocks/An_bottom.png | Bin 0 -> 305 bytes .../gtneioreplugin/textures/blocks/An_front.png | Bin 0 -> 309 bytes .../gtneioreplugin/textures/blocks/An_left.png | Bin 0 -> 311 bytes .../gtneioreplugin/textures/blocks/An_right.png | Bin 0 -> 307 bytes .../gtneioreplugin/textures/blocks/An_top.png | Bin 0 -> 308 bytes .../gtneioreplugin/textures/blocks/As_back.png | Bin 0 -> 495 bytes .../gtneioreplugin/textures/blocks/As_bottom.png | Bin 0 -> 554 bytes .../gtneioreplugin/textures/blocks/As_front.png | Bin 0 -> 535 bytes .../gtneioreplugin/textures/blocks/As_left.png | Bin 301 -> 527 bytes .../gtneioreplugin/textures/blocks/As_right.png | Bin 310 -> 506 bytes .../gtneioreplugin/textures/blocks/As_top.png | Bin 319 -> 548 bytes .../gtneioreplugin/textures/blocks/BC_back.png | Bin 0 -> 268 bytes .../gtneioreplugin/textures/blocks/BC_bottom.png | Bin 0 -> 280 bytes .../gtneioreplugin/textures/blocks/BC_front.png | Bin 0 -> 292 bytes .../gtneioreplugin/textures/blocks/BC_left.png | Bin 395 -> 262 bytes .../gtneioreplugin/textures/blocks/BC_right.png | Bin 413 -> 278 bytes .../gtneioreplugin/textures/blocks/BC_top.png | Bin 389 -> 254 bytes .../gtneioreplugin/textures/blocks/BE_back.png | Bin 0 -> 327 bytes .../gtneioreplugin/textures/blocks/BE_bottom.png | Bin 0 -> 329 bytes .../gtneioreplugin/textures/blocks/BE_front.png | Bin 0 -> 325 bytes .../gtneioreplugin/textures/blocks/BE_left.png | Bin 329 -> 322 bytes .../gtneioreplugin/textures/blocks/BE_right.png | Bin 319 -> 318 bytes .../gtneioreplugin/textures/blocks/BE_top.png | Bin 312 -> 317 bytes .../gtneioreplugin/textures/blocks/BF_back.png | Bin 0 -> 370 bytes .../gtneioreplugin/textures/blocks/BF_bottom.png | Bin 0 -> 393 bytes .../gtneioreplugin/textures/blocks/BF_front.png | Bin 0 -> 392 bytes .../gtneioreplugin/textures/blocks/BF_left.png | Bin 420 -> 386 bytes .../gtneioreplugin/textures/blocks/BF_right.png | Bin 462 -> 386 bytes .../gtneioreplugin/textures/blocks/BF_top.png | Bin 375 -> 390 bytes .../gtneioreplugin/textures/blocks/CB_back.png | Bin 0 -> 351 bytes .../gtneioreplugin/textures/blocks/CB_bottom.png | Bin 0 -> 337 bytes .../gtneioreplugin/textures/blocks/CB_front.png | Bin 0 -> 479 bytes .../gtneioreplugin/textures/blocks/CB_left.png | Bin 383 -> 424 bytes .../gtneioreplugin/textures/blocks/CB_right.png | Bin 383 -> 318 bytes .../gtneioreplugin/textures/blocks/CB_top.png | Bin 387 -> 414 bytes .../gtneioreplugin/textures/blocks/Ca_back.png | Bin 0 -> 301 bytes .../gtneioreplugin/textures/blocks/Ca_bottom.png | Bin 0 -> 300 bytes .../gtneioreplugin/textures/blocks/Ca_front.png | Bin 0 -> 301 bytes .../gtneioreplugin/textures/blocks/Ca_left.png | Bin 489 -> 300 bytes .../gtneioreplugin/textures/blocks/Ca_right.png | Bin 268 -> 316 bytes .../gtneioreplugin/textures/blocks/Ca_top.png | Bin 540 -> 299 bytes .../gtneioreplugin/textures/blocks/Ce_back.png | Bin 0 -> 343 bytes .../gtneioreplugin/textures/blocks/Ce_bottom.png | Bin 0 -> 333 bytes .../gtneioreplugin/textures/blocks/Ce_front.png | Bin 0 -> 330 bytes .../gtneioreplugin/textures/blocks/Ce_left.png | Bin 232 -> 340 bytes .../gtneioreplugin/textures/blocks/Ce_right.png | Bin 235 -> 335 bytes .../gtneioreplugin/textures/blocks/Ce_top.png | Bin 229 -> 335 bytes .../gtneioreplugin/textures/blocks/DD_back.png | Bin 0 -> 325 bytes .../gtneioreplugin/textures/blocks/DD_bottom.png | Bin 0 -> 332 bytes .../gtneioreplugin/textures/blocks/DD_front.png | Bin 0 -> 339 bytes .../gtneioreplugin/textures/blocks/DD_left.png | Bin 520 -> 342 bytes .../gtneioreplugin/textures/blocks/DD_right.png | Bin 471 -> 350 bytes .../gtneioreplugin/textures/blocks/DD_top.png | Bin 541 -> 331 bytes .../gtneioreplugin/textures/blocks/De_back.png | Bin 0 -> 259 bytes .../gtneioreplugin/textures/blocks/De_bottom.png | Bin 0 -> 268 bytes .../gtneioreplugin/textures/blocks/De_front.png | Bin 0 -> 259 bytes .../gtneioreplugin/textures/blocks/De_left.png | Bin 451 -> 265 bytes .../gtneioreplugin/textures/blocks/De_right.png | Bin 482 -> 263 bytes .../gtneioreplugin/textures/blocks/De_top.png | Bin 415 -> 248 bytes .../gtneioreplugin/textures/blocks/EA_back.png | Bin 0 -> 517 bytes .../gtneioreplugin/textures/blocks/EA_bottom.png | Bin 0 -> 575 bytes .../gtneioreplugin/textures/blocks/EA_front.png | Bin 0 -> 478 bytes .../gtneioreplugin/textures/blocks/EA_left.png | Bin 299 -> 553 bytes .../gtneioreplugin/textures/blocks/EA_right.png | Bin 449 -> 520 bytes .../gtneioreplugin/textures/blocks/EA_top.png | Bin 336 -> 554 bytes .../gtneioreplugin/textures/blocks/ED_back.png | Bin 0 -> 321 bytes .../gtneioreplugin/textures/blocks/ED_bottom.png | Bin 0 -> 326 bytes .../gtneioreplugin/textures/blocks/ED_front.png | Bin 0 -> 319 bytes .../gtneioreplugin/textures/blocks/ED_left.png | Bin 430 -> 327 bytes .../gtneioreplugin/textures/blocks/ED_right.png | Bin 445 -> 319 bytes .../gtneioreplugin/textures/blocks/ED_top.png | Bin 508 -> 338 bytes .../gtneioreplugin/textures/blocks/En_back.png | Bin 0 -> 452 bytes .../gtneioreplugin/textures/blocks/En_bottom.png | Bin 0 -> 524 bytes .../gtneioreplugin/textures/blocks/En_front.png | Bin 0 -> 392 bytes .../gtneioreplugin/textures/blocks/En_left.png | Bin 270 -> 396 bytes .../gtneioreplugin/textures/blocks/En_right.png | Bin 274 -> 410 bytes .../gtneioreplugin/textures/blocks/En_top.png | Bin 276 -> 528 bytes .../gtneioreplugin/textures/blocks/Eu_back.png | Bin 0 -> 497 bytes .../gtneioreplugin/textures/blocks/Eu_bottom.png | Bin 0 -> 464 bytes .../gtneioreplugin/textures/blocks/Eu_front.png | Bin 0 -> 517 bytes .../gtneioreplugin/textures/blocks/Eu_left.png | Bin 253 -> 510 bytes .../gtneioreplugin/textures/blocks/Eu_right.png | Bin 247 -> 481 bytes .../gtneioreplugin/textures/blocks/Eu_top.png | Bin 261 -> 503 bytes .../gtneioreplugin/textures/blocks/Ga_back.png | Bin 0 -> 510 bytes .../gtneioreplugin/textures/blocks/Ga_bottom.png | Bin 0 -> 524 bytes .../gtneioreplugin/textures/blocks/Ga_front.png | Bin 0 -> 457 bytes .../gtneioreplugin/textures/blocks/Ga_left.png | Bin 415 -> 492 bytes .../gtneioreplugin/textures/blocks/Ga_right.png | Bin 394 -> 490 bytes .../gtneioreplugin/textures/blocks/Ga_top.png | Bin 425 -> 528 bytes .../gtneioreplugin/textures/blocks/Ha_back.png | Bin 0 -> 402 bytes .../gtneioreplugin/textures/blocks/Ha_bottom.png | Bin 0 -> 389 bytes .../gtneioreplugin/textures/blocks/Ha_front.png | Bin 0 -> 398 bytes .../gtneioreplugin/textures/blocks/Ha_left.png | Bin 286 -> 394 bytes .../gtneioreplugin/textures/blocks/Ha_right.png | Bin 289 -> 398 bytes .../gtneioreplugin/textures/blocks/Ha_top.png | Bin 282 -> 393 bytes .../gtneioreplugin/textures/blocks/Ho_back.png | Bin 0 -> 268 bytes .../gtneioreplugin/textures/blocks/Ho_bottom.png | Bin 0 -> 267 bytes .../gtneioreplugin/textures/blocks/Ho_front.png | Bin 0 -> 258 bytes .../gtneioreplugin/textures/blocks/Ho_left.png | Bin 0 -> 261 bytes .../gtneioreplugin/textures/blocks/Ho_right.png | Bin 0 -> 262 bytes .../gtneioreplugin/textures/blocks/Ho_top.png | Bin 0 -> 265 bytes .../gtneioreplugin/textures/blocks/Io_back.png | Bin 0 -> 337 bytes .../gtneioreplugin/textures/blocks/Io_bottom.png | Bin 0 -> 342 bytes .../gtneioreplugin/textures/blocks/Io_front.png | Bin 0 -> 330 bytes .../gtneioreplugin/textures/blocks/Io_left.png | Bin 458 -> 340 bytes .../gtneioreplugin/textures/blocks/Io_right.png | Bin 454 -> 336 bytes .../gtneioreplugin/textures/blocks/Io_top.png | Bin 457 -> 340 bytes .../gtneioreplugin/textures/blocks/KB_back.png | Bin 0 -> 463 bytes .../gtneioreplugin/textures/blocks/KB_bottom.png | Bin 0 -> 465 bytes .../gtneioreplugin/textures/blocks/KB_front.png | Bin 0 -> 455 bytes .../gtneioreplugin/textures/blocks/KB_left.png | Bin 408 -> 447 bytes .../gtneioreplugin/textures/blocks/KB_right.png | Bin 424 -> 475 bytes .../gtneioreplugin/textures/blocks/KB_top.png | Bin 380 -> 493 bytes .../gtneioreplugin/textures/blocks/MB_back.png | Bin 0 -> 352 bytes .../gtneioreplugin/textures/blocks/MB_bottom.png | Bin 0 -> 466 bytes .../gtneioreplugin/textures/blocks/MB_front.png | Bin 0 -> 432 bytes .../gtneioreplugin/textures/blocks/MB_left.png | Bin 0 -> 444 bytes .../gtneioreplugin/textures/blocks/MB_right.png | Bin 0 -> 449 bytes .../gtneioreplugin/textures/blocks/MB_top.png | Bin 0 -> 408 bytes .../gtneioreplugin/textures/blocks/MM_back.png | Bin 0 -> 345 bytes .../gtneioreplugin/textures/blocks/MM_bottom.png | Bin 0 -> 335 bytes .../gtneioreplugin/textures/blocks/MM_front.png | Bin 0 -> 331 bytes .../gtneioreplugin/textures/blocks/MM_left.png | Bin 376 -> 348 bytes .../gtneioreplugin/textures/blocks/MM_right.png | Bin 440 -> 329 bytes .../gtneioreplugin/textures/blocks/MM_top.png | Bin 384 -> 343 bytes .../gtneioreplugin/textures/blocks/Ma_back.png | Bin 0 -> 341 bytes .../gtneioreplugin/textures/blocks/Ma_bottom.png | Bin 0 -> 325 bytes .../gtneioreplugin/textures/blocks/Ma_front.png | Bin 0 -> 305 bytes .../gtneioreplugin/textures/blocks/Ma_left.png | Bin 320 -> 317 bytes .../gtneioreplugin/textures/blocks/Ma_right.png | Bin 304 -> 325 bytes .../gtneioreplugin/textures/blocks/Ma_top.png | Bin 323 -> 325 bytes .../gtneioreplugin/textures/blocks/Me_back.png | Bin 0 -> 338 bytes .../gtneioreplugin/textures/blocks/Me_bottom.png | Bin 0 -> 317 bytes .../gtneioreplugin/textures/blocks/Me_front.png | Bin 0 -> 331 bytes .../gtneioreplugin/textures/blocks/Me_left.png | Bin 491 -> 343 bytes .../gtneioreplugin/textures/blocks/Me_right.png | Bin 456 -> 311 bytes .../gtneioreplugin/textures/blocks/Me_top.png | Bin 559 -> 335 bytes .../gtneioreplugin/textures/blocks/Mh_back.png | Bin 0 -> 309 bytes .../gtneioreplugin/textures/blocks/Mh_bottom.png | Bin 0 -> 302 bytes .../gtneioreplugin/textures/blocks/Mh_front.png | Bin 0 -> 307 bytes .../gtneioreplugin/textures/blocks/Mh_left.png | Bin 0 -> 263 bytes .../gtneioreplugin/textures/blocks/Mh_right.png | Bin 0 -> 250 bytes .../gtneioreplugin/textures/blocks/Mh_top.png | Bin 0 -> 299 bytes .../gtneioreplugin/textures/blocks/Mi_back.png | Bin 0 -> 283 bytes .../gtneioreplugin/textures/blocks/Mi_bottom.png | Bin 0 -> 272 bytes .../gtneioreplugin/textures/blocks/Mi_front.png | Bin 0 -> 275 bytes .../gtneioreplugin/textures/blocks/Mi_left.png | Bin 262 -> 277 bytes .../gtneioreplugin/textures/blocks/Mi_right.png | Bin 265 -> 277 bytes .../gtneioreplugin/textures/blocks/Mi_top.png | Bin 266 -> 267 bytes .../gtneioreplugin/textures/blocks/Mo_back.png | Bin 0 -> 433 bytes .../gtneioreplugin/textures/blocks/Mo_bottom.png | Bin 0 -> 360 bytes .../gtneioreplugin/textures/blocks/Mo_front.png | Bin 0 -> 334 bytes .../gtneioreplugin/textures/blocks/Mo_left.png | Bin 402 -> 309 bytes .../gtneioreplugin/textures/blocks/Mo_right.png | Bin 343 -> 426 bytes .../gtneioreplugin/textures/blocks/Mo_top.png | Bin 389 -> 341 bytes .../gtneioreplugin/textures/blocks/Ne_back.png | Bin 0 -> 271 bytes .../gtneioreplugin/textures/blocks/Ne_bottom.png | Bin 0 -> 267 bytes .../gtneioreplugin/textures/blocks/Ne_front.png | Bin 0 -> 286 bytes .../gtneioreplugin/textures/blocks/Ne_left.png | Bin 227 -> 265 bytes .../gtneioreplugin/textures/blocks/Ne_right.png | Bin 218 -> 287 bytes .../gtneioreplugin/textures/blocks/Ne_top.png | Bin 226 -> 272 bytes .../gtneioreplugin/textures/blocks/Np_back.png | Bin 0 -> 254 bytes .../gtneioreplugin/textures/blocks/Np_bottom.png | Bin 0 -> 221 bytes .../gtneioreplugin/textures/blocks/Np_front.png | Bin 0 -> 254 bytes .../gtneioreplugin/textures/blocks/Np_left.png | Bin 0 -> 220 bytes .../gtneioreplugin/textures/blocks/Np_right.png | Bin 0 -> 203 bytes .../gtneioreplugin/textures/blocks/Np_top.png | Bin 0 -> 223 bytes .../gtneioreplugin/textures/blocks/Ob_back.png | Bin 0 -> 282 bytes .../gtneioreplugin/textures/blocks/Ob_bottom.png | Bin 0 -> 289 bytes .../gtneioreplugin/textures/blocks/Ob_front.png | Bin 0 -> 290 bytes .../gtneioreplugin/textures/blocks/Ob_left.png | Bin 411 -> 288 bytes .../gtneioreplugin/textures/blocks/Ob_right.png | Bin 349 -> 286 bytes .../gtneioreplugin/textures/blocks/Ob_top.png | Bin 345 -> 298 bytes .../gtneioreplugin/textures/blocks/Ow_back.png | Bin 0 -> 600 bytes .../gtneioreplugin/textures/blocks/Ow_bottom.png | Bin 0 -> 279 bytes .../gtneioreplugin/textures/blocks/Ow_front.png | Bin 0 -> 358 bytes .../gtneioreplugin/textures/blocks/Ow_left.png | Bin 229 -> 557 bytes .../gtneioreplugin/textures/blocks/Ow_right.png | Bin 222 -> 547 bytes .../gtneioreplugin/textures/blocks/Ow_top.png | Bin 241 -> 575 bytes .../gtneioreplugin/textures/blocks/Ph_back.png | Bin 0 -> 316 bytes .../gtneioreplugin/textures/blocks/Ph_bottom.png | Bin 0 -> 344 bytes .../gtneioreplugin/textures/blocks/Ph_front.png | Bin 0 -> 332 bytes .../gtneioreplugin/textures/blocks/Ph_left.png | Bin 208 -> 307 bytes .../gtneioreplugin/textures/blocks/Ph_right.png | Bin 368 -> 327 bytes .../gtneioreplugin/textures/blocks/Ph_top.png | Bin 381 -> 327 bytes .../gtneioreplugin/textures/blocks/Pl_back.png | Bin 0 -> 384 bytes .../gtneioreplugin/textures/blocks/Pl_bottom.png | Bin 0 -> 361 bytes .../gtneioreplugin/textures/blocks/Pl_front.png | Bin 0 -> 384 bytes .../gtneioreplugin/textures/blocks/Pl_left.png | Bin 285 -> 380 bytes .../gtneioreplugin/textures/blocks/Pl_right.png | Bin 314 -> 389 bytes .../gtneioreplugin/textures/blocks/Pl_top.png | Bin 423 -> 372 bytes .../gtneioreplugin/textures/blocks/Pr_back.png | Bin 0 -> 395 bytes .../gtneioreplugin/textures/blocks/Pr_bottom.png | Bin 0 -> 402 bytes .../gtneioreplugin/textures/blocks/Pr_front.png | Bin 0 -> 396 bytes .../gtneioreplugin/textures/blocks/Pr_left.png | Bin 304 -> 377 bytes .../gtneioreplugin/textures/blocks/Pr_right.png | Bin 306 -> 416 bytes .../gtneioreplugin/textures/blocks/Pr_top.png | Bin 251 -> 485 bytes .../gtneioreplugin/textures/blocks/Ra_back.png | Bin 0 -> 588 bytes .../gtneioreplugin/textures/blocks/Ra_bottom.png | Bin 0 -> 445 bytes .../gtneioreplugin/textures/blocks/Ra_front.png | Bin 0 -> 548 bytes .../gtneioreplugin/textures/blocks/Ra_left.png | Bin 224 -> 495 bytes .../gtneioreplugin/textures/blocks/Ra_right.png | Bin 229 -> 518 bytes .../gtneioreplugin/textures/blocks/Ra_top.png | Bin 210 -> 524 bytes .../gtneioreplugin/textures/blocks/Rb_back.png | Bin 0 -> 481 bytes .../gtneioreplugin/textures/blocks/Rb_bottom.png | Bin 0 -> 451 bytes .../gtneioreplugin/textures/blocks/Rb_front.png | Bin 0 -> 486 bytes .../gtneioreplugin/textures/blocks/Rb_left.png | Bin 221 -> 411 bytes .../gtneioreplugin/textures/blocks/Rb_right.png | Bin 214 -> 460 bytes .../gtneioreplugin/textures/blocks/Rb_top.png | Bin 221 -> 438 bytes .../gtneioreplugin/textures/blocks/Se_back.png | Bin 0 -> 330 bytes .../gtneioreplugin/textures/blocks/Se_bottom.png | Bin 0 -> 343 bytes .../gtneioreplugin/textures/blocks/Se_front.png | Bin 0 -> 339 bytes .../gtneioreplugin/textures/blocks/Se_left.png | Bin 0 -> 348 bytes .../gtneioreplugin/textures/blocks/Se_right.png | Bin 0 -> 342 bytes .../gtneioreplugin/textures/blocks/Se_top.png | Bin 0 -> 340 bytes .../gtneioreplugin/textures/blocks/TE_back.png | Bin 0 -> 402 bytes .../gtneioreplugin/textures/blocks/TE_bottom.png | Bin 0 -> 449 bytes .../gtneioreplugin/textures/blocks/TE_front.png | Bin 0 -> 459 bytes .../gtneioreplugin/textures/blocks/TE_left.png | Bin 343 -> 545 bytes .../gtneioreplugin/textures/blocks/TE_right.png | Bin 353 -> 511 bytes .../gtneioreplugin/textures/blocks/TE_top.png | Bin 422 -> 558 bytes .../gtneioreplugin/textures/blocks/TF_back.png | Bin 0 -> 379 bytes .../gtneioreplugin/textures/blocks/TF_bottom.png | Bin 0 -> 312 bytes .../gtneioreplugin/textures/blocks/TF_front.png | Bin 0 -> 337 bytes .../gtneioreplugin/textures/blocks/TF_left.png | Bin 219 -> 314 bytes .../gtneioreplugin/textures/blocks/TF_right.png | Bin 222 -> 393 bytes .../gtneioreplugin/textures/blocks/TF_top.png | Bin 219 -> 271 bytes .../gtneioreplugin/textures/blocks/Ti_back.png | Bin 0 -> 280 bytes .../gtneioreplugin/textures/blocks/Ti_bottom.png | Bin 0 -> 264 bytes .../gtneioreplugin/textures/blocks/Ti_front.png | Bin 0 -> 268 bytes .../gtneioreplugin/textures/blocks/Ti_left.png | Bin 206 -> 267 bytes .../gtneioreplugin/textures/blocks/Ti_right.png | Bin 215 -> 271 bytes .../gtneioreplugin/textures/blocks/Ti_top.png | Bin 223 -> 251 bytes .../gtneioreplugin/textures/blocks/Tr_back.png | Bin 0 -> 315 bytes .../gtneioreplugin/textures/blocks/Tr_bottom.png | Bin 0 -> 329 bytes .../gtneioreplugin/textures/blocks/Tr_front.png | Bin 0 -> 322 bytes .../gtneioreplugin/textures/blocks/Tr_left.png | Bin 262 -> 331 bytes .../gtneioreplugin/textures/blocks/Tr_right.png | Bin 291 -> 322 bytes .../gtneioreplugin/textures/blocks/Tr_top.png | Bin 312 -> 314 bytes .../gtneioreplugin/textures/blocks/VA_back.png | Bin 0 -> 460 bytes .../gtneioreplugin/textures/blocks/VA_bottom.png | Bin 0 -> 539 bytes .../gtneioreplugin/textures/blocks/VA_front.png | Bin 0 -> 327 bytes .../gtneioreplugin/textures/blocks/VA_left.png | Bin 351 -> 526 bytes .../gtneioreplugin/textures/blocks/VA_right.png | Bin 440 -> 305 bytes .../gtneioreplugin/textures/blocks/VA_top.png | Bin 284 -> 441 bytes .../gtneioreplugin/textures/blocks/VB_back.png | Bin 0 -> 425 bytes .../gtneioreplugin/textures/blocks/VB_bottom.png | Bin 0 -> 390 bytes .../gtneioreplugin/textures/blocks/VB_front.png | Bin 0 -> 404 bytes .../gtneioreplugin/textures/blocks/VB_left.png | Bin 217 -> 382 bytes .../gtneioreplugin/textures/blocks/VB_right.png | Bin 224 -> 390 bytes .../gtneioreplugin/textures/blocks/VB_top.png | Bin 230 -> 340 bytes .../gtneioreplugin/textures/blocks/Ve_back.png | Bin 0 -> 295 bytes .../gtneioreplugin/textures/blocks/Ve_bottom.png | Bin 0 -> 283 bytes .../gtneioreplugin/textures/blocks/Ve_front.png | Bin 0 -> 285 bytes .../gtneioreplugin/textures/blocks/Ve_left.png | Bin 407 -> 293 bytes .../gtneioreplugin/textures/blocks/Ve_right.png | Bin 399 -> 275 bytes .../gtneioreplugin/textures/blocks/Ve_top.png | Bin 382 -> 286 bytes 265 files changed, 235 insertions(+), 79 deletions(-) create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/An_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/An_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/An_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/An_left.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/An_right.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/An_top.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/As_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/As_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/As_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/BC_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/BC_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/BC_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/BE_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/BE_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/BE_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/BF_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/BF_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/BF_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/CB_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/CB_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/CB_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ca_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ca_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ca_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ce_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ce_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ce_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/DD_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/DD_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/DD_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/De_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/De_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/De_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/EA_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/EA_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/EA_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/ED_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/ED_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/ED_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/En_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/En_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/En_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Eu_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Eu_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Eu_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ga_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ga_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ga_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ha_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ha_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ha_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ho_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ho_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ho_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ho_left.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ho_right.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ho_top.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Io_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Io_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Io_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/KB_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/KB_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/KB_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/MB_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/MB_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/MB_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/MB_left.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/MB_right.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/MB_top.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/MM_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/MM_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/MM_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ma_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ma_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ma_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Me_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Me_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Me_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mh_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mh_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mh_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mh_left.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mh_right.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mh_top.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mi_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mi_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mi_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mo_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mo_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Mo_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ne_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ne_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ne_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Np_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Np_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Np_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Np_left.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Np_right.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Np_top.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ob_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ob_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ob_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ow_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ow_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ow_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ph_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ph_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ph_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Pl_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Pl_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Pl_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Pr_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Pr_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Pr_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ra_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ra_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ra_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Rb_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Rb_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Rb_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Se_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Se_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Se_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Se_left.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Se_right.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Se_top.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/TE_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/TE_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/TE_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/TF_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/TF_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/TF_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ti_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ti_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ti_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Tr_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Tr_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Tr_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/VA_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/VA_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/VA_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/VB_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/VB_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/VB_front.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ve_back.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ve_bottom.png create mode 100644 src/main/resources/assets/gtneioreplugin/textures/blocks/Ve_front.png diff --git a/build.gradle b/build.gradle index 3930990407..d90330a85c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1685785062 +//version: 1689878047 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -69,7 +69,7 @@ plugins { id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.14' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.21' } print("You might want to check out './gradlew :faq' if your build fails.\n") @@ -115,6 +115,8 @@ propertyDefaultIfUnset("usesMixinDebug", project.usesMixins) propertyDefaultIfUnset("forceEnableMixins", false) propertyDefaultIfUnset("channel", "stable") propertyDefaultIfUnset("mappingsVersion", "12") +propertyDefaultIfUnset("usesMavenPublishing", true) +propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases") propertyDefaultIfUnset("modrinthProjectId", "") propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnset("curseForgeProjectId", "") @@ -357,7 +359,27 @@ catch (Exception ignored) { String identifiedVersion String versionOverride = System.getenv("VERSION") ?: null try { - identifiedVersion = versionOverride == null ? gitVersion() : versionOverride + // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty + if (versionOverride == null) { + def gitDetails = versionDetails() + def isDirty = gitVersion().endsWith(".dirty") // No public API for this, isCleanTag has a different meaning + String branchName = gitDetails.branchName ?: (System.getenv('GIT_BRANCH') ?: 'git') + if (branchName.startsWith('origin/')) { + branchName = branchName.minus('origin/') + } + branchName = branchName.replaceAll("[^a-zA-Z0-9-]+", "-") // sanitize branch names for semver + identifiedVersion = gitDetails.lastTag ?: '${gitDetails.gitHash}' + if (gitDetails.commitDistance > 0) { + identifiedVersion += "-${branchName}.${gitDetails.commitDistance}+${gitDetails.gitHash}" + if (isDirty) { + identifiedVersion += "-dirty" + } + } else if (isDirty) { + identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty" + } + } else { + identifiedVersion = versionOverride + } } catch (Exception ignored) { out.style(Style.Failure).text( @@ -465,10 +487,19 @@ sourceSets { } } -if (file('addon.gradle').exists()) { +if (file('addon.gradle.kts').exists()) { + apply from: 'addon.gradle.kts' +} else if (file('addon.gradle').exists()) { apply from: 'addon.gradle' } +// File for local tweaks not commited to Git +if (file('addon.local.gradle.kts').exists()) { + apply from: 'addon.local.gradle.kts' +} else if (file('addon.local.gradle').exists()) { + apply from: 'addon.local.gradle' +} + // Allow unsafe repos but warn repositories.configureEach { repo -> if (repo instanceof org.gradle.api.artifacts.repositories.UrlArtifactRepository) { @@ -479,7 +510,14 @@ repositories.configureEach { repo -> } } -apply from: 'repositories.gradle' +if (file('repositories.gradle.kts').exists()) { + apply from: 'repositories.gradle.kts' +} else if (file('repositories.gradle').exists()) { + apply from: 'repositories.gradle' +} else { + logger.error("Neither repositories.gradle.kts nor repositories.gradle was found, make sure you extracted the full ExampleMod template.") + throw new RuntimeException("Missing repositories.gradle[.kts]") +} configurations { runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable) @@ -585,7 +623,7 @@ dependencies { } } if (usesMixins.toBoolean()) { - implementation(mixinProviderSpec) + implementation(modUtils.enableMixins(mixinProviderSpec)) } else if (forceEnableMixins.toBoolean()) { runtimeOnlyNonPublishable(mixinProviderSpec) } @@ -611,12 +649,34 @@ configurations.all { } } -apply from: 'dependencies.gradle' +dependencies { + constraints { + def minGtnhLibVersion = "0.0.13" + implementation("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") { + because("fixes duplicate mod errors in java 17 configurations using old gtnhlib") + } + runtimeOnly("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") { + because("fixes duplicate mod errors in java 17 configurations using old gtnhlib") + } + devOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") { + because("fixes duplicate mod errors in java 17 configurations using old gtnhlib") + } + runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") { + because("fixes duplicate mod errors in java 17 configurations using old gtnhlib") + } + } +} + +if (file('dependencies.gradle.kts').exists()) { + apply from: 'dependencies.gradle.kts' +} else if (file('dependencies.gradle').exists()) { + apply from: 'dependencies.gradle' +} else { + logger.error("Neither dependencies.gradle.kts nor dependencies.gradle was found, make sure you extracted the full ExampleMod template.") + throw new RuntimeException("Missing dependencies.gradle[.kts]") +} def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' -def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins' -def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap -def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg" tasks.register('generateAssets') { group = "GTNH Buildscript" @@ -648,46 +708,17 @@ tasks.register('generateAssets') { } if (usesMixins.toBoolean()) { - tasks.named("reobfJar", ReobfuscatedJar).configure { - extraSrgFiles.from(mixinSrg) - } - tasks.named("processResources").configure { dependsOn("generateAssets") } tasks.named("compileJava", JavaCompile).configure { - doFirst { - new File(mixinTmpDir).mkdirs() - } options.compilerArgs += [ - "-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}", - "-AoutSrgFile=${mixinSrg}", - "-AoutRefMapFile=${refMap}", // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code "-XDenableSunApiLintControl", "-XDignore.symbol.file" ] } - - pluginManager.withPlugin('org.jetbrains.kotlin.kapt') { - kapt { - correctErrorTypes = true - javacOptions { - option("-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}") - option("-AoutSrgFile=$mixinSrg") - option("-AoutRefMapFile=$refMap") - } - } - tasks.configureEach { task -> - if (task.name == "kaptKotlin") { - task.doFirst { - new File(mixinTmpDir).mkdirs() - } - } - } - } - } tasks.named("processResources", ProcessResources).configure { @@ -705,7 +736,6 @@ tasks.named("processResources", ProcessResources).configure { } if (usesMixins.toBoolean()) { - from refMap dependsOn("compileJava", "compileScala") } } @@ -724,13 +754,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.3.5' + def lwjgl3ifyVersion = '1.4.0' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -979,6 +1009,9 @@ idea { } } runConfigurations { + "0. Build and Test"(Gradle) { + taskNames = ["build"] + } "1. Run Client"(Gradle) { taskNames = ["runClient"] } @@ -1098,6 +1131,11 @@ tasks.named("processIdeaSettings").configure { dependsOn("injectTags") } +tasks.named("ideVirtualMainClasses").configure { + // Make IntelliJ "Build project" build the mod jars + dependsOn("jar", "reobfJar", "spotlessCheck") +} + // workaround variable hiding in pom processing def projectConfigs = project.configurations @@ -1118,12 +1156,14 @@ publishing { } repositories { - maven { - url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases" - allowInsecureProtocol = true - credentials { - username = System.getenv("MAVEN_USER") ?: "NONE" - password = System.getenv("MAVEN_PASSWORD") ?: "NONE" + if (usesMavenPublishing.toBoolean()) { + maven { + url = mavenPublishUrl + allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven + credentials { + username = System.getenv("MAVEN_USER") ?: "NONE" + password = System.getenv("MAVEN_PASSWORD") ?: "NONE" + } } } } @@ -1238,7 +1278,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.1.1" +def buildscriptGradleVersion = "8.2.1" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion @@ -1344,8 +1384,14 @@ boolean isNewBuildScriptVersionAvailable() { String currentBuildScript = getFile("build.gradle").getText() String currentBuildScriptHash = getVersionHash(currentBuildScript) - String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText() - String availableBuildScriptHash = getVersionHash(availableBuildScript) + String availableBuildScriptHash + try { + String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText() + availableBuildScriptHash = getVersionHash(availableBuildScript) + } catch (IOException e) { + logger.warn("Could not check for buildscript update availability: {}", e.message) + return false + } boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash return !isUpToDate @@ -1510,3 +1556,17 @@ def getSecondaryArtifacts() { if (apiPackage) secondaryArtifacts += [apiJar] return secondaryArtifacts } + +// For easier scripting of things that require variables defined earlier in the buildscript +if (file('addon.late.gradle.kts').exists()) { + apply from: 'addon.late.gradle.kts' +} else if (file('addon.late.gradle').exists()) { + apply from: 'addon.late.gradle' +} + +// File for local tweaks not commited to Git +if (file('addon.late.local.gradle.kts').exists()) { + apply from: 'addon.late.local.gradle.kts' +} else if (file('addon.late.local.gradle').exists()) { + apply from: 'addon.late.local.gradle' +} diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java index 9e5ab1885c..7d3b1eb5bc 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java @@ -1,12 +1,12 @@ package pers.gwyog.gtneioreplugin.plugin.block; -import static pers.gwyog.gtneioreplugin.plugin.renderer.ItemDimensionDisplayRenderer.getPrefix; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; + +import pers.gwyog.gtneioreplugin.plugin.renderer.ItemDimensionDisplayRenderer; public class BlockDimensionDisplay extends Block { @@ -14,38 +14,34 @@ public class BlockDimensionDisplay extends Block { @SuppressWarnings("unused") public long getDimensionRocketTier() { - return dimensionRocketTier; + return this.dimensionRocketTier; } private final long dimensionRocketTier; - private IIcon iconTop; - private IIcon iconRight; - private IIcon iconLeft; + private final IIcon[] icons = new IIcon[6]; public BlockDimensionDisplay(String dimension) { super(Material.rock); this.dimension = dimension; - this.dimensionRocketTier = getPrefix(dimension); + this.dimensionRocketTier = ItemDimensionDisplayRenderer.getPrefix(dimension); } @Override public IIcon getIcon(int side, int meta) { - EnumFacing direction = EnumFacing.getFront(side); - return switch (direction) { - case NORTH, SOUTH -> iconRight; - case WEST, EAST -> iconLeft; - default -> iconTop; - }; + return this.icons[MathHelper.clamp_int(side, 0, 5)]; } @Override public void registerBlockIcons(IIconRegister iconRegister) { - this.iconTop = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_top"); - this.iconRight = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_right"); - this.iconLeft = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_left"); + this.icons[0] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_bottom"); + this.icons[1] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_top"); + this.icons[2] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_back"); + this.icons[3] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_front"); + this.icons[4] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_left"); + this.icons[5] = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_right"); } public String getDimension() { - return dimension; + return this.dimension; } } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java index 0c7617645c..0c670a6d3d 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java @@ -70,7 +70,8 @@ public class ItemDimensionDisplayRenderer implements IItemRenderer { case "Pr", "Tr" -> 6L; case "Ha", "KB", "MM", "Pl" -> 7L; case "BC", "BE", "BF", "CB", "TE", "VB" -> 8L; - case "DD" -> 9L; + case "An", "Ho", "Np", "Mh", "MB", "Se" -> 9L; + case "DD" -> 10L; default -> -1L; }; } diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java index d19a1fdff9..1a56044219 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java @@ -64,6 +64,7 @@ public class CSVMaker implements Runnable { oremix.setOreName(oreLayer.oreGenName.split("\\.")[2]); oremix.setHeight(oreLayer.worldGenHeightRange); oremix.setDensity(oreLayer.amountPerChunk); + oremix.an = Dims.contains("An"); oremix.as = Dims.contains("As"); oremix.bc = Dims.contains("BC"); oremix.be = Dims.contains("BE"); @@ -78,17 +79,22 @@ public class CSVMaker implements Runnable { oremix.eu = Dims.contains("Eu"); oremix.ga = Dims.contains("Ga"); oremix.ha = Dims.contains("Ha"); + oremix.ho = Dims.contains("Ho"); oremix.io = Dims.contains("Io"); oremix.kb = Dims.contains("KB"); oremix.make = Dims.contains("MM"); oremix.ma = Dims.contains("Ma"); + oremix.mb = Dims.contains("MB"); oremix.me = Dims.contains("Me"); + oremix.mh = Dims.contains("Mh"); oremix.mi = Dims.contains("Mi"); oremix.mo = Dims.contains("Mo"); + oremix.np = Dims.contains("Np"); oremix.ob = Dims.contains("Ob"); oremix.ph = Dims.contains("Ph"); oremix.pl = Dims.contains("Pl"); oremix.pr = Dims.contains("Pr"); + oremix.se = Dims.contains("Se"); oremix.tcetie = Dims.contains("TE"); oremix.tf = Dims.contains("TF"); oremix.ti = Dims.contains("Ti"); @@ -106,14 +112,14 @@ public class CSVMaker implements Runnable { BufferedWriter one = Files.newBufferedWriter(Paths.get(GTNEIOrePlugin.CSVnameSmall)); ColumnPositionMappingStrategy strat = new ColumnPositionMappingStrategy<>(); strat.setType(Oremix.class); - String[] columns = "ORENAME,mix,DENSITY,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie" + String[] columns = "ORENAME,mix,DENSITY,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie,an,ho,np,mh,mb,se" .split("\\,"); strat.setColumnMapping(columns); StatefulBeanToCsv beanToCsv = new StatefulBeanToCsvBuilder(one) .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build(); List towrite = Combsort(OreVeins); one.write( - "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E"); + "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E,Anubis,Horus,Neper,Maahes,Mehen Belt,Seth"); one.newLine(); beanToCsv.write(towrite); one.flush(); @@ -156,6 +162,7 @@ public class CSVMaker implements Runnable { + Integer.toString(oreLayer.Meta[2]) + "|" + Integer.toString(oreLayer.Meta[3])); + oremix.an = Dims.contains("An"); oremix.as = Dims.contains("As"); oremix.bc = Dims.contains("BC"); oremix.be = Dims.contains("BE"); @@ -170,17 +177,22 @@ public class CSVMaker implements Runnable { oremix.eu = Dims.contains("Eu"); oremix.ga = Dims.contains("Ga"); oremix.ha = Dims.contains("Ha"); + oremix.ho = Dims.contains("Ho"); oremix.io = Dims.contains("Io"); oremix.kb = Dims.contains("KB"); oremix.make = Dims.contains("MM"); oremix.ma = Dims.contains("Ma"); + oremix.mb = Dims.contains("MB"); oremix.me = Dims.contains("Me"); + oremix.mh = Dims.contains("Mh"); oremix.mi = Dims.contains("Mi"); oremix.mo = Dims.contains("Mo"); + oremix.np = Dims.contains("Np"); oremix.ob = Dims.contains("Ob"); oremix.ph = Dims.contains("Ph"); oremix.pl = Dims.contains("Pl"); oremix.pr = Dims.contains("Pr"); + oremix.se = Dims.contains("Se"); oremix.tcetie = Dims.contains("TE"); oremix.tf = Dims.contains("TF"); oremix.ti = Dims.contains("Ti"); @@ -198,14 +210,14 @@ public class CSVMaker implements Runnable { BufferedWriter one = Files.newBufferedWriter(Paths.get(GTNEIOrePlugin.CSVname)); ColumnPositionMappingStrategy strat = new ColumnPositionMappingStrategy<>(); strat.setType(Oremix.class); - String[] columns = "ORENAME,PRIMARY,SECONDARY,INBETWEEN,AROUND,mix,TIER,HEIGHT,DENSITY,SIZE,WEIGHT,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie" + String[] columns = "ORENAME,PRIMARY,SECONDARY,INBETWEEN,AROUND,mix,TIER,HEIGHT,DENSITY,SIZE,WEIGHT,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie,an,ho,np,mh,mb,se" .split("\\,"); strat.setColumnMapping(columns); StatefulBeanToCsv beanToCsv = new StatefulBeanToCsvBuilder(one) .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build(); List towrite = Combsort(OreVeins); one.write( - "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E"); + "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E,Anubis,Horus,Neper,Maahes,Mehen Belt,Seth"); one.newLine(); beanToCsv.write(towrite); one.flush(); diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java index 02ad143dd4..78224dc5ae 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java @@ -30,12 +30,18 @@ public class DimensionHelper { "GalaxySpace_Haumea", "GalaxySpace_Kuiperbelt", "GalaxySpace_MakeMake", "GalaxySpace_Pluto", // T8 "GalaxySpace_BarnardC", "GalaxySpace_BarnardE", "GalaxySpace_BarnardF", "GalaxySpace_CentauriA", - "GalaxySpace_TcetiE", "Underdark", "GalaxySpace_VegaB", }; + "GalaxySpace_TcetiE", "GalaxySpace_VegaB", + // T9 + "GalacticraftAmunRa_Anubis", "GalacticraftAmunRa_Horus", "GalacticraftAmunRa_Maahes", + "GalacticraftAmunRa_Mehen Belt", "GalacticraftAmunRa_Neper", "GalacticraftAmunRa_Seth", + // T10 + "Underdark", }; public static final String[] DimNameTrimmed = Arrays.stream(DimName) .map( n -> n.replaceAll("GalacticraftCore_", "").replaceAll("GalacticraftMars_", "") - .replaceAll("GalaxySpace_", "").replaceAll("Vanilla_", "Vanilla ")) + .replaceAll("GalaxySpace_", "").replaceAll("GalacticraftAmunRa_", "") + .replaceAll("Vanilla_", "Vanilla ")) .toArray(String[]::new); public static final String[] DimNameDisplayed = { // first 2 letters if one word else 1 letter of every word, except @@ -83,10 +89,18 @@ public class DimensionHelper { "BC", // GalaxySpace_BarnardC "BE", // GalaxySpace_BarnardE "BF", // GalaxySpace_BarnardF - "CB", // GalaxySpace_CentauriA is actually αCentauri Bb + "CB", // GalaxySpace_CentauriA is actually α Centauri Bb "TE", // GalaxySpace_TcetiE - "DD", // Underdark "VB", // GalaxySpace_VegaB + // T9 + "An", // GalacticraftAmunRa_Anubis + "Ho", // GalacticraftAmunRa_Horus + "Mh", // GalacticraftAmunRa_Maahes + "MB", // GalacticraftAmunRa_Mehen Belt + "Np", // GalacticraftAmunRa_Neper + "Se", // GalacticraftAmunRa_Seth + // T10 + "DD", // Underdark }; private static final HashMap> tooltipBuffer = new HashMap<>(); @@ -108,7 +122,8 @@ public class DimensionHelper { case "Proteus", "Triton" -> "T6: " + s; case "Haumea", "Kuiperbelt", "MakeMake", "Pluto" -> "T7: " + s; case "BarnardC", "BarnardE", "BarnardF", "CentauriA", "TcetiE", "VegaB" -> "T8: " + s; - case "Underdark" -> "T9: " + s; + case "Anubis", "Horus", "Maahes", "Mehen Belt", "Neper", "Seth" -> "T9: " + s; + case "Underdark" -> "T10: " + s; default -> s; }; diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java b/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java index d17e020db7..401cadc09f 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java @@ -99,6 +99,24 @@ public class Oremix { @CsvCustomBindByName(column = "T Ceti E", converter = XtoBool.class) public boolean tcetie; + @CsvCustomBindByName(column = "Anubis", required = false, converter = XtoBool.class) + public boolean an; + + @CsvCustomBindByName(column = "Horus", required = false, converter = XtoBool.class) + public boolean ho; + + @CsvCustomBindByName(column = "Neper", required = false, converter = XtoBool.class) + public boolean np; + + @CsvCustomBindByName(column = "Maahes", required = false, converter = XtoBool.class) + public boolean mh; + + @CsvCustomBindByName(column = "Mehen Belt", required = false, converter = XtoBool.class) + public boolean mb; + + @CsvCustomBindByName(column = "Seth", required = false, converter = XtoBool.class) + public boolean se; + @CsvCustomBindByName(column = "Ore Name", required = true, converter = Veinrenamer.class) private String oreName; @@ -393,6 +411,54 @@ public class Oremix { this.tcetie = tcetie; } + public boolean isAn() { + return an; + } + + public void setAn(boolean an) { + this.an = an; + } + + public boolean isHo() { + return ho; + } + + public void setHo(boolean ho) { + this.ho = ho; + } + + public boolean isNp() { + return np; + } + + public void setNp(boolean np) { + this.np = np; + } + + public boolean isMh() { + return mh; + } + + public void setMh(boolean mh) { + this.mh = mh; + } + + public boolean isMb() { + return mb; + } + + public void setMb(boolean mb) { + this.mb = mb; + } + + public boolean isSe() { + return se; + } + + public void setSe(boolean se) { + this.se = se; + } + public String getOreName() { return this.oreName; } diff --git a/src/main/resources/assets/gtneioreplugin/lang/en_US.lang b/src/main/resources/assets/gtneioreplugin/lang/en_US.lang index e55dedc668..8f629b5893 100644 --- a/src/main/resources/assets/gtneioreplugin/lang/en_US.lang +++ b/src/main/resources/assets/gtneioreplugin/lang/en_US.lang @@ -75,6 +75,12 @@ gtnop.world.BarnardC=Barnard C gtnop.world.BarnardE=Barnard E gtnop.world.BarnardF=Barnard F gtnop.world.TcetiE=T Ceti E +gtnop.world.Anubis=Anubis +gtnop.world.Mehen Belt=Mehen Belt +gtnop.world.Horus=Horus +gtnop.world.Maahes=Maahes +gtnop.world.Neper=Neper +gtnop.world.Seth=Seth gtnop.world.Underdark=Deep Dark diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/An_back.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_back.png new file mode 100644 index 0000000000..f2d08d0fdb Binary files /dev/null and b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_back.png differ diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/An_bottom.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_bottom.png new file mode 100644 index 0000000000..f8d55a86d4 Binary files /dev/null and b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_bottom.png differ diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/An_front.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_front.png new file mode 100644 index 0000000000..a1705da804 Binary files /dev/null and b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_front.png differ diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/An_left.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_left.png new file mode 100644 index 0000000000..f542adf34e Binary files /dev/null and b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_left.png differ diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/An_right.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_right.png new file mode 100644 index 0000000000..e6588b0d94 Binary files /dev/null and b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_right.png differ diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/An_top.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_top.png new file mode 100644 index 0000000000..bbd74fdeba Binary files /dev/null and b/src/main/resources/assets/gtneioreplugin/textures/blocks/An_top.png differ diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/As_back.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/As_back.png new file mode 100644 index 0000000000..61ed0f9cb0 Binary files /dev/null and b/src/main/resources/assets/gtneioreplugin/textures/blocks/As_back.png differ diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/As_bottom.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/As_bottom.png new file mode 100644 index 0000000000..39c99cf717 Binary files /dev/null and b/src/main/resources/assets/gtneioreplugin/textures/blocks/As_bottom.png differ diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/As_front.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/As_front.png new file mode 100644 index 0000000000..e624c07c5f Binary files /dev/null and b/src/main/resources/assets/gtneioreplugin/textures/blocks/As_front.png differ diff --git a/src/main/resources/assets/gtneioreplugin/textures/blocks/As_left.png b/src/main/resources/assets/gtneioreplugin/textures/blocks/As_left.png index c8a5799ea7..7a64cbc905 100644 Binary files a/src/main/resources/assets/gtneioreplugin/textures/blocks/As_left.png and b/src/main/resources/assets/gtneioreplugin/textures/blo